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

26 files changed, 36 insertions, 36 deletions

diff --git a/kmobile/DESIGN b/kmobile/DESIGN
index 287a3d9a2..90ea509ec 100644
--- a/kmobile/DESIGN
+++ b/kmobile/DESIGN
@@ -63,7 +63,7 @@ makes accessing mobile devices completely transparent to the
 application.
 
 One sample program which uses the client library is the kmobile
-kioslave. In Konqueror you might access any mobile device directly
+tdeioslave. In Konqueror you might access any mobile device directly
 by giving "mobile:/" as the URL.
 
 
@@ -72,8 +72,8 @@ by giving "mobile:/" as the URL.
 
 HINTS FOR DRIVER DEVELOPERS:
 ----------------------------
-- KMobile device drivers are very similiar to kioslaves. Refer
-  at the kioslave documentation if needed.
+- KMobile device drivers are very similiar to tdeioslaves. Refer
+  at the tdeioslave documentation if needed.
 
 - derive your driver only from the KMobileDevice class (#include <kmobiledevice.h>)
   and reimplement the functions which you really need
diff --git a/kmobile/Makefile.am b/kmobile/Makefile.am
index 69f90bd9b..91fab1819 100644
--- a/kmobile/Makefile.am
+++ b/kmobile/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for kmobile
 
-SUBDIRS = . devices		# kioslave
+SUBDIRS = . devices		# tdeioslave
 
 bin_PROGRAMS = kmobile 
 
diff --git a/kmobile/TODO b/kmobile/TODO
index 457393bbc..33b60b836 100644
--- a/kmobile/TODO
+++ b/kmobile/TODO
@@ -1,9 +1,9 @@
 DONE:
 -----
-- devices:/ kioslave integration
+- devices:/ tdeioslave integration
 - show per-device icons in konqueror (same as in the kmobile view)
 - fix mimetypes and their location under /share/mimelnk
-- kioslaves: cellphone:/, organizer:/, pda:/, (camera:/ not activated)
+- tdeioslaves: cellphone:/, organizer:/, pda:/, (camera:/ not activated)
 - system tray plugin
 - serial/IRDA/(USB?) locking features (acording to standards - done, but untested !!)
 
diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp
index 95a014a6c..1f33996e7 100644
--- a/kmobile/devices/gnokii/gnokii_mobile.cpp
+++ b/kmobile/devices/gnokii/gnokii_mobile.cpp
@@ -26,10 +26,10 @@
 #include <tqdir.h>
 
 #include <klibloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/kmobile/devices/skeleton/skeleton.cpp b/kmobile/devices/skeleton/skeleton.cpp
index 3a7c77b07..564681cd7 100644
--- a/kmobile/devices/skeleton/skeleton.cpp
+++ b/kmobile/devices/skeleton/skeleton.cpp
@@ -24,7 +24,7 @@
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp
index 2453b3bac..3e2663b5a 100644
--- a/kmobile/kmobile.cpp
+++ b/kmobile/kmobile.cpp
@@ -29,10 +29,10 @@
 #include <kstatusbar.h>
 #include <kkeydialog.h>
 #include <kaccel.h>
-#include <kio/netaccess.h>
-#include <kfiledialog.h>
+#include <tdeio/netaccess.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kedittoolbar.h>
 
diff --git a/kmobile/kmobileclient.cpp b/kmobile/kmobileclient.cpp
index 9c95efe8f..2eef7c53c 100644
--- a/kmobile/kmobileclient.cpp
+++ b/kmobile/kmobileclient.cpp
@@ -72,8 +72,8 @@ bool KMobileClient::startKMobileApplication()
   arg << TQString("kmobile") << params;
   TQCString replyType;
   TQByteArray replyData;
-  bool ok = call("klauncher", "klauncher", "tdeinit_exec_wait(TQString,TQStringList)", data, replyType, replyData);
-  PRINT_DEBUG << TQString("DCOP-CALL to klauncher: %1\n").arg(ok?"ok.":"failed.");
+  bool ok = call("tdelauncher", "tdelauncher", "tdeinit_exec_wait(TQString,TQStringList)", data, replyType, replyData);
+  PRINT_DEBUG << TQString("DCOP-CALL to tdelauncher: %1\n").arg(ok?"ok.":"failed.");
   return ok;
 }
 
diff --git a/kmobile/kmobiledevice.cpp b/kmobile/kmobiledevice.cpp
index d1e031324..3c970ab15 100644
--- a/kmobile/kmobiledevice.cpp
+++ b/kmobile/kmobiledevice.cpp
@@ -34,9 +34,9 @@
 #include <kstandarddirs.h>
 #include "kmobiledevice.h"
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h
index 111a26e5d..ffd568ea9 100644
--- a/kmobile/kmobiledevice.h
+++ b/kmobile/kmobiledevice.h
@@ -30,8 +30,8 @@
 #include <kabc/addressee.h>
 #include <kabc/addresseelist.h>
 
