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

69 files changed, 106 insertions, 106 deletions

diff --git a/kbabel/addons/CMakeLists.txt b/kbabel/addons/CMakeLists.txt
index 8b387853..6cf70a4c 100644
--- a/kbabel/addons/CMakeLists.txt
+++ b/kbabel/addons/CMakeLists.txt
@@ -10,4 +10,4 @@
 #################################################
 
 add_subdirectory( preview )
-add_subdirectory( kfile-plugins )
+add_subdirectory( tdefile-plugins )
diff --git a/kbabel/addons/Makefile.am b/kbabel/addons/Makefile.am
index 291996f0..ea1e5c4e 100644
--- a/kbabel/addons/Makefile.am
+++ b/kbabel/addons/Makefile.am
@@ -1,3 +1,3 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
-SUBDIRS = preview kfile-plugins
+SUBDIRS = preview tdefile-plugins
diff --git a/kbabel/addons/kfile-plugins/Makefile.am b/kbabel/addons/kfile-plugins/Makefile.am
deleted file mode 100644
index fab776e0..00000000
--- a/kbabel/addons/kfile-plugins/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-## Makefile.am for po file meta info plugin
-
-# set the include path for X, qt and KDE
-INCLUDES = -I$(srcdir)/../../common/ $(all_includes)
-
-# these are the headers for the project
-noinst_HEADERS   = kfile_po.h
-
-kde_module_LTLIBRARIES = kfile_po.la
-
-kfile_po_la_SOURCES = kfile_po.cpp
-kfile_po_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_po_la_LIBADD  = ../../common/libkbabelcommon.la $(LIB_KIO)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages: rc.cpp
-	$(XGETTEXT) kfile_po.cpp -o $(podir)/kfile_po.pot
-
-services_DATA = kfile_po.desktop
-servicesdir = $(kde_servicesdir)
diff --git a/kbabel/addons/preview/pothumbcreator.h b/kbabel/addons/preview/pothumbcreator.h
index f975b554..d74a8ccd 100644
--- a/kbabel/addons/preview/pothumbcreator.h
+++ b/kbabel/addons/preview/pothumbcreator.h
@@ -35,7 +35,7 @@
 #ifndef POTHUMBCREATOR_H
 #define POTHUMBCREATOR_H
 
-#include <kio/thumbcreator.h>
+#include <tdeio/thumbcreator.h>
 
 class KPixmapSplitter;
 
diff --git a/kbabel/addons/kfile-plugins/CMakeLists.txt b/kbabel/addons/tdefile-plugins/CMakeLists.txt
index f6fffd65..57fe6f65 100644
--- a/kbabel/addons/kfile-plugins/CMakeLists.txt
+++ b/kbabel/addons/tdefile-plugins/CMakeLists.txt
@@ -23,13 +23,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kfile_po.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdefile_po.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kfile_po (module) #########################
+##### tdefile_po (module) #########################
 
