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

11 years ago · ff94d46e42
parent b9553cef2a
commit ff94d46e42
279 changed files with 375 additions and 375 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -57,8 +57,8 @@ option( BUILD_KAPPTEMPLATE "Build kapptemplate" ${BUILD_ALL} )
 option( BUILD_KBABEL "Build kbabel" ${BUILD_ALL} )
 option( BUILD_KBUGBUSTER "Build kbugbuster" ${BUILD_ALL} )
 option( BUILD_KDEACCOUNTS_PLUGIN "Build kdeaccounts-plugin" ${BUILD_ALL} )
-option( BUILD_KFILE_PLUGINS "Build kfile-plugins" ${BUILD_ALL} )
+option( BUILD_KFILE_PLUGINS "Build tdefile-plugins" ${BUILD_ALL} )
-option( BUILD_KIOSLAVE "Build kioslave" ${BUILD_ALL} )
+option( BUILD_KIOSLAVE "Build tdeioslave" ${BUILD_ALL} )
 option( BUILD_KMTRACE "Build kmtrace" ${BUILD_ALL} )
 option( BUILD_KOMPARE "Build kompare" ${BUILD_ALL} )
 option( BUILD_KPROFILEMETHOD "Build kprofilemethod" ${BUILD_ALL} )
@ -97,8 +97,8 @@ tde_conditional_add_subdirectory( BUILD_KAPPTEMPLATE kapptemplate )
 tde_conditional_add_subdirectory( BUILD_KBABEL kbabel )
 tde_conditional_add_subdirectory( BUILD_KBUGBUSTER kbugbuster )
 tde_conditional_add_subdirectory( BUILD_KDEACCOUNTS_PLUGIN kdeaccounts-plugin )
-tde_conditional_add_subdirectory( BUILD_KFILE_PLUGINS kfile-plugins )
+tde_conditional_add_subdirectory( BUILD_KFILE_PLUGINS tdefile-plugins )
-tde_conditional_add_subdirectory( BUILD_KIOSLAVE kioslave )
+tde_conditional_add_subdirectory( BUILD_KIOSLAVE tdeioslave )
 tde_conditional_add_subdirectory( BUILD_KMTRACE kmtrace )
 tde_conditional_add_subdirectory( BUILD_KOMPARE kompare )
 tde_conditional_add_subdirectory( BUILD_KPROFILEMETHOD kprofilemethod )
--- a/cervisia/ChangeLog
+++ b/cervisia/ChangeLog
@ -643,7 +643,7 @@
 	* Extract AddRepositoryDialog from repositorydlg.cpp
 	* Save and read repository configuration to/from the
 	  configuration file of the cvs DCOP service
-	* Added kconf_update script to copy repository configuration
+	* Added tdeconf_update script to copy repository configuration
 	  to cvsservicerc
 2002-12-28  Christian Loose <christian.loose@hamburg.de>
@ -656,7 +656,7 @@
 	  uses the new cvs DCOP service
 	* Save and read cvs client and global compression level configuration
 	  to/from the configuration file of the cvs DCOP service
-	* Added kconf_update script
+	* Added tdeconf_update script
 2002-12-26  André Wöbbeking <Woebbeking@kde.org>
--- a/cervisia/Makefile.am
+++ b/cervisia/Makefile.am
@ -54,7 +54,7 @@ shellrc_DATA = cervisiashellui.rc eventsrc
 update_DATA = cervisia.upd
 update_SCRIPTS = move_repositories.pl change_colors.pl cervisia-normalize_cvsroot.pl cervisia-change_repos_list.pl
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 messages: rc.cpp
 	$(EXTRACTRC) *.rc >> rc.cpp
--- a/cervisia/addrepositorydlg.cpp
+++ b/cervisia/addrepositorydlg.cpp
@ -26,7 +26,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <knuminput.h>
--- a/cervisia/annotateview.cpp
+++ b/cervisia/annotateview.cpp
@ -21,7 +21,7 @@
 #include <tqheader.h>
 #include <tqpainter.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h>
 #include "loginfo.h"
--- a/cervisia/cervisiapart.cpp
+++ b/cervisia/cervisiapart.cpp
@ -27,7 +27,7 @@
 #include <kaboutdata.h>
 #include <kaction.h>
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kinputdialog.h>
 #include <kinstance.h>
 #include <klocale.h>
@ -41,7 +41,7 @@
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kglobal.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include "progressdlg.h"
 #include "logdlg.h"
--- a/cervisia/cervisiashell.cpp
+++ b/cervisia/cervisiashell.cpp
@ -22,7 +22,7 @@
 #include "cervisiashell.h"
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kedittoolbar.h>
 #include <khelpmenu.h>
 #include <kkeydialog.h>
--- a/cervisia/changelogdlg.cpp
+++ b/cervisia/changelogdlg.cpp
@ -23,7 +23,7 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
 #include <kmessagebox.h>
--- a/cervisia/checkoutdlg.cpp
+++ b/cervisia/checkoutdlg.cpp
@ -28,7 +28,7 @@
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <kprocess.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
--- a/cervisia/commitdlg.cpp
+++ b/cervisia/commitdlg.cpp
@ -28,7 +28,7 @@
 #include <tqlayout.h>
 #include <tqheader.h>
 #include <klistview.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include "cvsservice_stub.h"
--- a/cervisia/cvsinitdlg.cpp
+++ b/cervisia/cvsinitdlg.cpp
@ -23,7 +23,7 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kurlcompletion.h>
--- a/cervisia/cvsservice/CMakeLists.txt
+++ b/cervisia/cvsservice/CMakeLists.txt
@ -55,7 +55,7 @@ tde_add_tdeinit_executable( cvsservice AUTOMOC
    cvsjob.skel cvsjob.stub repository.cpp repository.skel
    repository.stub sshagent.cpp cvsserviceutils.cpp cvsloginjob.cpp
    cvsloginjob.skel cvsloginjob.stub
-  LINK kio-shared
+  LINK tdeio-shared
 )
--- a/cervisia/cvsservice/cvsservice.cpp
+++ b/cervisia/cvsservice/cvsservice.cpp
@ -26,7 +26,7 @@
 #include <dcopref.h>
 #include <dcopclient.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
--- a/cervisia/cvsservice/repository.cpp
+++ b/cervisia/cvsservice/repository.cpp
@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdirwatch.h>
 #include <kstandarddirs.h>
--- a/cervisia/diffdlg.cpp
+++ b/cervisia/diffdlg.cpp
@ -27,8 +27,8 @@
 #include <tqkeycode.h>
 #include <tqfileinfo.h>
 #include <tqregexp.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
--- a/cervisia/diffview.cpp
+++ b/cervisia/diffview.cpp
@ -27,7 +27,7 @@
 #include <tqstyle.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
--- a/cervisia/historydlg.cpp
+++ b/cervisia/historydlg.cpp
@ -25,7 +25,7 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqregexp.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klineedit.h>
 #include <klistview.h>
 #include <klocale.h>
--- a/cervisia/logdlg.cpp
+++ b/cervisia/logdlg.cpp
@ -30,9 +30,9 @@
 #include <tqtabwidget.h>
 #include <tqtextedit.h>
 #include <tqwhatsthis.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kfinddialog.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
--- a/cervisia/main.cpp
+++ b/cervisia/main.cpp
@ -24,7 +24,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kurl.h>
--- a/cervisia/misc.cpp
+++ b/cervisia/misc.cpp
@ -29,7 +29,7 @@
 #include <tqfileinfo.h>
 #include <tqregexp.h>
 #include <tqstringlist.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kemailsettings.h>
 #include <klocale.h>
 #include <kmessagebox.h>
--- a/cervisia/progressdlg.cpp
+++ b/cervisia/progressdlg.cpp
@ -30,7 +30,7 @@
 #include <dcopref.h>
 #include <kanimwidget.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "cervisiasettings.h"
--- a/cervisia/protocolview.cpp
+++ b/cervisia/protocolview.cpp
@ -24,7 +24,7 @@
 #include <tqdir.h>
 #include <tqpopupmenu.h>
 #include <dcopref.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
--- a/cervisia/repositories.cpp
+++ b/cervisia/repositories.cpp
@ -23,7 +23,7 @@
 #include <tqdir.h>
 #include <tqtextstream.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "repositories.h"
 #include "cervisiapart.h"
--- a/cervisia/repositorydlg.cpp
+++ b/cervisia/repositorydlg.cpp
@ -24,7 +24,7 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <kbuttonbox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
--- a/cervisia/resolvedlg.cpp
+++ b/cervisia/resolvedlg.cpp
@ -29,7 +29,7 @@
 #include <tqtextcodec.h>
 #include <tqtextstream.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tqregexp.h>
--- a/cervisia/settingsdlg.cpp
+++ b/cervisia/settingsdlg.cpp
@ -32,7 +32,7 @@
 #include <tqradiobutton.h>
 #include <kbuttonbox.h>
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kfontdialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
--- a/cervisia/updateview.cpp
+++ b/cervisia/updateview.cpp
@ -25,7 +25,7 @@
 #include <tqapplication.h>
 #include <tqfileinfo.h>
 #include <tqptrstack.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include "cervisiasettings.h"
--- a/cervisia/watchersdlg.cpp
+++ b/cervisia/watchersdlg.cpp
@ -21,7 +21,7 @@
 #include <tqlayout.h>
 #include <tqtable.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klineedit.h>
 #include <klocale.h>
