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

19 files changed, 23 insertions, 23 deletions

diff --git a/kcontrol/konq/CMakeLists.txt b/kcontrol/konq/CMakeLists.txt
index d7b12811f..3e99e5f27 100644
--- a/kcontrol/konq/CMakeLists.txt
+++ b/kcontrol/konq/CMakeLists.txt
@@ -45,6 +45,6 @@ tde_add_kpart( kcm_konq AUTOMOC
     behaviour.cpp desktop.cpp desktopbehavior_impl.cpp
     previews.cpp browser.cpp main.cpp rootopts.cpp
     fontopts.cpp  desktopbehavior.ui
-  LINK kio-shared tdeutils-shared
+  LINK tdeio-shared tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/konq/Makefile.am b/kcontrol/konq/Makefile.am
index f9ef60055..2dddd9426 100644
--- a/kcontrol/konq/Makefile.am
+++ b/kcontrol/konq/Makefile.am
@@ -21,7 +21,7 @@ kcmkonq_datadir = $(kde_appsdir)/.hidden
 
 xdg_apps_DATA = desktopbehavior.desktop desktop.desktop desktoppath.desktop filebrowser.desktop
 
-uiserver_DIR = $(kde_includes)/kio
+uiserver_DIR = $(kde_includes)/tdeio
 
 EXTRA_DIST = $(kcm_konq_la_DATA) $(kcmkonq_data_DATA)
 
diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp
index 12bf6159c..70c6a1d1d 100644
--- a/kcontrol/konq/behaviour.cpp
+++ b/kcontrol/konq/behaviour.cpp
@@ -29,8 +29,8 @@
 #include <dcopclient.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
-#include <kio/uiserver_stub.h>
+#include <tdeconfig.h>
+#include <tdeio/uiserver_stub.h>
 #include <klocale.h>
 #include <konq_defaults.h>
 #include <kstandarddirs.h>
@@ -258,9 +258,9 @@ void KBehaviourOptions::save()
     config.writeEntry( "ShowList", cbListProgress->isChecked() );
     config.sync();
     // Tell the running server
-    if ( kapp->dcopClient()->isApplicationRegistered( "kio_uiserver" ) )
+    if ( kapp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) )
     {
-      UIServer_stub uiserver( "kio_uiserver", "UIServer" );
+      UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
       uiserver.setListMode( cbListProgress->isChecked() );
     }
 
diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp
index 3b4bcb32a..93fecee08 100644
--- a/kcontrol/konq/desktop.cpp
+++ b/kcontrol/konq/desktop.cpp
@@ -31,7 +31,7 @@
 #include <kdialog.h>
 #include <klineedit.h>
 #include <knuminput.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <netwm.h>
 
diff --git a/kcontrol/konq/desktop.desktop b/kcontrol/konq/desktop.desktop
index 0fdb4a54f..e53afe11a 100644
--- a/kcontrol/konq/desktop.desktop
+++ b/kcontrol/konq/desktop.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/desktop/index.html#desktop-number
 Icon=desktop
-Exec=kcmshell desktop
+Exec=tdecmshell desktop
 
 
 X-TDE-Library=konq
diff --git a/kcontrol/konq/desktopbehavior.desktop b/kcontrol/konq/desktopbehavior.desktop
index bb34bc904..4f973bc46 100644
--- a/kcontrol/konq/desktopbehavior.desktop
+++ b/kcontrol/konq/desktopbehavior.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/desktopbehavior/index.html
 Icon=desktop
-Exec=kcmshell desktopbehavior
+Exec=tdecmshell desktopbehavior
 
 
 X-TDE-Library=konq
diff --git a/kcontrol/konq/desktopbehavior_impl.h b/kcontrol/konq/desktopbehavior_impl.h
index 640d6a2c3..d04d82136 100644
--- a/kcontrol/konq/desktopbehavior_impl.h
+++ b/kcontrol/konq/desktopbehavior_impl.h
@@ -23,7 +23,7 @@
 
 #include "desktopbehavior.h"
 #include "tqlistview.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdecmodule.h>
 
 class DesktopBehavior : public DesktopBehaviorBase
diff --git a/kcontrol/konq/desktoppath.desktop b/kcontrol/konq/desktoppath.desktop
index d4f072f1c..f316f8841 100644
--- a/kcontrol/konq/desktoppath.desktop
+++ b/kcontrol/konq/desktoppath.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/desktop/index.html#desktop-desktop-path
 Icon=kfm
