summaryrefslogtreecommitdiffstats
path: root/tdeutils/tdecmoduleproxy.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:04:16 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:04:16 -0600
commit5159cd2beb2e87806a5b54e9991b7895285c9d3e (patch)
tree9b70e8be47a390f8f4d56ead812ab0c9dad88709 /tdeutils/tdecmoduleproxy.cpp
parentc17cb900dcf52b8bd6dc300d4f103392900ec2b4 (diff)
downloadtdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.tar.gz
tdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tdeutils/tdecmoduleproxy.cpp')
-rw-r--r--tdeutils/tdecmoduleproxy.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tdeutils/tdecmoduleproxy.cpp b/tdeutils/tdecmoduleproxy.cpp
index 673074c16..d124db091 100644
--- a/tdeutils/tdecmoduleproxy.cpp
+++ b/tdeutils/tdecmoduleproxy.cpp
@@ -151,7 +151,7 @@ TDECModule * TDECModuleProxy::realModule() const
if( d->kcm )
return d->kcm;
- /* /We/ have no kcm, but kcmshell running with root prevs does.. */
+ /* /We/ have no kcm, but tdecmshell running with root prevs does.. */
if( d->rootMode )
return 0;
@@ -329,7 +329,7 @@ void TDECModuleProxy::runAsRoot()
lblBusy->show();
deleteClient();
- /* The DCOP registration is now gone, and it will occur again when kcmshell soon
+ /* The DCOP registration is now gone, and it will occur again when tdecmshell soon
* registers. Here's a race condition in other words, but how likely is that?
*
* - It's a user initiated action, which means the user have to do weird stuff, very
@@ -340,7 +340,7 @@ void TDECModuleProxy::runAsRoot()
* the DCOP object is established.
*/
- /* Prepare the process to run the kcmshell */
+ /* Prepare the process to run the tdecmshell */
TQString cmd = moduleInfo().service()->exec().stripWhiteSpace();
if (cmd.left(5) == "tdesu")
{
@@ -351,7 +351,7 @@ void TDECModuleProxy::runAsRoot()
cmd = TQString(cmd.remove( 0, cmd.find( ' ' ) )).stripWhiteSpace();
}
- if (cmd.left(8) == "kcmshell")
+ if (cmd.left(8) == "tdecmshell")
cmd = TQString(cmd.remove(0,8)).stripWhiteSpace();
/* Run the process */
@@ -364,7 +364,7 @@ void TDECModuleProxy::runAsRoot()
*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"))
+ *d->rootProcess << TQString("%1 %2 --embed-proxy %3 --lang %4").arg(locate("exe", "tdecmshell"))
.arg(cmd).arg(d->embedWidget->winId()).arg(TDEGlobal::locale()->language());
connect(d->rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(rootExited()));