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

43 files changed, 70 insertions, 70 deletions

diff --git a/konqueror/ChangeLog b/konqueror/ChangeLog
index cc734cffe..19c0a00eb 100644
--- a/konqueror/ChangeLog
+++ b/konqueror/ChangeLog
@@ -327,8 +327,8 @@ Sat Nov 25 17:38:27 2000  Carsten Pfeiffer  <[email protected]>
 2000-11-06  David Faure  <[email protected]>
 
 	* konq_operations.cc: statURL, calls a slot when it stat'ed
-	the url and created a kfileitem for it.
-	Used in doDrop when the destination's kfileitem is unknown. Fixes #14739.
+	the url and created a tdefileitem for it.
+	Used in doDrop when the destination's tdefileitem is unknown. Fixes #14739.
 	Also, KPropsDlg now does a similar thing when called with a KURL.
 
 2000-11-05  David Faure  <[email protected]>
diff --git a/konqueror/DESIGN b/konqueror/DESIGN
index 45ff6e47f..da257cb05 100644
--- a/konqueror/DESIGN
+++ b/konqueror/DESIGN
@@ -25,7 +25,7 @@ The KonqView contains the child part, which can be :
 Where to find those classes
 ===========================
 
-konq_run.* : Re-implementation of KRun (see libkio) for konqueror.
+konq_run.* : Re-implementation of KRun (see libtdeio) for konqueror.
 	   Responsible for finding appropriate view<->mimetype bindings.
 konq_view.* : KonqView, class used by KonqMainView to handle child views
 konq_frame.* : KonqFrame and KonqFrameHeader (handles view-statusbar).
