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

56 files changed, 83 insertions, 83 deletions

diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp
index eff9c78..d62eae5 100644
--- a/konq-plugins/adblock/adblock.cpp
+++ b/konq-plugins/adblock/adblock.cpp
@@ -34,7 +34,7 @@
 #include <kurllabel.h>
 #include <kdialogbase.h>
 #include <kurl.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <kpopupmenu.h>
diff --git a/konq-plugins/akregator/akregatorplugin.h b/konq-plugins/akregator/akregatorplugin.h
index 658730c..ee99306 100644
--- a/konq-plugins/akregator/akregatorplugin.h
+++ b/konq-plugins/akregator/akregatorplugin.h
@@ -22,8 +22,8 @@
 #define _AKREGATORPLUGIN_H_
 
 #include <konq_popupmenu.h>
-#include <kfileitem.h>
-#include <kconfig.h>
+#include <tdefileitem.h>
+#include <tdeconfig.h>
 
 #include "pluginbase.h"
 
diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp
index acd10f6..2bf0734 100644
--- a/konq-plugins/arkplugin/arkplugin.cpp
+++ b/konq-plugins/arkplugin/arkplugin.cpp
@@ -31,7 +31,7 @@
 #include <kpopupmenu.h>
 #include <kgenericfactory.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqdir.h>
 #include <tqcstring.h>
diff --git a/konq-plugins/arkplugin/arkplugin.h b/konq-plugins/arkplugin/arkplugin.h
index a1290fa..0d13158 100644
--- a/konq-plugins/arkplugin/arkplugin.h
+++ b/konq-plugins/arkplugin/arkplugin.h
@@ -22,8 +22,8 @@
 #define _ARKPLUGIN_H_
 
 #include <konq_popupmenu.h>
-#include <kfileitem.h>
-#include <kconfig.h>
+#include <tdefileitem.h>
+#include <tdeconfig.h>
 
 class KAction;
 class TQSignalMapper;
diff --git a/konq-plugins/babelfish/plugin_babelfish.cpp b/konq-plugins/babelfish/plugin_babelfish.cpp
index 325aa36..0cd4a54 100644
--- a/konq-plugins/babelfish/plugin_babelfish.cpp
+++ b/konq-plugins/babelfish/plugin_babelfish.cpp
@@ -24,7 +24,7 @@
 #include <kinstance.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <kaboutdata.h>
 
diff --git a/konq-plugins/crashes/crashesplugin.cpp b/konq-plugins/crashes/crashesplugin.cpp
index aa416a4..358d728 100644
--- a/konq-plugins/crashes/crashesplugin.cpp
+++ b/konq-plugins/crashes/crashesplugin.cpp
@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <kaction.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kinstance.h>
 #include <tdehtml_part.h>
 #include <kgenericfactory.h>
diff --git a/konq-plugins/dirfilter/dirfilterplugin.h b/konq-plugins/dirfilter/dirfilterplugin.h
index 1180767..c9a3a27 100644
--- a/konq-plugins/dirfilter/dirfilterplugin.h
+++ b/konq-plugins/dirfilter/dirfilterplugin.h
@@ -25,7 +25,7 @@
 
 
 #include <kurl.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <klibloader.h>
 #include <tdeparts/plugin.h>
 
diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp
index 5b24e9d..175696e 100644
--- a/konq-plugins/domtreeviewer/domtreeview.cpp
+++ b/konq-plugins/domtreeviewer/domtreeview.cpp
@@ -50,7 +50,7 @@
 #include <kcombobox.h>
 #include <kdialog.h>
 #include <keditcl.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobalsettings.h>
 #include <tdehtml_part.h>
 #include <klineedit.h>
diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp
index d9886df..e3ae074 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.cpp
+++ b/konq-plugins/domtreeviewer/domtreewindow.cpp
@@ -27,7 +27,7 @@
 #include <kaccel.h>
 #include <kapplication.h>
 #include <kcommand.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kglobal.h>
 #include <tdehtml_part.h>
diff --git a/konq-plugins/fsview/fsview.cpp b/konq-plugins/fsview/fsview.cpp
index 3ad3066..e1c8e01 100644
--- a/konq-plugins/fsview/fsview.cpp
+++ b/konq-plugins/fsview/fsview.cpp
@@ -26,7 +26,7 @@
 #include <tqtimer.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
@@ -34,7 +34,7 @@
 #include <kmimetype.h>
 #include <kurl.h>
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include "fsview.h"
 
diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp
index a4d86a8..b2b40ce 100644
--- a/konq-plugins/fsview/fsview_part.cpp
+++ b/konq-plugins/fsview/fsview_part.cpp
@@ -25,8 +25,8 @@
 #include <tqwhatsthis.h>
 
 #include <kinstance.h>
-#include <kfiledialog.h>
-#include <kfileitem.h>
+#include <tdefiledialog.h>
+#include <tdefileitem.h>
 #include <tdeparts/genericfactory.h>
 #include <kapplication.h>
 #include <kaboutdata.h>
@@ -35,7 +35,7 @@
 #include <kpopupmenu.h>
 #include <kglobalsettings.h>
 #include <kprotocolinfo.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kmessagebox.h>
 
 // from tdebase/libkonq...
diff --git a/konq-plugins/fsview/fsview_part.h b/konq-plugins/fsview/fsview_part.h
index 345db20..3cd4f97 100644
--- a/konq-plugins/fsview/fsview_part.h
+++ b/konq-plugins/fsview/fsview_part.h
@@ -25,7 +25,7 @@
 
 #include <tdeparts/part.h>
 #include <tdeparts/browserextension.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 
 #include "fsview.h"
 
diff --git a/konq-plugins/fsview/main.cpp b/konq-plugins/fsview/main.cpp
index 2906f74..a2086c2 100644
--- a/konq-plugins/fsview/main.cpp
+++ b/konq-plugins/fsview/main.cpp
@@ -9,7 +9,7 @@
 #include <kaboutdata.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "fsview.h"
 
diff --git a/konq-plugins/fsview/scan.h b/konq-plugins/fsview/scan.h
index 384a6dc..9062fb1 100644
--- a/konq-plugins/fsview/scan.h
+++ b/konq-plugins/fsview/scan.h
@@ -29,7 +29,7 @@
 
 /* Use KDE_lstat and TDEIO::fileoffset_t for 64-bit sizes */
 #include <klargefile.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 class ScanDir;
 class ScanFile;
diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp
index 466b91a..d0356ab 100644
--- a/konq-plugins/fsview/treemap.cpp
+++ b/konq-plugins/fsview/treemap.cpp
@@ -30,7 +30,7 @@
 #include <tqpopupmenu.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include "treemap.h"
diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
index 047e368..016f58a 100644
--- a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
+++ b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
@@ -39,7 +39,7 @@ Boston, MA 02110-1301, USA.
 #include <kcolorbutton.h>
 #include <kurlrequester.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "imgallerydialog.h"
 #include "imgallerydialog.moc"
diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
index ea343da..eee6d9d 100644
--- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
+++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
@@ -39,7 +39,7 @@ Boston, MA 02110-1301, USA.
 #include <kimageio.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kpushbutton.h>
 
 #include "imgallerydialog.h"