-tde_add_kpart( kfile_po AUTOMOC
-  SOURCES kfile_po.cpp
+tde_add_kpart( tdefile_po AUTOMOC
+  SOURCES tdefile_po.cpp
   LINK kbabelcommon-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kbabel/addons/tdefile-plugins/Makefile.am b/kbabel/addons/tdefile-plugins/Makefile.am
new file mode 100644
index 00000000..2d2b252f
--- /dev/null
+++ b/kbabel/addons/tdefile-plugins/Makefile.am
@@ -0,0 +1,22 @@
+## Makefile.am for po file meta info plugin
+
+# set the include path for X, qt and KDE
+INCLUDES = -I$(srcdir)/../../common/ $(all_includes)
+
+# these are the headers for the project
+noinst_HEADERS   = tdefile_po.h
+
+kde_module_LTLIBRARIES = tdefile_po.la
+
+tdefile_po_la_SOURCES = tdefile_po.cpp
+tdefile_po_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_po_la_LIBADD  = ../../common/libkbabelcommon.la $(LIB_KIO)
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+messages: rc.cpp
+	$(XGETTEXT) tdefile_po.cpp -o $(podir)/tdefile_po.pot
+
+services_DATA = tdefile_po.desktop
+servicesdir = $(kde_servicesdir)
diff --git a/kbabel/addons/kfile-plugins/kfile_po.cpp b/kbabel/addons/tdefile-plugins/tdefile_po.cpp
index 156f52c1..248f6fc1 100644
--- a/kbabel/addons/kfile-plugins/kfile_po.cpp
+++ b/kbabel/addons/tdefile-plugins/tdefile_po.cpp
@@ -28,7 +28,7 @@
  */
 
 
-#include "kfile_po.h"
+#include "tdefile_po.h"
 
 #include <tqstringlist.h>
 
@@ -38,7 +38,7 @@
 using namespace KBabel;
 
 typedef KGenericFactory<KPoPlugin> POFactory;
-K_EXPORT_COMPONENT_FACTORY(kfile_po, POFactory("kfile_po"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_po, POFactory("tdefile_po"))
 
 KPoPlugin::KPoPlugin(TQObject *parent, const char *name,
                      const TQStringList& args)
@@ -78,4 +78,4 @@ bool KPoPlugin::readInfo(KFileMetaInfo& metaInfo, uint)
   return false;
 }
 
-#include "kfile_po.moc"
+#include "tdefile_po.moc"
diff --git a/kbabel/addons/kfile-plugins/kfile_po.desktop b/kbabel/addons/tdefile-plugins/tdefile_po.desktop
index f844f531..7661ed91 100644
--- a/kbabel/addons/kfile-plugins/kfile_po.desktop
+++ b/kbabel/addons/tdefile-plugins/tdefile_po.desktop
@@ -55,7 +55,7 @@ Name[xh]=Ulwazi Lwencwadi yemifanekiso
 Name[zh_CN]=目录信息
 Name[zh_TW]=類別資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_po
+X-TDE-Library=tdefile_po
 MimeType=application/x-gettext
 PreferredGroups=CatalogInfo
 PreferredItems=Total,Fuzzy,Untranslated,LastTranslator,LanguageTeam,Revision
diff --git a/kbabel/addons/kfile-plugins/kfile_po.h b/kbabel/addons/tdefile-plugins/tdefile_po.h
index 63e740aa..75ed429b 100644
--- a/kbabel/addons/kfile-plugins/kfile_po.h
+++ b/kbabel/addons/tdefile-plugins/tdefile_po.h
@@ -32,7 +32,7 @@
 #ifndef KFILE_PO_H
 #define KFILE_PO_H
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class TQStringList;
 
diff --git a/kbabel/catalogmanager/CMakeLists.txt b/kbabel/catalogmanager/CMakeLists.txt
index c9d8443e..646a0f78 100644
--- a/kbabel/catalogmanager/CMakeLists.txt
+++ b/kbabel/catalogmanager/CMakeLists.txt
@@ -46,7 +46,7 @@ tde_add_executable( catalogmanager
   LINK
     catalogmanager-static catalogmanagercvs-static catalogmanagersvn-static
     kbabelcommonui-static kbabeldict-static
-    kbabelcommon-shared kbabeldictplugin-shared kio-shared
+    kbabelcommon-shared kbabeldictplugin-shared tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index e2992d21..41c18005 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -52,12 +52,12 @@
 #include <kapplication.h>
 #include <kaction.h>
 #include <kcmenumngr.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdatatool.h>
 #include <kdialogbase.h>
 //#include <kedittoolbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index c2fffb9e..de3ebf60 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -60,14 +60,14 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdatatool.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
 #include <kaction.h>
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 #include <kprogress.h>
 #include <twin.h>
 #include <tdeversion.h>
diff --git a/kbabel/catalogmanager/findinfilesdialog.cpp b/kbabel/catalogmanager/findinfilesdialog.cpp
index b035666a..be293012 100644
--- a/kbabel/catalogmanager/findinfilesdialog.cpp
+++ b/kbabel/catalogmanager/findinfilesdialog.cpp
@@ -37,7 +37,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.cpp b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
index 054e8489..27eee88f 100644
--- a/kbabel/catalogmanager/libcvs/cvsdialog.cpp
+++ b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
@@ -46,7 +46,7 @@
 #include <tqtextedit.h>
 #include <tqtextcodec.h>
 // KDE include files
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/kbabel/catalogmanager/libsvn/svndialog.cpp b/kbabel/catalogmanager/libsvn/svndialog.cpp
index c5f8c24a..083ce22d 100644
--- a/kbabel/catalogmanager/libsvn/svndialog.cpp
+++ b/kbabel/catalogmanager/libsvn/svndialog.cpp
@@ -45,7 +45,7 @@
 #include <tqstringlist.h>
 #include <tqtextedit.h>
 // KDE include files
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/kbabel/catalogmanager/markpatterndialog.cpp b/kbabel/catalogmanager/markpatterndialog.cpp
index 21e5eadc..7b033235 100644
--- a/kbabel/catalogmanager/markpatterndialog.cpp
+++ b/kbabel/catalogmanager/markpatterndialog.cpp
@@ -38,7 +38,7 @@
 
 #include <kcombobox.h>
 #include <kcompletion.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <tdeparts/componentfactory.h>
diff --git a/kbabel/common/CMakeLists.txt b/kbabel/common/CMakeLists.txt
index f6b6fd96..d0377a65 100644
--- a/kbabel/common/CMakeLists.txt
+++ b/kbabel/common/CMakeLists.txt
@@ -58,6 +58,6 @@ tde_add_library( kbabelcommon SHARED AUTOMOC
     exportplugin.cpp kbproject.cpp kbprojectmanager.cpp
     kbprojectsettings.kcfgc projectsettings.cpp stringdistance.cpp
   VERSION 3.2.0
-  LINK gettext-static kio-shared
+  LINK gettext-static tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kbabel/common/Makefile.am b/kbabel/common/Makefile.am
index 7d073444..eb455a7a 100644
--- a/kbabel/common/Makefile.am
+++ b/kbabel/common/Makefile.am
@@ -56,7 +56,7 @@ catalog.lo: version.h
 
 # updating of project settings for default project
 update_DATA = kbabel-projectrename.upd
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 api:
 	mkdir -p API && kdoc -d API -u $$PWD/API -p  -ltdecore -lqt-mt -ldcop $(pkginclude_HEADERS)	
diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp
index adf845fe..86f47c29 100644
--- a/kbabel/common/catalog.cpp
+++ b/kbabel/common/catalog.cpp
@@ -40,7 +40,7 @@
 #include <tqtextcodec.h>
 #include <tqdatetime.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdatatool.h>
 #include <kglobal.h>
 #include <klibloader.h>
@@ -48,7 +48,7 @@
 #include <kmessagebox.h>
 #include <kmimetype.h>
 #include <kapplication.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <krfcdate.h>
 #include <ktrader.h>
 #include <kurl.h>
diff --git a/kbabel/common/catalogsettings.cpp b/kbabel/common/catalogsettings.cpp
index d16bc9cc..64185d09 100644
--- a/kbabel/common/catalogsettings.cpp
+++ b/kbabel/common/catalogsettings.cpp
@@ -33,7 +33,7 @@
 **************************************************************************** */
 #include "catalogsettings.h"
 #include "kbprojectsettings.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kemailsettings.h>
 #include <kglobal.h>
diff --git a/kbabel/common/kbmailer.cpp b/kbabel/common/kbmailer.cpp
index 156754d0..3fbc12c2 100644
--- a/kbabel/common/kbmailer.cpp
+++ b/kbabel/common/kbmailer.cpp
@@ -40,7 +40,7 @@
 #include <tqwidget.h>
 
 #include <kapplication.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktar.h>
diff --git a/kbabel/common/kbproject.h b/kbabel/common/kbproject.h
index 3b2040ed..cedc97c8 100644
--- a/kbabel/common/kbproject.h
+++ b/kbabel/common/kbproject.h
@@ -35,7 +35,7 @@
 
 #include <tqstring.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "catalogsettings.h"
 #include "projectsettings.h"
 
diff --git a/kbabel/common/poinfo.cpp b/kbabel/common/poinfo.cpp
index 81bfd8b9..6fc27b55 100644
--- a/kbabel/common/poinfo.cpp
+++ b/kbabel/common/poinfo.cpp
@@ -38,7 +38,7 @@
 #include "resources.h"
 
 #include <kapplication.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
 #include <ksavefile.h>
 
diff --git a/kbabel/common/tagextractor.cpp b/kbabel/common/tagextractor.cpp
index 594ec948..bbf9ee1d 100644
--- a/kbabel/common/tagextractor.cpp
+++ b/kbabel/common/tagextractor.cpp
@@ -36,7 +36,7 @@
 #include "tagextractor.h"
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 using namespace KBabel;
 
diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp
index cf79f4b1..70a020a8 100644
--- a/kbabel/commonui/context.cpp
+++ b/kbabel/commonui/context.cpp
@@ -46,14 +46,14 @@
 #include <tqregexp.h>
 #include <tqvgroupbox.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kurl.h>
 #include <tdeversion.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <klibloader.h>
 #include <ktrader.h>
diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp
index 222fbea1..4c3f3f55 100644
--- a/kbabel/commonui/finddialog.cpp
+++ b/kbabel/commonui/finddialog.cpp
@@ -44,7 +44,7 @@
 #include <tqwhatsthis.h>
 
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <tdeparts/componentfactory.h>
diff --git a/kbabel/commonui/projectpref.h b/kbabel/commonui/projectpref.h
index ca99bdea..0a72bf02 100644
--- a/kbabel/commonui/projectpref.h
+++ b/kbabel/commonui/projectpref.h
@@ -35,7 +35,7 @@
 #ifndef PROJECTPREF_H
 #define PROJECTPREF_H
 
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 #include <tqptrlist.h>
 
 class SavePreferences;
diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp
index d4785445..63579dc8 100644
--- a/kbabel/commonui/projectprefwidgets.cpp
+++ b/kbabel/commonui/projectprefwidgets.cpp
@@ -45,7 +45,7 @@
 #include <kdatatool.h>
 #include <klocale.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <knuminput.h>
 #include <kmessagebox.h>
 #include <klineedit.h> 
diff --git a/kbabel/commonui/roughtransdlg.cpp b/kbabel/commonui/roughtransdlg.cpp
index f19747e3..caf919e3 100644
--- a/kbabel/commonui/roughtransdlg.cpp
+++ b/kbabel/commonui/roughtransdlg.cpp
@@ -52,7 +52,7 @@
 #include <tqwhatsthis.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kbabel/datatools/accelerators/main.cc b/kbabel/datatools/accelerators/main.cc
index 75ca871d..275a6289 100644
--- a/kbabel/datatools/accelerators/main.cc
+++ b/kbabel/datatools/accelerators/main.cc
@@ -35,7 +35,7 @@
 #include "catalogsettings.h"
 #include "main.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
diff --git a/kbabel/datatools/arguments/main.cc b/kbabel/datatools/arguments/main.cc
index f12bfac8..e125d792 100644
--- a/kbabel/datatools/arguments/main.cc
+++ b/kbabel/datatools/arguments/main.cc
@@ -35,7 +35,7 @@
 #include "catalogsettings.h"
 #include "main.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <klocale.h>
diff --git a/kbabel/datatools/context/main.cc b/kbabel/datatools/context/main.cc
index 95736dbd..3288aa96 100644
--- a/kbabel/datatools/context/main.cc
+++ b/kbabel/datatools/context/main.cc
@@ -35,7 +35,7 @@
 #include "catalogsettings.h"
 #include "main.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
diff --git a/kbabel/datatools/equations/main.cc b/kbabel/datatools/equations/main.cc
index 5abd7fed..a5c9688c 100644
--- a/kbabel/datatools/equations/main.cc
+++ b/kbabel/datatools/equations/main.cc
@@ -35,7 +35,7 @@
 #include "catalogsettings.h"
 #include "main.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
diff --git a/kbabel/datatools/length/main.cc b/kbabel/datatools/length/main.cc
index be809ffb..ec4bab17 100644
--- a/kbabel/datatools/length/main.cc
+++ b/kbabel/datatools/length/main.cc
@@ -38,7 +38,7 @@
 #include "main.h"
 #include <math.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
diff --git a/kbabel/datatools/not-translated/main.cc b/kbabel/datatools/not-translated/main.cc
index d14530b6..4bcdd416 100644
--- a/kbabel/datatools/not-translated/main.cc
+++ b/kbabel/datatools/not-translated/main.cc
@@ -37,7 +37,7 @@
 #include "catalogsettings.h"
 #include "main.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
diff --git a/kbabel/datatools/pluralforms/main.cc b/kbabel/datatools/pluralforms/main.cc
index 34782cfe..cdc6e990 100644
--- a/kbabel/datatools/pluralforms/main.cc
+++ b/kbabel/datatools/pluralforms/main.cc
@@ -36,7 +36,7 @@
 #include "catalogsettings.h"
 #include "main.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
diff --git a/kbabel/datatools/punctuation/main.cc b/kbabel/datatools/punctuation/main.cc
index 80f14c53..7a05aabe 100644
--- a/kbabel/datatools/punctuation/main.cc
+++ b/kbabel/datatools/punctuation/main.cc
@@ -35,7 +35,7 @@
 #include "catalogsettings.h"
 #include "main.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
diff --git a/kbabel/datatools/regexp/main.cc b/kbabel/datatools/regexp/main.cc
index 7d3c3120..9f948e03 100644
--- a/kbabel/datatools/regexp/main.cc
+++ b/kbabel/datatools/regexp/main.cc
@@ -32,7 +32,7 @@
 #include <tqdom.h>
 #include <tqstringlist.h>
 #include <tqregexp.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
diff --git a/kbabel/datatools/whitespace/main.cc b/kbabel/datatools/whitespace/main.cc
index 1b4eacf8..e838770f 100644
--- a/kbabel/datatools/whitespace/main.cc
+++ b/kbabel/datatools/whitespace/main.cc
@@ -37,7 +37,7 @@
 #include "catalogsettings.h"
 #include "main.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
diff --git a/kbabel/datatools/xml/main.cc b/kbabel/datatools/xml/main.cc
index da80d7d1..2f32db9a 100644
--- a/kbabel/datatools/xml/main.cc
+++ b/kbabel/datatools/xml/main.cc
@@ -37,7 +37,7 @@
 
 #include <tqdom.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
diff --git a/kbabel/kbabel/Makefile.am b/kbabel/kbabel/Makefile.am
index fd67a78d..54e99daf 100644
--- a/kbabel/kbabel/Makefile.am
+++ b/kbabel/kbabel/Makefile.am
@@ -72,7 +72,7 @@ rcdir = $(kde_datadir)/kbabel
 rc_DATA = kbabelui.rc
 
 update_DATA = kbabel-project.upd kbabel-difftoproject.upd
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 api:
 	mkdir -p API && kdoc -d API -u $$PWD/API -p  -ltdeui -ltdecore -lqt -ldcop $(noinst_HEADERS)
diff --git a/kbabel/kbabel/charselectview.cpp b/kbabel/kbabel/charselectview.cpp
index 9f591f17..d4a7c473 100644
--- a/kbabel/kbabel/charselectview.cpp
+++ b/kbabel/kbabel/charselectview.cpp
@@ -39,7 +39,7 @@
 #include <tqspinbox.h>
 #include <tqscrollview.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdialog.h>
 #include <klocale.h>
diff --git a/kbabel/kbabel/commentview.cpp b/kbabel/kbabel/commentview.cpp
index 8394909b..9a32da70 100644
--- a/kbabel/kbabel/commentview.cpp
+++ b/kbabel/kbabel/commentview.cpp
@@ -42,7 +42,7 @@
 #include <tqtextview.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdialog.h>
 #include <klocale.h>
diff --git a/kbabel/kbabel/headereditor.cpp b/kbabel/kbabel/headereditor.cpp
index 11c7eba1..38b11920 100644
--- a/kbabel/kbabel/headereditor.cpp
+++ b/kbabel/kbabel/headereditor.cpp
@@ -35,7 +35,7 @@
 #include <kcursor.h>
 #include <kglobalsettings.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktextedit.h>
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index 4935f9dd..79b21501 100644
--- a/kbabel/kbabel/kbabel.cpp
+++ b/kbabel/kbabel/kbabel.cpp
@@ -69,8 +69,8 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <ktoolbar.h>
-#include <kfiledialog.h>
-#include <kconfig.h>
+#include <tdefiledialog.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <kdialogbase.h>
 #include <kprogress.h>
diff --git a/kbabel/kbabel/kbabelpref.h b/kbabel/kbabel/kbabelpref.h
index e126f1e7..72732d12 100644
--- a/kbabel/kbabel/kbabelpref.h
+++ b/kbabel/kbabel/kbabelpref.h
@@ -35,7 +35,7 @@
 #ifndef KBABELPREF_H
 #define KBABELPREF_H
 
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 #include <tqptrlist.h>
 
 class SearchPreferences;
diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp
index 830d17ce..8380ad85 100644
--- a/kbabel/kbabel/kbabelview.cpp
+++ b/kbabel/kbabel/kbabelview.cpp
@@ -59,18 +59,18 @@
 #include <tdeversion.h>
 #include <kcharsets.h>
 #include <kcmenumngr.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 #include <kdatatool.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kcursor.h>
-#include <kfiledialog.h>
-#include <kconfig.h>
+#include <tdefiledialog.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kled.h>
 #include <klistbox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <knotifyclient.h>
 #include <ktempfile.h>
 #include <tdespell.h>
diff --git a/kbabel/kbabel/kbabelview.h b/kbabel/kbabel/kbabelview.h
index 6af2da00..205f34a8 100644
--- a/kbabel/kbabel/kbabelview.h
+++ b/kbabel/kbabel/kbabelview.h
@@ -64,7 +64,7 @@ struct ModuleInfo;
 
 #include <kdockwidget.h>
 #include <kurl.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqwidget.h>
 #include <tqstrlist.h>
 #include <resources.h>
diff --git a/kbabel/kbabel/kbabelview2.cpp b/kbabel/kbabel/kbabelview2.cpp
index c3d95520..02462e19 100644
--- a/kbabel/kbabel/kbabelview2.cpp
+++ b/kbabel/kbabel/kbabelview2.cpp
@@ -35,13 +35,13 @@
 
 #include <kdatatool.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <knotifyclient.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
diff --git a/kbabel/kbabel/kbcataloglistview.h b/kbabel/kbabel/kbcataloglistview.h
index 8a134178..c1fcd005 100644
--- a/kbabel/kbabel/kbcataloglistview.h
+++ b/kbabel/kbabel/kbcataloglistview.h
@@ -25,7 +25,7 @@
 
 #include <tqwidget.h>
 #include <catalogview.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqwidget.h>
 //#include <tqstrlist.h>
 #include <resources.h>
diff --git a/kbabel/kbabel/kbcharselect.cpp b/kbabel/kbabel/kbcharselect.cpp
index a1ad6c18..0f50f630 100644
--- a/kbabel/kbabel/kbcharselect.cpp
+++ b/kbabel/kbabel/kbcharselect.cpp
@@ -32,7 +32,7 @@
 **************************************************************************** */
 #include "kbcharselect.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcharselect.h>
 #include <kdialog.h>
 #include <klocale.h>
diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp
index 0240153d..957d7bd8 100644
--- a/kbabel/kbabel/kbhighlighting.cpp
+++ b/kbabel/kbabel/kbhighlighting.cpp
@@ -40,7 +40,7 @@
 #include <tqtextedit.h>
 
 #include "kapplication.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kbabelsettings.h>
diff --git a/kbabel/kbabel/spelldlg.cpp b/kbabel/kbabel/spelldlg.cpp
index e887fce5..7bb43851 100644
--- a/kbabel/kbabel/spelldlg.cpp
+++ b/kbabel/kbabel/spelldlg.cpp
@@ -36,7 +36,7 @@
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 
diff --git a/kbabel/kbabeldict/dictchooser.cpp b/kbabel/kbabeldict/dictchooser.cpp
index f5a3701f..a7803320 100644
--- a/kbabel/kbabeldict/dictchooser.cpp
+++ b/kbabel/kbabeldict/dictchooser.cpp
@@ -38,7 +38,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqpushbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistbox.h>
 #include <klocale.h>
 #include <kdialog.h>
diff --git a/kbabel/kbabeldict/kbabeldict.cpp b/kbabel/kbabeldict/kbabeldict.cpp
index cb2ed323..7453bcaf 100644
--- a/kbabel/kbabeldict/kbabeldict.cpp
+++ b/kbabel/kbabeldict/kbabeldict.cpp
@@ -33,7 +33,7 @@
 
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include "kbabeldict.h"
diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp
index 35abc555..4d0f4b2d 100644
--- a/kbabel/kbabeldict/kbabeldictbox.cpp
+++ b/kbabel/kbabeldict/kbabeldictbox.cpp
@@ -45,7 +45,7 @@
 #include <kaboutdata.h>
 #include <kaboutdialog.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcmenumngr.h>
 #include <kdialogbase.h>
 #include <klibloader.h>
diff --git a/kbabel/kbabeldict/kbabeldictview.cpp b/kbabel/kbabeldict/kbabeldictview.cpp
index 437de9e5..7ed294c9 100644
--- a/kbabel/kbabeldict/kbabeldictview.cpp
+++ b/kbabel/kbabeldict/kbabeldictview.cpp
@@ -50,7 +50,7 @@
 #include <tqvbox.h>
 
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kglobal.h>
 #include <klineedit.h>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
index 72042e16..126c8c10 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
@@ -35,9 +35,9 @@
 #include <tdeversion.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurlrequester.h>
 #include <kstandarddirs.h>
 
@@ -55,7 +55,7 @@
 #include <tqprogressbar.h>
 #include <tqpushbutton.h>
 #include <klineedit.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqdir.h>
 #include <tqradiobutton.h>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
index 4ee016cd..8d48df58 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
@@ -39,7 +39,7 @@
 #include <tqfile.h>
 
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 WordItem::WordItem (char *data, TQString w)
 {
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
index 41ae81f2..9958b409 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
@@ -5,7 +5,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurlrequester.h>
 #include <tqtoolbutton.h>
 #include <klineedit.h>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
index 9ba90514..b5b20967 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
@@ -17,7 +17,7 @@
 
 */
 #include "dbscan.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqdir.h>
 #include <tqfile.h>
 #include <kapplication.h>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
index d8489400..5e49a996 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
@@ -5,7 +5,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurlrequester.h>
 #include <tqtoolbutton.h>
 #include <klineedit.h>
diff --git a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp
index 51e5f6e6..116d3c69 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp
@@ -34,7 +34,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqpushbutton.h>
 #include <klineedit.h>
 #include <klocale.h>
diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
index e7a82d9a..57be4624 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
@@ -39,7 +39,7 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kinstance.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqregexp.h>
 #include <tqtextstream.h>
diff --git a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
index 8af71c48..893a1f1b 100644
--- a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
@@ -34,7 +34,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
 #include <klineedit.h>
diff --git a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
index 3e9f112d..eeeb53c0 100644
--- a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
@@ -36,7 +36,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
 #include <klineedit.h>
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
index 913402d8..e97d1430 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
@@ -39,7 +39,7 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kinstance.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqtextstream.h>
 #include <tqtimer.h>
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
index 0f849e9c..bc4001fb 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
@@ -43,7 +43,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 using namespace KBabel;
 
diff --git a/kbabel/kbabeldict/searchengine.h b/kbabel/kbabeldict/searchengine.h
index ca729469..5d823cc0 100644
--- a/kbabel/kbabeldict/searchengine.h
+++ b/kbabel/kbabeldict/searchengine.h
@@ -40,7 +40,7 @@
 #include <tqstring.h>
 #include <tqwidget.h>
 #include <kaboutdata.h>
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 
  
 /*