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

93 files changed, 127 insertions, 127 deletions

diff --git a/tderesources/birthdays/resourcekabc.cpp b/tderesources/birthdays/resourcekabc.cpp
index f3b191e1d..a36517ebd 100644
--- a/tderesources/birthdays/resourcekabc.cpp
+++ b/tderesources/birthdays/resourcekabc.cpp
@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kurl.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kstandarddirs.h>
 
 #include <kabc/stdaddressbook.h>
diff --git a/tderesources/birthdays/resourcekabc.h b/tderesources/birthdays/resourcekabc.h
index 169a02946..008b87e5d 100644
--- a/tderesources/birthdays/resourcekabc.h
+++ b/tderesources/birthdays/resourcekabc.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqdatetime.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "libkcal/incidence.h"
 #include "libkcal/calendarlocal.h"
diff --git a/tderesources/blogging/API_Blog.h b/tderesources/blogging/API_Blog.h
index 9425bd5e6..5ad5b478b 100644
--- a/tderesources/blogging/API_Blog.h
+++ b/tderesources/blogging/API_Blog.h
@@ -10,7 +10,7 @@
 #define API_BLOG_H
 
 #include <kurl.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <libkcal/journal.h>
 
 #include <tqobject.h>
diff --git a/tderesources/blogging/xmlrpcjob.cpp b/tderesources/blogging/xmlrpcjob.cpp
index f2e516308..cb377e7ed 100644
--- a/tderesources/blogging/xmlrpcjob.cpp
+++ b/tderesources/blogging/xmlrpcjob.cpp
@@ -31,9 +31,9 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kio/http.h>
+#include <tdeio/http.h>
 #include <kmdcodec.h>
-#include <kio/davjob.h>
+#include <tdeio/davjob.h>
 
 
 #define KIO_ARGS TQByteArray packedArgs; \
diff --git a/tderesources/blogging/xmlrpcjob.h b/tderesources/blogging/xmlrpcjob.h
index 1efe79e1d..4cf9a5dbd 100644
--- a/tderesources/blogging/xmlrpcjob.h
+++ b/tderesources/blogging/xmlrpcjob.h
@@ -29,8 +29,8 @@
 #include <tqvaluelist.h>
 #include <tqdom.h>
 