@@ -438,7 +438,7 @@ bool KImGalleryPlugin::createThumb( const TQString& imgName, const TQString& sou
     const TQString thumbDir = imgGalleryDir + TQString::fromLatin1("/thumbs/");
     int extent = m_configDlg->getThumbnailSize();
 
-    // this code is stolen from tdebase/kioslave/thumbnail/imagecreator.cpp
+    // this code is stolen from tdebase/tdeioslave/thumbnail/imagecreator.cpp
     // (c) 2000 gis and malte
 
     m_imgWidth = 120; // Setting the size of the images is
diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.h b/konq-plugins/kimgalleryplugin/imgalleryplugin.h
index 71e4434..0b5b611 100644
--- a/konq-plugins/kimgalleryplugin/imgalleryplugin.h
+++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.h
@@ -24,7 +24,7 @@ Boston, MA 02110-1301, USA.
 #include <tdeparts/plugin.h>
 #include <klibloader.h>
 #include <konq_dirpart.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 
 class TQProgressDialog;
 class KURL;
diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
index a2894f9..9816d9b 100644
--- a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
+++ b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
@@ -18,7 +18,7 @@
 #include <tqfile.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kstandarddirs.h>
diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.desktop b/konq-plugins/kuick/kcmkuick/kcmkuick.desktop
index ad46287..2fc4fd4 100644
--- a/konq-plugins/kuick/kcmkuick/kcmkuick.desktop
+++ b/konq-plugins/kuick/kcmkuick/kcmkuick.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=editcopy
 Type=Application
-Exec=kcmshell kcmkuick
+Exec=tdecmshell kcmkuick
 X-TDE-ModuleType=Library
 X-TDE-Library=kuick
 Name=Quick Copy & Move Plugin
diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp
index cfe19f0..754de2b 100644
--- a/konq-plugins/kuick/kdirmenu.cpp
+++ b/konq-plugins/kuick/kdirmenu.cpp
@@ -24,7 +24,7 @@
 #include <kaction.h>
 #include <kapplication.h>
 #include <kiconloader.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <klocale.h>
 #include <kurl.h>
 #include <ksimpleconfig.h>
diff --git a/konq-plugins/kuick/kmetamenu.cpp b/konq-plugins/kuick/kmetamenu.cpp
index efb85e2..7ba7a87 100644
--- a/konq-plugins/kuick/kmetamenu.cpp
+++ b/konq-plugins/kuick/kmetamenu.cpp
@@ -21,8 +21,8 @@
 #include <tdeimproxy.h>
 #include <kapplication.h>
 #include <klocale.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <konq_popupmenu.h>
 
diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp
index 589f212..b0ccaef 100644
--- a/konq-plugins/kuick/kuick_plugin.cpp
+++ b/konq-plugins/kuick/kuick_plugin.cpp
@@ -31,8 +31,8 @@
 #include <kmessagebox.h>
 #include <kgenericfactory.h>
 #include <tqobject.h>
-#include <kio/jobclasses.h>
-#include <kio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 
 typedef KGenericFactory<KTestMenu, KonqPopupMenu> KTestMenuFactory;
diff --git a/konq-plugins/minitools/minitoolsplugin.cpp b/konq-plugins/minitools/minitoolsplugin.cpp
index ea89b7e..97fc4aa 100644
--- a/konq-plugins/minitools/minitoolsplugin.cpp
+++ b/konq-plugins/minitools/minitoolsplugin.cpp
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <kaction.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kinstance.h>
 #include <tdehtml_part.h>
 #include <kgenericfactory.h>
diff --git a/konq-plugins/rsync/rsyncplugin.cpp b/konq-plugins/rsync/rsyncplugin.cpp
index afddb34..d337287 100644
--- a/konq-plugins/rsync/rsyncplugin.cpp
+++ b/konq-plugins/rsync/rsyncplugin.cpp
@@ -82,7 +82,7 @@
 #include <kpassdlg.h>
 #include <klistview.h>
 #include <kapplication.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include <kdirlister.h>
 #include <kstandarddirs.h>
@@ -94,8 +94,8 @@
 #include <kgenericfactory.h>
 #include <tdeparts/browserextension.h>
 
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 
 #include "rsyncplugin.h"
 
diff --git a/konq-plugins/rsync/rsyncplugin.h b/konq-plugins/rsync/rsyncplugin.h
index 0042762..af28935 100644
--- a/konq-plugins/rsync/rsyncplugin.h
+++ b/konq-plugins/rsync/rsyncplugin.h
@@ -24,11 +24,11 @@
 
 #include <kurl.h>
 #include <kprocess.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <klibloader.h>
 #include <tdeparts/plugin.h>
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 
 #include <libtdersync/tdersync.h>
 
diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp
index 7542a0f..e6c1830 100644
--- a/konq-plugins/searchbar/searchbar.cpp
+++ b/konq-plugins/searchbar/searchbar.cpp
@@ -24,7 +24,7 @@
 #include <dcopclient.h>
 #include <kapplication.h>
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>
 #include <kgenericfactory.h>
@@ -40,7 +40,7 @@
 #include <kstandarddirs.h>
 #include <kurifilter.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <tdeparts/mainwindow.h>
 #include <tdeparts/partmanager.h>
@@ -448,13 +448,13 @@ void SearchBarPlugin::selectSearchEngines()
 {
 	TDEProcess *process = new TDEProcess;
 
-	*process << "kcmshell" << "ebrowsing";
+	*process << "tdecmshell" << "ebrowsing";
 
 	connect(process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(searchEnginesSelected(TDEProcess *)));
 
 	if(!process->start())
 	{
-		kdDebug(1202) << "Couldn't invoke kcmshell." << endl;
+		kdDebug(1202) << "Couldn't invoke tdecmshell." << endl;
 		delete process;
 	}
 }
diff --git a/konq-plugins/sidebar/delicious/Makefile.am b/konq-plugins/sidebar/delicious/Makefile.am
index cb8eb48..35939eb 100644
--- a/konq-plugins/sidebar/delicious/Makefile.am
+++ b/konq-plugins/sidebar/delicious/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = . pics
 
 METASOURCES = AUTO
-INCLUDES = -I$(kde_includes)/kio $(all_includes)
+INCLUDES = -I$(kde_includes)/tdeio $(all_includes)
 
 ################################
 # these are the headers for your project
diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp
index 8a591b4..919c498 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.cpp
+++ b/konq-plugins/sidebar/delicious/mainWidget.cpp
@@ -32,14 +32,14 @@
 #include <tqdatetime.h>
 
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <krfcdate.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kinputdialog.h>
 
 MainWidget::MainWidget( TDEConfig * config, TQWidget * parent )
diff --git a/konq-plugins/sidebar/delicious/mainWidget.h b/konq-plugins/sidebar/delicious/mainWidget.h
index 4b7361b..733a594 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.h
+++ b/konq-plugins/sidebar/delicious/mainWidget.h
@@ -25,7 +25,7 @@
 
 #include "widget.h"
 
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 #include <tdeparts/browserextension.h>
 
 class TQStringList;
diff --git a/konq-plugins/sidebar/mediaplayer/Makefile.am b/konq-plugins/sidebar/mediaplayer/Makefile.am
index 12ba913..3a79209 100644
--- a/konq-plugins/sidebar/mediaplayer/Makefile.am
+++ b/konq-plugins/sidebar/mediaplayer/Makefile.am
@@ -3,7 +3,7 @@
 SUBDIRS = . pics
 
 # set the include path for X, qt and KDE
-INCLUDES = -I$(kde_includes)/kio -I$(kde_includes)/arts $(all_includes)        
+INCLUDES = -I$(kde_includes)/tdeio -I$(kde_includes)/arts $(all_includes)        
 
 # these are the headers for your project
 noinst_HEADERS = 
diff --git a/konq-plugins/sidebar/mediaplayer/engine.cpp b/konq-plugins/sidebar/mediaplayer/engine.cpp
index e4590b6..92343cc 100644
--- a/konq-plugins/sidebar/mediaplayer/engine.cpp
+++ b/konq-plugins/sidebar/mediaplayer/engine.cpp
@@ -26,7 +26,7 @@ extern "C"
 #include <sys/wait.h>
 }
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
index fc281b4..b615e88 100644
--- a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
+++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
@@ -20,7 +20,7 @@
 #include "mediaplayer.moc"
 #include <kdebug.h>
 #include <ksimpleconfig.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <kglobal.h>
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp
index a6993ae..ba2b129 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.cpp
+++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp
@@ -36,7 +36,7 @@
 #include <kapplication.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktar.h>
 #include <karchive.h>
 #include <dcopref.h>
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.h b/konq-plugins/sidebar/metabar/src/configdialog.h
index 3e10757..190c982 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.h
+++ b/konq-plugins/sidebar/metabar/src/configdialog.h
@@ -24,7 +24,7 @@
 #include <kpushbutton.h>
 #include <klistview.h>
 #include <knuminput.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqptrdict.h>
 #include <tqlistbox.h>
 #include <kactionselector.h>
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
index 9749a5b..0edf060 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
@@ -30,13 +30,13 @@
 #include <kdesktopfile.h>
 #include <ktrader.h>
 #include <krun.h>
