summaryrefslogtreecommitdiffstats
path: root/kutils
diff options
context:
space:
mode:
Diffstat (limited to 'kutils')
-rw-r--r--kutils/CMakeLists.txt6
-rw-r--r--kutils/Mainpage.dox2
-rw-r--r--kutils/Makefile.am2
-rw-r--r--kutils/kcmoduleproxy.cpp14
-rw-r--r--kutils/ksettings/CMakeLists.txt6
5 files changed, 15 insertions, 15 deletions
diff --git a/kutils/CMakeLists.txt b/kutils/CMakeLists.txt
index f0c2c135e..a033088cd 100644
--- a/kutils/CMakeLists.txt
+++ b/kutils/CMakeLists.txt
@@ -14,11 +14,11 @@ add_subdirectory( ksettings )
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/dcop
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio/kio
${CMAKE_SOURCE_DIR}/kutils
${CMAKE_SOURCE_DIR}/interfaces/kregexpeditor
diff --git a/kutils/Mainpage.dox b/kutils/Mainpage.dox
index f649fcc3d..935908d1d 100644
--- a/kutils/Mainpage.dox
+++ b/kutils/Mainpage.dox
@@ -19,6 +19,6 @@ Matthias Hoelzer-Kluepfel \<hoelzer@kde.org\>
*/
-// DOXYGEN_REFERENCES = kdecore kdeui kio
+// DOXYGEN_REFERENCES = tdecore tdeui kio
// DOXYGEN_SET_PROJECT_NAME = KUtils
// vim:ts=4:sw=4:expandtab:filetype=doxygen
diff --git a/kutils/Makefile.am b/kutils/Makefile.am
index 4ddda0d83..5377b6cf5 100644
--- a/kutils/Makefile.am
+++ b/kutils/Makefile.am
@@ -25,7 +25,7 @@ kde_servicetypes_DATA = kplugininfo.desktop
METASOURCES = AUTO
-DOXYGEN_REFERENCES = kdecore kdeui kio
+DOXYGEN_REFERENCES = tdecore tdeui kio
include ../admin/Doxyfile.am
# vim: et
diff --git a/kutils/kcmoduleproxy.cpp b/kutils/kcmoduleproxy.cpp
index 9ce81f700..8a7a3eff3 100644
--- a/kutils/kcmoduleproxy.cpp
+++ b/kutils/kcmoduleproxy.cpp
@@ -125,14 +125,14 @@ class KCModuleProxy::KCModuleProxyPrivate
- Two Layout problems in runAsRoot:
* lblBusy doesn't show
* d->kcm/d->rootInfo doesn't get it right when the user
- presses cancel in the kdesu dialog
+ presses cancel in the tdesu dialog
- Resizing horizontally is contrained; minimum size is set somewhere.
It appears to be somehow derived from the module's size.
- Prettify: set icon in KCMultiDialog.
- - Perhaps it's possible to link against kdesu such that
+ - Perhaps it's possible to link against tdesu such that
the dialog is in process?
*/
@@ -341,11 +341,11 @@ void KCModuleProxy::runAsRoot()
/* Prepare the process to run the kcmshell */
TQString cmd = moduleInfo().service()->exec().stripWhiteSpace();
- if (cmd.left(5) == "kdesu")
+ if (cmd.left(5) == "tdesu")
{
cmd = TQString(cmd.remove(0,5)).stripWhiteSpace();
- /* Remove all kdesu switches */
+ /* Remove all tdesu switches */
while( cmd.length() > 1 && cmd[ 0 ] == '-' )
cmd = TQString(cmd.remove( 0, cmd.find( ' ' ) )).stripWhiteSpace();
}
@@ -354,13 +354,13 @@ void KCModuleProxy::runAsRoot()
cmd = TQString(cmd.remove(0,8)).stripWhiteSpace();
/* Run the process */
- TQString kdesu = KStandardDirs::findExe("kdesu");
- if (!kdesu.isEmpty())
+ TQString tdesu = KStandardDirs::findExe("tdesu");
+ if (!tdesu.isEmpty())
{
d->rootProcess = new KProcess;
- *d->rootProcess << kdesu;
+ *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"))
diff --git a/kutils/ksettings/CMakeLists.txt b/kutils/ksettings/CMakeLists.txt
index 1047d6f0e..3e4744bd8 100644
--- a/kutils/ksettings/CMakeLists.txt
+++ b/kutils/ksettings/CMakeLists.txt
@@ -12,10 +12,10 @@
include_directories(
${TQT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/kdecore
+ ${CMAKE_BINARY_DIR}/tdecore
${CMAKE_SOURCE_DIR}/kutils
- ${CMAKE_SOURCE_DIR}/kdecore
- ${CMAKE_SOURCE_DIR}/kdeui
+ ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_SOURCE_DIR}/tdeui
${CMAKE_SOURCE_DIR}/kio/kio
)