-#include <kio/global.h>
-#include <kio/authinfo.h>
+#include <tdeio/global.h>
+#include <tdeio/authinfo.h>
 
 #include <libkcal/event.h>
 
@@ -202,7 +202,7 @@ public:
      **********************
      * FILE STORAGE SUPPORT
      **********************
-     * mostly compatible to the kioslave base class <kio/slavebase.h>
+     * mostly compatible to the tdeioslave base class <tdeio/slavebase.h>
      */
 
     /**
@@ -435,7 +435,7 @@ signals:
 
     /**
      * Call this to show a message box from the slave (it will in fact be handled
-     * by kio_uiserver, so that the progress info dialog for the slave is hidden
+     * by tdeio_uiserver, so that the progress info dialog for the slave is hidden
      * while this message box is shown)
      * @param type type of message box: QuestionYesNo, WarningYesNo, WarningContinueCancel...
      * @param text Message string. May contain newlines.
diff --git a/kmobile/kmobileiface.h b/kmobile/kmobileiface.h
index 60974b268..bac1a9ae6 100644
--- a/kmobile/kmobileiface.h
+++ b/kmobile/kmobileiface.h
@@ -46,7 +46,7 @@ k_dcop:
     virtual bool storeNote( TQString deviceName, int index, TQString note ) = 0;
 
     /*
-     * DCOP functions for the devices:/ kioslave
+     * DCOP functions for the devices:/ tdeioslave
      */
 k_dcop:
     virtual TQStringList kio_devices_deviceInfo(TQString deviceName) = 0;
diff --git a/kmobile/kmobileitem.cpp b/kmobile/kmobileitem.cpp
index dec9924a4..e7e97854f 100644
--- a/kmobile/kmobileitem.cpp
+++ b/kmobile/kmobileitem.cpp
@@ -22,7 +22,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "kmobileitem.h"
 
diff --git a/kmobile/kmobileview.cpp b/kmobile/kmobileview.cpp
index 0080b57a0..f90c9adf2 100644
--- a/kmobile/kmobileview.cpp
+++ b/kmobile/kmobileview.cpp
@@ -26,7 +26,7 @@
 #include <kabc/vcardconverter.h>
 #include <kprocess.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "kmobileview.h"
 #include "kmobileitem.h"