-#include <kfilemetainfo.h>
-#include <kconfig.h>
+#include <tdefilemetainfo.h>
+#include <tdeconfig.h>
 #include <kimageio.h>
 #include <kdebug.h>
 #include <kmdcodec.h>
 
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 
 #include <dcopclient.h>
 #include <dcopref.h>
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.h b/konq-plugins/sidebar/metabar/src/defaultplugin.h
index b86b12e..a9feb56 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.h
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.h
@@ -24,7 +24,7 @@
 #include "protocolplugin.h"
 #include "serviceloader.h"
 
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 
 #include <tqdict.h>
 #include <tqmap.h>
diff --git a/konq-plugins/sidebar/metabar/src/metabar.h b/konq-plugins/sidebar/metabar/src/metabar.h
index 29c8efa..baf40d5 100644
--- a/konq-plugins/sidebar/metabar/src/metabar.h
+++ b/konq-plugins/sidebar/metabar/src/metabar.h
@@ -7,7 +7,7 @@
 
 #include <konqsidebarplugin.h>
 #include <tqstring.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 class Metabar : public KonqSidebarPlugin
diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
index adf316c..aefa5fd 100644
--- a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
@@ -24,7 +24,7 @@
 #include <html_document.h>
 #include <css_value.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqrect.h>
 
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index 7142f15..af44158 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -361,10 +361,10 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg
     }
   }
   
