diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:02:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:02:02 -0600 |
| commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
| tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /kcontrol/kcontrol | |
| parent | 936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff) | |
| download | tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/kcontrol')
| -rw-r--r-- | kcontrol/kcontrol/main.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/kcontrol/moduleIface.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/kcontrol/modules.cpp | 8 | ||||
| -rw-r--r-- | kcontrol/kcontrol/toplevel.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp index ad61b11c1..27aaed1ba 100644 --- a/kcontrol/kcontrol/main.cpp +++ b/kcontrol/kcontrol/main.cpp @@ -38,7 +38,7 @@ #include <dcopclient.h> #include <kaboutdata.h> #include <kglobalsettings.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include "main.h" diff --git a/kcontrol/kcontrol/moduleIface.cpp b/kcontrol/kcontrol/moduleIface.cpp index 98135a27f..dbaba9054 100644 --- a/kcontrol/kcontrol/moduleIface.cpp +++ b/kcontrol/kcontrol/moduleIface.cpp @@ -21,7 +21,7 @@ #include "moduleIface.moc" #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> ModuleIface::ModuleIface(TQObject *parent, const char *name) : TQObject(parent, name), DCOPObject(name) { diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp index 8382c5d81..4c3ccbbc1 100644 --- a/kcontrol/kcontrol/modules.cpp +++ b/kcontrol/kcontrol/modules.cpp @@ -141,7 +141,7 @@ void ConfigModule::runAsRoot() delete _embedStack; // create an embed widget that will embed the - // kcmshell running as root + // tdecmshell running as root _embedLayout = new TQVBoxLayout(_module->parentWidget()); _embedFrame = new TQVBox( _module->parentWidget() ); _embedFrame->setFrameStyle( TQFrame::Box | TQFrame::Raised ); @@ -165,7 +165,7 @@ void ConfigModule::runAsRoot() _embedStack->raiseWidget(_busy); connect(_embedWidget, TQT_SIGNAL( windowEmbedded(WId)), TQT_SLOT( embedded())); - // prepare the process to run the kcmshell + // prepare the process to run the tdecmshell TQString cmd = service()->exec().stripWhiteSpace(); bool kdeshell = false; if (cmd.left(5) == "tdesu") @@ -179,7 +179,7 @@ void ConfigModule::runAsRoot() } } - if (cmd.left(8) == "kcmshell") + if (cmd.left(8) == "tdecmshell") { cmd = TQString(cmd.remove(0,8)).stripWhiteSpace(); kdeshell = true; @@ -198,7 +198,7 @@ void ConfigModule::runAsRoot() // We also don't have a way to close the module in that case. *_rootProcess << "--n"; // Don't keep password. if (kdeshell) { - *_rootProcess << TQString("%1 %2 --embed %3 --lang %4").arg(locate("exe", "kcmshell")).arg(cmd).arg(_embedWidget->winId()).arg(TDEGlobal::locale()->language()); + *_rootProcess << TQString("%1 %2 --embed %3 --lang %4").arg(locate("exe", "tdecmshell")).arg(cmd).arg(_embedWidget->winId()).arg(TDEGlobal::locale()->language()); } else { *_rootProcess << TQString("%1 --embed %2 --lang %3").arg(cmd).arg(_embedWidget->winId()).arg( TDEGlobal::locale()->language() ); diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp index fbfc86cd7..06a09e2d3 100644 --- a/kcontrol/kcontrol/toplevel.cpp +++ b/kcontrol/kcontrol/toplevel.cpp @@ -20,7 +20,7 @@ #include <kapplication.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kbugreport.h> #include <kaboutapplication.h> #include <kmessagebox.h> |