-Exec=kcmshell desktoppath
+Exec=tdecmshell desktoppath
 
 
 X-TDE-Library=konq
diff --git a/kcontrol/konq/fileappearance.desktop b/kcontrol/konq/fileappearance.desktop
index c2f74550e..b09e8380f 100644
--- a/kcontrol/konq/fileappearance.desktop
+++ b/kcontrol/konq/fileappearance.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/filemanager/index.html
 Icon=kfm
-Exec=kcmshell fileappearance
+Exec=tdecmshell fileappearance
 
 
 X-TDE-Library=konq
diff --git a/kcontrol/konq/filebehavior.desktop b/kcontrol/konq/filebehavior.desktop
index 1e1e0c19b..6a85a2e1e 100644
--- a/kcontrol/konq/filebehavior.desktop
+++ b/kcontrol/konq/filebehavior.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/filemanager/index.html
 Icon=kfm
-Exec=kcmshell filebehavior
+Exec=tdecmshell filebehavior
 
 
 X-TDE-Library=konq
diff --git a/kcontrol/konq/filebrowser.desktop b/kcontrol/konq/filebrowser.desktop
index 40e858e43..2f9520314 100644
--- a/kcontrol/konq/filebrowser.desktop
+++ b/kcontrol/konq/filebrowser.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/filemanager/index.html
 Icon=kfm
-Exec=kcmshell filebrowser
+Exec=tdecmshell filebrowser
 
 
 X-TDE-Library=konq
diff --git a/kcontrol/konq/filepreviews.desktop b/kcontrol/konq/filepreviews.desktop
index e113c147f..a83ce3601 100644
--- a/kcontrol/konq/filepreviews.desktop
+++ b/kcontrol/konq/filepreviews.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/filemanager/index.html
 Icon=kfm
-Exec=kcmshell filepreviews
+Exec=tdecmshell filepreviews
 
 
 X-TDE-Library=konq
diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp
index c1f610a46..e7c3fd9cf 100644
--- a/kcontrol/konq/fontopts.cpp
+++ b/kcontrol/konq/fontopts.cpp
@@ -28,7 +28,7 @@
 
 #include <kapplication.h>
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kfontcombo.h>
 #include <kfontdialog.h>
diff --git a/kcontrol/konq/main.cpp b/kcontrol/konq/main.cpp
index e57a84859..8e5afa965 100644
--- a/kcontrol/konq/main.cpp
+++ b/kcontrol/konq/main.cpp
@@ -30,7 +30,7 @@
 #include "browser.h"
 #include "desktopbehavior_impl.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 
 static TQCString configname()
diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp
index 0a6521a67..d69333a7c 100644
--- a/kcontrol/konq/previews.cpp
+++ b/kcontrol/konq/previews.cpp
@@ -27,7 +27,7 @@
 #include <dcopclient.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kglobal.h>
 #include <klistview.h>
diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp
index a3234dba4..f2a15fd65 100644
--- a/kcontrol/konq/rootopts.cpp
+++ b/kcontrol/konq/rootopts.cpp
@@ -26,11 +26,11 @@
 #include <kapplication.h>
 #include <kcustommenueditor.h>
 #include <kdebug.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kglobalsettings.h>
 #include <kipc.h>
 #include <klistview.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
diff --git a/kcontrol/konq/rootopts.h b/kcontrol/konq/rootopts.h
index 5fe1fe5c7..ec4510b1c 100644
--- a/kcontrol/konq/rootopts.h
+++ b/kcontrol/konq/rootopts.h
@@ -16,7 +16,7 @@
 #include <tqstring.h>
 
 #include <tdecmodule.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kurl.h>
 
 class TQCheckBox;
diff --git a/kcontrol/konq/webappearance.desktop b/kcontrol/konq/webappearance.desktop
index c2f74550e..b09e8380f 100644
--- a/kcontrol/konq/webappearance.desktop
+++ b/kcontrol/konq/webappearance.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/filemanager/index.html
 Icon=kfm
-Exec=kcmshell fileappearance
+Exec=tdecmshell fileappearance
 
 
 X-TDE-Library=konq
diff --git a/kcontrol/konq/webbehavior.desktop b/kcontrol/konq/webbehavior.desktop
index 2cfdef4ea..6c8aac9eb 100644
--- a/kcontrol/konq/webbehavior.desktop
+++ b/kcontrol/konq/webbehavior.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/filemanager/index.html
 Icon=kfm
-Exec=kcmshell filebehavior
+Exec=tdecmshell filebehavior
 
 
 X-TDE-Library=konq