diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
tree | 7b7a01768b3781763186c825af21bb14717d2c32 /kutils/kcmoduleproxy.cpp | |
parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kutils/kcmoduleproxy.cpp')
-rw-r--r-- | kutils/kcmoduleproxy.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kutils/kcmoduleproxy.cpp b/kutils/kcmoduleproxy.cpp index 3528ae738..f034c9a5f 100644 --- a/kutils/kcmoduleproxy.cpp +++ b/kutils/kcmoduleproxy.cpp @@ -93,7 +93,7 @@ class KCModuleProxy::KCModuleProxyPrivate TQStringList args; KCModule *kcm; QXEmbed *embedWidget; - KProcess *rootProcess; + TDEProcess *rootProcess; TQVBox *embedFrame; KCModuleProxyIfaceImpl *dcopObject; DCOPClient *dcopClient; @@ -359,17 +359,17 @@ void KCModuleProxy::runAsRoot() if (!tdesu.isEmpty()) { - d->rootProcess = new KProcess; + d->rootProcess = new TDEProcess; *d->rootProcess << tdesu; *d->rootProcess << "--nonewdcop" << "-n" << "-d" << TQString( "-i%1" ).arg(moduleInfo().icon()); *d->rootProcess << TQString("%1 %2 --embed-proxy %3 --lang %4").arg(locate("exe", "kcmshell")) - .arg(cmd).arg(d->embedWidget->winId()).arg(KGlobal::locale()->language()); + .arg(cmd).arg(d->embedWidget->winId()).arg(TDEGlobal::locale()->language()); - connect(d->rootProcess, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(rootExited())); + connect(d->rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(rootExited())); - if ( !d->rootProcess->start( KProcess::NotifyOnExit )) + if ( !d->rootProcess->start( TDEProcess::NotifyOnExit )) { d->rootMode = false; rootExited(); |