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

76 files changed, 128 insertions, 128 deletions

diff --git a/parts/abbrev/abbrevconfigwidget.cpp b/parts/abbrev/abbrevconfigwidget.cpp
index c21857f8..0d22005b 100644
--- a/parts/abbrev/abbrevconfigwidget.cpp
+++ b/parts/abbrev/abbrevconfigwidget.cpp
@@ -15,7 +15,7 @@
 
 #include "abbrevconfigwidget.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 
 #include <tqlistview.h>
diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp
index 3abe3b09..86dfe96f 100644
--- a/parts/abbrev/abbrevpart.cpp
+++ b/parts/abbrev/abbrevpart.cpp
@@ -26,8 +26,8 @@
 #include <kstandarddirs.h>
 #include <kdevgenericfactory.h>
 #include <kaction.h>
-#include <kconfig.h>
-#include <kio/netaccess.h>
+#include <tdeconfig.h>
+#include <tdeio/netaccess.h>
 #include <kiconloader.h>
 #include <kdevplugininfo.h>
 
diff --git a/parts/appwizard/README.dox b/parts/appwizard/README.dox
index 5baf78d0..05333af3 100644
--- a/parts/appwizard/README.dox
+++ b/parts/appwizard/README.dox
@@ -59,7 +59,7 @@ GBA       Game Boy Advance
 KDE       KDE application/applet
 Qt        Qt based
 Kicker    Kicker applet
-kioslave  KDE ioslave
+tdeioslave  KDE ioslave
 KOffice   KOffice application
 KDevelop  TDevelop plugin
 GNOME     GNOME application
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index 11552b27..176bf9cc 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -35,7 +35,7 @@
 #include <tqtimer.h>
 #include <klistview.h>
 #include <kiconview.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
@@ -45,21 +45,21 @@
 #include <kstandarddirs.h>
 #include <ktempfile.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
-#include <kfile.h>
+#include <tdefiledialog.h>
+#include <tdefile.h>
 #include <kapplication.h>
 #include <kpopupmenu.h>
 
 #include <ktrader.h>
 #include <tdeparts/componentfactory.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tqfile.h>
 #include <kmacroexpander.h>
 #include <karchive.h>
 #include <ktar.h>
 #include <ktempdir.h>
-#include <kfileitem.h>
-#include <kio/chmodjob.h>
+#include <tdefileitem.h>
+#include <tdeio/chmodjob.h>
 
 #include <tqlayout.h>
 
diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp
index 34b5422c..c66cb6fa 100644
--- a/parts/appwizard/importdlg.cpp
+++ b/parts/appwizard/importdlg.cpp
@@ -25,13 +25,13 @@
 #include <kbuttonbox.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kinstance.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <kcursor.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <kurlrequester.h>
 #include <ktrader.h>
 #include <tdeparts/componentfactory.h>