--- a/kapptemplate/kapp/app.cpp
+++ b/kapptemplate/kapp/app.cpp
@ -20,9 +20,9 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}.cpp
 #include <kmenubar.h>
 #include <kstatusbar.h>
 #include <kaccel.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <kurldrag.h>
 #include <kurlrequesterdlg.h>
--- a/kapptemplate/kpartapp/app.cpp
+++ b/kapptemplate/kpartapp/app.cpp
@ -9,7 +9,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}.cpp
 #include "${APP_NAME_LC}.moc"
 #include <kkeydialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <kedittoolbar.h>
@ -19,7 +19,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}.cpp
 #include <klibloader.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstatusbar.h>
 ${APP_NAME}::${APP_NAME}()
--- a/kapptemplate/kpartapp/app_part.cpp
+++ b/kapptemplate/kpartapp/app_part.cpp
@ -7,7 +7,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}_part.cpp
 #include <kinstance.h>
 #include <kaction.h>
 #include <kstdaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tdeparts/genericfactory.h>
 #include <tqfile.h>
--- 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 )
--- 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
--- a/kbabel/addons/kfile-plugins/Makefile.am
+++ b/kbabel/addons/kfile-plugins/Makefile.am
@ -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)
--- 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;
--- a/kbabel/addons/tdefile-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
+tde_add_kpart( tdefile_po AUTOMOC
-  SOURCES kfile_po.cpp
+  SOURCES tdefile_po.cpp
  LINK kbabelcommon-shared
  DESTINATION ${PLUGIN_INSTALL_DIR}
 )
--- a/kbabel/addons/tdefile-plugins/Makefile.am
+++ 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)
--- a/kbabel/addons/tdefile-plugins/tdefile_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"
--- a/kbabel/addons/tdefile-plugins/tdefile_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
--- a/kbabel/addons/tdefile-plugins/tdefile_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;
--- 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}
 )
--- 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>
--- 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 <tdefiledialog.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kprogress.h>
 #include <twin.h>
 #include <tdeversion.h>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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}
 )
--- 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)	
--- 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>
--- 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>
--- 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>
--- 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"
--- 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>
--- 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;
--- 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>
--- 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>
--- 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;
--- 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> 
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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)
--- 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>
--- 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>
--- 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>
--- 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 <tdefiledialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <kdialogbase.h>
 #include <kprogress.h>
