6 files changed, 13 insertions, 13 deletions
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 );