diff --git a/parts/appwizard/misc.cpp b/parts/appwizard/misc.cpp
index 50399aef..5546b404 100644
--- a/parts/appwizard/misc.cpp
+++ b/parts/appwizard/misc.cpp
@@ -19,7 +19,7 @@
 #include <unistd.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 void AppWizardUtil::guessAuthorAndEmail(TQString *author, TQString *email)
 {
diff --git a/parts/appwizard/profilesupport.cpp b/parts/appwizard/profilesupport.cpp
index 3d5fcff2..2c48d6f2 100644
--- a/parts/appwizard/profilesupport.cpp
+++ b/parts/appwizard/profilesupport.cpp
@@ -22,7 +22,7 @@
 #include <tqfileinfo.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kdevplugincontroller.h>
 
diff --git a/parts/astyle/astyle_adaptor.cpp b/parts/astyle/astyle_adaptor.cpp
index 6d6d44b6..1f8c3ff7 100644
--- a/parts/astyle/astyle_adaptor.cpp
+++ b/parts/astyle/astyle_adaptor.cpp
@@ -9,7 +9,7 @@
 #include <tqcheckbox.h>
 #include <kdebug.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 
diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp
index 18675ad5..ed0720a4 100644
--- a/parts/astyle/astyle_part.cpp
+++ b/parts/astyle/astyle_part.cpp
@@ -23,8 +23,8 @@
 #include <kdevplugininfo.h>
 #include <configwidgetproxy.h>
 #include <kapplication.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tqlineedit.h>
diff --git a/parts/bookmarks/bookmarks_config.cpp b/parts/bookmarks/bookmarks_config.cpp
index f2164fd8..5fe6a4aa 100644
--- a/parts/bookmarks/bookmarks_config.cpp
+++ b/parts/bookmarks/bookmarks_config.cpp
@@ -9,7 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 
 #include "bookmarks_config.h"
diff --git a/parts/classview/classtoolwidget.cpp b/parts/classview/classtoolwidget.cpp
index 251ff556..41020bd0 100644
--- a/parts/classview/classtoolwidget.cpp
+++ b/parts/classview/classtoolwidget.cpp
@@ -13,7 +13,7 @@
 
 #include "classtoolwidget.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kpopupmenu.h>
diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp
index a541251b..6aefc1fa 100644
--- a/parts/classview/classtreebase.cpp
+++ b/parts/classview/classtreebase.cpp
@@ -17,7 +17,7 @@
 #include <tqheader.h>
 #include <tqregexp.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpopupmenu.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp
index 1f047168..cba88bf5 100644
--- a/parts/classview/classviewwidget.cpp
+++ b/parts/classview/classviewwidget.cpp
@@ -28,7 +28,7 @@
 #include <kaction.h>
 #include <kactionclasses.h>
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <urlutil.h>
 #include <kdevcore.h>
diff --git a/parts/classview/hierarchydlg.cpp b/parts/classview/hierarchydlg.cpp
index 2d55199c..bda529d5 100644
--- a/parts/classview/hierarchydlg.cpp
+++ b/parts/classview/hierarchydlg.cpp
@@ -15,8 +15,8 @@
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
-#include <kfile.h>
-#include <kfiledialog.h>
+#include <tdefile.h>
+#include <tdefiledialog.h>
 #include <kurlrequesterdlg.h>
 #include <kurlrequester.h>
 #include <kmessagebox.h>
diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp
index b24917df..f5959d73 100644
--- a/parts/classview/navigator.cpp
+++ b/parts/classview/navigator.cpp
@@ -23,7 +23,7 @@
 
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kapplication.h>
diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp
index fef1372e..0f4f7b5c 100644
--- a/parts/ctags2/ctags2_part.cpp
+++ b/parts/ctags2/ctags2_part.cpp
@@ -28,7 +28,7 @@
 #include <kstringhandler.h>
 #include <kdialogbase.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaction.h>
 
 #include "kdevappfrontend.h"
diff --git a/parts/ctags2/ctags2_settingswidget.cpp b/parts/ctags2/ctags2_settingswidget.cpp
index 1cdbc187..49503cdc 100644
--- a/parts/ctags2/ctags2_settingswidget.cpp
+++ b/parts/ctags2/ctags2_settingswidget.cpp
@@ -19,7 +19,7 @@
 #include <kapplication.h>
 #include <kurlcompletion.h>
 #include <kurlrequester.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <kdevplugin.h>
 #include <domutil.h>
diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp
index 2f899828..4d36bd17 100644
--- a/parts/diff/diffpart.cpp
+++ b/parts/diff/diffpart.cpp
@@ -18,10 +18,10 @@
 #include <klocale.h>
 #include <kdevgenericfactory.h>
 #include <kaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kprocess.h>
-#include <kio/jobclasses.h>
-#include <kio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/job.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/editinterface.h>
 #include <kmessagebox.h>
diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp
index 539108e1..298e2083 100644
--- a/parts/diff/diffwidget.cpp
+++ b/parts/diff/diffwidget.cpp
@@ -15,21 +15,21 @@
 #include <tqcursor.h>
 #include <tqfile.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kservice.h>
 #include <ktempfile.h>
 #include <kpopupmenu.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 
 #include <tdeparts/componentfactory.h>
 #include <tdeparts/part.h>
 
-#include <kio/jobclasses.h>
-#include <kio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/job.h>
 
 #include <kdevmainwindow.h>
 
diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp
index 40d482b5..b29b4d6c 100644
--- a/parts/distpart/distpart_widget.cpp
+++ b/parts/distpart/distpart_widget.cpp
@@ -24,8 +24,8 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <kprocess.h>
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include "kdevproject.h"
 #include "domutil.h"
diff --git a/parts/distpart/specsupport.cpp b/parts/distpart/specsupport.cpp
index 153c0c3d..a942d69e 100644
--- a/parts/distpart/specsupport.cpp
+++ b/parts/distpart/specsupport.cpp
@@ -24,7 +24,7 @@
 #include "distpart_widget.h"
 
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kprocess.h>
 #include <tqfile.h>
diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp
index 21fc1b5b..fa6bafd0 100644
--- a/parts/documentation/docglobalconfigwidget.cpp
+++ b/parts/documentation/docglobalconfigwidget.cpp
@@ -29,7 +29,7 @@
 #include <tqwidgetstack.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp
index 77b4e6b2..b436520f 100644
--- a/parts/documentation/documentation_part.cpp
+++ b/parts/documentation/documentation_part.cpp
@@ -44,7 +44,7 @@
 #include <kbookmarkmenu.h>
 #include <kinputdialog.h>
 #include <kstringhandler.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <twin.h>
 #include <tdetexteditor/document.h>
 
@@ -636,7 +636,7 @@ TQCString DocumentationPart::startAssistant()
     TQDataStream arg(data, IO_WriteOnly);
     arg << app << URLs;
 
-    if (!TDEApplication::dcopClient()->call("klauncher", "klauncher", function,  data, replyType, replyData))
+    if (!TDEApplication::dcopClient()->call("tdelauncher", "tdelauncher", function,  data, replyType, replyData))
     {
         kdDebug() << "call failed" << endl;
         lastAssistant = "";
diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp
index 567237e2..e7bbc6c3 100644
--- a/parts/documentation/documentation_widget.cpp
+++ b/parts/documentation/documentation_widget.cpp
@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kdevcore.h>
 #include <kdevdocumentationplugin.h>
diff --git a/parts/documentation/find_documentation_options.cpp b/parts/documentation/find_documentation_options.cpp
index df04ca81..54aac7ac 100644
--- a/parts/documentation/find_documentation_options.cpp
+++ b/parts/documentation/find_documentation_options.cpp
@@ -25,7 +25,7 @@
 #include <klistview.h>
 #include <klocale.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 
 FindDocumentationOptions::FindDocumentationOptions(TQWidget* parent, const char* name, bool modal)
diff --git a/parts/documentation/interfaces/CMakeLists.txt b/parts/documentation/interfaces/CMakeLists.txt
index 2809877a..f4a2ff08 100644
--- a/parts/documentation/interfaces/CMakeLists.txt
+++ b/parts/documentation/interfaces/CMakeLists.txt
@@ -39,6 +39,6 @@ install( FILES
 tde_add_library( documentation_interfaces SHARED AUTOMOC
   SOURCES kdevdocumentationplugin.cpp
   VERSION 0.0.0
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
index 5c261c4c..6c6805e1 100644
--- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp
+++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
@@ -26,7 +26,7 @@
 
 #include <kstandarddirs.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
 #include <klocale.h>
diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.h b/parts/documentation/interfaces/kdevdocumentationplugin.h
index aa329ac5..9c61e208 100644
--- a/parts/documentation/interfaces/kdevdocumentationplugin.h
+++ b/parts/documentation/interfaces/kdevdocumentationplugin.h
@@ -26,7 +26,7 @@
 #include <klistbox.h>
 #include <klistview.h>
 #include <kurl.h>
-#include <kfile.h>
+#include <tdefile.h>
 
 #define CACHE_VERSION "3"
 
diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp
index 7293d985..e17ec86b 100644
--- a/parts/documentation/plugins/chm/docchmplugin.cpp
+++ b/parts/documentation/plugins/chm/docchmplugin.cpp
@@ -21,10 +21,10 @@
 
 #include <kurl.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <klistview.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <iostream>
 #include <fstream>
 #include <tqvaluevector.h>
@@ -101,7 +101,7 @@ TQString DocCHMPlugin::getSpecialData(const TQString& name, KURL url) {
 }
 
 
-///this currently is useless, because htdig cannot use kioslaves
+///this currently is useless, because htdig cannot use tdeioslaves
 TQStringList DocCHMPlugin::fullTextSearchLocations()
 {
     //return TQStringList::split( '\n', getSpecialData("contents", m_url));
diff --git a/parts/documentation/plugins/custom/doccustomplugin.cpp b/parts/documentation/plugins/custom/doccustomplugin.cpp
index fb1a028b..cbf966a6 100644
--- a/parts/documentation/plugins/custom/doccustomplugin.cpp
+++ b/parts/documentation/plugins/custom/doccustomplugin.cpp
@@ -21,7 +21,7 @@
 
 #include <kurl.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <klistview.h>
 
diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
index 33a1fc77..d794f2a3 100644
--- a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
+++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
@@ -28,7 +28,7 @@
 
 #include <kurl.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 
diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.cpp b/parts/documentation/plugins/djvu/docdjvuplugin.cpp
index fca1b3b8..c156a085 100644
--- a/parts/documentation/plugins/djvu/docdjvuplugin.cpp
+++ b/parts/documentation/plugins/djvu/docdjvuplugin.cpp
@@ -21,7 +21,7 @@
 
 #include <kurl.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <klistview.h>
 
diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
index a0df440a..13cee5d0 100644
--- a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
+++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
@@ -30,7 +30,7 @@
 
 #include <kurl.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 
diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
index 50a5fd35..681fdbba 100644
--- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
+++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
@@ -28,7 +28,7 @@
 
 #include <kurl.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <klistview.h>
 #include <kstandarddirs.h>
diff --git a/parts/documentation/plugins/pdb/docpdbplugin.cpp b/parts/documentation/plugins/pdb/docpdbplugin.cpp
index f252c03e..06692f6c 100644
--- a/parts/documentation/plugins/pdb/docpdbplugin.cpp
+++ b/parts/documentation/plugins/pdb/docpdbplugin.cpp
@@ -21,7 +21,7 @@
 
 #include <kurl.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <klistview.h>
 
diff --git a/parts/documentation/plugins/pdf/docpdfplugin.cpp b/parts/documentation/plugins/pdf/docpdfplugin.cpp
index c6dcb8ee..9bc4285a 100644
--- a/parts/documentation/plugins/pdf/docpdfplugin.cpp
+++ b/parts/documentation/plugins/pdf/docpdfplugin.cpp
@@ -21,7 +21,7 @@
 
 #include <kurl.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <klistview.h>
 
diff --git a/parts/documentation/plugins/qt/docqtplugin.cpp b/parts/documentation/plugins/qt/docqtplugin.cpp
index b3e43388..19017d96 100644
--- a/parts/documentation/plugins/qt/docqtplugin.cpp
+++ b/parts/documentation/plugins/qt/docqtplugin.cpp
@@ -27,7 +27,7 @@
 
 #include <kurl.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <klistview.h>
 
diff --git a/parts/documentation/protocols/chm/CMakeLists.txt b/parts/documentation/protocols/chm/CMakeLists.txt
index 49745057..3a7ae935 100644
--- a/parts/documentation/protocols/chm/CMakeLists.txt
+++ b/parts/documentation/protocols/chm/CMakeLists.txt
@@ -34,7 +34,7 @@ install( FILES
 
 tde_add_kpart( kio_chm
   SOURCES decompress.cpp chmfile.cpp chm.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/parts/documentation/protocols/chm/Makefile.am b/parts/documentation/protocols/chm/Makefile.am
index d68f20bd..933f4685 100644
--- a/parts/documentation/protocols/chm/Makefile.am
+++ b/parts/documentation/protocols/chm/Makefile.am
@@ -1,4 +1,4 @@
-## Makefile.am of tdebase/kioslave/chm
+## Makefile.am of tdebase/tdeioslave/chm
 
 INCLUDES = -I$(top_srcdir)/lib/widgets $(all_includes) 
 
diff --git a/parts/documentation/protocols/chm/chm.h b/parts/documentation/protocols/chm/chm.h
index 333b5ca3..23d9f232 100644
--- a/parts/documentation/protocols/chm/chm.h
+++ b/parts/documentation/protocols/chm/chm.h
@@ -20,8 +20,8 @@
 #include <tqstring.h>
 #include <tqcstring.h>
 #include <kurl.h>
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 #include "chmfile.h"
 
 class TQCString;
diff --git a/parts/documentation/protocols/chm/chm.protocol b/parts/documentation/protocols/chm/chm.protocol
index 90daa4c5..492524e0 100644
--- a/parts/documentation/protocols/chm/chm.protocol
+++ b/parts/documentation/protocols/chm/chm.protocol
@@ -5,32 +5,32 @@ input=none
 output=filesystem
 reading=true
 defaultMimetype=text/html
-Description=A kioslave for displaying WinHelp files
-Description[ca]=Un kioslave per a mostrar fitxers WinHelp
-Description[da]=En kioslave til visning af Windows hjælpefiler
+Description=A tdeioslave for displaying WinHelp files
+Description[ca]=Un tdeioslave per a mostrar fitxers WinHelp
+Description[da]=En tdeioslave til visning af Windows hjælpefiler
 Description[de]=Ein Ein-/Ausgabemodul zur Anzeige von WinHelp-Dateien
 Description[el]=Ένας υπηρέτης kio για εμφάνιση αρχείων WinHelp
-Description[es]=Un kioslave para mostrar archivos WinHelp
+Description[es]=Un tdeioslave para mostrar archivos WinHelp
 Description[et]=WinHelp-failide kuvamise IO-moodul
-Description[eu]=WinHelp fitxategiak bistaratzeko kioslave bat
-Description[fa]=یک kioslave برای نمایش پرونده‌های WinHelp
-Description[fr]=Un esclave d'E/S (kioslave) pour l'affichage des fichiers WinHelp
-Description[gl]=Un kioslave para mostrar ficheiros WinHelp
+Description[eu]=WinHelp fitxategiak bistaratzeko tdeioslave bat
+Description[fa]=یک tdeioslave برای نمایش پرونده‌های WinHelp
+Description[fr]=Un esclave d'E/S (tdeioslave) pour l'affichage des fichiers WinHelp
+Description[gl]=Un tdeioslave para mostrar ficheiros WinHelp
 Description[hu]=KDE-protokoll WinHelp-fájlok megjelenítéséhez
-Description[it]=Un kioslave per mostrare i file WinHelp
-Description[ja]=WinHelp を表示するための kioslave
+Description[it]=Un tdeioslave per mostrare i file WinHelp
+Description[ja]=WinHelp を表示するための tdeioslave
 Description[nds]=En In-/Utgaavmoduul för't Wiesen vun "WinHelp"-Dateien
 Description[ne]=WinHelp फाइलहरूका लागि किवस्लेभ
-Description[nl]=Een kioslave voor het weergeven van WinHelp-bestanden
-Description[pl]=kioslave do pokazywania plików WinHelp
-Description[pt]=A 'kioslave' para mostrar ficheiros WinHelp
-Description[pt_BR]=Um kioslave para exibir arquivos WinHelp
+Description[nl]=Een tdeioslave voor het weergeven van WinHelp-bestanden
+Description[pl]=tdeioslave do pokazywania plików WinHelp
+Description[pt]=A 'tdeioslave' para mostrar ficheiros WinHelp
+Description[pt_BR]=Um tdeioslave para exibir arquivos WinHelp
 Description[ru]=Обработчик ввода-вывода для файлов WinHelp
-Description[sk]=kioslave pre zobrazenie WinHelp súborov
+Description[sk]=tdeioslave pre zobrazenie WinHelp súborov
 Description[sr]=KIOSlave за приказ WinHelp фајлова
 Description[sr@Latn]=KIOSlave za prikaz WinHelp fajlova
 Description[sv]=En I/O-slav för att visa WinHelp-filer
-Description[tr]=WinHelp dosyalarını görüntülemek için bir kioslave
-Description[zh_CN]=显示 WinHelp 文件的 kioslave
-Description[zh_TW]=顯示 WinHelp 檔案的 kioslave
+Description[tr]=WinHelp dosyalarını görüntülemek için bir tdeioslave
+Description[zh_CN]=显示 WinHelp 文件的 tdeioslave
+Description[zh_TW]=顯示 WinHelp 檔案的 tdeioslave
 Icon=help
diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h
index f8779d75..9d1812b1 100644
--- a/parts/documentation/protocols/chm/kchmpart.h
+++ b/parts/documentation/protocols/chm/kchmpart.h
@@ -21,8 +21,8 @@
 #include <tdeparts/part.h>
 #include <tdeparts/browserextension.h>
 #include <tdehtml_part.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kdevhtmlpart.h>
 
 #include <tqcstring.h>
diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp
index 16f71171..28e3a2eb 100644
--- a/parts/documentation/searchview.cpp
+++ b/parts/documentation/searchview.cpp
@@ -39,7 +39,7 @@
 #include <kprocess.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 
diff --git a/parts/documentation/tools/htdig/CMakeLists.txt b/parts/documentation/tools/htdig/CMakeLists.txt
index b3a627ac..35080ec6 100644
--- a/parts/documentation/tools/htdig/CMakeLists.txt
+++ b/parts/documentation/tools/htdig/CMakeLists.txt
@@ -24,6 +24,6 @@ link_directories(
 
 tde_add_executable( tdevelop-htdig AUTOMOC
   SOURCES htdigindex.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp
index b7b56304..57dde9ee 100644
--- a/parts/documentation/tools/htdig/htdigindex.cpp
+++ b/parts/documentation/tools/htdig/htdigindex.cpp
@@ -27,7 +27,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/parts/doxygen/input.cpp b/parts/doxygen/input.cpp
index 29cd1ec6..f9ec69a8 100644
--- a/parts/doxygen/input.cpp
+++ b/parts/doxygen/input.cpp
@@ -19,7 +19,7 @@
 #include <tqspinbox.h>
 #include <tqtooltip.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 
diff --git a/parts/filecreate/fcconfigwidget.cpp b/parts/filecreate/fcconfigwidget.cpp
index 45721e17..dc818db1 100644
--- a/parts/filecreate/fcconfigwidget.cpp
+++ b/parts/filecreate/fcconfigwidget.cpp
@@ -21,7 +21,7 @@
 #include <tqlabel.h>
 
 #include <kstandarddirs.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kurlrequester.h>
 #include <kicondialog.h>
 #include <klocale.h>
diff --git a/parts/filecreate/filecreate_filedialog.h b/parts/filecreate/filecreate_filedialog.h
index 023f3277..54365717 100644
--- a/parts/filecreate/filecreate_filedialog.h
+++ b/parts/filecreate/filecreate_filedialog.h
@@ -13,7 +13,7 @@
 #ifndef __KDEVPART_FILECREATE_FILEDIALOG_H__
 #define __KDEVPART_FILECREATE_FILEDIALOG_H__
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include "filecreate_typechooser.h"
 
diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp
index 2a598f36..0c907db1 100644
--- a/parts/filecreate/filecreate_part.cpp
+++ b/parts/filecreate/filecreate_part.cpp
@@ -20,7 +20,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kdevgenericfactory.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kstdaction.h>
diff --git a/parts/filelist/filelist_item.cpp b/parts/filelist/filelist_item.cpp
index 9fd8fe31..9e6b1fdd 100644
--- a/parts/filelist/filelist_item.cpp
+++ b/parts/filelist/filelist_item.cpp
@@ -16,7 +16,7 @@
 #include "filelist_item.h"
 
 #include <kiconloader.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 FileListItem * FileListItem::s_activeItem = 0;
 
diff --git a/parts/filelist/projectviewconfig.cpp b/parts/filelist/projectviewconfig.cpp
index 0aeac511..90475668 100644
--- a/parts/filelist/projectviewconfig.cpp
+++ b/parts/filelist/projectviewconfig.cpp
@@ -21,7 +21,7 @@
 
 #include <tqcheckbox.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 
 
diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp
index 62cae2b0..e963ac9f 100644
--- a/parts/filelist/projectviewpart.cpp
+++ b/parts/filelist/projectviewpart.cpp
@@ -48,7 +48,7 @@
 #include <tdeparts/part.h>
 #include <kxmlguibuilder.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 
 #include <kdevplugininfo.h>
diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp
index cbe1cd06..82587ac0 100644
--- a/parts/fileselector/fileselector_part.cpp
+++ b/parts/fileselector/fileselector_part.cpp
@@ -11,8 +11,8 @@
 #include <kapplication.h>
 #include <kstandarddirs.h>
 #include <ktextbrowser.h>
-#include <kconfig.h>
-#include <kfileitem.h>
+#include <tdeconfig.h>
+#include <tdefileitem.h>
 #include <kdevgenericfactory.h>
 #include <kdiroperator.h>
 #include <kdialogbase.h>
diff --git a/parts/fileselector/fileselector_part.h b/parts/fileselector/fileselector_part.h
index 29e535dc..c4cae6e1 100644
--- a/parts/fileselector/fileselector_part.h
+++ b/parts/fileselector/fileselector_part.h
@@ -4,7 +4,7 @@
 #include <kdevplugin.h>
 
 #include <kdialogbase.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 #include <tqguardedptr.h>
 
diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp
index cfa72b6c..284b24da 100644
--- a/parts/fileselector/fileselector_widget.cpp
+++ b/parts/fileselector/fileselector_widget.cpp
@@ -56,7 +56,7 @@
 #include <kurlcombobox.h>
 #include <kurlcompletion.h>
 #include <kprotocolinfo.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kcombobox.h>
 #include <kaction.h>
@@ -65,13 +65,13 @@
 #include <tqtoolbar.h>
 #include <kpopupmenu.h>
 #include <kdialog.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <kdebug.h>
 //END Includes
 
 
-// from kfiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors)
+// from tdefiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors)
 static void silenceTQToolBar(TQtMsgType, const char *)
 {}
 
diff --git a/parts/fileselector/fileselector_widget.h b/parts/fileselector/fileselector_widget.h
index 17c533ee..7c80a6de 100644
--- a/parts/fileselector/fileselector_widget.h
+++ b/parts/fileselector/fileselector_widget.h
@@ -23,7 +23,7 @@
 #define FILESELECTOR_WIDGET_H
 
 #include <tqwidget.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <kurl.h>
 #include <ktoolbar.h>
 #include <tqframe.h>
diff --git a/parts/fileview/fileitemfactory.h b/parts/fileview/fileitemfactory.h
index 065591d7..9a9ebb98 100644
--- a/parts/fileview/fileitemfactory.h
+++ b/parts/fileview/fileitemfactory.h
@@ -12,7 +12,7 @@
 #ifndef FILEITEMFACTORY_H
 #define FILEITEMFACTORY_H
 
-#include <kfiletreeview.h>
+#include <tdefiletreeview.h>
 
 class FileTreeWidget;
 
diff --git a/parts/fileview/filetreeviewwidgetimpl.h b/parts/fileview/filetreeviewwidgetimpl.h
index eaffa71f..6cee53f8 100644
--- a/parts/fileview/filetreeviewwidgetimpl.h
+++ b/parts/fileview/filetreeviewwidgetimpl.h
@@ -14,7 +14,7 @@
 
 #include <tqobject.h>
 #include <tqvaluelist.h>
-#include <kfiletreeview.h>
+#include <tdefiletreeview.h>
 #include <tqdom.h>
 
 #include "fileitemfactory.h"
diff --git a/parts/fileview/filetreewidget.cpp b/parts/fileview/filetreewidget.cpp
index fb4560fc..904f3710 100644
--- a/parts/fileview/filetreewidget.cpp
+++ b/parts/fileview/filetreewidget.cpp
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kpopupmenu.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kurl.h>
 #include <kaction.h>
 
diff --git a/parts/fileview/filetreewidget.h b/parts/fileview/filetreewidget.h
index dfdff858..5d844aa5 100644
--- a/parts/fileview/filetreewidget.h
+++ b/parts/fileview/filetreewidget.h
@@ -15,7 +15,7 @@
 #define _FILETREEWIDGET_H_
 
 #include <tqguardedptr.h>
-#include <kfiletreeview.h>
+#include <tdefiletreeview.h>
 
 #include <kdevversioncontrol.h>
 
diff --git a/parts/filter/shellfilterdlg.cpp b/parts/filter/shellfilterdlg.cpp
index 59b598e1..a381098e 100644
--- a/parts/filter/shellfilterdlg.cpp
+++ b/parts/filter/shellfilterdlg.cpp
@@ -15,7 +15,7 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <kbuttonbox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/parts/filter/shellinsertdlg.cpp b/parts/filter/shellinsertdlg.cpp
index fd8752e4..7b46ff7d 100644
--- a/parts/filter/shellinsertdlg.cpp
+++ b/parts/filter/shellinsertdlg.cpp
@@ -14,7 +14,7 @@
 #include <tqcombobox.h>
 #include <tqlayout.h>
 #include <tqpushbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kbuttonbox.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/parts/grepview/grepdlg.cpp b/parts/grepview/grepdlg.cpp
index e792b04b..74e6bf03 100644
--- a/parts/grepview/grepdlg.cpp
+++ b/parts/grepview/grepdlg.cpp
@@ -18,13 +18,13 @@
 #include <tqwhatsthis.h>
 #include <tqtooltip.h>
 #include <tqstringlist.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kbuttonbox.h>
 #include <kpushbutton.h>
 #include <kapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <tdeversion.h>
diff --git a/parts/konsole/konsoleviewwidget.cpp b/parts/konsole/konsoleviewwidget.cpp
index a9f84bb6..4a326343 100644
--- a/parts/konsole/konsoleviewwidget.cpp
+++ b/parts/konsole/konsoleviewwidget.cpp
@@ -18,7 +18,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "kdevcore.h"
 #include "kdevproject.h"
diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp
index 6020b1d6..6c7f525a 100644
--- a/parts/outputviews/appoutputwidget.cpp
+++ b/parts/outputviews/appoutputwidget.cpp
@@ -26,10 +26,10 @@
 #include <kdebug.h>
 #include <kstatusbar.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpopupmenu.h>
 #include <klineedit.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include "appoutputviewpart.h"
 #include "filterdlg.h"
diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp
index a1b1cb70..1f0d6cd5 100644
--- a/parts/outputviews/makeactionfilter.cpp
+++ b/parts/outputviews/makeactionfilter.cpp
@@ -231,19 +231,19 @@ void MakeActionFilter::test()
 	<< TestItem( //libtool, linking 2
 		"/bin/sh ../libtool --silent --mode=link --tag=CXX g++  -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic "
 		"-W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts "
-		"-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common    -o libkfilereplacepart.la.closure libkfilereplacepart_la_closure.lo "
-		"-module -no-undefined  -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/trinity/lib  -version-info 1:0:0 kfilereplacepart.lo kfilereplacedoc.lo "
-		"kfilereplaceview.lo kaboutkfilereplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo kfilereplacepref.lo "
+		"-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common    -o libtdefilereplacepart.la.closure libtdefilereplacepart_la_closure.lo "
+		"-module -no-undefined  -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/trinity/lib  -version-info 1:0:0 tdefilereplacepart.lo tdefilereplacedoc.lo "
+		"tdefilereplaceview.lo kabouttdefilereplace.lo kaddstringdlg.lo tdeconfirmdlg.lo kernel.lo kexpression.lo tdefilereplacepref.lo "
 		"klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -ltdeparts -ltdehtml",
-		"linking", "libtool", "libkfilereplacepart.la.closure")
+		"linking", "libtool", "libtdefilereplacepart.la.closure")
 	<< TestItem( //libtool, linking 3
 		"/bin/sh ../libtool --silent --mode=link --tag=CXX g++  -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic "
 		"-W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts "
-		"-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common    -o libkfilereplacepart.la -rpath /opt/trinity/lib/trinity "
-		"-module -no-undefined  -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/trinity/lib  -version-info 1:0:0 kfilereplacepart.lo "
-		"kfilereplacedoc.lo kfilereplaceview.lo kaboutkfilereplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo "
-		"kfilereplacepref.lo klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -ltdeparts -ltdehtml",
-		"linking", "libtool", "libkfilereplacepart.la")
+		"-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common    -o libtdefilereplacepart.la -rpath /opt/trinity/lib/trinity "
+		"-module -no-undefined  -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/trinity/lib  -version-info 1:0:0 tdefilereplacepart.lo "
+		"tdefilereplacedoc.lo tdefilereplaceview.lo kabouttdefilereplace.lo kaddstringdlg.lo tdeconfirmdlg.lo kernel.lo kexpression.lo "
+		"tdefilereplacepref.lo klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -ltdeparts -ltdehtml",
+		"linking", "libtool", "libtdefilereplacepart.la")
 	<< TestItem( //automake, builddir!=srcdir, libtool=no, compiling
 		" g++ -DHAVE_CONFIG_H -I. -I/home/andris/cvs-developement/head/quanta/quanta/project "
 		"-I../.. -I/home/andris/cvs-developement/head/quanta/quanta/dialogs -I/opt/trinity/include -I/usr/lib/qt3/include -I/usr/X11R6/include  "
diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp
index 07204c8c..54e13fb8 100644
--- a/parts/outputviews/makewidget.cpp
+++ b/parts/outputviews/makewidget.cpp
@@ -31,7 +31,7 @@
 #include <kinstance.h>
 #include <kstatusbar.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqmessagebox.h>
 #include <tqapplication.h>
diff --git a/parts/partexplorer/README.dox b/parts/partexplorer/README.dox
index 0b95d89c..8a28ad5e 100644
--- a/parts/partexplorer/README.dox
+++ b/parts/partexplorer/README.dox
@@ -1,7 +1,7 @@
 /** \class PartExplorerPlugin
 A Graphical tool for performing KTrader-like queries about registered services
 
-PartExplorer is a frontend to KTrader class (http://developer.kde.org/documentation/library/3.1-api/kio/html/classKTrader.html)
+PartExplorer is a frontend to KTrader class (http://developer.kde.org/documentation/library/3.1-api/tdeio/html/classKTrader.html)
 and uses its syntax, no more no less: so before saying "it really sucks", give a look at
 http://developer.kde.org/documentation/library/kdeqt/tradersyntax.html.
 
diff --git a/parts/scripting/scriptingglobalconfig.cpp b/parts/scripting/scriptingglobalconfig.cpp
index 45d005a3..e1bbf414 100644
--- a/parts/scripting/scriptingglobalconfig.cpp
+++ b/parts/scripting/scriptingglobalconfig.cpp
@@ -23,11 +23,11 @@
 #include "scriptingpart.h"
 #include <keditlistbox.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 scriptingGlobalConfig::scriptingGlobalConfig(scriptingPart *part, TQWidget *parent, const char *name)
     : scriptingGlobalConfigBase(parent, name), m_part(part)
 {
-    // read kconfig and post list to the m_dirs
+    // read tdeconfig and post list to the m_dirs
     TDEConfig *cfg = kapp->config();
      TQStringList searchDirs = cfg->readListEntry("SearchDirs");
     m_dirs->clear();
@@ -36,7 +36,7 @@ scriptingGlobalConfig::scriptingGlobalConfig(scriptingPart *part, TQWidget *pare
 
 void scriptingGlobalConfig::accept()
 {
-    // read mdirs and save to kconfig
+    // read mdirs and save to tdeconfig
     TDEConfig *cfg = kapp->config();
     if( !m_dirs->isEnabled() )
         cfg->writeEntry("SearchDirs", TQStringList() );
diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp
index 35b0f9b0..8f799242 100644
--- a/parts/scripting/scriptingpart.cpp
+++ b/parts/scripting/scriptingpart.cpp
@@ -36,7 +36,7 @@
 #include <kdevmainwindow.h>
 #include <configwidgetproxy.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "scriptingglobalconfig.h"
 #include "tdescriptactionmanager.h"
 
diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp
index 8e54fd75..447193f4 100644
--- a/parts/snippet/snippet_widget.cpp
+++ b/parts/snippet/snippet_widget.cpp
@@ -23,7 +23,7 @@
 #include <tdetexteditor/editor.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <tdetexteditor/document.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqtooltip.h>
 #include <kpopupmenu.h>
 #include <tqregexp.h>
diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp
index 5efd3870..774df47c 100644
--- a/parts/tipofday/tipofday_part.cpp
+++ b/parts/tipofday/tipofday_part.cpp
@@ -7,7 +7,7 @@
 #include <kaboutdata.h>
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
 #include <kiconloader.h>
diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp
index b35ac551..28af7745 100644
--- a/parts/tools/tools_part.cpp
+++ b/parts/tools/tools_part.cpp
@@ -9,7 +9,7 @@
 
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>
 #include <kdialogbase.h>
diff --git a/parts/tools/toolsconfigwidget.cpp b/parts/tools/toolsconfigwidget.cpp
index ef34eb97..f6cec15a 100644
--- a/parts/tools/toolsconfigwidget.cpp
+++ b/parts/tools/toolsconfigwidget.cpp
@@ -16,7 +16,7 @@
 #include <tqtimer.h>
 
 #include <klineedit.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>
diff --git a/parts/uimode/uichooser_widget.cpp b/parts/uimode/uichooser_widget.cpp
index 25df2d5a..c2d88499 100644
--- a/parts/uimode/uichooser_widget.cpp
+++ b/parts/uimode/uichooser_widget.cpp
@@ -19,7 +19,7 @@
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 
diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp
index 287dd7ec..aa530e95 100644
--- a/parts/valgrind/valgrind_part.cpp
+++ b/parts/valgrind/valgrind_part.cpp
@@ -10,7 +10,7 @@
 #include <kaction.h>
 #include <kprocess.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdebug.h>
 
 #include "kdevcore.h"