-  else if(protocol == "kcmshell"){
+  else if(protocol == "tdecmshell"){
     TQString module = url.path().remove('/');
     
-    KRun::runCommand("kcmshell " + module);
+    KRun::runCommand("tdecmshell " + module);
   }
   
   else if(protocol == "action"){
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.h b/konq-plugins/sidebar/metabar/src/metabarwidget.h
index 95c1148..aad695b 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.h
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.h
@@ -23,8 +23,8 @@
 
 #include <tdehtml_part.h>
 
-#include <kconfig.h>
-#include <kfileitem.h>
+#include <tdeconfig.h>
+#include <tdefileitem.h>
 #include <kurl.h>
 #include <kservice.h>
 #include <kpopupmenu.h>
diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.h b/konq-plugins/sidebar/metabar/src/protocolplugin.h
index 6683f61..2ffd207 100644
--- a/konq-plugins/sidebar/metabar/src/protocolplugin.h
+++ b/konq-plugins/sidebar/metabar/src/protocolplugin.h
@@ -21,7 +21,7 @@
 #ifndef _PROTOCOL_PLUGIN_H
 #define _PROTOCOL_PLUGIN_H
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <tdehtml_part.h>
 
 #include <html_element.h>
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.h b/konq-plugins/sidebar/metabar/src/serviceloader.h
index 6e47a76..99d85ed 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.h
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.h
@@ -27,7 +27,7 @@
 #include <tqwidget.h>
 
 #include <kpopupmenu.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kmimetype.h>
 #include <kurl.h>
 
diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
index 71fce21..b5186e7 100644
--- a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
@@ -72,7 +72,7 @@ void SettingsPlugin::loadActions(DOM::HTMLElement node)
       TDECModuleInfo kcminfo(service);
       
       DOM::DOMString innerHTML;      
-      MetabarWidget::addEntry(innerHTML, i18n("Run"), "kcmshell:/" + name, kcminfo.icon());
+      MetabarWidget::addEntry(innerHTML, i18n("Run"), "tdecmshell:/" + name, kcminfo.icon());
       node.setInnerHTML(innerHTML);
       
       m_functions->show("actions");
@@ -180,7 +180,7 @@ void SettingsPlugin::slotGotEntries(TDEIO::Job *job, const TDEIO::UDSEntryList &
     kdDebug() << url << endl;
     
     if(type == S_IFREG){
-      url = "kcmshell:/" + KURL(url).filename();
+      url = "tdecmshell:/" + KURL(url).filename();
     }
 
     MetabarWidget::addEntry(innerHTML, name, url, icon);
diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.h b/konq-plugins/sidebar/metabar/src/settingsplugin.h
index c8580de..75f61d3 100644
--- a/konq-plugins/sidebar/metabar/src/settingsplugin.h
+++ b/konq-plugins/sidebar/metabar/src/settingsplugin.h
@@ -23,8 +23,8 @@
 
 #include "protocolplugin.h"
 
-#include <kio/jobclasses.h>
-#include <kio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/job.h>
 
 class SettingsPlugin : public ProtocolPlugin
 {
diff --git a/konq-plugins/sidebar/newsticker/norsswidget.cpp b/konq-plugins/sidebar/newsticker/norsswidget.cpp
index 8419dff..602b189 100644
--- a/konq-plugins/sidebar/newsticker/norsswidget.cpp
+++ b/konq-plugins/sidebar/newsticker/norsswidget.cpp
@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kdebug.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 #include "sidebarsettings.h"
 #include "configfeeds.h"
 #include "norsswidget.h"
diff --git a/konq-plugins/sidebar/newsticker/nspanel.h b/konq-plugins/sidebar/newsticker/nspanel.h
index 6a3ee73..b8590ca 100644
--- a/konq-plugins/sidebar/newsticker/nspanel.h
+++ b/konq-plugins/sidebar/newsticker/nspanel.h
@@ -30,7 +30,7 @@
 #include <tqtooltip.h>
 #include <dcopref.h>
 #include <dcopobject.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klistbox.h>
 
 
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
index ecbad6c..f6b3b7d 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
@@ -42,7 +42,7 @@
 #include <kapplication.h>
 #include <kbugreport.h>
 #include <kstdguiitem.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 #include "sidebarsettings.h"
 #include "configfeeds.h"
 #include "nsstacktabwidget.h"
diff --git a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp
index 05619ed..e5f8f60 100644
--- a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp
+++ b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp
@@ -21,7 +21,7 @@
 
 #include <kapplication.h>
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <tdehtml_part.h>
 #include <kinstance.h>
@@ -249,7 +249,7 @@ bool SettingsPlugin::cookiesEnabled( const TQString& url )
 
 
 //
-// sync with kcontrol/kio/ksaveioconfig.* !
+// sync with kcontrol/tdeio/ksaveioconfig.* !
 //
 
 void SettingsPlugin::toggleProxy()
@@ -266,7 +266,7 @@ void SettingsPlugin::toggleProxy()
       type = KProtocolManager::NoProxy;
     }
     
-    TDEConfig config("kioslaverc", false, false);
+    TDEConfig config("tdeioslaverc", false, false);
     config.setGroup( "Proxy Settings" );    
     config.writeEntry( "ProxyType", type );
 
diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp
index ecfcff6..763e685 100644
--- a/konq-plugins/uachanger/uachangerplugin.cpp
+++ b/konq-plugins/uachanger/uachangerplugin.cpp
@@ -28,8 +28,8 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <ktrader.h>
-#include <kconfig.h>
-#include <kio/job.h>
+#include <tdeconfig.h>
+#include <tdeio/job.h>
 #include <kservice.h>
 #include <kinstance.h>
 #include <kpopupmenu.h>
diff --git a/konq-plugins/validators/validatorsdialog.cpp b/konq-plugins/validators/validatorsdialog.cpp
index e23b091..27b5294 100644
--- a/konq-plugins/validators/validatorsdialog.cpp
+++ b/konq-plugins/validators/validatorsdialog.cpp
@@ -22,7 +22,7 @@
 #include <tqgroupbox.h>
 #include <tqlayout.h>
 #include <tqcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <klocale.h>
 
diff --git a/konq-plugins/validators/validatorsdialog.h b/konq-plugins/validators/validatorsdialog.h
index 4d219e7..3e6c80d 100644
--- a/konq-plugins/validators/validatorsdialog.h
+++ b/konq-plugins/validators/validatorsdialog.h
@@ -22,7 +22,7 @@
 
 #include <tqcombobox.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 
 class ValidatorsDialog : public KDialogBase
diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp
index 63a7570..4c83c43 100644
--- a/konq-plugins/webarchiver/archivedialog.cpp
+++ b/konq-plugins/webarchiver/archivedialog.cpp
@@ -26,11 +26,11 @@
 #include <ktempfile.h>
 #include <ktar.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kpassivepopup.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tdehtml_part.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
@@ -38,7 +38,7 @@
 #include <tqstylesheet.h>
 #include <tqiodevice.h>
 #include <klistview.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kapplication.h>
 #include <kurllabel.h>
 #include <kprogress.h>
diff --git a/konq-plugins/webarchiver/archivedialog.h b/konq-plugins/webarchiver/archivedialog.h
index c882529..da0212c 100644
--- a/konq-plugins/webarchiver/archivedialog.h
+++ b/konq-plugins/webarchiver/archivedialog.h
@@ -25,7 +25,7 @@
 
 #include <kdialogbase.h>
 #include <ktempfile.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <tqstring.h>
 #include <tqmap.h>
diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp
index 338c52e..2d7f006 100644
--- a/konq-plugins/webarchiver/plugin_webarchiver.cpp
+++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp
@@ -35,7 +35,7 @@
 #include <kaction.h>
 #include <kinstance.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <tdehtml_part.h>
diff --git a/konq-plugins/webarchiver/webarchivecreator.h b/konq-plugins/webarchiver/webarchivecreator.h
index a5ad7de..461ccfc 100644
--- a/konq-plugins/webarchiver/webarchivecreator.h
+++ b/konq-plugins/webarchiver/webarchivecreator.h
@@ -22,7 +22,7 @@
 #ifndef __webarchivecreator_h__
 #define __webarchivecreator_h__
 
-#include <kio/thumbcreator.h>
+#include <tdeio/thumbcreator.h>
 
 class KHTMLPart;