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

11 files changed, 14 insertions, 14 deletions

diff --git a/nsplugins/CMakeLists.txt b/nsplugins/CMakeLists.txt
index 9ed66c7bb..278ac1f88 100644
--- a/nsplugins/CMakeLists.txt
+++ b/nsplugins/CMakeLists.txt
@@ -54,7 +54,7 @@ tde_add_kpart( kcm_nsplugins AUTOMOC
 
 tde_add_executable( nspluginscan AUTOMOC
   SOURCES pluginscan.cpp
-  LINK pluginpaths-static kio-shared Xt
+  LINK pluginpaths-static tdeio-shared Xt
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/nsplugins/kcm_nsplugins.cpp b/nsplugins/kcm_nsplugins.cpp
index 16234c62f..4613dc617 100644
--- a/nsplugins/kcm_nsplugins.cpp
+++ b/nsplugins/kcm_nsplugins.cpp
@@ -25,7 +25,7 @@
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurlrequester.h>
 
 #include <tqwhatsthis.h>
diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp
index 115490552..87191a5d7 100644
--- a/nsplugins/nspluginloader.cpp
+++ b/nsplugins/nspluginloader.cpp
@@ -33,7 +33,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <dcopclient.h>
 #include <dcopstub.h>
 #include <tqlayout.h>
diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp
index 104619f29..97d56ad53 100644
--- a/nsplugins/plugin_part.cpp
+++ b/nsplugins/plugin_part.cpp
@@ -25,8 +25,8 @@
 #include <kaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <tdeparts/browserinterface.h>
 #include <tdeparts/browserextension.h>
diff --git a/nsplugins/plugin_paths.cpp b/nsplugins/plugin_paths.cpp
index 121fc9d64..905d90551 100644
--- a/nsplugins/plugin_paths.cpp
+++ b/nsplugins/plugin_paths.cpp
@@ -25,7 +25,7 @@
 
 #include "plugin_paths.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <stdlib.h>
 
 TQStringList getSearchPaths()
diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp
index 867497ef4..aa836c36b 100644
--- a/nsplugins/pluginscan.cpp
+++ b/nsplugins/pluginscan.cpp
@@ -45,7 +45,7 @@
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <klibloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcrash.h>
 #include <kdesktopfile.h>
 #include <kservicetype.h>
@@ -657,5 +657,5 @@ int main( int argc, char **argv )
     if ( !dcc->isAttached() )
         dcc->attach();
     // Tel kded to update sycoca database.
-    dcc->send("kded", "kbuildsycoca", "recreate()", TQByteArray());
+    dcc->send("kded", "tdebuildsycoca", "recreate()", TQByteArray());
 }
diff --git a/nsplugins/tdehtml_plugins.desktop b/nsplugins/tdehtml_plugins.desktop
index b38c16160..b79fa3100 100644
--- a/nsplugins/tdehtml_plugins.desktop
+++ b/nsplugins/tdehtml_plugins.desktop
@@ -2,7 +2,7 @@
 Type=Application
 DocPath=kcontrol/tdehtml/index.html#kbrowse-plugins
 Icon=konqueror
-Exec=kcmshell tdehtml_plugins
+Exec=tdecmshell tdehtml_plugins
 
 X-TDE-ModuleType=Library
 X-TDE-Library=konqhtml
diff --git a/nsplugins/viewer/CMakeLists.txt b/nsplugins/viewer/CMakeLists.txt
index cfd95de6c..14cd69135 100644
--- a/nsplugins/viewer/CMakeLists.txt
+++ b/nsplugins/viewer/CMakeLists.txt
@@ -30,6 +30,6 @@ tde_add_executable( nspluginviewer AUTOMOC
     ../NSPluginCallbackIface.stub NSPluginClassIface.skel
     nsplugin.cpp viewer.cpp kxt.cpp qxteventloop.cpp
     glibevents.cpp
-  LINK tdeparts-shared kio-shared ${GLIB2_LIBRARIES} Xt dl
+  LINK tdeparts-shared tdeio-shared ${GLIB2_LIBRARIES} Xt dl
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index 535502a87..874ac53ea 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -44,10 +44,10 @@
 #endif
 
 #include <dcopclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klibloader.h>
 #include <klocale.h>
 #include <kprocess.h>
diff --git a/nsplugins/viewer/nsplugin.h b/nsplugins/viewer/nsplugin.h
index 6eb5d6be3..96bb1da15 100644
--- a/nsplugins/viewer/nsplugin.h
+++ b/nsplugins/viewer/nsplugin.h
@@ -42,7 +42,7 @@
 #include <tqguardedptr.h>
 
 #include <tdeparts/browserextension.h>  // for URLArgs
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 
 #define XP_UNIX
diff --git a/nsplugins/viewer/viewer.cpp b/nsplugins/viewer/viewer.cpp
index af72ef6cc..9e73c5542 100644
--- a/nsplugins/viewer/viewer.cpp
+++ b/nsplugins/viewer/viewer.cpp
@@ -44,7 +44,7 @@
 #ifdef Bool
 #undef Bool
 #endif
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #if TQT_VERSION < 0x030100
 #include "kxt.h"