@@ -392,17 +392,17 @@ bool KMobileView::storeNote( TQString deviceName, int index, TQString note )
 
 
 /*
- * DCOP Implementation for the devices:/ kioslave
+ * DCOP Implementation for the devices:/ tdeioslave
  */
 
 /*
  * returns the information for the given deviceName for usage in the
- * the devices kioslave. The TQStringList returned is comparable to the
- * format of /etc/fstab file. Please refer to the devices kioslave for
+ * the devices tdeioslave. The TQStringList returned is comparable to the
+ * format of /etc/fstab file. Please refer to the devices tdeioslave for
  * further information.
  * If deviceName is empty, this functions returns information for all
  * active mobile devices.
- * (function is only used by the devices kioslave - don't use elsewhere !)
+ * (function is only used by the devices tdeioslave - don't use elsewhere !)
  */
 TQStringList KMobileView::kio_devices_deviceInfo(TQString deviceName)
 {
diff --git a/kmobile/kmobileview.h b/kmobile/kmobileview.h
index 39e2a53e0..4672349fd 100644
--- a/kmobile/kmobileview.h
+++ b/kmobile/kmobileview.h
@@ -63,7 +63,7 @@ public:
     TQString readNote( TQString deviceName, int index );
     bool storeNote( TQString deviceName, int index, TQString note );
 
-    /* devices kioslave support: */
+    /* devices tdeioslave support: */
     TQStringList kio_devices_deviceInfo(TQString deviceName);
 
 public:
diff --git a/kmobile/kioslave/Makefile.am b/kmobile/tdeioslave/Makefile.am
index 6f9d24201..df5288ec7 100644
--- a/kmobile/kioslave/Makefile.am
+++ b/kmobile/tdeioslave/Makefile.am
@@ -11,8 +11,8 @@ kio_mobile_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
 kde_services_DATA = mobile.protocol cellphone.protocol \
 	organizer.protocol pda.protocol 
 # do not install the camera protocol now - we already have a 
-# camera kioslave !!
+# camera tdeioslave !!
 #	phonecamera.protocol
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kio_mobile.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_mobile.pot
diff --git a/kmobile/kioslave/cellphone.protocol b/kmobile/tdeioslave/cellphone.protocol
index 5f37df784..c47e25472 100644
--- a/kmobile/kioslave/cellphone.protocol
+++ b/kmobile/tdeioslave/cellphone.protocol
@@ -14,5 +14,5 @@ deleting=true
 # moving=true
 # mimetype=text/plain
 # determineMimetypeFromExtension=true
-DocPath=kioslave/mobile.html
+DocPath=tdeioslave/mobile.html
 Icon=mobile_phone
diff --git a/kmobile/kioslave/kio_mobile.cpp b/kmobile/tdeioslave/kio_mobile.cpp
index e8cff4fa1..e8cff4fa1 100644
--- a/kmobile/kioslave/kio_mobile.cpp
+++ b/kmobile/tdeioslave/kio_mobile.cpp
diff --git a/kmobile/kioslave/kio_mobile.h b/kmobile/tdeioslave/kio_mobile.h
index f534514f3..05a30a22f 100644
--- a/kmobile/kioslave/kio_mobile.h
+++ b/kmobile/tdeioslave/kio_mobile.h
@@ -22,7 +22,7 @@
 #include <tqstring.h>
 #include <tqvaluelist.h>
 
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 #include <kmobiledevice.h>
 #include <kmobileclient.h>
 
diff --git a/kmobile/kioslave/mimetypes/Makefile.am b/kmobile/tdeioslave/mimetypes/Makefile.am
index 5105c51bf..5105c51bf 100644
--- a/kmobile/kioslave/mimetypes/Makefile.am
+++ b/kmobile/tdeioslave/mimetypes/Makefile.am
diff --git a/kmobile/kioslave/mimetypes/mobile_addressbook.desktop b/kmobile/tdeioslave/mimetypes/mobile_addressbook.desktop
index cf56e0247..cf56e0247 100644
--- a/kmobile/kioslave/mimetypes/mobile_addressbook.desktop
+++ b/kmobile/tdeioslave/mimetypes/mobile_addressbook.desktop
diff --git a/kmobile/kioslave/mimetypes/mobile_calendar.desktop b/kmobile/tdeioslave/mimetypes/mobile_calendar.desktop
index 09d133ab5..09d133ab5 100644
--- a/kmobile/kioslave/mimetypes/mobile_calendar.desktop
+++ b/kmobile/tdeioslave/mimetypes/mobile_calendar.desktop
diff --git a/kmobile/kioslave/mimetypes/mobile_device.desktop b/kmobile/tdeioslave/mimetypes/mobile_device.desktop
index 2f59d2dec..2f59d2dec 100644
--- a/kmobile/kioslave/mimetypes/mobile_device.desktop
+++ b/kmobile/tdeioslave/mimetypes/mobile_device.desktop
diff --git a/kmobile/kioslave/mimetypes/mobile_notes.desktop b/kmobile/tdeioslave/mimetypes/mobile_notes.desktop
index 7878c13d9..7878c13d9 100644
--- a/kmobile/kioslave/mimetypes/mobile_notes.desktop
+++ b/kmobile/tdeioslave/mimetypes/mobile_notes.desktop
diff --git a/kmobile/kioslave/mobile.protocol b/kmobile/tdeioslave/mobile.protocol
index 7b8385f86..e87d7154b 100644
--- a/kmobile/kioslave/mobile.protocol
+++ b/kmobile/tdeioslave/mobile.protocol
@@ -14,5 +14,5 @@ deleting=true
 # moving=true
 # mimetype=text/plain
 # determineMimetypeFromExtension=true
-DocPath=kioslave/mobile.html
+DocPath=tdeioslave/mobile.html
 Icon=kaddressbook
diff --git a/kmobile/kioslave/organizer.protocol b/kmobile/tdeioslave/organizer.protocol
index b211a74f9..3b83e002f 100644
--- a/kmobile/kioslave/organizer.protocol
+++ b/kmobile/tdeioslave/organizer.protocol
@@ -14,5 +14,5 @@ deleting=true
 # moving=true
 # mimetype=text/plain
 # determineMimetypeFromExtension=true
-DocPath=kioslave/mobile.html
+DocPath=tdeioslave/mobile.html
 Icon=mobile_organizer
diff --git a/kmobile/kioslave/pda.protocol b/kmobile/tdeioslave/pda.protocol
index cbab2e03a..8113b5bfa 100644
--- a/kmobile/kioslave/pda.protocol
+++ b/kmobile/tdeioslave/pda.protocol
@@ -14,5 +14,5 @@ deleting=true
 # moving=true
 # mimetype=text/plain
 # determineMimetypeFromExtension=true
-DocPath=kioslave/mobile.html
+DocPath=tdeioslave/mobile.html
 Icon=mobile_organizer
diff --git a/kmobile/kioslave/phonecamera.protocol b/kmobile/tdeioslave/phonecamera.protocol
index 7a0b341f2..296ebccb5 100644
--- a/kmobile/kioslave/phonecamera.protocol
+++ b/kmobile/tdeioslave/phonecamera.protocol
@@ -14,5 +14,5 @@ deleting=true
 # moving=true
 # mimetype=text/plain
 # determineMimetypeFromExtension=true
-DocPath=kioslave/mobile.html
+DocPath=tdeioslave/mobile.html
 Icon=mobile_camera