@@ -39,8 +39,8 @@ dirtree/*  : KonqDirTree, the directory tree
 Libs used by konqueror
 ======================
 
-tdecore, tdeui, kfile, tdehtml, tdeparts - usual stuff :)
-libkio - I/O stuff, mimetypes, services
+tdecore, tdeui, tdefile, tdehtml, tdeparts - usual stuff :)
+libtdeio - I/O stuff, mimetypes, services
 libkonq - bookmarks, properties dialog, templates ("new") menu, icon view widget
 
 How konqueror opens URLs
diff --git a/konqueror/TODO b/konqueror/TODO
index 725abeb4a..fad57be2d 100644
--- a/konqueror/TODO
+++ b/konqueror/TODO
@@ -34,7 +34,7 @@ dirtree:
 
 - Create dynamic items when browsing non-local URLs (FTP etc.)
 
-kpropsdlg (kfile):
+kpropsdlg (tdefile):
 ======
 
 - Maybe add GUI (in kpropertiesdialog probably) for user defined actions in .desktop
diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc
index fed36a1e2..ab602eb94 100644
--- a/konqueror/about/konq_aboutpage.cc
+++ b/konqueror/about/konq_aboutpage.cc
@@ -13,7 +13,7 @@
 #include <kiconloader.h>
 #include <kurifilter.h>
 #include <ktrader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <assert.h>
 #include <tqfile.h>
@@ -281,12 +281,12 @@ TQString KonqAboutPageFactory::specs()
           .arg( i18n("<A HREF=\"%1\">Cascading Style Sheets</A> (CSS 1, partially CSS 2)").arg("http://www.w3.org/Style/CSS/") )
           .arg( i18n("built-in") )
           .arg( i18n("<A HREF=\"%1\">ECMA-262</A> Edition 3 (roughly equals JavaScript 1.5)").arg("http://www.ecma.ch/ecma1/STAND/ECMA-262.HTM") )
-          .arg( i18n("JavaScript disabled (globally). Enable JavaScript <A HREF=\"%1\">here</A>.").arg("exec:/kcmshell tdehtml_java_js") )
-          .arg( i18n("JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</A>.").arg("exec:/kcmshell tdehtml_java_js") ) // leave the double backslashes here, they are necessary for javascript !
+          .arg( i18n("JavaScript disabled (globally). Enable JavaScript <A HREF=\"%1\">here</A>.").arg("exec:/tdecmshell tdehtml_java_js") )
+          .arg( i18n("JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</A>.").arg("exec:/tdecmshell tdehtml_java_js") ) // leave the double backslashes here, they are necessary for javascript !
           .arg( i18n("Secure <A HREF=\"%1\">Java</A><SUP>&reg;</SUP> support").arg("http://java.sun.com") )
           .arg( i18n("JDK 1.2.0 (Java 2) compatible VM (<A HREF=\"%1\">Blackdown</A>, <A HREF=\"%2\">IBM</A> or <A HREF=\"%3\">Sun</A>)")
                       .arg("http://www.blackdown.org").arg("http://www.ibm.com").arg("http://java.sun.com") )
-          .arg( i18n("Enable Java (globally) <A HREF=\"%1\">here</A>.").arg("exec:/kcmshell tdehtml_java_js") ) // TODO Maybe test if Java is enabled ?
+          .arg( i18n("Enable Java (globally) <A HREF=\"%1\">here</A>.").arg("exec:/tdecmshell tdehtml_java_js") ) // TODO Maybe test if Java is enabled ?
           .arg( i18n("Netscape Communicator<SUP>&reg;</SUP> <A HREF=\"%4\">plugins</A> (for viewing <A HREF=\"%1\">Flash<SUP>&reg;</SUP></A>, <A HREF=\"%2\">Real<SUP>&reg;</SUP></A>Audio, <A HREF=\"%3\">Real<SUP>&reg;</SUP></A>Video, etc.)")
                       .arg("http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash")
                       .arg("http://www.real.com").arg("http://www.real.com")
@@ -306,7 +306,7 @@ TQString KonqAboutPageFactory::specs()
           .arg( i18n("Transfer protocols") )
           .arg( i18n("HTTP 1.1 (including gzip/bzip2 compression)") )
           .arg( i18n("FTP") )
-          .arg( i18n("and <A HREF=\"%1\">many more...</A>").arg("exec:/kcmshell ioslaveinfo") )
+          .arg( i18n("and <A HREF=\"%1\">many more...</A>").arg("exec:/tdecmshell ioslaveinfo") )
           .arg( i18n("URL-Completion") )
           .arg( i18n("Manual"))
 	  .arg( i18n("Popup"))
@@ -366,7 +366,7 @@ TQString KonqAboutPageFactory::tips()
 		      "using Google, for the search phrase \"KDE\". There are a lot of "
 		      "Web-Shortcuts predefined to make searching for software or looking "
 		      "up certain words in an encyclopedia a breeze. You can even "
-                      "<a href=\"%1\">create your own</a> Web-Shortcuts." ).arg("exec:/kcmshell ebrowsing") )
+                      "<a href=\"%1\">create your own</a> Web-Shortcuts." ).arg("exec:/tdecmshell ebrowsing") )
 	  .arg( i18n( "Use the magnifier button <img width='16' height='16' src=\"%1\"> in the"
 		      " toolbar to increase the font size on your web page.").arg(viewmag_icon_path) )
 	  .arg( i18n( "When you want to paste a new address into the Location toolbar you might want to "
@@ -386,11 +386,11 @@ TQString KonqAboutPageFactory::tips()
 		      ", or create your own ones." ).arg(view_left_right_icon_path))
 	  .arg( i18n( "Use the <a href=\"%1\">user-agent</a> feature if the website you are visiting "
                       "asks you to use a different browser "
-		      "(and do not forget to send a complaint to the webmaster!)" ).arg("exec:/kcmshell useragent") )
+		      "(and do not forget to send a complaint to the webmaster!)" ).arg("exec:/tdecmshell useragent") )
 	  .arg( i18n( "The <img width='16' height='16' src=\"%1\"> History in your SideBar ensures "
 		      "that you can keep track of the pages you have visited recently.").arg(history_icon_path) )
 	  .arg( i18n( "Use a caching <a href=\"%1\">proxy</a> to speed up your"
-		      " Internet connection.").arg("exec:/kcmshell proxy") )
+		      " Internet connection.").arg("exec:/tdecmshell proxy") )
 	  .arg( i18n( "Advanced users will appreciate the Konsole which you can embed into "
 		      "Konqueror (Window -> <img width='16' height='16' SRC=\"%1\"> Show "
  		      "Terminal Emulator).").arg(openterm_icon_path))
@@ -437,7 +437,7 @@ KonqAboutPage::KonqAboutPage( //KonqMainWindow *
 	setCharset(codec->name(), true);
     else
 	setCharset("iso-8859-1", true);
-    // about:blah isn't a kioslave -> disable View source
+    // about:blah isn't a tdeioslave -> disable View source
     KAction * act = actionCollection()->action("viewDocumentSource");
     if ( act )
       act->setEnabled( false );
diff --git a/konqueror/client/CMakeLists.txt b/konqueror/client/CMakeLists.txt
index 558a5d7f9..3ae477d32 100644
--- a/konqueror/client/CMakeLists.txt
+++ b/konqueror/client/CMakeLists.txt
@@ -23,8 +23,8 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kfmclient_3_2.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
-install( PROGRAMS kfmclient_3_2_update.sh DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
+install( FILES kfmclient_3_2.upd DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
+install( PROGRAMS kfmclient_3_2_update.sh DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
 
 
 ##### kfmclient (tdeinit) #######################
@@ -39,5 +39,5 @@ set( ${target}_SRCS
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
 )
diff --git a/konqueror/client/Makefile.am b/konqueror/client/Makefile.am
index bef42b01c..059bfa8ec 100644
--- a/konqueror/client/Makefile.am
+++ b/konqueror/client/Makefile.am
@@ -18,6 +18,6 @@ KDesktopIface_DIR = $(top_srcdir)/kdesktop
 messages:
 	$(XGETTEXT) -kaliasLocal *.h *.cc -o $(podir)/kfmclient.pot
 
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = kfmclient_3_2.upd
 update_SCRIPTS = kfmclient_3_2_update.sh
diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc
index 649115d5c..6e8ccc2ac 100644
--- a/konqueror/client/kfmclient.cc
+++ b/konqueror/client/kfmclient.cc
@@ -25,7 +25,7 @@
 
 #include <tqdir.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kcmdlineargs.h>
 #include <kpropertiesdialog.h>
 #include <klocale.h>
@@ -35,7 +35,7 @@
 #include <kopenwith.h>
 #include <kurlrequesterdlg.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdebug.h>
 #include <dcopclient.h>
 #include <kservice.h>
diff --git a/konqueror/iconview/konq_iconview.h b/konqueror/iconview/konq_iconview.h
index 425f54d1d..56bef37dc 100644
--- a/konqueror/iconview/konq_iconview.h
+++ b/konqueror/iconview/konq_iconview.h
@@ -26,7 +26,7 @@
 #include <kmimetyperesolver.h>
 #include <tqptrdict.h>
 #include <tqptrlist.h>
-#include <kfileivi.h>
+#include <tdefileivi.h>
 
 class KonqPropsView;
 class KFileItem;
diff --git a/konqueror/keditbookmarks/CMakeLists.txt b/konqueror/keditbookmarks/CMakeLists.txt
index e5954898b..90583b734 100644
--- a/konqueror/keditbookmarks/CMakeLists.txt
+++ b/konqueror/keditbookmarks/CMakeLists.txt
@@ -37,7 +37,7 @@ set( target kbookmarkmerger )
 
 tde_add_executable( ${target}
   SOURCES kbookmarkmerger.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/konqueror/keditbookmarks/DESIGN b/konqueror/keditbookmarks/DESIGN
index 723a279d7..4ebe5e9c5 100644
--- a/konqueror/keditbookmarks/DESIGN
+++ b/konqueror/keditbookmarks/DESIGN
@@ -7,11 +7,11 @@ four main layers:
 various other thingies:
    search           : incremental search implementation
    favicons         : iterating action implementation using bookmarkiterator
-   importers        : forwarders to kio/bookmarks code
-   exporters        : forwarders to kio/bookmarks code, and html export code
+   importers        : forwarders to tdeio/bookmarks code
+   exporters        : forwarders to tdeio/bookmarks code, and html export code
    dcop             : dcop handling, internal interface
    bookmarkiterator : is a baseclass for iterating actions, of sorts...
-   updater          : favicon updating base stuff - kio/tdehtml crap
+   updater          : favicon updating base stuff - tdeio/tdehtml crap
    testlink         : link testing stuff
 
 3 different selection styles:
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index 4bcd50735..23e6fe16d 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -45,7 +45,7 @@
 #include <kaction.h>
 #include <kstdaction.h>
 #include <kedittoolbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kkeydialog.h>
 #include <kmessagebox.h>
 #include <kinputdialog.h>
diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp
index edc4a66bb..7780196ca 100644
--- a/konqueror/keditbookmarks/bookmarkinfo.cpp
+++ b/konqueror/keditbookmarks/bookmarkinfo.cpp
@@ -42,7 +42,7 @@
 #include <kedittoolbar.h>
 #include <kmessagebox.h>
 #include <klineedit.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <kbookmarkdrag.h>
 #include <kbookmarkmanager.h>
diff --git a/konqueror/keditbookmarks/importers.cpp b/konqueror/keditbookmarks/importers.cpp
index 3a9a613c1..4c96765e2 100644
--- a/konqueror/keditbookmarks/importers.cpp
+++ b/konqueror/keditbookmarks/importers.cpp
@@ -30,7 +30,7 @@
 #include <klocale.h>
 
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <kbookmarkmanager.h>
 
diff --git a/konqueror/keditbookmarks/importers.h b/konqueror/keditbookmarks/importers.h
index ef23f5527..eee00823a 100644
--- a/konqueror/keditbookmarks/importers.h
+++ b/konqueror/keditbookmarks/importers.h
@@ -24,7 +24,7 @@
 
 #include "commands.h"
 #include <klocale.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <kcommand.h>
 #include <kbookmark.h>
diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp
index 1fa31e967..3a2b14d5e 100644
--- a/konqueror/keditbookmarks/listview.cpp
+++ b/konqueror/keditbookmarks/listview.cpp
@@ -43,7 +43,7 @@
 #include <kaction.h>
 #include <kstdaction.h>
 #include <kedittoolbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kkeydialog.h>
 #include <kmessagebox.h>
 #include <klineedit.h>
diff --git a/konqueror/keditbookmarks/testlink.h b/konqueror/keditbookmarks/testlink.h
index a808202e1..a224279df 100644
--- a/konqueror/keditbookmarks/testlink.h
+++ b/konqueror/keditbookmarks/testlink.h
@@ -22,7 +22,7 @@
 
 #include <tqobject.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kbookmark.h>
 
 #include "listview.h"
diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp
index 8ae218611..eea4d8c58 100644
--- a/konqueror/keditbookmarks/toplevel.cpp
+++ b/konqueror/keditbookmarks/toplevel.cpp
@@ -49,7 +49,7 @@
 #include <kedittoolbar.h>
 #include <kmessagebox.h>
 #include <klineedit.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <kdebug.h>
 
diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp
index 4060b08a8..6d14d89ae 100644
--- a/konqueror/keditbookmarks/updater.cpp
+++ b/konqueror/keditbookmarks/updater.cpp
@@ -30,7 +30,7 @@
 #include <klocale.h>
 #include <kapplication.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <tdeparts/part.h>
 #include <tdeparts/componentfactory.h>
diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc
index b07135366..6199b59ae 100644
--- a/konqueror/konq_combo.cc
+++ b/konqueror/konq_combo.cc
@@ -20,7 +20,7 @@
 #include <tqpainter.h>
 #include <tqstyle.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcompletionbox.h>
 #include <kdebug.h>
 #include <kiconloader.h>
diff --git a/konqueror/konq_extensionmanager.cc b/konqueror/konq_extensionmanager.cc
index 120f36e4e..d7b36c37b 100644
--- a/konqueror/konq_extensionmanager.cc
+++ b/konqueror/konq_extensionmanager.cc
@@ -17,7 +17,7 @@
 #include <tqlayout.h>
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <tdeparts/componentfactory.h>
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index 09ea92c87..c5e1d7d7a 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -94,13 +94,13 @@
 #include <kurlrequester.h>
 #include <kuserprofile.h>
 #include <twin.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kpopupmenu.h>
 #include <kprocess.h>
-#include <kio/scheduler.h>
-#include <kio/netaccess.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/netaccess.h>
 #include <kaccelmanager.h>
 #include <kstringhandler.h>
 #include <kuser.h>
diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h
index bb850195b..d1b6e0c01 100644
--- a/konqueror/konq_mainwindow.h
+++ b/konqueror/konq_mainwindow.h
@@ -27,7 +27,7 @@
 #include <tqtimer.h>
 #include <tqguardedptr.h>
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include "konq_openurlrequest.h"
 
 #include <tdeparts/mainwindow.h>
diff --git a/konqueror/konq_profiledlg.cc b/konqueror/konq_profiledlg.cc
index 07d0b5b77..5ca6c426f 100644
--- a/konqueror/konq_profiledlg.cc
+++ b/konqueror/konq_profiledlg.cc
@@ -31,7 +31,7 @@
 #include <klistview.h>
 #include <kdebug.h>
 #include <kstdguiitem.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <ksimpleconfig.h>
diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc
index 2082821a8..42b9222ae 100644
--- a/konqueror/listview/konq_infolistviewitem.cc
+++ b/konqueror/listview/konq_infolistviewitem.cc
@@ -19,7 +19,7 @@
 
 #include "konq_listview.h"
 #include <konq_settings.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <assert.h>
diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc
index cb942dfe8..9a87baa17 100644
--- a/konqueror/listview/konq_infolistviewwidget.cc
+++ b/konqueror/listview/konq_infolistviewwidget.cc
@@ -22,12 +22,12 @@
 #include "konq_listview.h"
 
 #include <klocale.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <kdebug.h>
 #include <kaction.h>
 #include <kservicetype.h>
 #include <kuserprofile.h>
-#include <kio/metainfojob.h>
+#include <tdeio/metainfojob.h>
 
 #include <tqstringlist.h>
 
@@ -349,7 +349,7 @@ void KonqInfoListViewWidget::determineCounts(const KFileItemList& list)
 #warning ### change this
 #endif
         // this will load the plugin which we don't need because we delegate
-        // the job to the kioslave
+        // the job to the tdeioslave
         (*it).hasPlugin = prov->plugin(it.key());
 
         if ( (*it).hasPlugin)
diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h
index 9bdc60e3d..cbfcc446b 100644
--- a/konqueror/listview/konq_listviewwidget.h
+++ b/konqueror/listview/konq_listviewwidget.h
@@ -24,7 +24,7 @@
 #include <tqvaluevector.h>
 
 #include <kurl.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <klistview.h>
 #include <tdeparts/browserextension.h>
 #include <konq_propsview.h>
diff --git a/konqueror/listview/konq_textviewitem.h b/konqueror/listview/konq_textviewitem.h
index f091781e2..cbeda1730 100644
--- a/konqueror/listview/konq_textviewitem.h
+++ b/konqueror/listview/konq_textviewitem.h
@@ -22,7 +22,7 @@
 
 #include <tqlistview.h>
 #include <tqstring.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <klocale.h>
 #include "konq_listviewitems.h"
 #include "konq_textviewwidget.h"
diff --git a/konqueror/preloader/CMakeLists.txt b/konqueror/preloader/CMakeLists.txt
index d8e33ef40..09dca4593 100644
--- a/konqueror/preloader/CMakeLists.txt
+++ b/konqueror/preloader/CMakeLists.txt
@@ -40,6 +40,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK konqueror_intern-static kio-shared tdeinit_kded-shared
+  LINK konqueror_intern-static tdeio-shared tdeinit_kded-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/konqueror/preloader/preloader.cc b/konqueror/preloader/preloader.cc
index 35b2352e1..aa3d97169 100644
--- a/konqueror/preloader/preloader.cc
+++ b/konqueror/preloader/preloader.cc
@@ -20,7 +20,7 @@
 #include "preloader.h"
 #include "konq_settingsxt.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <dcopref.h>
 #include <kapplication.h>
 #include <dcopclient.h>
diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
index 838f2aad7..ec9d6ef2a 100644
--- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
+++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
@@ -28,14 +28,14 @@
 #include <kaction.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcharsets.h>
 #include <kpopupmenu.h>
 #include <dcopclient.h>
 #include <kgenericfactory.h>
 #include <kprotocolmanager.h>
 #include <kprotocolinfo.h>
-#include <kio/slaveconfig.h>
+#include <tdeio/slaveconfig.h>
 #include <konq_dirpart.h>
 #include <tdeparts/browserextension.h>
 
diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
index 16975c405..efd95a88b 100644
--- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp
+++ b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
@@ -24,7 +24,7 @@
 #include <kapplication.h>
 #include "kshellcmddialog.h"
 #include <kgenericfactory.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 KShellCmdPlugin::KShellCmdPlugin( TQObject* parent, const char* name,
 	                          const TQStringList & )
diff --git a/konqueror/sidebar/CMakeLists.txt b/konqueror/sidebar/CMakeLists.txt
index fa9c3cbd5..45e483d5a 100644
--- a/konqueror/sidebar/CMakeLists.txt
+++ b/konqueror/sidebar/CMakeLists.txt
@@ -36,8 +36,8 @@ install( FILES konqsidebarplugin.h DESTINATION ${INCLUDE_INSTALL_DIR} )
 install( FILES konqsidebartng.rc DESTINATION ${CONFIG_INSTALL_DIR} )
 install( FILES konq_sidebartng.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 install( FILES .version DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/entries )
-install( FILES konqsidebartng.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
-install( PROGRAMS move_konqsidebartng_entries.sh DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
+install( FILES konqsidebartng.upd DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
+install( PROGRAMS move_konqsidebartng_entries.sh DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
 
 
 ##### konqsidebarplugin (lib) ###################
@@ -66,6 +66,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK konqsidebarplugin-shared konq-shared kio-shared tdeutils-shared
+  LINK konqsidebarplugin-shared konq-shared tdeio-shared tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/konqueror/sidebar/Makefile.am b/konqueror/sidebar/Makefile.am
index 702320841..1cfc7f6ac 100644
--- a/konqueror/sidebar/Makefile.am
+++ b/konqueror/sidebar/Makefile.am
@@ -39,6 +39,6 @@ partrc_DATA = konqsidebartng.rc
 versiondir = $(kde_datadir)/konqsidebartng/entries/
 version_DATA=.version
 
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = konqsidebartng.upd
 update_SCRIPTS = move_konqsidebartng_entries.sh
diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h
index 0433261c7..7540ef398 100644
--- a/konqueror/sidebar/konqsidebarplugin.h
+++ b/konqueror/sidebar/konqsidebarplugin.h
@@ -24,9 +24,9 @@
 #include <tqstring.h>
 #include <tdeparts/part.h>
 #include <tdeparts/browserextension.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <tqguardedptr.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 class KonqSidebarPluginPrivate;
 
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index 6a5ecd22d..44b3cca35 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -36,13 +36,13 @@
 #include <kmessagebox.h>
 #include <kinputdialog.h>
 #include <konq_events.h>
-#include <kfileitem.h>
-#include <kio/netaccess.h>
+#include <tdefileitem.h>
+#include <tdeio/netaccess.h>
 #include <kpopupmenu.h>
 #include <kprocess.h>
 #include <kurlrequesterdlg.h>
 #include <kinputdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdesktopfile.h>
 #include "konqsidebar.h"
 
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
index 9c31acdf5..57109e7cb 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
@@ -27,7 +27,7 @@
 #include <kuserprofile.h>
 #include <tqapplication.h>
 #include <tqclipboard.h>
-#include <kio/paste.h>
+#include <tdeio/paste.h>
 #include <tqfile.h>
 #include <tqpainter.h>
 #include <kiconloader.h>
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.h b/konqueror/sidebar/trees/dirtree_module/dirtree_module.h
index af915aa46..89b5dcbaf 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.h
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.h
@@ -20,7 +20,7 @@
 #define dirtree_module_h
 
 #include <konq_sidebartreemodule.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <tqpixmap.h>
 #include <tqdict.h>
 #include <tqptrdict.h>
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index 30d96f060..fa7f8ba39 100644
--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@@ -23,7 +23,7 @@
 #include <kapplication.h>
 #include <kaction.h>
 #include <kcursor.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
@@ -278,7 +278,7 @@ void KonqSidebarHistoryModule::slotRemoveEntry()
 void KonqSidebarHistoryModule::slotPreferences()
 {
     // Run the history sidebar settings.
-    KRun::run( "kcmshell kcmhistory", KURL::List() );
+    KRun::run( "tdecmshell kcmhistory", KURL::List() );
 }
 
 void KonqSidebarHistoryModule::slotSortByName()
diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp
index 701f72776..b51c118e2 100644
--- a/konqueror/sidebar/trees/history_module/history_settings.cpp
+++ b/konqueror/sidebar/trees/history_module/history_settings.cpp
@@ -1,6 +1,6 @@
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <dcopclient.h>
 
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
index 967616bd5..b2e92c6fd 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
@@ -29,7 +29,7 @@
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kfontdialog.h>
 #include <kgenericfactory.h>
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.desktop b/konqueror/sidebar/trees/history_module/kcmhistory.desktop
index 38b224555..c6c020988 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.desktop
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=history
 Type=Application
-Exec=kcmshell kcmhistory
+Exec=tdecmshell kcmhistory
 
 X-TDE-ModuleType=Library
 X-TDE-Library=history
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index b156c071d..b53ce2635 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -38,7 +38,7 @@
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmimetype.h>
 #include <kprocess.h>
 #include <kpropertiesdialog.h>
diff --git a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
index 8c9b787f8..d6eb37857 100644
--- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
@@ -20,7 +20,7 @@
 #include "konq_sidebartreemodule.h"
 #include <kdebug.h>
 #include <kdirnotify_stub.h>
-#include <kio/paste.h>
+#include <tdeio/paste.h>
 #include <konq_operations.h>
 #include <kprotocolinfo.h>
 #include <kurldrag.h>