--- 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;
--- 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 <tdefiledialog.h>
-#include <kconfig.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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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)
 {
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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;
--- 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>
 /*
--- a/kbugbuster/CMakeLists.txt
+++ b/kbugbuster/CMakeLists.txt
@ -39,6 +39,6 @@ tde_add_executable( kbugbuster
  SOURCES main.cpp
  LINK
    kbbmainwindow-static kbbbackend_nopic-static
-    tdeutils-shared kio-shared tdehtml-shared
+    tdeutils-shared tdeio-shared tdehtml-shared
  DESTINATION ${BIN_INSTALL_DIR}
 )
--- a/kbugbuster/backend/bugcommand.cpp
+++ b/kbugbuster/backend/bugcommand.cpp
@ -1,5 +1,5 @@
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include "bugcommand.h"
--- a/kbugbuster/backend/bugjob.cpp
+++ b/kbugbuster/backend/bugjob.cpp
@ -3,7 +3,7 @@
 #include "kbbprefs.h"
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <string.h>
 #include <klocale.h>
--- a/kbugbuster/backend/bugjob.h
+++ b/kbugbuster/backend/bugjob.h
@ -1,7 +1,7 @@
 #ifndef KBB_BUGJOB_H
 #define KBB_BUGJOB_H
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 #include "bugserver.h"
--- a/kbugbuster/backend/bugserverconfig.cpp
+++ b/kbugbuster/backend/bugserverconfig.cpp
@ -27,7 +27,7 @@
 #include "kbbprefs.h"
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 BugServerConfig::BugServerConfig()
 {
--- a/kbugbuster/backend/bugsystem.cpp
+++ b/kbugbuster/backend/bugsystem.cpp
@ -12,7 +12,7 @@
 #include <kemailsettings.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "packageimpl.h"
 #include "bugimpl.h"
--- a/kbugbuster/backend/kbbprefs.cpp
+++ b/kbugbuster/backend/kbbprefs.cpp
@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "bugsystem.h"
 #include "bugserver.h"
--- a/kbugbuster/backend/kbbprefs.h
+++ b/kbugbuster/backend/kbbprefs.h
@ -26,7 +26,7 @@
 #include <tqmap.h>
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include "mailsender.h"
--- a/kbugbuster/gui/centralwidget.cpp
+++ b/kbugbuster/gui/centralwidget.cpp
@ -40,7 +40,7 @@
 #include "bugserver.h"
 #include "centralwidget.h"
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include "loadallbugsdlg.h"
--- a/kbugbuster/gui/kbbmainwindow.cpp
+++ b/kbugbuster/gui/kbbmainwindow.cpp
@ -27,7 +27,7 @@
 #include <kaction.h>
 #include <kbookmarkmenu.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kinputdialog.h>
--- a/kbugbuster/gui/loadallbugsdlg.cpp
+++ b/kbugbuster/gui/loadallbugsdlg.cpp
@ -17,7 +17,7 @@
 #include "bugsystem.h"
 #include "bugcache.h"
 #include <kdebug.h>
-#include <kio/defaultprogress.h>
+#include <tdeio/defaultprogress.h>
 #include <tqtimer.h>
 LoadAllBugsDlg::LoadAllBugsDlg(  const Package& pkg, const TQString &component )
--- a/kbugbuster/tderesources/CMakeLists.txt
+++ b/kbugbuster/tderesources/CMakeLists.txt
@ -38,6 +38,6 @@ tde_add_kpart( kcal_bugzilla AUTOMOC
  SOURCES
    kcalresource.cpp kcalresourceconfig.cpp
    kcalresource_plugin.cpp resourceprefs.kcfgc
-  LINK kbbbackend_pic-static tdecore-shared kio-shared kabc kcal tderesources
+  LINK kbbbackend_pic-static tdecore-shared tdeio-shared kabc kcal tderesources
  DESTINATION ${PLUGIN_INSTALL_DIR}
 )
--- a/kbugbuster/tderesources/kcalresource.cpp
+++ b/kbugbuster/tderesources/kcalresource.cpp
@ -28,7 +28,7 @@
 #include <kdebug.h>
 #include <kurl.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
--- a/kbugbuster/tderesources/kcalresource.h
+++ b/kbugbuster/tderesources/kcalresource.h
@ -26,7 +26,7 @@
 #include <tqdatetime.h>
 #include <kurl.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdirwatch.h>
 #include <incidence.h>
--- a/kbugbuster/tderesources/resourceprefs.kcfgc
+++ b/kbugbuster/tderesources/resourceprefs.kcfgc
@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=tderesources_kcal_bugzilla.kcfg
 ClassName=ResourcePrefs
 NameSpace=KBB
--- a/kfile-plugins/c++/Makefile.am
+++ b/kfile-plugins/c++/Makefile.am
@ -1,22 +0,0 @@
 ## Makefile.am for c++ file meta info plugin
 # set the include path for X, qt and KDE
 INCLUDES         = $(all_includes)
 # these are the headers for your project
 noinst_HEADERS   = kfile_cpp.h
 kde_module_LTLIBRARIES = kfile_cpp.la
 kfile_cpp_la_SOURCES = kfile_cpp.cpp
 kfile_cpp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 kfile_cpp_la_LIBADD = $(LIB_KIO)
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
 messages:
 	$(XGETTEXT) *.cpp -o $(podir)/kfile_cpp.pot
 services_DATA = kfile_cpp.desktop kfile_h.desktop
 servicesdir = $(kde_servicesdir)
--- a/kfile-plugins/diff/Makefile.am
+++ b/kfile-plugins/diff/Makefile.am
@ -1,22 +0,0 @@
 ## Makefile.am for diff file meta info plugin
 # set the include path for X, qt and KDE
 INCLUDES         = $(all_includes)
 # these are the headers for your project
 noinst_HEADERS   = kfile_diff.h
 kde_module_LTLIBRARIES = kfile_diff.la
 kfile_diff_la_SOURCES = kfile_diff.cpp
 kfile_diff_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 kfile_diff_la_LIBADD = $(LIB_KSYCOCA)
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
 messages:
 	$(XGETTEXT) *.cpp *.h -o $(podir)/kfile_diff.pot
 services_DATA = kfile_diff.desktop
 servicesdir = $(kde_servicesdir)
--- a/kfile-plugins/ts/Makefile.am
+++ b/kfile-plugins/ts/Makefile.am
@ -1,21 +0,0 @@
 ## Makefile.am for text file meta info plugin
 # set the include path for X, qt and KDE
 INCLUDES         = $(all_includes)
 noinst_HEADERS   = kfile_ts.h
 kde_module_LTLIBRARIES = kfile_ts.la
 kfile_ts_la_SOURCES = kfile_ts.cpp
 kfile_ts_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 kfile_ts_la_LIBADD = $(LIB_KIO)
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
 messages:
 	$(XGETTEXT) *.cpp -o $(podir)/kfile_ts.pot
 services_DATA = kfile_ts.desktop
 servicesdir = $(kde_servicesdir)
--- a/kompare/CMakeLists.txt
+++ b/kompare/CMakeLists.txt
@ -49,7 +49,7 @@ tde_add_executable( kompare AUTOMOC
  SOURCES
    main.cpp kompare_shell.cpp kompareurldialog.cpp
  LINK
-    dialogpages-static kompareinterface-shared kio-shared
+    dialogpages-static kompareinterface-shared tdeio-shared
    tdeparts-shared tdetexteditor-shared
  DESTINATION ${BIN_INSTALL_DIR}
 )
--- a/kompare/ChangeLog
+++ b/kompare/ChangeLog
@ -197,7 +197,7 @@ Jun    29, 2003 : Otto Bruggeman
          different enum value, so i hope i did it the right way, session
          management may be broken now when the session was stored with 3.1.2
          and restarted with 3.1.3. But that is unfortunately unfixable with a
-          kconf_update script.
+          tdeconf_update script.
 Jun    29, 2003 : Otto Bruggeman
 	* Removed a lot of commented code since it is no longer used and will
--- a/kompare/TODO
+++ b/kompare/TODO
@ -1,5 +1,5 @@
 !!! Must do before a merge back into HEAD !!!
-* Write a kconfupdate script to convert the kconfigfile
+* Write a tdeconfupdate script to convert the tdeconfigfile
  * the diff options now have their own group
  * the view options now have their own group
  * the Recent Files group has been renamed to Recent Compare Files
--- a/kompare/kompare_shell.cpp
+++ b/kompare/kompare_shell.cpp
@ -344,7 +344,7 @@ void KompareShell::readProperties(TDEConfig* config)
 	else
 	{ // just in case something weird has happened, dont restore the diff then
 	  // Bruggie: or when some idiot like me changes the possible values for mode
-	  // IOW, a nice candidate for a kconf_update thingy :)
+	  // IOW, a nice candidate for a tdeconf_update thingy :)
 		m_viewPart->readProperties( config );
 	}
 }
--- a/kompare/komparepart/kompare_part.cpp
+++ b/kompare/komparepart/kompare_part.cpp
@ -27,8 +27,8 @@
 #include <kaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kfiletreeview.h>
+#include <tdefiletreeview.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstdaction.h>
@ -37,7 +37,7 @@
 #include <tdeparts/genericfactory.h>
 //#include <ktempdir.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include "diffmodel.h"
 #include "komparelistview.h"
--- a/kompare/komparepart/komparesaveoptionswidget.cpp
+++ b/kompare/komparepart/komparesaveoptionswidget.cpp
@ -24,7 +24,7 @@
 #include <tqspinbox.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurlrequester.h>
 #include "diffsettings.h"
--- a/kompare/libdialogpages/diffsettings.cpp
+++ b/kompare/libdialogpages/diffsettings.cpp
@ -15,7 +15,7 @@
 **
 ****************************************************************************/
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "diffsettings.h"
--- a/kompare/libdialogpages/filespage.cpp
+++ b/kompare/libdialogpages/filespage.cpp
@ -21,7 +21,7 @@
 #include <kapplication.h>
 #include <kcharsets.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klocale.h>
--- a/kompare/libdialogpages/filessettings.cpp
+++ b/kompare/libdialogpages/filessettings.cpp
@ -17,7 +17,7 @@
 ****************************************************************************/
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "filessettings.h"
--- a/kompare/libdialogpages/pagebase.h
+++ b/kompare/libdialogpages/pagebase.h
@ -23,7 +23,7 @@
 #include <tqsize.h>
 #include <tqwidget.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ktabctl.h>
 #include "kompare.h"
--- a/kompare/libdialogpages/viewsettings.cpp
+++ b/kompare/libdialogpages/viewsettings.cpp
@ -19,7 +19,7 @@
 #include <tqfont.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h>
 #include "viewsettings.h"
--- a/kompare/libdiff2/komparemodellist.cpp
+++ b/kompare/libdiff2/komparemodellist.cpp
@ -29,7 +29,7 @@
 #include <kcharsets.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmimetype.h>
 #include <ktempfile.h>
--- a/kompare/main.cpp
+++ b/kompare/main.cpp
@ -21,7 +21,7 @@
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <kdebug.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <klocale.h>
 #include <kmessagebox.h>
--- a/kompare/tests/subversion/contextm.diff
+++ b/kompare/tests/subversion/contextm.diff
@ -71,7 +71,7 @@ Index: README
 ! ln -s vimwidgetrc share/config/vimwidgetrc
 ! 
 ! 8. Update the desktop mimetype database:
-! kbuildsycoca
+! tdebuildsycoca
 ! 
 ! To test it, run VimPartShell. Or run konqueror from this dir and click on a
 ! text file.
--- a/kompare/tests/subversion/normalm.diff
+++ b/kompare/tests/subversion/normalm.diff
@ -65,7 +65,7 @@ Index: README
 < ln -s vimwidgetrc share/config/vimwidgetrc
 < 
 < 8. Update the desktop mimetype database:
-< kbuildsycoca
+< tdebuildsycoca
 < 
 < To test it, run VimPartShell. Or run konqueror from this dir and click on a
 < text file.
--- a/kompare/tests/subversion/unifiedm.diff
+++ b/kompare/tests/subversion/unifiedm.diff
@ -68,7 +68,7 @@ Index: README
 -ln -s vimwidgetrc share/config/vimwidgetrc
 -
 -8. Update the desktop mimetype database:
-kbuildsycoca
+-tdebuildsycoca
 -
 -To test it, run VimPartShell. Or run konqueror from this dir and click on a
 -text file.
--- a/kuiviewer/kuiviewer.cpp
+++ b/kuiviewer/kuiviewer.cpp
@ -39,7 +39,7 @@
 #include <klibloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 KUIViewer::KUIViewer()
    : KParts::MainWindow( 0L, "KUIViewer" )
--- a/kuiviewer/kuiviewer_part.cpp
+++ b/kuiviewer/kuiviewer_part.cpp
@ -24,12 +24,12 @@
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <kinstance.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klistview.h>
 #include <tdeparts/genericfactory.h>
 #include <kstdaction.h>
--- a/kuiviewer/quicreator.h
+++ b/kuiviewer/quicreator.h
@ -22,7 +22,7 @@
 #ifndef UICREATOR_H
 #define UICREATOR_H 
-#include <kio/thumbcreator.h>
+#include <tdeio/thumbcreator.h>
 class QUICreator : public ThumbCreator
 {
--- a/poxml/CMakeLists.txt
+++ b/poxml/CMakeLists.txt
@ -29,7 +29,7 @@ link_directories(
 tde_add_executable( split2po
  SOURCES split.cpp parser.cpp
-  LINK kio-shared
+  LINK tdeio-shared
  DESTINATION ${BIN_INSTALL_DIR}
 )
@ -38,7 +38,7 @@ tde_add_executable( split2po
 tde_add_executable( xml2pot
  SOURCES xml2pot.cpp parser.cpp
-  LINK kio-shared
+  LINK tdeio-shared
  DESTINATION ${BIN_INSTALL_DIR}
 )
@ -47,7 +47,7 @@ tde_add_executable( xml2pot
 tde_add_executable( po2xml
  SOURCES GettextLexer.cpp GettextParser.cpp po2xml.cpp parser.cpp
-  LINK antlr-static kio-shared
+  LINK antlr-static tdeio-shared
  DESTINATION ${BIN_INSTALL_DIR}
 )
@ -56,7 +56,7 @@ tde_add_executable( po2xml
 tde_add_executable( swappo
  SOURCES GettextLexer.cpp GettextParser.cpp swappo.cpp parser.cpp
-  LINK antlr-static kio-shared
+  LINK antlr-static tdeio-shared
  DESTINATION ${BIN_INSTALL_DIR}
 )
@ -65,6 +65,6 @@ tde_add_executable( swappo
 tde_add_executable( transxx
  SOURCES GettextLexer.cpp GettextParser.cpp transxx.cpp parser.cpp
-  LINK antlr-static kio-shared
+  LINK antlr-static tdeio-shared
  DESTINATION ${BIN_INSTALL_DIR}
 )
--- a/scripts/completions/zsh/_tdecmshell
+++ b/scripts/completions/zsh/_tdecmshell
@ -1,7 +1,7 @@
-#compdef kcmshell=kcmshell appletproxy=appletproxy
+#compdef tdecmshell=tdecmshell appletproxy=appletproxy
 local i resource tmp dir flags
-if [ "$service" = "kcmshell" ]; then
+if [ "$service" = "tdecmshell" ]; then
 	resource="apps";
 	dir="/Settings";
 	flags=":t:r";
--- a/scripts/fixheaders
+++ b/scripts/fixheaders
@ -28,21 +28,21 @@ $lastdir = '.';
 '`QTextStream\' undeclared \(first use this function\)' => "qtextstream",
 '`QTextStream\' was not declared in this scope' => "qtextstream",
 'incomplete type `QSocketNotifier\'' => "qsocketnotifier",
- 'no matching function for call to `TDEConfig' => "kconfig",
+ 'no matching function for call to `TDEConfig' => "tdeconfig",
- 'variable `class TDEConfig \S*\' has initializer but incomplete type' => "kconfig",
+ 'variable `class TDEConfig \S*\' has initializer but incomplete type' => "tdeconfig",
 'implicit declaration of function `int kdDebug' => "kdebug",
 'implicit declaration of function `int kdWarning' => "kdebug",
 '`QFile\' undeclared \(first use this function' => "qfile",
 'variable `QFile \S*\' has initializer but incomplete type' => "qfile",
- 'type `TDEConfigBase\' is not a base type for type `TDEConfig' => "kconfig",
+ 'type `TDEConfigBase\' is not a base type for type `TDEConfig' => "tdeconfig",
 'invalid use of undefined type `class QAccel' => "qaccel",
 'invalid use of undefined type `class TDEAboutData' => "kaboutdata",
 'incomplete type `TDEAboutData\'' => "kaboutdata",
 'incomplete type `QGrid\'' => "qgrid",
 'invalid use of undefined type `class QGrid\'' => "qgrid",
- 'aggregate `class TDEConfig \S*\' has incomplete type' => "kconfig",
+ 'aggregate `class TDEConfig \S*\' has incomplete type' => "tdeconfig",
 '`stderr\' undeclared \(first use this function' => "stdio",
- 'invalid use of undefined type `class TDEConfig' => "kconfig",
+ 'invalid use of undefined type `class TDEConfig' => "tdeconfig",
 'implicit declaration of function `int f?printf' => "stdio",
 'no method `TDEGlobal::' => "kglobal",
 '`TDEGlobal\' undeclared \(first use this function\)' => "kglobal",
--- a/scripts/kde-devel-vim.vim
+++ b/scripts/kde-devel-vim.vim
@ -235,7 +235,7 @@ function! MapIdentHeader( ident )
    elseif a:ident == 'K\(Double\|Int\)\(NumInput\|SpinBox\)'
        return '<knuminput.h>'
    elseif a:ident == 'TDEConfigGroup'
-        return '<kconfigbase.h>'
+        return '<tdeconfigbase.h>'
    elseif a:ident == 'KListViewItem'
        return '<klistview.h>'
    elseif a:ident =~ 'kd\(Debug\|Warning\|Error\|Fatal\|Backtrace\)'
--- a/scripts/kde-emacs/klaralv.el
+++ b/scripts/kde-emacs/klaralv.el
@ -121,7 +121,7 @@
    ; KDE
    (kdebug.h kdDebug kdWarning kdError kdFatal kdBacktrace)
-    (kconfig.h TDEConfigGroup)
+    (tdeconfig.h TDEConfigGroup)
    (kiconloader.h BarIcon SmallIcon DesktopIcon KIcon)
    (kicondialog.h KIconCanvas KIconButton)
    (knuminput.h KDoubleNumInput KIntNumInput)
--- a/scripts/tdesvn-build
+++ b/scripts/tdesvn-build
@ -231,7 +231,7 @@ reporting bugs.
 You can find additional information at B<tdesvn-build> home page,
 F<http://tdesvn-build.kde.org/>, or using tdesvn-build
-docbook documentation, using the help kioslave, F<help:/tdesvn-build>.
+docbook documentation, using the help tdeioslave, F<help:/tdesvn-build>.
 =head1 AUTHOR
--- a/tdecachegrind/tdecachegrind/CMakeLists.txt
+++ b/tdecachegrind/tdecachegrind/CMakeLists.txt
@ -45,6 +45,6 @@ tde_add_executable( tdecachegrind AUTOMOC
    multiview.cpp callitem.cpp coverageitem.cpp sourceitem.cpp
    costlistitem.cpp partlistitem.cpp functionitem.cpp instritem.cpp
    stackitem.cpp callgraphview.cpp
-  LINK kio-shared
+  LINK tdeio-shared
  DESTINATION ${BIN_INSTALL_DIR}
 )
--- a/tdecachegrind/tdecachegrind/callgraphview.cpp
+++ b/tdecachegrind/tdecachegrind/callgraphview.cpp
@ -37,11 +37,11 @@
 #include <kdebug.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ktempfile.h>
 #include <kapplication.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include "configuration.h"
 #include "callgraphview.h"
--- a/tdecachegrind/tdecachegrind/callmapview.cpp
+++ b/tdecachegrind/tdecachegrind/callmapview.cpp
@ -26,7 +26,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "callmapview.h"
 #include "configuration.h"
--- a/tdecachegrind/tdecachegrind/configdlg.cpp
+++ b/tdecachegrind/tdecachegrind/configdlg.cpp
@ -28,7 +28,7 @@
 #include <tqmessagebox.h>
 #include <kcolorbutton.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <knumvalidator.h>
--- a/tdecachegrind/tdecachegrind/configuration.cpp
+++ b/tdecachegrind/tdecachegrind/configuration.cpp
@ -20,7 +20,7 @@
 * Configuration for KCachegrind
 */
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
@ -130,12 +130,12 @@ Configuration* Configuration::config()
 }
-void Configuration::saveOptions(TDEConfig* kconfig)
+void Configuration::saveOptions(TDEConfig* tdeconfig)
 {
  Configuration* c = config();
  // color options
-  TDEConfigGroup colorConfig(kconfig, TQCString("CostColors"));
+  TDEConfigGroup colorConfig(tdeconfig, TQCString("CostColors"));
  TQDictIterator<ColorSetting> it( c->_colors );
  int count = 1;
  for( ; it.current(); ++it ) {
@ -152,7 +152,7 @@ void Configuration::saveOptions(TDEConfig* kconfig)
  colorConfig.writeEntry( "Count", count-1);
  // source options
-  TDEConfigGroup sourceConfig(kconfig, TQCString("Source"));
+  TDEConfigGroup sourceConfig(tdeconfig, TQCString("Source"));
  sourceConfig.writeEntry("Dirs", c->_generalSourceDirs, ':');
  TQDictIterator<TQStringList> it2( c->_objectSourceDirs );
  count = 1;
@ -166,7 +166,7 @@ void Configuration::saveOptions(TDEConfig* kconfig)
  sourceConfig.writeEntry( "Count", count-1);
  // general options
-  TDEConfigGroup generalConfig(kconfig, TQCString("General"));
+  TDEConfigGroup generalConfig(tdeconfig, TQCString("General"));
  generalConfig.writeEntry("ShowPercentage", c->_showPercentage);
  generalConfig.writeEntry("ShowExpanded", c->_showExpanded);
  generalConfig.writeEntry("ShowCycles", c->_showCycles);
@ -179,7 +179,7 @@ void Configuration::saveOptions(TDEConfig* kconfig)
  generalConfig.writeEntry("Context", c->_context);
  generalConfig.writeEntry("NoCostInside", c->_noCostInside);
-  TDEConfigGroup ctConfig(kconfig, TQCString("CostTypes"));
+  TDEConfigGroup ctConfig(tdeconfig, TQCString("CostTypes"));
  int ctCount = TraceCostType::knownTypeCount();
  ctConfig.writeEntry( "Count", ctCount);
  for (int i=0; i<ctCount; i++) {
@ -200,7 +200,7 @@ void Configuration::saveOptions(TDEConfig* kconfig)
-void Configuration::readOptions(TDEConfig* kconfig)
+void Configuration::readOptions(TDEConfig* tdeconfig)
 {
  int i, count;
  Configuration* c = config();
@ -226,7 +226,7 @@ void Configuration::readOptions(TDEConfig* kconfig)
  c->color("CostType-Dr")->color = TQColor(40,40,180);
  c->color("CostType-Dw")->color = TQColor(80,80,120);
-  TDEConfigGroup colorConfig(kconfig, TQCString("CostColors"));
+  TDEConfigGroup colorConfig(tdeconfig, TQCString("CostColors"));
  count = colorConfig.readNumEntry("Count", 0);
  for (i=1;i<=count;i++) {
    TQString n = colorConfig.readEntry(TQString("Name%1").arg(i));
@ -245,7 +245,7 @@ void Configuration::readOptions(TDEConfig* kconfig)
  }
  // source options
-  TDEConfigGroup sourceConfig(kconfig, TQCString("Source"));
+  TDEConfigGroup sourceConfig(tdeconfig, TQCString("Source"));
  TQStringList dirs;
  dirs = sourceConfig.readListEntry("Dirs", ':');
  if (dirs.count()>0) c->_generalSourceDirs = dirs;
@ -263,7 +263,7 @@ void Configuration::readOptions(TDEConfig* kconfig)
  // general options
-  TDEConfigGroup generalConfig(kconfig, TQCString("General"));
+  TDEConfigGroup generalConfig(tdeconfig, TQCString("General"));
  c->_showPercentage = generalConfig.readBoolEntry("ShowPercentage", true);
  c->_showExpanded = generalConfig.readBoolEntry("ShowExpanded", false);
  c->_showCycles = generalConfig.readBoolEntry("ShowCycles", true);
@ -279,7 +279,7 @@ void Configuration::readOptions(TDEConfig* kconfig)
  // known cost types
  if (TraceCostType::knownTypeCount()==0) {
-    TDEConfigGroup ctConfig(kconfig, TQCString("CostTypes"));
+    TDEConfigGroup ctConfig(tdeconfig, TQCString("CostTypes"));
    int ctCount = ctConfig.readNumEntry("Count", 0);
    if (ctCount>0) {
      for (int i=1;i<=ctCount;i++) {
--- a/tdecachegrind/tdecachegrind/instrview.cpp
+++ b/tdecachegrind/tdecachegrind/instrview.cpp
@ -25,7 +25,7 @@
 #include <tqwhatsthis.h>
 #include <tqpopupmenu.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include "configuration.h"
--- a/tdecachegrind/tdecachegrind/multiview.cpp
+++ b/tdecachegrind/tdecachegrind/multiview.cpp
@ -24,7 +24,7 @@
 */
 #include <tqobjectlist.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include "multiview.h"
--- a/tdecachegrind/tdecachegrind/partselection.cpp
+++ b/tdecachegrind/tdecachegrind/partselection.cpp
@ -30,7 +30,7 @@
 #include <tqlayout.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include "partselection.h"
--- a/tdecachegrind/tdecachegrind/tabview.cpp
+++ b/tdecachegrind/tdecachegrind/tabview.cpp
@ -29,7 +29,7 @@
 #include <tqpopupmenu.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "tabview.h"
 #include "costtypeview.h"
--- a/tdecachegrind/tdecachegrind/toplevel.cpp
+++ b/tdecachegrind/tdecachegrind/toplevel.cpp
@ -42,8 +42,8 @@
 #include <kstdaction.h>
 #include <kaction.h>
 #include <kurl.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kedittoolbar.h>
 #include <kkeydialog.h>
 #include <ktip.h>
@ -105,9 +105,9 @@ TopLevel::TopLevel(const char *name)
 #endif
  _statusbar->addWidget(_statusLabel, 1);
-  TDEConfig* kconfig = TDEGlobal::config();
+  TDEConfig* tdeconfig = TDEGlobal::config();
-  Configuration::readOptions( kconfig );
+  Configuration::readOptions( tdeconfig );
-  _openRecent->loadEntries( kconfig );
+  _openRecent->loadEntries( tdeconfig );
  // set toggle after reading configuration
  _showPercentage = Configuration::showPercentage();
@ -201,20 +201,20 @@ void TopLevel::setupPartSelection(PartSelection* ps)
 */
 void TopLevel::saveCurrentState(TQString postfix)
 {
-  TDEConfig* kconfig = TDEGlobal::config();
+  TDEConfig* tdeconfig = TDEGlobal::config();
  TQCString pf = postfix.ascii();
-  TDEConfigGroup psConfig(kconfig, TQCString("PartOverview")+pf);
+  TDEConfigGroup psConfig(tdeconfig, TQCString("PartOverview")+pf);
  _partSelection->saveVisualisationConfig(&psConfig);
-  TDEConfigGroup stateConfig(kconfig, TQCString("CurrentState")+pf);
+  TDEConfigGroup stateConfig(tdeconfig, TQCString("CurrentState")+pf);
  stateConfig.writeEntry("CostType",
 			 _costType ? _costType->name() : TQString("?"));
  stateConfig.writeEntry("CostType2",
 			 _costType2 ? _costType2->name() : TQString("?"));
  stateConfig.writeEntry("GroupType", TraceItem::typeName(_groupType));
-  _multiView->saveViewConfig(kconfig, TQString("MainView"), postfix, true);
+  _multiView->saveViewConfig(tdeconfig, TQString("MainView"), postfix, true);
 }
 /**
@ -253,17 +253,17 @@ void TopLevel::saveTraceSettings()
 */
 void TopLevel::restoreCurrentState(TQString postfix)
 {
-  TDEConfig* kconfig = TDEGlobal::config();
+  TDEConfig* tdeconfig = TDEGlobal::config();
-  TQStringList gList = kconfig->groupList();
+  TQStringList gList = tdeconfig->groupList();
  TQCString pf = postfix.ascii();
  // dock properties (not position, this should be have done before)
  TQCString group = TQCString("PartOverview");
  if (gList.contains(group+pf)) group += pf;
-  TDEConfigGroup psConfig(kconfig, group);
+  TDEConfigGroup psConfig(tdeconfig, group);
  _partSelection->readVisualisationConfig(&psConfig);
-  _multiView->readViewConfig(kconfig, TQString("MainView"), postfix, true);
+  _multiView->readViewConfig(tdeconfig, TQString("MainView"), postfix, true);
  _taSplit->setChecked(_multiView->childCount()>1);
  _taSplitDir->setEnabled(_multiView->childCount()>1);
  _taSplitDir->setChecked(_multiView->orientation() == Qt::Horizontal);
--- a/tdecachegrind/tdecachegrind/traceitemview.cpp
+++ b/tdecachegrind/tdecachegrind/traceitemview.cpp
@ -21,7 +21,7 @@
 */
 #include <tqwidget.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
--- a/tdecachegrind/tdecachegrind/treemap.cpp
+++ b/tdecachegrind/tdecachegrind/treemap.cpp
@ -30,7 +30,7 @@
 #include <tqpopupmenu.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include "treemap.h"
--- a/tdefile-plugins/CMakeLists.txt
+++ b/tdefile-plugins/CMakeLists.txt
--- a/tdefile-plugins/Makefile.am
+++ b/tdefile-plugins/Makefile.am
--- a/tdefile-plugins/c++/CMakeLists.txt
+++ b/tdefile-plugins/c++/CMakeLists.txt
@ -22,14 +22,14 @@ link_directories(
 ##### other data ################################
-install( FILES kfile_cpp.desktop kfile_h.desktop
+install( FILES tdefile_cpp.desktop tdefile_h.desktop
  DESTINATION ${SERVICES_INSTALL_DIR} )
-##### kfile_cpp (module) ########################
+##### tdefile_cpp (module) ########################
-tde_add_kpart( kfile_cpp AUTOMOC
+tde_add_kpart( tdefile_cpp AUTOMOC
-  SOURCES kfile_cpp.cpp
+  SOURCES tdefile_cpp.cpp
-  LINK kio-shared
+  LINK tdeio-shared
  DESTINATION ${PLUGIN_INSTALL_DIR}
 )
--- a/tdefile-plugins/c++/Makefile.am
+++ b/tdefile-plugins/c++/Makefile.am
@ -0,0 +1,22 @@
 ## Makefile.am for c++ file meta info plugin
 # set the include path for X, qt and KDE
 INCLUDES         = $(all_includes)
 # these are the headers for your project
 noinst_HEADERS   = tdefile_cpp.h
 kde_module_LTLIBRARIES = tdefile_cpp.la
 tdefile_cpp_la_SOURCES = tdefile_cpp.cpp
 tdefile_cpp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 tdefile_cpp_la_LIBADD = $(LIB_KIO)
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
 messages:
 	$(XGETTEXT) *.cpp -o $(podir)/tdefile_cpp.pot
 services_DATA = tdefile_cpp.desktop tdefile_h.desktop
 servicesdir = $(kde_servicesdir)
--- a/tdefile-plugins/c++/tdefile_cpp.cpp
+++ b/tdefile-plugins/c++/tdefile_cpp.cpp
@ -17,7 +17,7 @@
 *
 */
-#include "kfile_cpp.h"
+#include "tdefile_cpp.h"
 #include <kurl.h>
 #include <klocale.h>
@ -29,7 +29,7 @@
 typedef KGenericFactory<KCppPlugin> CppFactory;
-K_EXPORT_COMPONENT_FACTORY(kfile_cpp, CppFactory("kfile_cpp"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_cpp, CppFactory("tdefile_cpp"))
 KCppPlugin::KCppPlugin(TQObject *parent, const char *name,
                       const TQStringList &args)
@ -127,4 +127,4 @@ bool KCppPlugin::readInfo( KFileMetaInfo& info, uint )
    return true;
 }
-#include "kfile_cpp.moc"
+#include "tdefile_cpp.moc"
--- a/tdefile-plugins/c++/tdefile_cpp.desktop
+++ b/tdefile-plugins/c++/tdefile_cpp.desktop
@ -54,7 +54,7 @@ Name[xh]=C++ Ulwazi
 Name[zh_CN]=C++ 信息
 Name[zh_TW]=C++ 資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_cpp
+X-TDE-Library=tdefile_cpp
 MimeType=text/x-c++src;text/x-chdr
 PreferredGroups=General
 PreferredItems=Lines,Code,Comment,Blank,Strings,i18n Strings,Included Files
--- a/tdefile-plugins/c++/tdefile_cpp.h
+++ b/tdefile-plugins/c++/tdefile_cpp.h
@ -20,7 +20,7 @@
 #ifndef __KFILE_CPP_H__
 #define __KFILE_CPP_H__
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <kurl.h>
 class TQStringList;
--- a/tdefile-plugins/c++/tdefile_h.desktop
+++ b/tdefile-plugins/c++/tdefile_h.desktop
@ -53,6 +53,6 @@ Name[xh]=C/C++ Ulwazi lokubhaliweyo okuphezulu
 Name[zh_CN]=C/C++ 头文件信息
 Name[zh_TW]=C/C++ 檔頭資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_cpp
+X-TDE-Library=tdefile_cpp
 MimeType=text/x-chdr
 PreferredItems=Lines,Code,Comment,Blank,Strings,i18n Strings,Included Files
--- a/tdefile-plugins/diff/CMakeLists.txt
+++ b/tdefile-plugins/diff/CMakeLists.txt
@ -22,13 +22,13 @@ link_directories(
 ##### other data ################################
-install( FILES kfile_diff.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdefile_diff.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-##### kfile_diff (module) #######################
+##### tdefile_diff (module) #######################
-tde_add_kpart( kfile_diff AUTOMOC
+tde_add_kpart( tdefile_diff AUTOMOC
-  SOURCES kfile_diff.cpp
+  SOURCES tdefile_diff.cpp
-  LINK kio-shared
+  LINK tdeio-shared
  DESTINATION ${PLUGIN_INSTALL_DIR}
 )
--- a/tdefile-plugins/diff/Makefile.am
+++ b/tdefile-plugins/diff/Makefile.am
@ -0,0 +1,22 @@
 ## Makefile.am for diff file meta info plugin
 # set the include path for X, qt and KDE
 INCLUDES         = $(all_includes)
 # these are the headers for your project
 noinst_HEADERS   = tdefile_diff.h
 kde_module_LTLIBRARIES = tdefile_diff.la
 tdefile_diff_la_SOURCES = tdefile_diff.cpp
 tdefile_diff_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 tdefile_diff_la_LIBADD = $(LIB_KSYCOCA)
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
 messages:
 	$(XGETTEXT) *.cpp *.h -o $(podir)/tdefile_diff.pot
 services_DATA = tdefile_diff.desktop
 servicesdir = $(kde_servicesdir)
--- a/tdefile-plugins/diff/tdefile_diff.cpp
+++ b/tdefile-plugins/diff/tdefile_diff.cpp
@ -1,5 +1,5 @@
 /**************************************************************************
-**                             kfile_diff.cpp
+**                             tdefile_diff.cpp
 **                              -------------------
 **      begin                   : Sun Jan 20 23:25:44 2002
 **      copyright               : (C) 2002-2003 by Otto Bruggeman
@ -40,9 +40,9 @@
 #include <kprocess.h>
 #include <kurl.h>
-#include "kfile_diff.h"
+#include "tdefile_diff.h"
-K_EXPORT_COMPONENT_FACTORY(kfile_diff, KGenericFactory<KDiffPlugin>("kfile_diff"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_diff, KGenericFactory<KDiffPlugin>("tdefile_diff"))
 KDiffPlugin::KDiffPlugin(TQObject *parent, const char *name,
                         const TQStringList &preferredItems)
@ -604,7 +604,7 @@ void KDiffPlugin::determineDiffInfo( const TQStringList lines,
 	}
 }
-#include "kfile_diff.moc"
+#include "tdefile_diff.moc"
 /* vim: set ts=4 sw=4 noet: */
--- a/tdefile-plugins/diff/tdefile_diff.desktop
+++ b/tdefile-plugins/diff/tdefile_diff.desktop
@ -52,6 +52,6 @@ Name[uk]=Статистика відмінностей
 Name[zh_CN]=Diff 统计
 Name[zh_TW]=Diff 狀態
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_diff
+X-TDE-Library=tdefile_diff
 MimeType=text/x-diff
 PreferredItems=Files,First,Format,Hunks,Insert,Modify,Delete
--- a/tdefile-plugins/diff/tdefile_diff.h
+++ b/tdefile-plugins/diff/tdefile_diff.h
@ -1,5 +1,5 @@
 /**************************************************************************
-**                             kfile_diff.h
+**                             tdefile_diff.h
 **                              -------------------
 **      begin                   : Sun Jan 20 23:25:29 2002
 **      copyright               : (C) 2002 by Otto Bruggeman
@ -18,7 +18,7 @@
 #ifndef __KFILE_PDF_H__
 #define __KFILE_PDF_H__
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 class TQStringList;
--- a/tdefile-plugins/ts/CMakeLists.txt
+++ b/tdefile-plugins/ts/CMakeLists.txt
@ -22,14 +22,14 @@ link_directories(
 ##### other data ################################
-install( FILES kfile_ts.desktop
+install( FILES tdefile_ts.desktop
  DESTINATION ${SERVICES_INSTALL_DIR} )
-##### kfile_ts (module) #########################
+##### tdefile_ts (module) #########################
-tde_add_kpart( kfile_ts AUTOMOC
+tde_add_kpart( tdefile_ts AUTOMOC
-  SOURCES kfile_ts.cpp
+  SOURCES tdefile_ts.cpp
-  LINK kio-shared
+  LINK tdeio-shared
  DESTINATION ${PLUGIN_INSTALL_DIR}
 )
--- a/tdefile-plugins/ts/Makefile.am
+++ b/tdefile-plugins/ts/Makefile.am
@ -0,0 +1,21 @@
 ## Makefile.am for text file meta info plugin
 # set the include path for X, qt and KDE
 INCLUDES         = $(all_includes)
 noinst_HEADERS   = tdefile_ts.h
 kde_module_LTLIBRARIES = tdefile_ts.la
 tdefile_ts_la_SOURCES = tdefile_ts.cpp
 tdefile_ts_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 tdefile_ts_la_LIBADD = $(LIB_KIO)
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
 messages:
 	$(XGETTEXT) *.cpp -o $(podir)/tdefile_ts.pot
 services_DATA = tdefile_ts.desktop
 servicesdir = $(kde_servicesdir)
--- a/tdefile-plugins/ts/tdefile_ts.cpp
+++ b/tdefile-plugins/ts/tdefile_ts.cpp
@ -17,7 +17,7 @@
 *
 */
-#include "kfile_ts.h"
+#include "tdefile_ts.h"
 #include <kgenericfactory.h>
 #include <kdebug.h>
@ -27,7 +27,7 @@
 typedef KGenericFactory<KTsPlugin> TsFactory;
-K_EXPORT_COMPONENT_FACTORY(kfile_ts, TsFactory("kfile_ts"))
+K_EXPORT_COMPONENT_FACTORY(tdefile_ts, TsFactory("tdefile_ts"))
 KTsPlugin::KTsPlugin(TQObject *parent, const char *name,
        const TQStringList &args) : KFilePlugin(parent, name, args)
@ -90,4 +90,4 @@ bool KTsPlugin::readInfo(KFileMetaInfo& info, uint)
    return true;
 }
-#include "kfile_ts.moc"
+#include "tdefile_ts.moc"
--- a/tdefile-plugins/ts/tdefile_ts.desktop
+++ b/tdefile-plugins/ts/tdefile_ts.desktop
@ -48,7 +48,7 @@ Name[uk]=інформація про файл формату Qt Linguist
 Name[zh_CN]=Qt 语言大师文件信息
 Name[zh_TW]=Qt 語言檔資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_ts
+X-TDE-Library=tdefile_ts
 MimeType=application/x-linguist
 PreferredGroups=General
 PreferredItems=Messages,Translated,Untranslated,Fuzzi
--- a/tdefile-plugins/ts/tdefile_ts.h
+++ b/tdefile-plugins/ts/tdefile_ts.h
@ -20,7 +20,7 @@
 #ifndef __KFILE_TS_H_
 #define __KFILE_TS_H_
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 class TQStringList;
--- a/tdeioslave/CMakeLists.txt
+++ b/tdeioslave/CMakeLists.txt
--- a/tdeioslave/Makefile.am
+++ b/tdeioslave/Makefile.am
@ -1,4 +1,4 @@
-if include_kioslave_svn
+if include_tdeioslave_svn
 SVN_SUBDIR = svn
 endif
--- a/tdeioslave/svn/AUTHORS
+++ b/tdeioslave/svn/AUTHORS
--- a/tdeioslave/svn/CMakeLists.txt
+++ b/tdeioslave/svn/CMakeLists.txt
@ -41,6 +41,6 @@ install( FILES
 tde_add_kpart( kio_svn
  SOURCES svn.cpp
-  LINK kio-shared ${APR_LIBRARIES} ${SVN_LIBRARIES}
+  LINK tdeio-shared ${APR_LIBRARIES} ${SVN_LIBRARIES}
  DESTINATION ${PLUGIN_INSTALL_DIR}
 )
--- a/tdeioslave/svn/COPYING
+++ b/tdeioslave/svn/COPYING
--- a/tdeioslave/svn/ConfigureChecks.cmake
+++ b/tdeioslave/svn/ConfigureChecks.cmake
--- a/tdeioslave/svn/Makefile.am
+++ b/tdeioslave/svn/Makefile.am
@ -12,4 +12,4 @@ protocol_DATA = svn+http.protocol svn+https.protocol svn+file.protocol svn+ssh.p
 protocoldir = $(kde_servicesdir)
 messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kio_svn.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_svn.pot
--- a/tdeioslave/svn/README
+++ b/tdeioslave/svn/README
--- a/tdeioslave/svn/TODO
+++ b/tdeioslave/svn/TODO
--- a/tdeioslave/svn/configure.in.bot
+++ b/tdeioslave/svn/configure.in.bot
@ -3,7 +3,7 @@ if test "x$with_subversion" = xcheck && test -z "$SVN_SUBDIR"; then
  echo "You're missing Subversion libraries (1.x)"
  echo "KDE will not be able to browse Subversion repositories without it,"
  echo "consider installing it."
-  echo "Look at kioslave/svn/README for more information"
+  echo "Look at tdeioslave/svn/README for more information"
  echo ""
  all_tests=bad
 fi
--- a/tdeioslave/svn/configure.in.in
+++ b/tdeioslave/svn/configure.in.in
@ -155,4 +155,4 @@ AC_SUBST(SVN_INCLUDE)
 AC_SUBST(SVN_LIB)
 AC_SUBST(SVN_CPPFLAGS)
 AC_SUBST(SVNLD)
-AM_CONDITIONAL(include_kioslave_svn, test -n "$SVN_SUBDIR")
+AM_CONDITIONAL(include_tdeioslave_svn, test -n "$SVN_SUBDIR")
--- a/tdeioslave/svn/icons/CMakeLists.txt
+++ b/tdeioslave/svn/icons/CMakeLists.txt
--- a/tdeioslave/svn/icons/Makefile.am
+++ b/tdeioslave/svn/icons/Makefile.am
--- a/tdeioslave/svn/icons/cr128-action-svn_add.png
+++ b/tdeioslave/svn/icons/cr128-action-svn_add.png
--- a/tdeioslave/svn/icons/cr128-action-svn_branch.png
+++ b/tdeioslave/svn/icons/cr128-action-svn_branch.png
--- a/tdeioslave/svn/icons/cr128-action-svn_merge.png
+++ b/tdeioslave/svn/icons/cr128-action-svn_merge.png
--- a/tdeioslave/svn/icons/cr128-action-svn_remove.png
+++ b/tdeioslave/svn/icons/cr128-action-svn_remove.png
--- a/tdeioslave/svn/icons/cr128-action-svn_status.png
+++ b/tdeioslave/svn/icons/cr128-action-svn_status.png
--- a/tdeioslave/svn/icons/cr128-action-svn_switch.png
+++ b/tdeioslave/svn/icons/cr128-action-svn_switch.png
--- a/tdeioslave/svn/icons/cr16-action-svn_add.png
+++ b/tdeioslave/svn/icons/cr16-action-svn_add.png
--- a/tdeioslave/svn/icons/cr16-action-svn_branch.png
+++ b/tdeioslave/svn/icons/cr16-action-svn_branch.png
--- a/tdeioslave/svn/icons/cr16-action-svn_merge.png
+++ b/tdeioslave/svn/icons/cr16-action-svn_merge.png
--- a/tdeioslave/svn/icons/cr16-action-svn_remove.png
+++ b/tdeioslave/svn/icons/cr16-action-svn_remove.png
--- a/tdeioslave/svn/icons/cr16-action-svn_status.png
+++ b/tdeioslave/svn/icons/cr16-action-svn_status.png
--- a/tdeioslave/svn/icons/cr16-action-svn_switch.png
+++ b/tdeioslave/svn/icons/cr16-action-svn_switch.png
--- a/tdeioslave/svn/icons/cr22-action-svn_add.png
+++ b/tdeioslave/svn/icons/cr22-action-svn_add.png
--- a/tdeioslave/svn/icons/cr22-action-svn_branch.png
+++ b/tdeioslave/svn/icons/cr22-action-svn_branch.png
--- a/tdeioslave/svn/icons/cr22-action-svn_merge.png
+++ b/tdeioslave/svn/icons/cr22-action-svn_merge.png
--- a/tdeioslave/svn/icons/cr22-action-svn_remove.png
+++ b/tdeioslave/svn/icons/cr22-action-svn_remove.png
--- a/tdeioslave/svn/icons/cr22-action-svn_status.png
+++ b/tdeioslave/svn/icons/cr22-action-svn_status.png
--- a/tdeioslave/svn/icons/cr22-action-svn_switch.png
+++ b/tdeioslave/svn/icons/cr22-action-svn_switch.png
--- a/tdeioslave/svn/icons/cr32-action-svn_add.png
+++ b/tdeioslave/svn/icons/cr32-action-svn_add.png
--- a/tdeioslave/svn/icons/cr32-action-svn_branch.png
+++ b/tdeioslave/svn/icons/cr32-action-svn_branch.png
--- a/tdeioslave/svn/icons/cr32-action-svn_merge.png
+++ b/tdeioslave/svn/icons/cr32-action-svn_merge.png
--- a/tdeioslave/svn/icons/cr32-action-svn_remove.png
+++ b/tdeioslave/svn/icons/cr32-action-svn_remove.png
--- a/tdeioslave/svn/icons/cr32-action-svn_status.png
+++ b/tdeioslave/svn/icons/cr32-action-svn_status.png
--- a/tdeioslave/svn/icons/cr32-action-svn_switch.png
+++ b/tdeioslave/svn/icons/cr32-action-svn_switch.png
--- a/tdeioslave/svn/icons/cr48-action-svn_add.png
+++ b/tdeioslave/svn/icons/cr48-action-svn_add.png
--- a/tdeioslave/svn/icons/cr48-action-svn_branch.png
+++ b/tdeioslave/svn/icons/cr48-action-svn_branch.png
--- a/tdeioslave/svn/icons/cr48-action-svn_merge.png
+++ b/tdeioslave/svn/icons/cr48-action-svn_merge.png
--- a/tdeioslave/svn/icons/cr48-action-svn_remove.png
+++ b/tdeioslave/svn/icons/cr48-action-svn_remove.png
--- a/tdeioslave/svn/icons/cr48-action-svn_status.png
+++ b/tdeioslave/svn/icons/cr48-action-svn_status.png
--- a/tdeioslave/svn/icons/cr48-action-svn_switch.png
+++ b/tdeioslave/svn/icons/cr48-action-svn_switch.png
--- a/tdeioslave/svn/icons/cr64-action-svn_add.png
+++ b/tdeioslave/svn/icons/cr64-action-svn_add.png
--- a/tdeioslave/svn/icons/cr64-action-svn_branch.png
+++ b/tdeioslave/svn/icons/cr64-action-svn_branch.png
--- a/tdeioslave/svn/icons/cr64-action-svn_merge.png
+++ b/tdeioslave/svn/icons/cr64-action-svn_merge.png
--- a/tdeioslave/svn/icons/cr64-action-svn_remove.png
+++ b/tdeioslave/svn/icons/cr64-action-svn_remove.png
--- a/tdeioslave/svn/icons/cr64-action-svn_status.png
+++ b/tdeioslave/svn/icons/cr64-action-svn_status.png
--- a/tdeioslave/svn/icons/cr64-action-svn_switch.png
+++ b/tdeioslave/svn/icons/cr64-action-svn_switch.png
--- a/tdeioslave/svn/icons/crsc-action-svn_add.svgz
+++ b/tdeioslave/svn/icons/crsc-action-svn_add.svgz
--- a/tdeioslave/svn/icons/crsc-action-svn_branch.svgz
+++ b/tdeioslave/svn/icons/crsc-action-svn_branch.svgz
--- a/tdeioslave/svn/icons/crsc-action-svn_merge.svgz
+++ b/tdeioslave/svn/icons/crsc-action-svn_merge.svgz
--- a/tdeioslave/svn/icons/crsc-action-svn_remove.svgz
+++ b/tdeioslave/svn/icons/crsc-action-svn_remove.svgz
--- a/tdeioslave/svn/icons/crsc-action-svn_status.svgz
+++ b/tdeioslave/svn/icons/crsc-action-svn_status.svgz
--- a/tdeioslave/svn/icons/crsc-action-svn_switch.svgz
+++ b/tdeioslave/svn/icons/crsc-action-svn_switch.svgz
--- a/tdeioslave/svn/ksvnd/CMakeLists.txt
+++ b/tdeioslave/svn/ksvnd/CMakeLists.txt
@ -31,6 +31,6 @@ install( FILES ksvnd.desktop
 tde_add_kpart( kded_ksvnd AUTOMOC
  SOURCES commitdlg.ui ksvnd.cpp ksvnd.skel
-  LINK kio-shared tdeinit_kded-shared
+  LINK tdeio-shared tdeinit_kded-shared
  DESTINATION ${PLUGIN_INSTALL_DIR}
 )
--- a/tdeioslave/svn/ksvnd/Makefile.am
+++ b/tdeioslave/svn/ksvnd/Makefile.am
--- a/tdeioslave/svn/ksvnd/commitdlg.ui
+++ b/tdeioslave/svn/ksvnd/commitdlg.ui
--- a/tdeioslave/svn/ksvnd/commitdlg.ui.h
+++ b/tdeioslave/svn/ksvnd/commitdlg.ui.h
--- a/tdeioslave/svn/ksvnd/ksvnd.cpp
+++ b/tdeioslave/svn/ksvnd/ksvnd.cpp
--- a/tdeioslave/svn/ksvnd/ksvnd.desktop
+++ b/tdeioslave/svn/ksvnd/ksvnd.desktop
--- a/tdeioslave/svn/ksvnd/ksvnd.h
+++ b/tdeioslave/svn/ksvnd/ksvnd.h
--- a/tdeioslave/svn/svn+file.protocol
+++ b/tdeioslave/svn/svn+file.protocol
--- a/tdeioslave/svn/svn+http.protocol
+++ b/tdeioslave/svn/svn+http.protocol
--- a/tdeioslave/svn/svn+https.protocol
+++ b/tdeioslave/svn/svn+https.protocol
--- a/tdeioslave/svn/svn+ssh.protocol
+++ b/tdeioslave/svn/svn+ssh.protocol
--- a/tdeioslave/svn/svn.cpp
+++ b/tdeioslave/svn/svn.cpp
--- a/tdeioslave/svn/svn.h
+++ b/tdeioslave/svn/svn.h
@ -24,8 +24,8 @@
 #include <tqcstring.h>
 #include <kurl.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 #include <subversion-1/svn_pools.h>
 #include <subversion-1/svn_auth.h>
 #include <subversion-1/svn_client.h>
--- a/tdeioslave/svn/svn.protocol
+++ b/tdeioslave/svn/svn.protocol
--- a/tdeioslave/svn/svnhelper/CMakeLists.txt
+++ b/tdeioslave/svn/svnhelper/CMakeLists.txt
@ -33,6 +33,6 @@ tde_add_executable( kio_svn_helper AUTOMOC
  SOURCES
    kio_svn_helper.cpp subversioncheckout.ui subversionswitch.ui
    subversionlog.ui subversiondiff.ui
-  LINK kio-shared
+  LINK tdeio-shared
  DESTINATION ${BIN_INSTALL_DIR}
 )
--- a/tdeioslave/svn/svnhelper/Makefile.am
+++ b/tdeioslave/svn/svnhelper/Makefile.am
--- a/tdeioslave/svn/svnhelper/apply_patch.desktop
+++ b/tdeioslave/svn/svnhelper/apply_patch.desktop
--- a/tdeioslave/svn/svnhelper/kio_svn_helper.cpp
+++ b/tdeioslave/svn/svnhelper/kio_svn_helper.cpp
@ -26,9 +26,9 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <tqtimer.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tqpixmap.h>
 #include <kmessagebox.h>
--- a/tdeioslave/svn/svnhelper/kio_svn_helper.h
+++ b/tdeioslave/svn/svnhelper/kio_svn_helper.h
@ -21,7 +21,7 @@
 #define _KIO_SVN_HELPER_H_
 #include <kapplication.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <twinmodule.h>
 #include <tqstringlist.h>
--- a/tdeioslave/svn/svnhelper/subversion.desktop
+++ b/tdeioslave/svn/svnhelper/subversion.desktop
--- a/tdeioslave/svn/svnhelper/subversion_toplevel.desktop
+++ b/tdeioslave/svn/svnhelper/subversion_toplevel.desktop
--- a/tdeioslave/svn/svnhelper/subversioncheckout.ui
+++ b/tdeioslave/svn/svnhelper/subversioncheckout.ui
--- a/tdeioslave/svn/svnhelper/subversiondiff.ui
+++ b/tdeioslave/svn/svnhelper/subversiondiff.ui
--- a/tdeioslave/svn/svnhelper/subversionlog.ui
+++ b/tdeioslave/svn/svnhelper/subversionlog.ui
--- a/tdeioslave/svn/svnhelper/subversionswitch.ui
+++ b/tdeioslave/svn/svnhelper/subversionswitch.ui
--- a/umbrello/umbrello/CMakeLists.txt
+++ b/umbrello/umbrello/CMakeLists.txt
@ -81,6 +81,6 @@ tde_add_executable( umbrello AUTOMOC
  LINK
    refactoring-static codeimport-static kdevcppparser-static clipboard-static
    codegenerator-static docgenerators-static dialogs-static
-    tdeprint-shared kio-shared ${XML2_LIBRARIES} ${XSLT_LIBRARIES}
+    tdeprint-shared tdeio-shared ${XML2_LIBRARIES} ${XSLT_LIBRARIES}
  DESTINATION ${BIN_INSTALL_DIR}
 )
--- a/umbrello/umbrello/autolayout/autolayoutdlg.h
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.h
@ -15,7 +15,7 @@
 #include "newautolayoutdialog.h"
 #include "../umlview.h"
 #include <tqobject.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "autotqlayout.h"
 class AutolayoutDlg : public MyDialog1
--- a/umbrello/umbrello/codegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerationpolicy.cpp
@ -27,7 +27,7 @@
 #include <tqdatetime.h>
 // kde includes
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
--- a/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp
@ -21,7 +21,7 @@
 #include <tqlabel.h>
 #include <tqregexp.h>
 #include <tqlistview.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kcombobox.h>
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp
@ -19,7 +19,7 @@
 // qt/kde includes
 #include <tqregexp.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 // app includes
 #include "cppcodegenerationpolicypage.h"
 #include "../uml.h"
--- a/umbrello/umbrello/codegenerators/cppcodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerator.cpp
@ -20,7 +20,7 @@
 // qt/kde includes
 #include <tqregexp.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 // app includes
 #include "cppcodedocumentation.h"
--- a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp
@ -17,7 +17,7 @@
 // own header
 #include "javacodegenerationpolicy.h"
 // qt/kde includes
-#include <kconfig.h>
+#include <tdeconfig.h>
 // app includes
 #include "javacodegenerationpolicypage.h"
 #include "javacodegenerator.h"
--- a/umbrello/umbrello/codegenerators/javacodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/javacodegenerator.cpp
@ -19,7 +19,7 @@
 // qt/kde includes
 #include <tqregexp.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
--- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp
@ -20,7 +20,7 @@
 // own header
 #include "rubycodegenerationpolicy.h"
 // qt/kde includes
-#include <kconfig.h>
+#include <tdeconfig.h>
 // app includes
 #include "rubycodegenerationpolicypage.h"
 #include "rubycodegenerator.h"
--- a/umbrello/umbrello/codegenerators/rubycodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodegenerator.cpp
@ -22,7 +22,7 @@
 // qt/kde includes
 #include <tqregexp.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
--- a/umbrello/umbrello/configurable.cpp
+++ b/umbrello/umbrello/configurable.cpp
@ -23,7 +23,7 @@
 // KDE includes
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 // local includes
 #include "pluginloader.h"
--- a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp
+++ b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp
@ -29,7 +29,7 @@
 //kde include
 #include <knuminput.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 //qt include
--- a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
+++ b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
@ -18,7 +18,7 @@
 #include <tqtooltip.h>
 // kde include files
-#include <kfilefiltercombo.h>
+#include <tdefilefiltercombo.h>
 #include <klocale.h>
 // application specific includes
--- a/umbrello/umbrello/dialogs/settingsdlg.cpp
+++ b/umbrello/umbrello/dialogs/settingsdlg.cpp
@ -20,7 +20,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 // app includes
 #include "codegenerationoptionspage.h"
 #include "codevieweroptionspage.h"
--- a/umbrello/umbrello/docgenerators/docbookgenerator.cpp
+++ b/umbrello/umbrello/docgenerators/docbookgenerator.cpp
@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <ktempfile.h>
 #include <kmessagebox.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kstandarddirs.h>
 #include <tqfile.h>
 #include <tqregexp.h>
--- a/umbrello/umbrello/docgenerators/main.cpp
+++ b/umbrello/umbrello/docgenerators/main.cpp
@ -27,7 +27,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <ktip.h>
 #include <kdebug.h>
--- a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
+++ b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <ktempfile.h>
 #include <kmessagebox.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kstandarddirs.h>
 #include <tqfile.h>
 #include <tqregexp.h>
--- a/umbrello/umbrello/main.cpp
+++ b/umbrello/umbrello/main.cpp
@ -15,7 +15,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <ktip.h>
 #include <kdebug.h>
--- a/umbrello/umbrello/plugin.cpp
+++ b/umbrello/umbrello/plugin.cpp
@ -21,7 +21,7 @@
 // KDE includes
 #include <kdebug.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 // app includes
 #include "pluginloader.h"
--- a/umbrello/umbrello/uml.cpp
+++ b/umbrello/umbrello/uml.cpp
@ -24,10 +24,10 @@
 // kde includes
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kprinter.h>
--- a/umbrello/umbrello/umldoc.cpp
+++ b/umbrello/umbrello/umldoc.cpp
@ -25,8 +25,8 @@
 #include <kapplication.h>
 #include <tdeversion.h>
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
--- a/umbrello/umbrello/umllistview.cpp
+++ b/umbrello/umbrello/umllistview.cpp
@ -22,7 +22,7 @@
 #include <kiconloader.h>
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
--- a/umbrello/umbrello/umlview.cpp
+++ b/umbrello/umbrello/umlview.cpp
@ -35,11 +35,11 @@
 //kde include files
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <kprinter.h>
 #include <kcursor.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kdebug.h>
--- a/umbrello/umbrello/umlviewimageexporter.cpp
+++ b/umbrello/umbrello/umlviewimageexporter.cpp
@ -18,10 +18,10 @@
 //kde include files
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 // application specific includes
 #include "umlviewimageexportermodel.h"
--- a/umbrello/umbrello/umlviewimageexporterall.cpp
+++ b/umbrello/umbrello/umlviewimageexporterall.cpp
@ -21,7 +21,7 @@
 #include <klocale.h>
 #include <kurl.h>
 #include <kurlrequester.h>
-#include <kfilefiltercombo.h>
+#include <tdefilefiltercombo.h>
 #include <kmessagebox.h>
 // application specific includes
--- a/umbrello/umbrello/umlviewimageexportermodel.cpp
+++ b/umbrello/umbrello/umlviewimageexportermodel.cpp
@ -30,7 +30,7 @@
 #include <klocale.h>
 #include <ktempfile.h>
 #include <kapplication.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 // application specific includes
 #include "uml.h"
`@ -1,3 +1,3 @@`
	`AUTOMAKE_OPTIONS = foreign 1.4`	`AUTOMAKE_OPTIONS = foreign 1.4`

	`SUBDIRS = preview kfile-plugins`	`SUBDIRS = preview tdefile-plugins`