Rename a number of libraries and executables to avoid conflicts with KDE4

5 files changed, 12 insertions, 12 deletions

diff --git a/kcontrol/kthememanager/CMakeLists.txt b/kcontrol/kthememanager/CMakeLists.txt
index 2d71a367e..b3d000aa5 100644
--- a/kcontrol/kthememanager/CMakeLists.txt
+++ b/kcontrol/kthememanager/CMakeLists.txt
@@ -33,6 +33,6 @@ tde_add_kpart( kcm_kthememanager AUTOMOC
   SOURCES
     kthemedlg.ui newthemewidget.ui knewthemedlg.cpp
     ktheme.cpp kthememanager.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp
index faf6feb9c..e516ddd41 100644
--- a/kcontrol/kthememanager/ktheme.cpp
+++ b/kcontrol/kthememanager/ktheme.cpp
@@ -28,13 +28,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <dcopclient.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdatastream.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <kipc.h>
 #include <klocale.h>
 #include <kservice.h>
diff --git a/kcontrol/kthememanager/kthemedlg.ui.h b/kcontrol/kthememanager/kthemedlg.ui.h
index 85d22cb9d..762de201d 100644
--- a/kcontrol/kthememanager/kthemedlg.ui.h
+++ b/kcontrol/kthememanager/kthemedlg.ui.h
@@ -16,34 +16,34 @@ void KThemeDlg::startKonqui( const TQString & url )
 
 void KThemeDlg::startBackground()
 {
-    KRun::runCommand("kcmshell kde-background");
+    KRun::runCommand("tdecmshell kde-background");
 }
 
 
 void KThemeDlg::startColors()
 {
-    KRun::runCommand("kcmshell kde-colors");
+    KRun::runCommand("tdecmshell kde-colors");
 }
 
 
 void KThemeDlg::startStyle()
 {
-    KRun::runCommand("kcmshell kde-style");
+    KRun::runCommand("tdecmshell kde-style");
 }
 
 
 void KThemeDlg::startIcons()
 {
-    KRun::runCommand("kcmshell kde-icons");
+    KRun::runCommand("tdecmshell kde-icons");
 }
 
 void KThemeDlg::startFonts()
 {
-   KRun::runCommand("kcmshell kde-fonts");
+   KRun::runCommand("tdecmshell kde-fonts");
 }
 
 
 void KThemeDlg::startSaver()
 {
-    KRun::runCommand("kcmshell kde-screensaver");
+    KRun::runCommand("tdecmshell kde-screensaver");
 }
diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp
index 4a4817041..a72766837 100644
--- a/kcontrol/kthememanager/kthememanager.cpp
+++ b/kcontrol/kthememanager/kthememanager.cpp
@@ -28,7 +28,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kemailsettings.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klistview.h>
diff --git a/kcontrol/kthememanager/kthememanager.desktop b/kcontrol/kthememanager/kthememanager.desktop
index 26a3ed3cd..07e6b69b1 100644
--- a/kcontrol/kthememanager/kthememanager.desktop
+++ b/kcontrol/kthememanager/kthememanager.desktop
@@ -66,7 +66,7 @@ Comment[vi]=Trình quản lý các sắc thái của TDE
 Comment[wa]=Manaedjî tinmes pol rivnance globåle di TDE
 Comment[zh_CN]=管理全局 TDE 视觉主题
 Comment[zh_TW]=管理全域 TDE 視覺佈景
-Exec=kcmshell kthememanager
+Exec=tdecmshell kthememanager
 Icon=kthememgr
 Keywords=themes,look and feel
 Keywords[af]=themes,look and feel,temas