-#include <kio/jobclasses.h>
-#include <kio/global.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/global.h>
 
 namespace TDEIO {
 
diff --git a/tderesources/caldav/prefsskel.kcfgc b/tderesources/caldav/prefsskel.kcfgc
index b6b3aae0b..4406dc794 100644
--- a/tderesources/caldav/prefsskel.kcfgc
+++ b/tderesources/caldav/prefsskel.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=prefsskel.kcfg
 ClassName=CalDavPrefsSkel
 NameSpace=KCal
diff --git a/tderesources/caldav/resource.h b/tderesources/caldav/resource.h
index ea04ef483..ee5805327 100644
--- a/tderesources/caldav/resource.h
+++ b/tderesources/caldav/resource.h
@@ -27,7 +27,7 @@
 #include <kabc/locknull.h>
 
 #include <tdepimmacros.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 namespace KCal {
 
diff --git a/tderesources/carddav/prefsskel.kcfgc b/tderesources/carddav/prefsskel.kcfgc
index 12ca40ce5..5eb6ae284 100644
--- a/tderesources/carddav/prefsskel.kcfgc
+++ b/tderesources/carddav/prefsskel.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=prefsskel.kcfg
 ClassName=CardDavPrefsSkel
 NameSpace=KABC
diff --git a/tderesources/carddav/resource.h b/tderesources/carddav/resource.h
index cf5090e57..8f783ab28 100644
--- a/tderesources/carddav/resource.h
+++ b/tderesources/carddav/resource.h
@@ -26,7 +26,7 @@
 #include <kabc/locknull.h>
 
 #include <tdepimmacros.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 namespace KABC {
 
diff --git a/tderesources/egroupware/kabc_egroupwareprefs.kcfgc b/tderesources/egroupware/kabc_egroupwareprefs.kcfgc
index 599001bbd..10adb19b2 100644
--- a/tderesources/egroupware/kabc_egroupwareprefs.kcfgc
+++ b/tderesources/egroupware/kabc_egroupwareprefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=tderesources_kabc_egroupware.kcfg
 ClassName=EGroupwarePrefs
 NameSpace=KABC
diff --git a/tderesources/egroupware/kabc_resourcexmlrpc.cpp b/tderesources/egroupware/kabc_resourcexmlrpc.cpp
index 84e783827..39e3aac14 100644
--- a/tderesources/egroupware/kabc_resourcexmlrpc.cpp
+++ b/tderesources/egroupware/kabc_resourcexmlrpc.cpp
@@ -22,7 +22,7 @@
 
 #include <kabc/addressee.h>
 #include <kabprefs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmdcodec.h>
diff --git a/tderesources/egroupware/kcal_egroupwareprefs.kcfgc b/tderesources/egroupware/kcal_egroupwareprefs.kcfgc
index 6c9f6d4d3..4eb0e394a 100644
--- a/tderesources/egroupware/kcal_egroupwareprefs.kcfgc
+++ b/tderesources/egroupware/kcal_egroupwareprefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=tderesources_kcal_egroupware.kcfg
 ClassName=EGroupwarePrefs
 NameSpace=KCal
diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.h b/tderesources/egroupware/kcal_resourcexmlrpc.h
index 5253babaa..9be4662fb 100644
--- a/tderesources/egroupware/kcal_resourcexmlrpc.h
+++ b/tderesources/egroupware/kcal_resourcexmlrpc.h
@@ -26,7 +26,7 @@
 #include <tqptrlist.h>
 #include <tqstring.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 
 #include <tdepimmacros.h>
diff --git a/tderesources/egroupware/knotes_egroupwareprefs.kcfgc b/tderesources/egroupware/knotes_egroupwareprefs.kcfgc
index 6c3fbdffe..70adfc55d 100644
--- a/tderesources/egroupware/knotes_egroupwareprefs.kcfgc
+++ b/tderesources/egroupware/knotes_egroupwareprefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=tderesources_knotes_egroupware.kcfg
 ClassName=EGroupwarePrefs
 NameSpace=KNotes
diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.h b/tderesources/egroupware/knotes_resourcexmlrpc.h
index df8a4dd36..3550aed48 100644
--- a/tderesources/egroupware/knotes_resourcexmlrpc.h
+++ b/tderesources/egroupware/knotes_resourcexmlrpc.h
@@ -25,7 +25,7 @@
 #include <tqptrlist.h>
 #include <tqstring.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <tdepimmacros.h>
 
diff --git a/tderesources/egroupware/xmlrpciface.cpp b/tderesources/egroupware/xmlrpciface.cpp
index d43613e65..7af9814a1 100644
--- a/tderesources/egroupware/xmlrpciface.cpp
+++ b/tderesources/egroupware/xmlrpciface.cpp
@@ -11,7 +11,7 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <kmdcodec.h>
 
diff --git a/tderesources/featureplan/kcal_resourcefeatureplan.h b/tderesources/featureplan/kcal_resourcefeatureplan.h
index 2808aef71..08bf1f39f 100644
--- a/tderesources/featureplan/kcal_resourcefeatureplan.h
+++ b/tderesources/featureplan/kcal_resourcefeatureplan.h
@@ -30,7 +30,7 @@
 #include <kabc/locknull.h>
 
 #include <tdepimmacros.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 namespace KCal {
 
diff --git a/tderesources/featureplan/prefs.kcfgc b/tderesources/featureplan/prefs.kcfgc
index 0866d4e38..1b4ac4945 100644
--- a/tderesources/featureplan/prefs.kcfgc
+++ b/tderesources/featureplan/prefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=tderesources_kcal_featureplan.kcfg
 ClassName=Prefs
 #NameSpace=KBB
diff --git a/tderesources/groupdav/groupdavaddressbookadaptor.cpp b/tderesources/groupdav/groupdavaddressbookadaptor.cpp
index f8f30f659..9704e5bd8 100644
--- a/tderesources/groupdav/groupdavaddressbookadaptor.cpp
+++ b/tderesources/groupdav/groupdavaddressbookadaptor.cpp
@@ -30,7 +30,7 @@
 #include <kabc/vcardconverter.h>
 #include <kabcresourcecached.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kdebug.h>
 
 using namespace KABC;
diff --git a/tderesources/groupdav/groupdavglobals.cpp b/tderesources/groupdav/groupdavglobals.cpp
index 5088bca96..793c1b965 100644
--- a/tderesources/groupdav/groupdavglobals.cpp
+++ b/tderesources/groupdav/groupdavglobals.cpp
@@ -34,8 +34,8 @@
 #include <kabc/vcardconverter.h>
 
 #include <kdebug.h>
-#include <kio/davjob.h>
-#include <kio/job.h>
+#include <tdeio/davjob.h>
+#include <tdeio/job.h>
 
 TQString GroupDavGlobals::extractFingerprint( TDEIO::Job *job, const TQString &/*jobData*/ )
 {
diff --git a/tderesources/groupware/kabc_resourcegroupware.cpp b/tderesources/groupware/kabc_resourcegroupware.cpp
index 3c9d9792c..44cee5630 100644
--- a/tderesources/groupware/kabc_resourcegroupware.cpp
+++ b/tderesources/groupware/kabc_resourcegroupware.cpp
@@ -22,7 +22,7 @@
 
 #include <kabc/addressee.h>
 #include <kabc/vcardconverter.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/tderesources/groupware/kabc_resourcegroupware.h b/tderesources/groupware/kabc_resourcegroupware.h
index 53c1d007a..1c5feb847 100644
--- a/tderesources/groupware/kabc_resourcegroupware.h
+++ b/tderesources/groupware/kabc_resourcegroupware.h
@@ -24,7 +24,7 @@
 
 #include <libtdepim/progressmanager.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 class TDEConfig;
 
diff --git a/tderesources/groupware/kcal_groupwareprefsbase.kcfgc b/tderesources/groupware/kcal_groupwareprefsbase.kcfgc
index 7e243ddc0..e174cad41 100644
--- a/tderesources/groupware/kcal_groupwareprefsbase.kcfgc
+++ b/tderesources/groupware/kcal_groupwareprefsbase.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=tderesources_kcal_groupware.kcfg
 ClassName=GroupwarePrefsBase
 NameSpace=KCal
diff --git a/tderesources/groupware/kcal_resourcegroupware.h b/tderesources/groupware/kcal_resourcegroupware.h
index d3c809db7..d757ad730 100644
--- a/tderesources/groupware/kcal_resourcegroupware.h
+++ b/tderesources/groupware/kcal_resourcegroupware.h
@@ -26,8 +26,8 @@
 #include <libkcal/resourcecached.h>
 
 #include <kabc/locknull.h>
-#include <kio/job.h>
-#include <kconfig.h>
+#include <tdeio/job.h>
+#include <tdeconfig.h>
 
 namespace KPIM {
 class GroupwarePrefsBase;
@@ -36,7 +36,7 @@ class GroupwarePrefsBase;
 namespace KCal {
 
 /**
-  This class provides a resource for accessing a Groupware kioslave-based
+  This class provides a resource for accessing a Groupware tdeioslave-based
   calendar.
 */
 class ResourceGroupware : public ResourceCached
diff --git a/tderesources/groupware/kcal_resourcegroupwareconfig.h b/tderesources/groupware/kcal_resourcegroupwareconfig.h
index dd6a93afa..7bfa34d44 100644
--- a/tderesources/groupware/kcal_resourcegroupwareconfig.h
+++ b/tderesources/groupware/kcal_resourcegroupwareconfig.h
@@ -34,7 +34,7 @@ class ResourceCachedReloadConfig;
 class ResourceCachedSaveConfig;
 
 /**
-  Configuration widget for groupware kioslave resource.
+  Configuration widget for groupware tdeioslave resource.
   
   @see KCalResourceGroupware
 */
diff --git a/tderesources/groupwise/CMakeLists.txt b/tderesources/groupwise/CMakeLists.txt
index 68c829a7b..a5617229a 100644
--- a/tderesources/groupwise/CMakeLists.txt
+++ b/tderesources/groupwise/CMakeLists.txt
@@ -10,7 +10,7 @@
 #################################################
 
 add_subdirectory( soap )
-add_subdirectory( kioslave )
+add_subdirectory( tdeioslave )
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/tderesources/groupwise/Makefile.am b/tderesources/groupwise/Makefile.am
index 4b7eb408e..486e89774 100644
--- a/tderesources/groupwise/Makefile.am
+++ b/tderesources/groupwise/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = soap kioslave
+SUBDIRS = soap tdeioslave
 
 INCLUDES = -I$(top_srcdir) $(all_includes)
 
diff --git a/tderesources/groupwise/kabc_resourcegroupwise.cpp b/tderesources/groupwise/kabc_resourcegroupwise.cpp
index b3930bfbe..cf5c4e95d 100644
--- a/tderesources/groupwise/kabc_resourcegroupwise.cpp
+++ b/tderesources/groupwise/kabc_resourcegroupwise.cpp
@@ -23,7 +23,7 @@
 
 #include <kabc/addressee.h>
 #include <kabc/vcardconverter.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/tderesources/groupwise/kabc_resourcegroupwise.h b/tderesources/groupwise/kabc_resourcegroupwise.h
index 658ddd76b..0c7533eef 100644
--- a/tderesources/groupwise/kabc_resourcegroupwise.h
+++ b/tderesources/groupwise/kabc_resourcegroupwise.h
@@ -27,7 +27,7 @@
 
 #include <libtdepim/progressmanager.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 class TDEConfig;
 
diff --git a/tderesources/groupwise/kcal_groupwiseprefsbase.kcfgc b/tderesources/groupwise/kcal_groupwiseprefsbase.kcfgc
index 3130cde1e..357cdc956 100644
--- a/tderesources/groupwise/kcal_groupwiseprefsbase.kcfgc
+++ b/tderesources/groupwise/kcal_groupwiseprefsbase.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=tderesources_kcal_groupwise.kcfg
 ClassName=GroupwisePrefsBase
 NameSpace=KCal
diff --git a/tderesources/groupwise/kcal_resourcegroupwise.h b/tderesources/groupwise/kcal_resourcegroupwise.h
index 088e624a6..f4417079c 100644
--- a/tderesources/groupwise/kcal_resourcegroupwise.h
+++ b/tderesources/groupwise/kcal_resourcegroupwise.h
@@ -28,8 +28,8 @@
 #include <libkcal/resourcecached.h>
 
 #include <kabc/locknull.h>
-#include <kio/job.h>
-#include <kconfig.h>
+#include <tdeio/job.h>
+#include <tdeconfig.h>
 #include <tdepimmacros.h>
 
 class ngwt__Settings;
diff --git a/tderesources/groupwise/soap/groupwiseserver.cpp b/tderesources/groupwise/soap/groupwiseserver.cpp
index 9112fdeab..cedcde6aa 100644
--- a/tderesources/groupwise/soap/groupwiseserver.cpp
+++ b/tderesources/groupwise/soap/groupwiseserver.cpp
@@ -30,9 +30,9 @@
 #include <kabc/addressee.h>
 #include <kabc/addresseelist.h>
 
-#include <kio/job.h>
-#include <kio/jobclasses.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/netaccess.h>
 #include <kprotocolmanager.h>
 #include <ktempfile.h>
 #include <kdebug.h>
diff --git a/tderesources/groupwise/soap/groupwiseserver.h b/tderesources/groupwise/soap/groupwiseserver.h
index 95218be06..e1c25c0f3 100644
--- a/tderesources/groupwise/soap/groupwiseserver.h
+++ b/tderesources/groupwise/soap/groupwiseserver.h
@@ -21,8 +21,8 @@
 #ifndef GROUPWISESERVER_H
 #define GROUPWISESERVER_H
 
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <tqapplication.h>
 #include <tqmap.h>
 #include <tqobject.h>
diff --git a/tderesources/groupwise/soap/ksslsocket.cpp b/tderesources/groupwise/soap/ksslsocket.cpp
index 90ccf83d6..809c29b8b 100644
--- a/tderesources/groupwise/soap/ksslsocket.cpp
+++ b/tderesources/groupwise/soap/ksslsocket.cpp
@@ -181,12 +181,12 @@ int KSSLSocket::messageBox( TDEIO::SlaveBase::MessageBoxType type, const TQStrin
 		d->dcc = new DCOPClient();
 		d->dcc->attach();
 	}
-	if (!d->dcc->isApplicationRegistered("kio_uiserver"))
+	if (!d->dcc->isApplicationRegistered("tdeio_uiserver"))
 	{
-		TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",TQStringList());
+		TDEApplication::startServiceByDesktopPath("tdeio_uiserver.desktop",TQStringList());
 	}
 
-	d->dcc->call("kio_uiserver", "UIServer",
+	d->dcc->call("tdeio_uiserver", "UIServer",
 			"messageBox(int,int,TQString,TQString,TQString,TQString)", data, returnType, result);
 
 	if( returnType == "int" )
diff --git a/tderesources/groupwise/soap/ksslsocket.h b/tderesources/groupwise/soap/ksslsocket.h
index c19b440a1..425459483 100644
--- a/tderesources/groupwise/soap/ksslsocket.h
+++ b/tderesources/groupwise/soap/ksslsocket.h
@@ -21,7 +21,7 @@
 
 #include <tqvariant.h>
 #include <kextsock.h>
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 
 class KSSLSocketPrivate;
 
diff --git a/tderesources/groupwise/soap/soapdebug.cpp b/tderesources/groupwise/soap/soapdebug.cpp
index 415021a78..e68da9ee1 100644
--- a/tderesources/groupwise/soap/soapdebug.cpp
+++ b/tderesources/groupwise/soap/soapdebug.cpp
@@ -3,7 +3,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <ktempfile.h>
 
diff --git a/tderesources/groupwise/kioslave/CMakeLists.txt b/tderesources/groupwise/tdeioslave/CMakeLists.txt
index 23476fe0e..23476fe0e 100644
--- a/tderesources/groupwise/kioslave/CMakeLists.txt
+++ b/tderesources/groupwise/tdeioslave/CMakeLists.txt
diff --git a/tderesources/groupwise/kioslave/Makefile.am b/tderesources/groupwise/tdeioslave/Makefile.am
index 2b2eaa074..e6da52837 100644
--- a/tderesources/groupwise/kioslave/Makefile.am
+++ b/tderesources/groupwise/tdeioslave/Makefile.am
@@ -16,4 +16,4 @@ kio_groupwise_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
 kio_groupwise_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kio_groupwise.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_groupwise.pot
diff --git a/tderesources/groupwise/kioslave/groupwise.cpp b/tderesources/groupwise/tdeioslave/groupwise.cpp
index c3addd3b0..bfa02156a 100644
--- a/tderesources/groupwise/kioslave/groupwise.cpp
+++ b/tderesources/groupwise/tdeioslave/groupwise.cpp
@@ -34,7 +34,7 @@
 #include <kabc/vcardconverter.h>
 
 #include <kinstance.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <ktempfile.h>
diff --git a/tderesources/groupwise/kioslave/groupwise.h b/tderesources/groupwise/tdeioslave/groupwise.h
index c5f109d30..e95ed260a 100644
--- a/tderesources/groupwise/kioslave/groupwise.h
+++ b/tderesources/groupwise/tdeioslave/groupwise.h
@@ -20,7 +20,7 @@
 #ifndef GROUPWISE_H
 #define GROUPWISE_H
 
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 
 #include <tqobject.h>
 
diff --git a/tderesources/groupwise/kioslave/groupwise.protocol b/tderesources/groupwise/tdeioslave/groupwise.protocol
index ec22851aa..a7c26b6e3 100644
--- a/tderesources/groupwise/kioslave/groupwise.protocol
+++ b/tderesources/groupwise/tdeioslave/groupwise.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-DocPath=kioslave/groupwise.html
+DocPath=tdeioslave/groupwise.html
 exec=kio_groupwise
 input=none
 output=filesystem
diff --git a/tderesources/groupwise/kioslave/groupwises.protocol b/tderesources/groupwise/tdeioslave/groupwises.protocol
index b2b2c7b9b..2666f1fd7 100644
--- a/tderesources/groupwise/kioslave/groupwises.protocol
+++ b/tderesources/groupwise/tdeioslave/groupwises.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-DocPath=kioslave/groupwise.html
+DocPath=tdeioslave/groupwise.html
 exec=kio_groupwise
 input=none
 output=filesystem
diff --git a/tderesources/kolab/CMakeLists.txt b/tderesources/kolab/CMakeLists.txt
index 01acd3972..d8d194432 100644
--- a/tderesources/kolab/CMakeLists.txt
+++ b/tderesources/kolab/CMakeLists.txt
@@ -14,5 +14,5 @@ add_subdirectory( kabc )
 add_subdirectory( knotes )
 add_subdirectory( kcal )
 
-install( FILES kolab-resource.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
-install( PROGRAMS upgrade-resourcetype.pl DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
+install( FILES kolab-resource.upd DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
+install( PROGRAMS upgrade-resourcetype.pl DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
diff --git a/tderesources/kolab/Makefile.am b/tderesources/kolab/Makefile.am
index 0f144e05c..3b8838433 100644
--- a/tderesources/kolab/Makefile.am
+++ b/tderesources/kolab/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = shared kabc knotes kcal
 
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = kolab-resource.upd
 update_SCRIPTS = upgrade-resourcetype.pl 
 
diff --git a/tderesources/kolab/kabc/contact.cpp b/tderesources/kolab/kabc/contact.cpp
index ff8f869b7..dac619fea 100644
--- a/tderesources/kolab/kabc/contact.cpp
+++ b/tderesources/kolab/kabc/contact.cpp
@@ -37,7 +37,7 @@
 #include <kabc/stdaddressbook.h>
 #include <libkcal/freebusyurlstore.h>
 #include <libtdepim/distributionlist.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kdebug.h>
 #include <tqfile.h>
 #include <float.h>
diff --git a/tderesources/kolab/kabc/resourcekolab.cpp b/tderesources/kolab/kabc/resourcekolab.cpp
index ce7c18c42..51c3a4b42 100644
--- a/tderesources/kolab/kabc/resourcekolab.cpp
+++ b/tderesources/kolab/kabc/resourcekolab.cpp
@@ -38,8 +38,8 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
-#include <kio/observer.h>
-#include <kio/uiserver_stub.h>
+#include <tdeio/observer.h>
+#include <tdeio/uiserver_stub.h>
 #include <kabc/vcardconverter.h>
 #include <kmainwindow.h>
 #include <kapplication.h>
@@ -197,8 +197,8 @@ bool KABC::ResourceKolab::loadSubResource( const TQString& subResource )
   // If it's too big the progressbar is jumpy.
   const int nbMessages = 200;
 
-  (void)Observer::self(); // ensure kio_uiserver is running
-  UIServer_stub uiserver( "kio_uiserver", "UIServer" );
+  (void)Observer::self(); // ensure tdeio_uiserver is running
+  UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
   int progressId = 0;
   if ( count > 200 ) {
     progressId = uiserver.newJob( kapp->dcopClient()->appId(), true );
diff --git a/tderesources/kolab/kcal/incidence.cpp b/tderesources/kolab/kcal/incidence.cpp
index ddc31491b..b5603b191 100644
--- a/tderesources/kolab/kcal/incidence.cpp
+++ b/tderesources/kolab/kcal/incidence.cpp
@@ -44,7 +44,7 @@
 #include <kdebug.h>
 #include <kmdcodec.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 using namespace Kolab;
 
diff --git a/tderesources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp
index 44c13fd2b..50f8b5b82 100644
--- a/tderesources/kolab/kcal/resourcekolab.cpp
+++ b/tderesources/kolab/kcal/resourcekolab.cpp
@@ -37,8 +37,8 @@
 #include "task.h"
 #include "journal.h"
 
-#include <kio/observer.h>
-#include <kio/uiserver_stub.h>
+#include <tdeio/observer.h>
+#include <tdeio/uiserver_stub.h>
 #include <kapplication.h>
 #include <dcopclient.h>
 #include <libtdepim/kincidencechooser.h>
@@ -172,8 +172,8 @@ bool ResourceKolab::loadSubResource( const TQString& subResource,
                            : i18n( "Loading events..." );
   const bool useProgress = tqApp && tqApp->type() != TQApplication::Tty && count > mProgressDialogIncidenceLimit;
   if ( useProgress )
-    (void)::Observer::self(); // ensure kio_uiserver is running
-  UIServer_stub uiserver( "kio_uiserver", "UIServer" );
+    (void)::Observer::self(); // ensure tdeio_uiserver is running
+  UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
   int progressId = 0;
   if ( useProgress ) {
     progressId = uiserver.newJob( kapp->dcopClient()->appId(), true );
diff --git a/tderesources/lib/addressbookadaptor.cpp b/tderesources/lib/addressbookadaptor.cpp
index 8cc28f67a..230ac3509 100644
--- a/tderesources/lib/addressbookadaptor.cpp
+++ b/tderesources/lib/addressbookadaptor.cpp
@@ -26,7 +26,7 @@
 #include <kabc/addressee.h>
 #include <kabc/vcardconverter.h>
 #include <libtdepim/kabcresourcecached.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 
 using namespace KABC;
diff --git a/tderesources/lib/calendaradaptor.cpp b/tderesources/lib/calendaradaptor.cpp
index f2e255f0d..ffbccefc5 100644
--- a/tderesources/lib/calendaradaptor.cpp
+++ b/tderesources/lib/calendaradaptor.cpp
@@ -28,7 +28,7 @@
 #include <libkcal/resourcecached.h>
 #include <libkcal/icalformat.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <kdebug.h>
 
diff --git a/tderesources/lib/davaddressbookadaptor.cpp b/tderesources/lib/davaddressbookadaptor.cpp
index 5b4a0a521..bf4a03476 100644
--- a/tderesources/lib/davaddressbookadaptor.cpp
+++ b/tderesources/lib/davaddressbookadaptor.cpp
@@ -30,8 +30,8 @@
 // #include <kabc/vcardconverter.h>
 // #include <kabcresourcecached.h>
 
-#include <kio/davjob.h>
-// #include <kio/job.h>
+#include <tdeio/davjob.h>
+// #include <tdeio/job.h>
 #include <kdebug.h>
 
 using namespace KABC;
diff --git a/tderesources/lib/davcalendaradaptor.cpp b/tderesources/lib/davcalendaradaptor.cpp
index 5d6be2da6..5263c2a18 100644
--- a/tderesources/lib/davcalendaradaptor.cpp
+++ b/tderesources/lib/davcalendaradaptor.cpp
@@ -22,7 +22,7 @@
 #include "davcalendaradaptor.h"
 
 #include <kdebug.h>
-#include <kio/davjob.h>
+#include <tdeio/davjob.h>
 // #include <folderlister.h>
 
 // #include <tqdom.h>
diff --git a/tderesources/lib/folderlister.cpp b/tderesources/lib/folderlister.cpp
index 6cb341acd..c12d3ae69 100644
--- a/tderesources/lib/folderlister.cpp
+++ b/tderesources/lib/folderlister.cpp
@@ -25,10 +25,10 @@
 #include "groupwaredataadaptor.h"
 #include "tderesources_groupwareprefs.h"
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqstringlist.h>
 
 using namespace KPIM;
diff --git a/tderesources/lib/groupwaredataadaptor.cpp b/tderesources/lib/groupwaredataadaptor.cpp
index 85dacdaa8..4a89bd02c 100644
--- a/tderesources/lib/groupwaredataadaptor.cpp
+++ b/tderesources/lib/groupwaredataadaptor.cpp
@@ -23,7 +23,7 @@
 
 #include "groupwaredataadaptor.h"
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <libemailfunctions/idmapper.h>
 
 using namespace KPIM;
diff --git a/tderesources/lib/groupwaredownloadjob.cpp b/tderesources/lib/groupwaredownloadjob.cpp
index 9104da847..63c7e988d 100644
--- a/tderesources/lib/groupwaredownloadjob.cpp
+++ b/tderesources/lib/groupwaredownloadjob.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kurl.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <libemailfunctions/idmapper.h>
 #include <libtdepim/progressmanager.h>
 
diff --git a/tderesources/lib/groupwareresourcejob.h b/tderesources/lib/groupwareresourcejob.h
index f2818f2cd..d32caaae1 100644
--- a/tderesources/lib/groupwareresourcejob.h
+++ b/tderesources/lib/groupwareresourcejob.h
@@ -32,7 +32,7 @@ namespace KPIM {
 class GroupwareDataAdaptor;
 
 /**
-  This class provides a resource for accessing a Groupware kioslave-based
+  This class provides a resource for accessing a Groupware tdeioslave-based
   calendar.
 */
 class GroupwareJob : public TQObject
diff --git a/tderesources/lib/groupwareuploadjob.cpp b/tderesources/lib/groupwareuploadjob.cpp
index cf46571fc..e896c0dab 100644
--- a/tderesources/lib/groupwareuploadjob.cpp
+++ b/tderesources/lib/groupwareuploadjob.cpp
@@ -31,7 +31,7 @@
 
 #include <kdebug.h>
 #include <kurl.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <tqstringlist.h>
 #include <tqtimer.h>
diff --git a/tderesources/lib/groupwareuploadjob.h b/tderesources/lib/groupwareuploadjob.h
index b3a0ff756..13ba3ed54 100644
--- a/tderesources/lib/groupwareuploadjob.h
+++ b/tderesources/lib/groupwareuploadjob.h
@@ -41,7 +41,7 @@ class GroupwareDataAdaptor;
 class ProgressItem;
 
 /**
-  This class provides a resource for accessing a Groupware kioslave-based
+  This class provides a resource for accessing a Groupware tdeioslave-based
   calendar.
 */
 class GroupwareUploadJob : public GroupwareJob
diff --git a/tderesources/lib/kcal_cachesettingsdlg.h b/tderesources/lib/kcal_cachesettingsdlg.h
index 1a6b369ab..51263e263 100644
--- a/tderesources/lib/kcal_cachesettingsdlg.h
+++ b/tderesources/lib/kcal_cachesettingsdlg.h
@@ -36,7 +36,7 @@ class ResourceCachedReloadConfig;
 class ResourceCachedSaveConfig;
 
 /**
-  Configuration widget for groupware kioslave resource.
+  Configuration widget for groupware tdeioslave resource.
   @see KCalOpenGroupware
 */
 class KDE_EXPORT CacheSettingsDialog : public KDialogBase
diff --git a/tderesources/lib/kcal_resourcegroupwarebase.cpp b/tderesources/lib/kcal_resourcegroupwarebase.cpp
index bd459331a..56ffae7d5 100644
--- a/tderesources/lib/kcal_resourcegroupwarebase.cpp
+++ b/tderesources/lib/kcal_resourcegroupwarebase.cpp
@@ -31,7 +31,7 @@
 #include "groupwareuploadjob.h"
 
 #include <libkcal/icalformat.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 
 #include <tqapplication.h>
diff --git a/tderesources/lib/kcal_resourcegroupwarebase.h b/tderesources/lib/kcal_resourcegroupwarebase.h
index f6b46dbf7..8a1033fb2 100644
--- a/tderesources/lib/kcal_resourcegroupwarebase.h
+++ b/tderesources/lib/kcal_resourcegroupwarebase.h
@@ -46,7 +46,7 @@ namespace KCal {
 class CalendarAdaptor;
 
 /**
-  This class provides a resource for accessing a Groupware kioslave-based
+  This class provides a resource for accessing a Groupware tdeioslave-based
   calendar.
 */
 class KDE_EXPORT ResourceGroupwareBase : public ResourceCached
diff --git a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h
index ab4f841a2..7639b562f 100644
--- a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h
+++ b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h
@@ -40,7 +40,7 @@ namespace KCal {
 class CacheSettingsDialog;
 
 /**
-  Configuration widget for groupware kioslave resource.
+  Configuration widget for groupware tdeioslave resource.
 
   @see KCalOpenGroupware
 */
diff --git a/tderesources/newexchange/exchangeaddressbookadaptor.cpp b/tderesources/newexchange/exchangeaddressbookadaptor.cpp
index 7e8ae8bb9..1abaacd4d 100644
--- a/tderesources/newexchange/exchangeaddressbookadaptor.cpp
+++ b/tderesources/newexchange/exchangeaddressbookadaptor.cpp
@@ -25,7 +25,7 @@
 #include "exchangeglobals.h"
 #include <webdavhandler.h>
 #include <kdebug.h>
-#include <kio/davjob.h>
+#include <tdeio/davjob.h>
 
 using namespace KABC;
 
diff --git a/tderesources/newexchange/exchangecalendaradaptor.cpp b/tderesources/newexchange/exchangecalendaradaptor.cpp
index 89c9b742e..a6777fb27 100644
--- a/tderesources/newexchange/exchangecalendaradaptor.cpp
+++ b/tderesources/newexchange/exchangecalendaradaptor.cpp
@@ -26,7 +26,7 @@
 #include <webdavhandler.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kio/davjob.h>
+#include <tdeio/davjob.h>
 #include <libkcal/resourcecached.h>
 #include "davcalendaradaptor.h"
 
diff --git a/tderesources/newexchange/exchangeglobals.cpp b/tderesources/newexchange/exchangeglobals.cpp
index f2d90cd6d..dc74650c5 100644
--- a/tderesources/newexchange/exchangeglobals.cpp
+++ b/tderesources/newexchange/exchangeglobals.cpp
@@ -29,8 +29,8 @@
 
 #include <libkcal/resourcecached.h>
 #include <libemailfunctions/idmapper.h>
-#include <kio/job.h>
-#include <kio/davjob.h>
+#include <tdeio/job.h>
+#include <tdeio/davjob.h>
 #include <kdebug.h>
 
 KPIM::FolderLister::ContentType ExchangeGlobals::getContentType( const TQDomElement &prop )
diff --git a/tderesources/remote/resourceremote.cpp b/tderesources/remote/resourceremote.cpp
index ed05f8405..78b650658 100644
--- a/tderesources/remote/resourceremote.cpp
+++ b/tderesources/remote/resourceremote.cpp
@@ -28,7 +28,7 @@
 
 #include <kdebug.h>
 #include <kurl.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
diff --git a/tderesources/remote/resourceremote.h b/tderesources/remote/resourceremote.h
index 2c3fd5fad..04099ff97 100644
--- a/tderesources/remote/resourceremote.h
+++ b/tderesources/remote/resourceremote.h
@@ -26,7 +26,7 @@
 #include <tqdatetime.h>
 
 #include <kurl.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdirwatch.h>
 #include <tdepimmacros.h>
 
diff --git a/tderesources/scalix/CMakeLists.txt b/tderesources/scalix/CMakeLists.txt
index ca7fc5237..0be4fd954 100644
--- a/tderesources/scalix/CMakeLists.txt
+++ b/tderesources/scalix/CMakeLists.txt
@@ -12,6 +12,6 @@
 add_subdirectory( shared )
 add_subdirectory( kabc )
 add_subdirectory( kcal )
-add_subdirectory( kioslave )
+add_subdirectory( tdeioslave )
 add_subdirectory( knotes )
 add_subdirectory( scalixadmin )
diff --git a/tderesources/scalix/Makefile.am b/tderesources/scalix/Makefile.am
index 1a58c7ec9..ca3230486 100644
--- a/tderesources/scalix/Makefile.am
+++ b/tderesources/scalix/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = shared kabc kcal kioslave knotes scalixadmin
+SUBDIRS = shared kabc kcal tdeioslave knotes scalixadmin
 
 messages: rc.cpp
 	$(XGETTEXT) shared/*.cpp kabc/*.cpp kcal/*.cpp knotes/*.cpp -o $(podir)/kres_scalix.pot
diff --git a/tderesources/scalix/kabc/resourcescalix.cpp b/tderesources/scalix/kabc/resourcescalix.cpp
index 42aef92d5..13ee99ec8 100644
--- a/tderesources/scalix/kabc/resourcescalix.cpp
+++ b/tderesources/scalix/kabc/resourcescalix.cpp
@@ -38,8 +38,8 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
-#include <kio/observer.h>
-#include <kio/uiserver_stub.h>
+#include <tdeio/observer.h>
+#include <tdeio/uiserver_stub.h>
 #include <kmainwindow.h>
 #include <kapplication.h>
 #include <dcopclient.h>
@@ -193,8 +193,8 @@ bool KABC::ResourceScalix::loadSubResourceHelper( const TQString& subResource,
   // If it's too big the progressbar is jumpy.
   const int nbMessages = 200;
 
-  (void)Observer::self(); // ensure kio_uiserver is running
-  UIServer_stub uiserver( "kio_uiserver", "UIServer" );
+  (void)Observer::self(); // ensure tdeio_uiserver is running
+  UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
   int progressId = 0;
   if ( count > 200 ) {
     progressId = uiserver.newJob( kapp->dcopClient()->appId(), true );
diff --git a/tderesources/scalix/kcal/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp
index a757c81fc..672a7bfbf 100644
--- a/tderesources/scalix/kcal/resourcescalix.cpp
+++ b/tderesources/scalix/kcal/resourcescalix.cpp
@@ -33,8 +33,8 @@
 
 #include "resourcescalix.h"
 
-#include <kio/observer.h>
-#include <kio/uiserver_stub.h>
+#include <tdeio/observer.h>
+#include <tdeio/uiserver_stub.h>
 #include <kapplication.h>
 #include <dcopclient.h>
 #include <libkcal/icalformat.h>
@@ -161,8 +161,8 @@ bool ResourceScalix::loadSubResource( const TQString& subResource,
                            : i18n( "Loading events..." );
   const bool useProgress = tqApp && tqApp->type() != TQApplication::Tty && count > mProgressDialogIncidenceLimit;
   if ( useProgress )
-    (void)::Observer::self(); // ensure kio_uiserver is running
-  UIServer_stub uiserver( "kio_uiserver", "UIServer" );
+    (void)::Observer::self(); // ensure tdeio_uiserver is running
+  UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
   int progressId = 0;
   if ( useProgress ) {
     progressId = uiserver.newJob( kapp->dcopClient()->appId(), true );
diff --git a/tderesources/scalix/scalixadmin/jobs.cpp b/tderesources/scalix/scalixadmin/jobs.cpp
index 49b0a8fe5..e7dd94457 100644
--- a/tderesources/scalix/scalixadmin/jobs.cpp
+++ b/tderesources/scalix/scalixadmin/jobs.cpp
@@ -18,7 +18,7 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <kio/scheduler.h>
+#include <tdeio/scheduler.h>
 #include <klocale.h>
 
 #include "jobs.h"
diff --git a/tderesources/scalix/scalixadmin/jobs.h b/tderesources/scalix/scalixadmin/jobs.h
index 0c73fb507..832db0700 100644
--- a/tderesources/scalix/scalixadmin/jobs.h
+++ b/tderesources/scalix/scalixadmin/jobs.h
@@ -18,7 +18,7 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #ifndef JOBS_H
 #define JOBS_H
diff --git a/tderesources/scalix/scalixadmin/passwordpage.cpp b/tderesources/scalix/scalixadmin/passwordpage.cpp
index 6dd8ab10e..9bdc13776 100644
--- a/tderesources/scalix/scalixadmin/passwordpage.cpp
+++ b/tderesources/scalix/scalixadmin/passwordpage.cpp
@@ -24,7 +24,7 @@
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstringhandler.h>
diff --git a/tderesources/scalix/scalixadmin/settings.cpp b/tderesources/scalix/scalixadmin/settings.cpp
index 279491c5f..277a0631d 100644
--- a/tderesources/scalix/scalixadmin/settings.cpp
+++ b/tderesources/scalix/scalixadmin/settings.cpp
@@ -18,8 +18,8 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <kconfig.h>
-#include <kio/scheduler.h>
+#include <tdeconfig.h>
+#include <tdeio/scheduler.h>
 #include <kstringhandler.h>
 
 #include "settings.h"
diff --git a/tderesources/scalix/scalixadmin/settings.h b/tderesources/scalix/scalixadmin/settings.h
index 29028f3b8..490b98a7d 100644
--- a/tderesources/scalix/scalixadmin/settings.h
+++ b/tderesources/scalix/scalixadmin/settings.h
@@ -22,8 +22,8 @@
 #define SETTINGS_H
 
 #include <kurl.h>
-#include <kio/global.h>
-#include <kio/slave.h>
+#include <tdeio/global.h>
+#include <tdeio/slave.h>
 
 class Settings
 {
diff --git a/tderesources/scalix/kioslave/CMakeLists.txt b/tderesources/scalix/tdeioslave/CMakeLists.txt
index 7ba76f672..7ba76f672 100644
--- a/tderesources/scalix/kioslave/CMakeLists.txt
+++ b/tderesources/scalix/tdeioslave/CMakeLists.txt
diff --git a/tderesources/scalix/kioslave/Makefile.am b/tderesources/scalix/tdeioslave/Makefile.am
index 5607fb9d7..1e66f7091 100644
--- a/tderesources/scalix/kioslave/Makefile.am
+++ b/tderesources/scalix/tdeioslave/Makefile.am
@@ -14,4 +14,4 @@ kio_scalix_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtde
 kio_scalix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kio_scalix.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_scalix.pot
diff --git a/tderesources/scalix/kioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp
index 1b4cc7b8f..40084669d 100644
--- a/tderesources/scalix/kioslave/scalix.cpp
+++ b/tderesources/scalix/tdeioslave/scalix.cpp
@@ -25,7 +25,7 @@
 #include <kcmdlineargs.h>
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <klocale.h>
 
 #include <tdepimmacros.h>
diff --git a/tderesources/scalix/kioslave/scalix.h b/tderesources/scalix/tdeioslave/scalix.h
index dc034b7b5..f4dbdeadd 100644
--- a/tderesources/scalix/kioslave/scalix.h
+++ b/tderesources/scalix/tdeioslave/scalix.h
@@ -21,8 +21,8 @@
 #ifndef SCALIX_H
 #define SCALIX_H
 
-#include <kio/job.h>
-#include <kio/slavebase.h>
+#include <tdeio/job.h>
+#include <tdeio/slavebase.h>
 
 #include <tqobject.h>
 
diff --git a/tderesources/scalix/kioslave/scalix.protocol b/tderesources/scalix/tdeioslave/scalix.protocol
index a527d77dd..91a213e87 100644
--- a/tderesources/scalix/kioslave/scalix.protocol
+++ b/tderesources/scalix/tdeioslave/scalix.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-DocPath=kioslave/scalix.html
+DocPath=tdeioslave/scalix.html
 exec=kio_scalix
 input=none
 output=filesystem
diff --git a/tderesources/scalix/kioslave/scalixs.protocol b/tderesources/scalix/tdeioslave/scalixs.protocol
index fd13db6ad..19defac56 100644
--- a/tderesources/scalix/kioslave/scalixs.protocol
+++ b/tderesources/scalix/tdeioslave/scalixs.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-DocPath=kioslave/scalix.html
+DocPath=tdeioslave/scalix.html
 exec=kio_scalix
 input=none
 output=filesystem
diff --git a/tderesources/slox/kabcresourceslox.cpp b/tderesources/slox/kabcresourceslox.cpp
index e7ab6ecae..04ce9555e 100644
--- a/tderesources/slox/kabcresourceslox.cpp
+++ b/tderesources/slox/kabcresourceslox.cpp
@@ -22,7 +22,7 @@
 #include <tqapplication.h>
 
 #include <kabc/picture.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmdcodec.h>
@@ -30,7 +30,7 @@
 #include <kstringhandler.h>
 #include <libtdepim/kpimprefs.h>
 #include <libtdepim/progressmanager.h>
-#include <kio/davjob.h>
+#include <tdeio/davjob.h>
 
 #include "webdavhandler.h"
 #include "sloxaccounts.h"
diff --git a/tderesources/slox/kabcsloxprefs.kcfgc b/tderesources/slox/kabcsloxprefs.kcfgc
index 11e2f2c21..51bd1ac16 100644
--- a/tderesources/slox/kabcsloxprefs.kcfgc
+++ b/tderesources/slox/kabcsloxprefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=tderesources_kabc_slox.kcfg
 ClassName=SloxPrefs
 NameSpace=KABC
diff --git a/tderesources/slox/kcalresourceslox.cpp b/tderesources/slox/kcalresourceslox.cpp
index 1311ebc52..a877622e9 100644
--- a/tderesources/slox/kcalresourceslox.cpp
+++ b/tderesources/slox/kcalresourceslox.cpp
@@ -30,8 +30,8 @@
 
 #include <kdebug.h>
 #include <kurl.h>
-#include <kio/job.h>
-#include <kio/davjob.h>
+#include <tdeio/job.h>
+#include <tdeio/davjob.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 
diff --git a/tderesources/slox/kcalresourceslox.h b/tderesources/slox/kcalresourceslox.h
index 6735b9934..8b2b68d26 100644
--- a/tderesources/slox/kcalresourceslox.h
+++ b/tderesources/slox/kcalresourceslox.h
@@ -29,7 +29,7 @@
 #include <tqdom.h>
 
 #include <kurl.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdirwatch.h>
 #include <tdepimmacros.h>
 
diff --git a/tderesources/slox/kcalsloxprefs.kcfgc b/tderesources/slox/kcalsloxprefs.kcfgc
index 3b352a214..e971d32d8 100644
--- a/tderesources/slox/kcalsloxprefs.kcfgc
+++ b/tderesources/slox/kcalsloxprefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=tderesources_kcal_slox.kcfg
 ClassName=SloxPrefs
 NameSpace=KCal
diff --git a/tderesources/slox/sloxaccounts.cpp b/tderesources/slox/sloxaccounts.cpp
index aa648d1bc..1831d79ae 100644
--- a/tderesources/slox/sloxaccounts.cpp
+++ b/tderesources/slox/sloxaccounts.cpp
@@ -28,10 +28,10 @@
 #include <kstaticdeleter.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kio/job.h>
-#include <kio/davjob.h>
+#include <tdeio/job.h>
+#include <tdeio/davjob.h>
 #include <kstringhandler.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqfile.h>
 #include <tqdom.h>
diff --git a/tderesources/slox/sloxfoldermanager.cpp b/tderesources/slox/sloxfoldermanager.cpp
index a60cd7885..728420555 100644
--- a/tderesources/slox/sloxfoldermanager.cpp
+++ b/tderesources/slox/sloxfoldermanager.cpp
@@ -22,8 +22,8 @@
 #include <tqstring.h>
 
 #include <kdebug.h>
-#include <kio/job.h>
-#include <kio/davjob.h>
+#include <tdeio/job.h>
+#include <tdeio/davjob.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 
diff --git a/tderesources/slox/webdavhandler.cpp b/tderesources/slox/webdavhandler.cpp
index 32d3c4167..65caebf23 100644
--- a/tderesources/slox/webdavhandler.cpp
+++ b/tderesources/slox/webdavhandler.cpp
@@ -37,7 +37,7 @@
 #include <libtdepim/kpimprefs.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqfile.h>
 
diff --git a/tderesources/tvanytime/kcal_resourcetvanytime.h b/tderesources/tvanytime/kcal_resourcetvanytime.h
index 1c8bd9c90..65e9ac115 100644
--- a/tderesources/tvanytime/kcal_resourcetvanytime.h
+++ b/tderesources/tvanytime/kcal_resourcetvanytime.h
@@ -28,8 +28,8 @@
 #include <libkcal/resourcecached.h>
 
 #include <kabc/locknull.h>
-#include <kio/job.h>
-#include <kconfig.h>
+#include <tdeio/job.h>
+#include <tdeconfig.h>
 #include <tdepimmacros.h>
 
 #include "service.h"
diff --git a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp
index f9ec2a499..dbce86fef 100644
--- a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp
+++ b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp
@@ -25,7 +25,7 @@
 #include <tqspinbox.h>
 #include <tqwhatsthis.h>
 
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <klocale.h>
 #include <kdebug.h>
 //#include <kdialogbase.h>
diff --git a/tderesources/tvanytime/kcal_tvanytimeprefsbase.kcfgc b/tderesources/tvanytime/kcal_tvanytimeprefsbase.kcfgc
index 6693e4148..3b5a05c6d 100644
--- a/tderesources/tvanytime/kcal_tvanytimeprefsbase.kcfgc
+++ b/tderesources/tvanytime/kcal_tvanytimeprefsbase.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=tderesources_kcal_tvanytime.kcfg
 ClassName=TVAnytimePrefsBase
 NameSpace=KCal