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

14 files changed, 19 insertions, 19 deletions

diff --git a/kmrml/kmrml/CMakeLists.txt b/kmrml/kmrml/CMakeLists.txt
index b570b684..4d445b2d 100644
--- a/kmrml/kmrml/CMakeLists.txt
+++ b/kmrml/kmrml/CMakeLists.txt
@@ -37,7 +37,7 @@ install( FILES mrml-servicemenu.desktop DESTINATION ${DATA_INSTALL_DIR}/konquero
 
 tde_add_kpart( kio_mrml AUTOMOC
   SOURCES mrml.cpp
-  LINK kmrmlstuff-static kio-shared
+  LINK kmrmlstuff-static tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kmrml/kmrml/kcontrol/CMakeLists.txt b/kmrml/kmrml/kcontrol/CMakeLists.txt
index 15f85e95..6ff6fbb6 100644
--- a/kmrml/kmrml/kcontrol/CMakeLists.txt
+++ b/kmrml/kmrml/kcontrol/CMakeLists.txt
@@ -33,6 +33,6 @@ tde_add_kpart( kcm_kmrml AUTOMOC
     kcmkmrml.cpp mainpage.cpp indexer.cpp
     serverconfigwidget.ui indexcleaner.cpp
   LINK
-    kmrmlstuff-static tdeparts-shared kio-shared
+    kmrmlstuff-static tdeparts-shared tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kmrml/kmrml/kcontrol/indextest.cpp b/kmrml/kmrml/kcontrol/indextest.cpp
index 9571a88f..6fe6587f 100644
--- a/kmrml/kmrml/kcontrol/indextest.cpp
+++ b/kmrml/kmrml/kcontrol/indextest.cpp
@@ -3,7 +3,7 @@
 #include "indextest.moc"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 using namespace KMrmlConfig;
diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.desktop b/kmrml/kmrml/kcontrol/kcmkmrml.desktop
index 1de03e4a..b8f9e4ba 100644
--- a/kmrml/kmrml/kcontrol/kcmkmrml.desktop
+++ b/kmrml/kmrml/kcontrol/kcmkmrml.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell kcmkmrml
+Exec=tdecmshell kcmkmrml
 Icon=folder_image
 Type=Application
 
diff --git a/kmrml/kmrml/kcontrol/mainpage.cpp b/kmrml/kmrml/kcontrol/mainpage.cpp
index a8a0ab84..ee8fd88f 100644
--- a/kmrml/kmrml/kcontrol/mainpage.cpp
+++ b/kmrml/kmrml/kcontrol/mainpage.cpp
@@ -36,8 +36,8 @@
 
 #include <tdeversion.h>
 #include <kdebug.h>
-#include <kio/slaveconfig.h>
-#include <kio/ioslave_defaults.h> // MAX_PORT_VALUE
+#include <tdeio/slaveconfig.h>
+#include <tdeio/ioslave_defaults.h> // MAX_PORT_VALUE
 
 #include "serverconfigwidget.h"
 #include "mainpage.h"
diff --git a/kmrml/kmrml/lib/kmrml_config.cpp b/kmrml/kmrml/lib/kmrml_config.cpp
index be408bc2..9aa92d54 100644
--- a/kmrml/kmrml/lib/kmrml_config.cpp
+++ b/kmrml/kmrml/lib/kmrml_config.cpp
@@ -20,7 +20,7 @@
 #include <tqfile.h>
 #include <tqtextcodec.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kprocess.h>
diff --git a/kmrml/kmrml/loader.cpp b/kmrml/kmrml/loader.cpp
index ec1d7cdd..576513ed 100644
--- a/kmrml/kmrml/loader.cpp
+++ b/kmrml/kmrml/loader.cpp
@@ -17,7 +17,7 @@
 */
 
 #include <kstaticdeleter.h>
-#include <kio/scheduler.h>
+#include <tdeio/scheduler.h>
 
 #include "loader.h"
 
diff --git a/kmrml/kmrml/loader.h b/kmrml/kmrml/loader.h
index aa63823e..4c8b8b21 100644
--- a/kmrml/kmrml/loader.h
+++ b/kmrml/kmrml/loader.h
@@ -24,7 +24,7 @@
 #include <tqmap.h>
 #include <tqobject.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 
 class Download
diff --git a/kmrml/kmrml/mrml.cpp b/kmrml/kmrml/mrml.cpp
index d6273c2c..adbbbe95 100644
--- a/kmrml/kmrml/mrml.cpp
+++ b/kmrml/kmrml/mrml.cpp
@@ -25,7 +25,7 @@
 #include <unistd.h>
 #endif
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kinstance.h>
diff --git a/kmrml/kmrml/mrml.h b/kmrml/kmrml/mrml.h
index 13d3cde7..2a39466f 100644
--- a/kmrml/kmrml/mrml.h
+++ b/kmrml/kmrml/mrml.h
@@ -20,7 +20,7 @@
 #define MRML_H
 
 
-#include <kio/tcpslavebase.h>
+#include <tdeio/tcpslavebase.h>
 #include <kurl.h>
 
 #include <kmrml_config.h>
diff --git a/kmrml/kmrml/mrml.protocol b/kmrml/kmrml/mrml.protocol
index c3a732eb..4efceaee 100644
--- a/kmrml/kmrml/mrml.protocol
+++ b/kmrml/kmrml/mrml.protocol
@@ -7,4 +7,4 @@ reading=true
 defaultMimetype=text/mrml
 determineMimetypeFromExtension=false
 Icon=image
-DocPath=kioslave/mrml.html
+DocPath=tdeioslave/mrml.html
diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp
index 29e633a7..a808da9e 100644
--- a/kmrml/kmrml/mrml_part.cpp
+++ b/kmrml/kmrml/mrml_part.cpp
@@ -30,15 +30,15 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdatastream.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kinstance.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kmessagebox.h>
 #include <knuminput.h>
 #include <kprotocolinfo.h>
@@ -284,7 +284,7 @@ bool MrmlPart::openURL( const KURL& url )
                                             "kmrml_ask_configure_gift" )
                  == KMessageBox::Yes )
             {
-                TDEApplication::tdeinitExec( "kcmshell",
+                TDEApplication::tdeinitExec( "tdecmshell",
                                            TQString::fromLatin1("kcmkmrml"));
                 setStatus( NeedCollection );
                 return false;
diff --git a/kmrml/kmrml/mrmlsearch.cpp b/kmrml/kmrml/mrmlsearch.cpp
index fbd1468d..9a06f309 100644
--- a/kmrml/kmrml/mrmlsearch.cpp
+++ b/kmrml/kmrml/mrmlsearch.cpp
@@ -21,7 +21,7 @@
 // from Konqueror and creates a query of the form
 // mrml://host.com/?relevant=url1;url2;url3;url4....
 // By default, the mrml URL is mrml://localhost", but you can override that
-// by editing ~/.trinity/share/config/kio_mrmlrc and adding
+// by editing ~/.trinity/share/config/tdeio_mrmlrc and adding
 // [MRML Settings]
 // Default URL=mrml://url.to.your.giftserver.com
 //
@@ -32,7 +32,7 @@
 
 #include <tqfile.h>
 #include <tqstring.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kinstance.h>
 #include <kurl.h>
diff --git a/kmrml/kmrml/server/CMakeLists.txt b/kmrml/kmrml/server/CMakeLists.txt
index 337bede6..652d5c07 100644
--- a/kmrml/kmrml/server/CMakeLists.txt
+++ b/kmrml/kmrml/server/CMakeLists.txt
@@ -30,6 +30,6 @@ INSTALL( FILES daemonwatcher.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
 
 tde_add_kpart( kded_daemonwatcher AUTOMOC
   SOURCES watcher.cpp watcher.skel
-  LINK kmrmlstuff-static tdeparts-shared kio-shared tdeinit_kded-shared
+  LINK kmrmlstuff-static tdeparts-shared tdeio-shared tdeinit_kded-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )