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

author: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2013-01-27 01:04:58 -0600
committer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2013-01-27 01:04:58 -0600
commit: b10a61b1fd2fe561ba61a384d4a344bae2a4aa29 (patch)
tree: 99dc6b2584265b2df91f7dbc1dcbf7a54efd205e /kopete
parent: 64c3be47ff36e40035ead93f913aeeb1e4f85e4b (diff)
download: tdenetwork-b10a61b1fd2fe561ba61a384d4a344bae2a4aa29.tar.gz
tdenetwork-b10a61b1fd2fe561ba61a384d4a344bae2a4aa29.zip
203 files changed, 373 insertions, 373 deletions
diff --git a/kopete/INSTALL b/kopete/INSTALL
index 8c75ea29..1523effd 100644
--- a/kopete/INSTALL
+++ b/kopete/INSTALL
@@ -193,9 +193,9 @@ directory where TDE doesn't look for additional resources like plugins.
 It's also possible that you've just been too impatient :)
 
 Kopete installs several .desktop files that have to be processed by a
-TDE application called 'kbuildsycoca'. If you run Kopete directly
+TDE application called 'tdebuildsycoca'. If you run Kopete directly
 after installing it this process might still be running and Kopete
-doesn't see the new plugins yet. Try running 'kbuildsycoca' from a
+doesn't see the new plugins yet. Try running 'tdebuildsycoca' from a
 console and restart Kopete when it finishes. If that doesn't help,
 please read on.
 
diff --git a/kopete/kopete/CMakeLists.txt b/kopete/kopete/CMakeLists.txt
index b88714c2..8f7f6b98 100644
--- a/kopete/kopete/CMakeLists.txt
+++ b/kopete/kopete/CMakeLists.txt
@@ -14,7 +14,7 @@ add_subdirectory( addcontactwizard )
 add_subdirectory( contactlist )
 add_subdirectory( chatwindow )
 add_subdirectory( config )
-add_subdirectory( kconf_update )
+add_subdirectory( tdeconf_update )
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/kopete/kopete/Makefile.am b/kopete/kopete/Makefile.am
index ed4305c6..0dbf8f13 100644
--- a/kopete/kopete/Makefile.am
+++ b/kopete/kopete/Makefile.am
@@ -23,7 +23,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) \
 KDE_ICON = AUTO
 METASOURCES = AUTO
 
-SUBDIRS = addaccountwizard addcontactwizard contactlist chatwindow config . kconf_update
+SUBDIRS = addaccountwizard addcontactwizard contactlist chatwindow config . tdeconf_update
 
 bin_PROGRAMS = kopete
 kopete_SOURCES = main.cpp 	kopeteapplication.cpp kopeteiface.cpp \
diff --git a/kopete/kopete/addcontactwizard/addcontactwizard.cpp b/kopete/kopete/addcontactwizard/addcontactwizard.cpp
index 1c011f99..02523865 100644
--- a/kopete/kopete/addcontactwizard/addcontactwizard.cpp
+++ b/kopete/kopete/addcontactwizard/addcontactwizard.cpp
@@ -46,7 +46,7 @@
 #include <tqlayout.h>
 #include <tqvbox.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kiconloader.h>
 
diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp
index 01361872..7a6235f1 100644
--- a/kopete/kopete/chatwindow/chatmessagepart.cpp
+++ b/kopete/kopete/chatwindow/chatmessagepart.cpp
@@ -50,7 +50,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tdehtmlview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -60,8 +60,8 @@
 #include <kstringhandler.h>
 #include <ktempfile.h>
 #include <kurldrag.h>
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
diff --git a/kopete/kopete/chatwindow/chatview.cpp b/kopete/kopete/chatwindow/chatview.cpp
index 34324b45..136a9b4e 100644
--- a/kopete/kopete/chatwindow/chatview.cpp
+++ b/kopete/kopete/chatwindow/chatview.cpp
@@ -32,7 +32,7 @@
 #include "kopetecontactlist.h"
 #include "kopeteviewmanager.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ktabwidget.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kopete/kopete/chatwindow/kopetechatwindow.cpp b/kopete/kopete/chatwindow/kopetechatwindow.cpp
index e205fb5a..a330dc43 100644
--- a/kopete/kopete/chatwindow/kopetechatwindow.cpp
+++ b/kopete/kopete/chatwindow/kopetechatwindow.cpp
@@ -30,7 +30,7 @@
 #include <kcursor.h>
 #include <klocale.h>
 #include <kmenubar.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpopupmenu.h>
 #include <kiconloader.h>
 #include <kdebug.h>
diff --git a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp
index 7ed0e931..6a5b4534 100644
--- a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp
+++ b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp
@@ -30,9 +30,9 @@
 #include <kzip.h>
 #include <ktar.h>
 #include <kmimetype.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kstaticdeleter.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 #include "kopetechatwindowstyle.h"
diff --git a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.h b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.h
index 3cf5d6e9..7c9a181f 100644
--- a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.h
+++ b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.h
@@ -20,7 +20,7 @@
 
 #include <tqobject.h>
 #include <tqmap.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kopete_export.h>
 
 class ChatWindowStyle;
diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
index 7cb9a03f..b70313b9 100644
--- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp
+++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
@@ -34,7 +34,7 @@
 #include <kaction.h>
 #include <kapplication.h>
 #include <kcolordialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <tdeversion.h>
diff --git a/kopete/kopete/chatwindow/krichtexteditpart.cpp b/kopete/kopete/chatwindow/krichtexteditpart.cpp
index 6f3bdf25..152570a8 100644
--- a/kopete/kopete/chatwindow/krichtexteditpart.cpp
+++ b/kopete/kopete/chatwindow/krichtexteditpart.cpp
@@ -4,7 +4,7 @@
 #include <kglobalsettings.h>
 #include <kfontdialog.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include <tqapplication.h>
 #include <tqclipboard.h>
diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp
index 63c51b89..0aff7691 100644
--- a/kopete/kopete/config/appearance/appearanceconfig.cpp
+++ b/kopete/kopete/config/appearance/appearanceconfig.cpp
@@ -43,11 +43,11 @@
 #include <kapplication.h>
 #include <kcolorcombo.h>
 #include <kcolorbutton.h>
-#include <kconfig.h> // for KNewStuff emoticon fetching
+#include <tdeconfig.h> // for KNewStuff emoticon fetching
 #include <kdebug.h>
 #include <kfontrequester.h>
 #include <kgenericfactory.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tdehtmlview.h>
 #include <klineedit.h>
 #include <klocale.h>
@@ -59,7 +59,7 @@
 #include <kurlrequesterdlg.h>
 #include <kurlrequester.h>
 #include <krun.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <knewstuff/downloaddialog.h> // knewstuff emoticon and chatwindow fetching
 #include <knewstuff/engine.h>         // "
@@ -696,7 +696,7 @@ void AppearanceConfig::slotGetChatStyles()
 	// you have to do this by hand when providing your own Engine
 	KNS::ProviderLoader *provider = new KNS::ProviderLoader( this );
 	TQObject::connect( provider, TQT_SIGNAL( providersLoaded(Provider::List*) ), downloadDialog, TQT_SLOT( slotProviders (Provider::List *) ) );
-	provider->load( "kopete/chatstyle", "http://download.kde.org/khotnewstuff/kopetestyles12-providers.xml" );
+	provider->load( "kopete/chatstyle", "http://download.kde.org/tdehotnewstuff/kopetestyles12-providers.xml" );
 	downloadDialog->exec();
 }
 
@@ -856,7 +856,7 @@ void AppearanceConfig::slotGetEmoticonThemes()
 	TDEConfig* config = TDEGlobal::config();
 	config->setGroup( "KNewStuff" );
 	config->writeEntry( "ProvidersUrl",
-						"http://download.kde.org/khotnewstuff/emoticons-providers.xml" );
+						"http://download.kde.org/tdehotnewstuff/emoticons-providers.xml" );
 	config->writeEntry( "StandardResource", "emoticons" );
 	config->writeEntry( "Uncompress", "application/x-gzip" );
 	config->sync();
diff --git a/kopete/kopete/config/appearance/emoticonseditdialog.cpp b/kopete/kopete/config/appearance/emoticonseditdialog.cpp
index d432d22e..f0510a5f 100644
--- a/kopete/kopete/config/appearance/emoticonseditdialog.cpp
+++ b/kopete/kopete/config/appearance/emoticonseditdialog.cpp
@@ -23,8 +23,8 @@
 #include <klocale.h>
 #include <klistview.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
-#include <kio/job.h>
+#include <tdefiledialog.h>
+#include <tdeio/job.h>
 #include <tqpixmap.h>
 #include <tqheader.h>
 #include <tqlayout.h>
diff --git a/kopete/kopete/config/avdevice/avdeviceconfig.cpp b/kopete/kopete/config/avdevice/avdeviceconfig.cpp
index cf619fd7..cf5f98ed 100644
--- a/kopete/kopete/config/avdevice/avdeviceconfig.cpp
+++ b/kopete/kopete/config/avdevice/avdeviceconfig.cpp
@@ -32,7 +32,7 @@
 #include <kpushbutton.h>
 #include <kgenericfactory.h>
 #include <ktrader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
 #include <tqimage.h>
 #include <tqpixmap.h>
diff --git a/kopete/kopete/config/behavior/behaviorconfig.cpp b/kopete/kopete/config/behavior/behaviorconfig.cpp
index bae2d832..f3d61b44 100644
--- a/kopete/kopete/config/behavior/behaviorconfig.cpp
+++ b/kopete/kopete/config/behavior/behaviorconfig.cpp
@@ -33,7 +33,7 @@
 #include <kpushbutton.h>
 #include <kgenericfactory.h>
 #include <ktrader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klineedit.h>
 
 #include "kopeteprefs.h"
diff --git a/kopete/kopete/config/identity/kopeteidentityconfig.cpp b/kopete/kopete/config/identity/kopeteidentityconfig.cpp
index da13d3cc..1d513964 100644
--- a/kopete/kopete/config/identity/kopeteidentityconfig.cpp
+++ b/kopete/kopete/config/identity/kopeteidentityconfig.cpp
@@ -30,7 +30,7 @@
 
 // KDE includes
 #include <kcombobox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kpushbutton.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
@@ -45,7 +45,7 @@
 #include <kmdcodec.h>
 
 // KDE KIO includes
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 // KDE KABC(AddressBook) includes
 #include <kabc/addresseedialog.h>
diff --git a/kopete/kopete/config/identity/kopeteidentityconfig.h b/kopete/kopete/config/identity/kopeteidentityconfig.h
index d0795412..37f4e7df 100644
--- a/kopete/kopete/config/identity/kopeteidentityconfig.h
+++ b/kopete/kopete/config/identity/kopeteidentityconfig.h
@@ -19,7 +19,7 @@
 #define _IDENTITYCONFIG_H
 
 #include <tdecmodule.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include "kopetemetacontact.h"
 
diff --git a/kopete/kopete/config/identity/kopeteidentityconfigpreferences.kcfgc b/kopete/kopete/config/identity/kopeteidentityconfigpreferences.kcfgc
index 6f93d40f..ffa89670 100644
--- a/kopete/kopete/config/identity/kopeteidentityconfigpreferences.kcfgc
+++ b/kopete/kopete/config/identity/kopeteidentityconfigpreferences.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=kopeteidentityconfigpreferences.kcfg
 ClassName=KopeteIdentityConfigPreferences
 Singleton=true
diff --git a/kopete/kopete/contactlist/customnotificationprops.cpp b/kopete/kopete/contactlist/customnotificationprops.cpp
index bc5ed895..82851eb4 100644
--- a/kopete/kopete/contactlist/customnotificationprops.cpp
+++ b/kopete/kopete/contactlist/customnotificationprops.cpp
@@ -23,7 +23,7 @@
 #include <tqlineedit.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurlrequester.h>
 
 #include "customnotifications.h"
diff --git a/kopete/kopete/contactlist/kopetelviprops.cpp b/kopete/kopete/contactlist/kopetelviprops.cpp
index a731b504..f64af84d 100644
--- a/kopete/kopete/contactlist/kopetelviprops.cpp
+++ b/kopete/kopete/contactlist/kopetelviprops.cpp
@@ -33,7 +33,7 @@
 #include <tqcombobox.h>
 
 #include <kdialogbase.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kicondialog.h>
 #include <kiconloader.h>
 #include <klocale.h>
@@ -521,7 +521,7 @@ void KopeteMetaLVIProps::slotFromKABCClicked()
 
 void KopeteMetaLVIProps::slotOpenSoundDialog( KURLRequester *requester )
 {
-	// taken from tdelibs/kio/kfile/knotifydialog.cpp
+	// taken from tdelibs/tdeio/tdefile/knotifydialog.cpp
 	// only need to init this once
 	requester->disconnect( TQT_SIGNAL( openFileDialog( KURLRequester * )),
 						this, TQT_SLOT( slotOpenSoundDialog( KURLRequester * )));
diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
index 7daabb61..3f2165c4 100644
--- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
+++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
@@ -34,7 +34,7 @@
 #include <kpassivepopup.h>
 #include <kpopupmenu.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 
 #include <kabc/addressbook.h>
diff --git a/kopete/kopete/kconf_update/CMakeLists.txt b/kopete/kopete/kconf_update/CMakeLists.txt
deleted file mode 100644
index 000654da..00000000
--- a/kopete/kopete/kconf_update/CMakeLists.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-add_definitions( -DKDE_NO_COMPAT )
-
-include_directories(
-  ${TDE_INCLUDE_DIR}
-  ${TQT_INCLUDE_DIRS}
-)
-
-link_directories(
-  ${TQT_LIBRARY_DIRS}
-)
-
-
-##### other data ################################
-
-install( FILES
-    kopete-pluginloader.upd kopete-account-kconf_update.upd
-    kopete-pluginloader2.upd kopete-jabberproxytype-kconf_update.upd
-    kopete-jabberpriorityaddition-kconf_update.upd
-    kopete-nameTracking.upd
-  DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
-
-install( PROGRAMS
-    kopete-pluginloader.pl kopete-jabberpriorityaddition-kconf_update.sh
-    kopete-pluginloader2.sh kopete-jabberproxytype-kconf_update.sh
-    kopete-account-0.10.pl kopete-account-kconf_update.sh
-  DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
-
-
-##### kopete_account_kconf_update (executable) ##
-
-tde_add_executable( "kopete-account-kconf_update"
-  SOURCES kopete-account-kconf_update.cpp
-  LINK ${TQT_LIBRARIES}
-  DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
-)
-
-
-##### kopete_pluginloader2_kconf_update (executable)
-
-tde_add_executable( "kopete-pluginloader2-kconf_update"
-  SOURCES kopete-pluginloader2.cpp
-  LINK ${TQT_LIBRARIES}
-  DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
-)
-
-
-##### kopete_nameTracking_kconf_update (executable)
-
-tde_add_executable( "kopete-nameTracking-kconf_update"
-  SOURCES kopete-nameTracking.cpp
-  LINK tdecore-shared
-  DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
-)
diff --git a/kopete/kopete/kconf_update/Makefile.am b/kopete/kopete/kconf_update/Makefile.am
deleted file mode 100644
index 7ae291dd..00000000
--- a/kopete/kopete/kconf_update/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT $(all_includes)
-
-update_DATA = kopete-pluginloader.upd kopete-account-kconf_update.upd \
-	kopete-pluginloader2.upd kopete-jabberproxytype-kconf_update.upd \
-	kopete-jabberpriorityaddition-kconf_update.upd kopete-nameTracking.upd
-update_SCRIPTS = kopete-pluginloader.pl kopete-account-kconf_update.sh \
-	kopete-pluginloader2.sh kopete-jabberproxytype-kconf_update.sh \
-	kopete-jabberpriorityaddition-kconf_update.sh kopete-account-0.10.pl
-updatedir = $(kde_datadir)/kconf_update
-
-# The Qt app cannot go into kde_datadir, that is not portable.
-# install to kde_bindir/kconf_update_bin instead.
-# KDE 3.2 will allow kconf_update scripts to run directly from there,
-# but for us that's too late. Use the .sh script as a workaround.
-kconf_PROGRAMS = kopete-account-kconf_update kopete-pluginloader2-kconf_update \
-	kopete-nameTracking-kconf_update
-kconfdir = $(libdir)/kconf_update_bin
-
-kopete_account_kconf_update_SOURCES = kopete-account-kconf_update.cpp
-kopete_account_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kopete_account_kconf_update_LDADD = $(LIB_QT)
-
-kopete_pluginloader2_kconf_update_SOURCES = kopete-pluginloader2.cpp
-kopete_pluginloader2_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kopete_pluginloader2_kconf_update_LDADD = $(LIB_QT)
-
-kopete_nameTracking_kconf_update_SOURCES = kopete-nameTracking.cpp
-kopete_nameTracking_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kopete_nameTracking_kconf_update_LDADD = $(LIB_QT) $(LIB_TDECORE)
-
-# vim: set noet:
-
diff --git a/kopete/kopete/kconf_update/kopete-jabberpriorityaddition-kconf_update.upd b/kopete/kopete/kconf_update/kopete-jabberpriorityaddition-kconf_update.upd
deleted file mode 100644
index 8e761e6f..00000000
--- a/kopete/kopete/kconf_update/kopete-jabberpriorityaddition-kconf_update.upd
+++ /dev/null
@@ -1,4 +0,0 @@
-Id=kopete0.9/r1
-File=kopeterc
-Script=kopete-jabberpriorityaddition-kconf_update.sh,sh
-
diff --git a/kopete/kopete/kconf_update/kopete-jabberproxytype-kconf_update.upd b/kopete/kopete/kconf_update/kopete-jabberproxytype-kconf_update.upd
deleted file mode 100644
index c39ce69b..00000000
--- a/kopete/kopete/kconf_update/kopete-jabberproxytype-kconf_update.upd
+++ /dev/null
@@ -1,4 +0,0 @@
-Id=kopete0.9/r1
-File=kopeterc
-Script=kopete-jabberproxytype-kconf_update.sh,sh
-
diff --git a/kopete/kopete/kconf_update/kopete-nameTracking.upd b/kopete/kopete/kconf_update/kopete-nameTracking.upd
deleted file mode 100644
index da0a0e2d..00000000
--- a/kopete/kopete/kconf_update/kopete-nameTracking.upd
+++ /dev/null
@@ -1,3 +0,0 @@
-Id=kopete0.9/r1
-File=kopeterc
-Script=kopete-nameTracking-kconf_update
diff --git a/kopete/kopete/kopeteapplication.cpp b/kopete/kopete/kopeteapplication.cpp
index 8a41bc49..2e469bf5 100644
--- a/kopete/kopete/kopeteapplication.cpp
+++ b/kopete/kopete/kopeteapplication.cpp
@@ -23,7 +23,7 @@
 #include <tqtimer.h>
 #include <tqregexp.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kcmdlineargs.h>
diff --git a/kopete/kopete/kopeteeditglobalidentitywidget.cpp b/kopete/kopete/kopeteeditglobalidentitywidget.cpp
index 4e752fa8..c1f181be 100644
--- a/kopete/kopete/kopeteeditglobalidentitywidget.cpp
+++ b/kopete/kopete/kopeteeditglobalidentitywidget.cpp
@@ -31,9 +31,9 @@
 #include <ktoolbar.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kpixmapregionselectordialog.h>
 
 // Kopete include
diff --git a/kopete/kopete/kopeteiface.cpp b/kopete/kopete/kopeteiface.cpp
index d532dacd..7995c64e 100644
--- a/kopete/kopete/kopeteiface.cpp
+++ b/kopete/kopete/kopeteiface.cpp
@@ -17,7 +17,7 @@
 
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 #include "kopeteiface.h"
diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp
index 5215d588..5e4c7bd0 100644
--- a/kopete/kopete/kopetewindow.cpp
+++ b/kopete/kopete/kopetewindow.cpp
@@ -32,7 +32,7 @@
 
 #include <kaction.h>
 #include <kactionclasses.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/kopete/kopete/tdeconf_update/CMakeLists.txt b/kopete/kopete/tdeconf_update/CMakeLists.txt
new file mode 100644
index 00000000..342178f1
--- /dev/null
+++ b/kopete/kopete/tdeconf_update/CMakeLists.txt
@@ -0,0 +1,64 @@
+#################################################
+#
+#  (C) 2010-2011 Serghei Amelian
+#  serghei (DOT) amelian (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+add_definitions( -DKDE_NO_COMPAT )
+
+include_directories(
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### other data ################################
+
+install( FILES
+    kopete-pluginloader.upd kopete-account-tdeconf_update.upd
+    kopete-pluginloader2.upd kopete-jabberproxytype-tdeconf_update.upd
+    kopete-jabberpriorityaddition-tdeconf_update.upd
+    kopete-nameTracking.upd
+  DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
+
+install( PROGRAMS
+    kopete-pluginloader.pl kopete-jabberpriorityaddition-tdeconf_update.sh
+    kopete-pluginloader2.sh kopete-jabberproxytype-tdeconf_update.sh
+    kopete-account-0.10.pl kopete-account-tdeconf_update.sh
+  DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
+
+
+##### kopete_account_tdeconf_update (executable) ##
+
+tde_add_executable( "kopete-account-tdeconf_update"
+  SOURCES kopete-account-tdeconf_update.cpp
+  LINK ${TQT_LIBRARIES}
+  DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin
+)
+
+
+##### kopete_pluginloader2_tdeconf_update (executable)
+
+tde_add_executable( "kopete-pluginloader2-tdeconf_update"
+  SOURCES kopete-pluginloader2.cpp
+  LINK ${TQT_LIBRARIES}
+  DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin
+)
+
+
+##### kopete_nameTracking_tdeconf_update (executable)
+
+tde_add_executable( "kopete-nameTracking-tdeconf_update"
+  SOURCES kopete-nameTracking.cpp
+  LINK tdecore-shared
+  DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin
+)
diff --git a/kopete/kopete/tdeconf_update/Makefile.am b/kopete/kopete/tdeconf_update/Makefile.am
new file mode 100644
index 00000000..8c4b949e
--- /dev/null
+++ b/kopete/kopete/tdeconf_update/Makefile.am
@@ -0,0 +1,32 @@
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT $(all_includes)
+
+update_DATA = kopete-pluginloader.upd kopete-account-tdeconf_update.upd \
+	kopete-pluginloader2.upd kopete-jabberproxytype-tdeconf_update.upd \
+	kopete-jabberpriorityaddition-tdeconf_update.upd kopete-nameTracking.upd
+update_SCRIPTS = kopete-pluginloader.pl kopete-account-tdeconf_update.sh \
+	kopete-pluginloader2.sh kopete-jabberproxytype-tdeconf_update.sh \
+	kopete-jabberpriorityaddition-tdeconf_update.sh kopete-account-0.10.pl
+updatedir = $(kde_datadir)/tdeconf_update
+
+# The Qt app cannot go into kde_datadir, that is not portable.
+# install to kde_bindir/tdeconf_update_bin instead.
+# KDE 3.2 will allow tdeconf_update scripts to run directly from there,
+# but for us that's too late. Use the .sh script as a workaround.
+tdeconf_PROGRAMS = kopete-account-tdeconf_update kopete-pluginloader2-tdeconf_update \
+	kopete-nameTracking-tdeconf_update
+tdeconfdir = $(libdir)/tdeconf_update_bin
+
+kopete_account_tdeconf_update_SOURCES = kopete-account-tdeconf_update.cpp
+kopete_account_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_account_tdeconf_update_LDADD = $(LIB_QT)
+
+kopete_pluginloader2_tdeconf_update_SOURCES = kopete-pluginloader2.cpp
+kopete_pluginloader2_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_pluginloader2_tdeconf_update_LDADD = $(LIB_QT)
+
+kopete_nameTracking_tdeconf_update_SOURCES = kopete-nameTracking.cpp
+kopete_nameTracking_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_nameTracking_tdeconf_update_LDADD = $(LIB_QT) $(LIB_TDECORE)
+
+# vim: set noet:
+
diff --git a/kopete/kopete/kconf_update/kopete-account-0.10.pl b/kopete/kopete/tdeconf_update/kopete-account-0.10.pl
index 3925a52f..3925a52f 100755
--- a/kopete/kopete/kconf_update/kopete-account-0.10.pl
+++ b/kopete/kopete/tdeconf_update/kopete-account-0.10.pl
diff --git a/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp b/kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.cpp
index 4e0daa55..42ba47f1 100644
--- a/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp
+++ b/kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.cpp
@@ -1,5 +1,5 @@
 /*
-    kconf_update app for migrating kopete 0.6.x accounts to 0.7. Code is
+    tdeconf_update app for migrating kopete 0.6.x accounts to 0.7. Code is
     not up to my normal standards, but it does the job, and since it's
     supposed to run exactly once on each system that's good enough for me :)
 
diff --git a/kopete/kopete/kconf_update/kopete-account-kconf_update.sh b/kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.sh
index e47477b8..c9a1bcfc 100644
--- a/kopete/kopete/kconf_update/kopete-account-kconf_update.sh
+++ b/kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 IFS=:
-SUFF=kconf_update_bin/kopete-account-kconf_update
+SUFF=tdeconf_update_bin/kopete-account-tdeconf_update
 for path in `tde-config --path lib`; do
   if test -x "$path/$SUFF"; then
      exec "$path/$SUFF"
diff --git a/kopete/kopete/kconf_update/kopete-account-kconf_update.upd b/kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.upd
index ed1f3ac7..d48aeed1 100644
--- a/kopete/kopete/kconf_update/kopete-account-kconf_update.upd
+++ b/kopete/kopete/tdeconf_update/kopete-account-tdeconf_update.upd
@@ -1,6 +1,6 @@
 Id=kopete0.7/r1
 File=kopeterc
-Script=kopete-account-kconf_update.sh,sh
+Script=kopete-account-tdeconf_update.sh,sh
 
 #remove the PluginData_ProtocolID_ prefix from config keys
 Id=kopete0.10/r1
diff --git a/kopete/kopete/kconf_update/kopete-jabberpriorityaddition-kconf_update.sh b/kopete/kopete/tdeconf_update/kopete-jabberpriorityaddition-tdeconf_update.sh
index 2ba47416..2ba47416 100644
--- a/kopete/kopete/kconf_update/kopete-jabberpriorityaddition-kconf_update.sh
+++ b/kopete/kopete/tdeconf_update/kopete-jabberpriorityaddition-tdeconf_update.sh
diff --git a/kopete/kopete/tdeconf_update/kopete-jabberpriorityaddition-tdeconf_update.upd b/kopete/kopete/tdeconf_update/kopete-jabberpriorityaddition-tdeconf_update.upd
new file mode 100644
index 00000000..7fd7d586
--- /dev/null
+++ b/kopete/kopete/tdeconf_update/kopete-jabberpriorityaddition-tdeconf_update.upd
@@ -0,0 +1,4 @@
+Id=kopete0.9/r1
+File=kopeterc
+Script=kopete-jabberpriorityaddition-tdeconf_update.sh,sh
+
diff --git a/kopete/kopete/kconf_update/kopete-jabberproxytype-kconf_update.sh b/kopete/kopete/tdeconf_update/kopete-jabberproxytype-tdeconf_update.sh
index 3cbf8a55..3cbf8a55 100644
--- a/kopete/kopete/kconf_update/kopete-jabberproxytype-kconf_update.sh
+++ b/kopete/kopete/tdeconf_update/kopete-jabberproxytype-tdeconf_update.sh
diff --git a/kopete/kopete/tdeconf_update/kopete-jabberproxytype-tdeconf_update.upd b/kopete/kopete/tdeconf_update/kopete-jabberproxytype-tdeconf_update.upd
new file mode 100644
index 00000000..efc15155
--- /dev/null
+++ b/kopete/kopete/tdeconf_update/kopete-jabberproxytype-tdeconf_update.upd
@@ -0,0 +1,4 @@
+Id=kopete0.9/r1
+File=kopeterc
+Script=kopete-jabberproxytype-tdeconf_update.sh,sh
+
diff --git a/kopete/kopete/kconf_update/kopete-nameTracking.cpp b/kopete/kopete/tdeconf_update/kopete-nameTracking.cpp
index d56dfc76..ee1f3f93 100644
--- a/kopete/kopete/kconf_update/kopete-nameTracking.cpp
+++ b/kopete/kopete/tdeconf_update/kopete-nameTracking.cpp
@@ -1,5 +1,5 @@
 /*
-    kconf_update app for updating the contactlist format ( <= 0.9.0) for MetaContacts to
+    tdeconf_update app for updating the contactlist format ( <= 0.9.0) for MetaContacts to
     track the name of a subcontact.
 
     Kopete    (c) 2002-2004 by the Kopete developers  <kopete-devel@kde.org>
diff --git a/kopete/kopete/tdeconf_update/kopete-nameTracking.upd b/kopete/kopete/tdeconf_update/kopete-nameTracking.upd
new file mode 100644
index 00000000..62dd9538
--- /dev/null
+++ b/kopete/kopete/tdeconf_update/kopete-nameTracking.upd
@@ -0,0 +1,3 @@
+Id=kopete0.9/r1
+File=kopeterc
+Script=kopete-nameTracking-tdeconf_update
diff --git a/kopete/kopete/kconf_update/kopete-pluginloader.pl b/kopete/kopete/tdeconf_update/kopete-pluginloader.pl
index 19709d3a..19709d3a 100755
--- a/kopete/kopete/kconf_update/kopete-pluginloader.pl
+++ b/kopete/kopete/tdeconf_update/kopete-pluginloader.pl
diff --git a/kopete/kopete/kconf_update/kopete-pluginloader.upd b/kopete/kopete/tdeconf_update/kopete-pluginloader.upd
index cc739414..cc739414 100644
--- a/kopete/kopete/kconf_update/kopete-pluginloader.upd
+++ b/kopete/kopete/tdeconf_update/kopete-pluginloader.upd
diff --git a/kopete/kopete/kconf_update/kopete-pluginloader2.cpp b/kopete/kopete/tdeconf_update/kopete-pluginloader2.cpp
index d9b0fb39..cf96144b 100644
--- a/kopete/kopete/kconf_update/kopete-pluginloader2.cpp
+++ b/kopete/kopete/tdeconf_update/kopete-pluginloader2.cpp
@@ -1,5 +1,5 @@
 /*
-    kconf_update app for migrating the list of loaded plugins in
+    tdeconf_update app for migrating the list of loaded plugins in
     kopete 0.7.x to the new KPluginSelector format.
 
     Copyright (c) 2003      by Martijn Klingens <klingens@kde.org>
diff --git a/kopete/kopete/kconf_update/kopete-pluginloader2.sh b/kopete/kopete/tdeconf_update/kopete-pluginloader2.sh
index a6144152..f858a72e 100644
--- a/kopete/kopete/kconf_update/kopete-pluginloader2.sh
+++ b/kopete/kopete/tdeconf_update/kopete-pluginloader2.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 IFS=:
-SUFF=kconf_update_bin/kopete-pluginloader2-kconf_update
+SUFF=tdeconf_update_bin/kopete-pluginloader2-tdeconf_update
 for path in `tde-config --path lib`; do
   if test -x "$path/$SUFF"; then
      exec "$path/$SUFF"
diff --git a/kopete/kopete/kconf_update/kopete-pluginloader2.upd b/kopete/kopete/tdeconf_update/kopete-pluginloader2.upd
index 3461c7a7..3461c7a7 100644
--- a/kopete/kopete/kconf_update/kopete-pluginloader2.upd
+++ b/kopete/kopete/tdeconf_update/kopete-pluginloader2.upd
diff --git a/kopete/libkopete/avdevice/videodevicepool.h b/kopete/libkopete/avdevice/videodevicepool.h
index 75ed9ed4..2a42f97f 100644
--- a/kopete/libkopete/avdevice/videodevicepool.h
+++ b/kopete/libkopete/avdevice/videodevicepool.h
@@ -32,7 +32,7 @@
 #include "videodevice.h"
 #include "kopete_export.h"
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 namespace Kopete {
diff --git a/kopete/libkopete/kautoconfig.cpp b/kopete/libkopete/kautoconfig.cpp
index 14c5efaf..e1fcf210 100644
--- a/kopete/libkopete/kautoconfig.cpp
+++ b/kopete/libkopete/kautoconfig.cpp
@@ -23,7 +23,7 @@
 #include <kglobal.h>
 #include <tqsqlpropertymap.h>
 #include <tqobjectlist.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <tdeversion.h>
 
@@ -101,8 +101,8 @@ public:
   }
 };
 
-KAutoConfig::KAutoConfig(TDEConfig *kconfig, TQObject *parent,
-    const char *name) : TQObject(parent, name), config(kconfig) {
+KAutoConfig::KAutoConfig(TDEConfig *tdeconfig, TQObject *parent,
+    const char *name) : TQObject(parent, name), config(tdeconfig) {
   d = new KAutoConfigPrivate();
 }
 
diff --git a/kopete/libkopete/kautoconfig.h b/kopete/libkopete/kautoconfig.h
index b582e85a..1779f174 100644
--- a/kopete/libkopete/kautoconfig.h
+++ b/kopete/libkopete/kautoconfig.h
@@ -119,12 +119,12 @@ signals:
 public:
   /**
    * Constructor.
-   * @param kconfig - TDEConfig to use when retrieving/saving the widgets
+   * @param tdeconfig - TDEConfig to use when retrieving/saving the widgets
    * that KAutoConfig knows about.
    * @param parent - Parent object.
    * @param name - Object name.
    */ 
-  KAutoConfig( TDEConfig *kconfig, TQObject *parent=0, const char *name=0 );
+  KAutoConfig( TDEConfig *tdeconfig, TQObject *parent=0, const char *name=0 );
  
   /**
    * Constructor.
diff --git a/kopete/libkopete/knotification.cpp b/kopete/libkopete/knotification.cpp
index e8f69779..e0f49646 100644
--- a/kopete/libkopete/knotification.cpp
+++ b/kopete/libkopete/knotification.cpp
@@ -24,7 +24,7 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpassivepopup.h>
 #include <kactivelabel.h>
 #include <kprocess.h>
diff --git a/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp
index 69efb623..ccca93be 100644
--- a/kopete/libkopete/kopeteaccount.cpp
+++ b/kopete/libkopete/kopeteaccount.cpp
@@ -19,7 +19,7 @@
 #include <tqapplication.h>
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <kdialogbase.h>
diff --git a/kopete/libkopete/kopeteaccountmanager.cpp b/kopete/libkopete/kopeteaccountmanager.cpp
index 21f0d688..df844211 100644
--- a/kopete/libkopete/kopeteaccountmanager.cpp
+++ b/kopete/libkopete/kopeteaccountmanager.cpp
@@ -22,7 +22,7 @@
 #include <tqregexp.h>
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kplugininfo.h>
diff --git a/kopete/libkopete/kopeteaway.cpp b/kopete/libkopete/kopeteaway.cpp
index 94e07ddd..e0bf1553 100644
--- a/kopete/libkopete/kopeteaway.cpp
+++ b/kopete/libkopete/kopeteaway.cpp
@@ -29,7 +29,7 @@
 #include "kopetecontact.h"
 #include "kopeteprefs.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqtimer.h>
 #include <kapplication.h>
 #include <dcopref.h>
diff --git a/kopete/libkopete/kopeteblacklister.cpp b/kopete/libkopete/kopeteblacklister.cpp
index e31a5d1a..e249d736 100644
--- a/kopete/libkopete/kopeteblacklister.cpp
+++ b/kopete/libkopete/kopeteblacklister.cpp
@@ -17,7 +17,7 @@
 
 #include "kopetecontact.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 #include <tqstringlist.h>
diff --git a/kopete/libkopete/kopetecontactlistelement.cpp b/kopete/libkopete/kopetecontactlistelement.cpp
index 89e9ea29..86fc19c1 100644
--- a/kopete/libkopete/kopetecontactlistelement.cpp
+++ b/kopete/libkopete/kopetecontactlistelement.cpp
@@ -18,7 +18,7 @@
 
 #include "kopetecontactlistelement.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 
diff --git a/kopete/libkopete/kopeteglobal.cpp b/kopete/libkopete/kopeteglobal.cpp
index 1c889fc5..4b77444d 100644
--- a/kopete/libkopete/kopeteglobal.cpp
+++ b/kopete/libkopete/kopeteglobal.cpp
@@ -21,7 +21,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmimetype.h>
 #include <kmessagebox.h>
 #include <kprogress.h>
diff --git a/kopete/libkopete/kopetemimetypehandler.cpp b/kopete/libkopete/kopetemimetypehandler.cpp
index b05b2f4e..90da909b 100644
--- a/kopete/libkopete/kopetemimetypehandler.cpp
+++ b/kopete/libkopete/kopetemimetypehandler.cpp
@@ -24,7 +24,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmimetype.h>
 #include <kmessagebox.h>
 #include <kprogress.h>
diff --git a/kopete/libkopete/kopetepassword.cpp b/kopete/libkopete/kopetepassword.cpp
index e56e0f5d..8ee74036 100644
--- a/kopete/libkopete/kopetepassword.cpp
+++ b/kopete/libkopete/kopetepassword.cpp
@@ -28,7 +28,7 @@
 
 #include <kactivelabel.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klocale.h>
diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp
index a98b0fc3..5648e0cc 100644
--- a/kopete/libkopete/kopetepluginmanager.cpp
+++ b/kopete/libkopete/kopetepluginmanager.cpp
@@ -505,7 +505,7 @@ bool PluginManager::setPluginEnabled( const TQString &_pluginId, bool enabled /*
 	TDEConfig *config = TDEGlobal::config();
 	config->setGroup( "Plugins" );
 
-	// FIXME: What is this for? This sort of thing is kconf_update's job - Richard
+	// FIXME: What is this for? This sort of thing is tdeconf_update's job - Richard
 	if ( !pluginId.startsWith( TQString::fromLatin1( "kopete_" ) ) )
 		pluginId.prepend( TQString::fromLatin1( "kopete_" ) );
 
diff --git a/kopete/libkopete/kopeteprefs.cpp b/kopete/libkopete/kopeteprefs.cpp
index 353ea46d..77e8381a 100644
--- a/kopete/libkopete/kopeteprefs.cpp
+++ b/kopete/libkopete/kopeteprefs.cpp
@@ -22,7 +22,7 @@
 
 #include <kapplication.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 
diff --git a/kopete/libkopete/kopetetransfermanager.cpp b/kopete/libkopete/kopetetransfermanager.cpp
index 27952b9a..43e57573 100644
--- a/kopete/libkopete/kopetetransfermanager.cpp
+++ b/kopete/libkopete/kopetetransfermanager.cpp
@@ -18,10 +18,10 @@
 
 #include <klocale.h>
 #include <kstaticdeleter.h>
-#include <kfiledialog.h>
-#include <kfileitem.h>
+#include <tdefiledialog.h>
+#include <tdefileitem.h>
 #include <kmessagebox.h>
-#include <kio/observer.h>
+#include <tdeio/observer.h>
 
 #include "kopetemetacontact.h"
 #include "kopetecontact.h"
diff --git a/kopete/libkopete/kopetetransfermanager.h b/kopete/libkopete/kopetetransfermanager.h
index bd18c3f3..0333fc5a 100644
--- a/kopete/libkopete/kopetetransfermanager.h
+++ b/kopete/libkopete/kopetetransfermanager.h
@@ -24,7 +24,7 @@
 #include <tqmap.h>
 #include "kopete_export.h"
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 namespace Kopete
 {
diff --git a/kopete/libkopete/kopeteutils.cpp b/kopete/libkopete/kopeteutils.cpp
index 07e56734..0681b4c7 100644
--- a/kopete/libkopete/kopeteutils.cpp
+++ b/kopete/libkopete/kopeteutils.cpp
@@ -2,7 +2,7 @@
     Kopete Utils.
     Copyright (c) 2005 Duncan Mac-Vicar Prett <duncan@kde.org>
 
-      isHostReachable function code derived from KDE's HTTP kioslave
+      isHostReachable function code derived from KDE's HTTP tdeioslave
         Copyright (c) 2005 Waldo Bastian <bastian@kde.org>
 
     Kopete    (c) 2002-2003 by the Kopete developers  <kopete-devel@kde.org>
diff --git a/kopete/libkopete/private/kopeteviewmanager.cpp b/kopete/libkopete/private/kopeteviewmanager.cpp
index 37f04e02..9fbc19c7 100644
--- a/kopete/libkopete/private/kopeteviewmanager.cpp
+++ b/kopete/libkopete/private/kopeteviewmanager.cpp
@@ -16,7 +16,7 @@
 
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <tqptrlist.h>
diff --git a/kopete/libkopete/ui/addressbookselectorwidget.cpp b/kopete/libkopete/ui/addressbookselectorwidget.cpp
index 7b6fc27f..5a75bbf9 100644
--- a/kopete/libkopete/ui/addressbookselectorwidget.cpp
+++ b/kopete/libkopete/ui/addressbookselectorwidget.cpp
@@ -27,7 +27,7 @@
 
 #include <tqcheckbox.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kiconloader.h>
 
diff --git a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
index 7291feb9..524d6bed 100644
--- a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
+++ b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
@@ -18,9 +18,9 @@
 #include <tqtextedit.h>
 
 #include <klineedit.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kpushbutton.h>
 #include <kmessagebox.h>
 
diff --git a/kopete/libkopete/ui/kopetelistview.cpp b/kopete/libkopete/ui/kopetelistview.cpp
index 7e783024..b0f7e787 100644
--- a/kopete/libkopete/ui/kopetelistview.cpp
+++ b/kopete/libkopete/ui/kopetelistview.cpp
@@ -24,7 +24,7 @@
 
 #include <tqapplication.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqtimer.h>
diff --git a/kopete/libkopete/ui/metacontactselectorwidget.cpp b/kopete/libkopete/ui/metacontactselectorwidget.cpp
index 0fa64a4e..26b075a3 100644
--- a/kopete/libkopete/ui/metacontactselectorwidget.cpp
+++ b/kopete/libkopete/ui/metacontactselectorwidget.cpp
@@ -27,7 +27,7 @@
 #include <tqvaluelist.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kiconloader.h>
 
diff --git a/kopete/plugins/addbookmarks/CMakeLists.txt b/kopete/plugins/addbookmarks/CMakeLists.txt
index 4d1df111..d7a3b1c8 100644
--- a/kopete/plugins/addbookmarks/CMakeLists.txt
+++ b/kopete/plugins/addbookmarks/CMakeLists.txt
@@ -25,7 +25,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_addbookmarks.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_addbookmarks_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_addbookmarks_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 
 
 ##### kopete_addbookmarks (module) ##############
diff --git a/kopete/plugins/addbookmarks/Makefile.am b/kopete/plugins/addbookmarks/Makefile.am
index 1a6d19df..006ed524 100644
--- a/kopete/plugins/addbookmarks/Makefile.am
+++ b/kopete/plugins/addbookmarks/Makefile.am
@@ -19,4 +19,4 @@ service_DATA = kopete_addbookmarks.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_addbookmarks_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
diff --git a/kopete/plugins/addbookmarks/addbookmarksplugin.h b/kopete/plugins/addbookmarks/addbookmarksplugin.h
index 32143ff9..4bf10668 100644
--- a/kopete/plugins/addbookmarks/addbookmarksplugin.h
+++ b/kopete/plugins/addbookmarks/addbookmarksplugin.h
@@ -16,7 +16,7 @@
 #include <kgenericfactory.h>
 #include <kopeteplugin.h>
 #include <kbookmarkmanager.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <tqcstring.h>
 #include <tqmap.h>
 
diff --git a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp
index 31f12978..8fe0fed1 100644
--- a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp
+++ b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp
@@ -10,7 +10,7 @@
 //
 //
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 #include "addbookmarksprefssettings.h"
diff --git a/kopete/plugins/alias/CMakeLists.txt b/kopete/plugins/alias/CMakeLists.txt
index d8ca2088..dfbc7c1b 100644
--- a/kopete/plugins/alias/CMakeLists.txt
+++ b/kopete/plugins/alias/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_alias.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_alias_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_alias_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 
 
 ##### kopete_alias (module) #####################
diff --git a/kopete/plugins/alias/Makefile.am b/kopete/plugins/alias/Makefile.am
index 2172da71..ee84eb0c 100644
--- a/kopete/plugins/alias/Makefile.am
+++ b/kopete/plugins/alias/Makefile.am
@@ -15,5 +15,5 @@ service_DATA = kopete_alias.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_alias_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
 
diff --git a/kopete/plugins/alias/aliaspreferences.cpp b/kopete/plugins/alias/aliaspreferences.cpp
index 4ffa9d27..f81da475 100644
--- a/kopete/plugins/alias/aliaspreferences.cpp
+++ b/kopete/plugins/alias/aliaspreferences.cpp
@@ -14,7 +14,7 @@
 #include <kglobal.h>
 #include <kgenericfactory.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqregexp.h>
 #include <tqlayout.h>
 #include <kplugininfo.h>
diff --git a/kopete/plugins/autoreplace/CMakeLists.txt b/kopete/plugins/autoreplace/CMakeLists.txt
index 9a39da64..671835b0 100644
--- a/kopete/plugins/autoreplace/CMakeLists.txt
+++ b/kopete/plugins/autoreplace/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_autoreplace.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_autoreplace_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_autoreplace_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 
 
 ##### kopete_autoreplace (module) ###############
diff --git a/kopete/plugins/autoreplace/Makefile.am b/kopete/plugins/autoreplace/Makefile.am
index e6363ae3..3a0d6440 100644
--- a/kopete/plugins/autoreplace/Makefile.am
+++ b/kopete/plugins/autoreplace/Makefile.am
@@ -17,5 +17,5 @@ service_DATA = kopete_autoreplace.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_autoreplace_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
 
diff --git a/kopete/plugins/autoreplace/autoreplaceconfig.cpp b/kopete/plugins/autoreplace/autoreplaceconfig.cpp
index 0ce547cb..ce0ca264 100644
--- a/kopete/plugins/autoreplace/autoreplaceconfig.cpp
+++ b/kopete/plugins/autoreplace/autoreplaceconfig.cpp
@@ -18,7 +18,7 @@
 
 #include "autoreplaceconfig.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 
diff --git a/kopete/plugins/cryptography/CMakeLists.txt b/kopete/plugins/cryptography/CMakeLists.txt
index 4952d8e2..27e36787 100644
--- a/kopete/plugins/cryptography/CMakeLists.txt
+++ b/kopete/plugins/cryptography/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_cryptography.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_cryptography_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_cryptography_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 install( FILES cryptographyui.rc cryptographychatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_cryptography )
 
 
diff --git a/kopete/plugins/cryptography/Makefile.am b/kopete/plugins/cryptography/Makefile.am
index 90c4c586..8e90bbfc 100644
--- a/kopete/plugins/cryptography/Makefile.am
+++ b/kopete/plugins/cryptography/Makefile.am
@@ -18,7 +18,7 @@ service_DATA = kopete_cryptography.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_cryptography_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
 
 mydatadir = $(kde_datadir)/kopete_cryptography
 mydata_DATA = cryptographyui.rc cryptographychatui.rc
diff --git a/kopete/plugins/cryptography/cryptographyguiclient.cpp b/kopete/plugins/cryptography/cryptographyguiclient.cpp
index 898e7f1a..4892afb1 100644
--- a/kopete/plugins/cryptography/cryptographyguiclient.cpp
+++ b/kopete/plugins/cryptography/cryptographyguiclient.cpp
@@ -21,7 +21,7 @@
 #include "kopetechatsession.h"
 
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kgenericfactory.h>
 
diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp
index 7e7d7761..06412936 100644
--- a/kopete/plugins/cryptography/cryptographyplugin.cpp
+++ b/kopete/plugins/cryptography/cryptographyplugin.cpp
@@ -21,7 +21,7 @@
 
 #include <kdebug.h>
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <tdeversion.h>
 #include <kaboutdata.h>
diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp
index 65cfb3bc..e3d2e630 100644
--- a/kopete/plugins/cryptography/popuppublic.cpp
+++ b/kopete/plugins/cryptography/popuppublic.cpp
@@ -43,7 +43,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 #include "popuppublic.h"
diff --git a/kopete/plugins/highlight/CMakeLists.txt b/kopete/plugins/highlight/CMakeLists.txt
index 78da77b7..0b92404a 100644
--- a/kopete/plugins/highlight/CMakeLists.txt
+++ b/kopete/plugins/highlight/CMakeLists.txt
@@ -28,7 +28,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_highlight.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_highlight_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_highlight_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 
 
 ##### kopete_highlight (module) #################
diff --git a/kopete/plugins/highlight/Makefile.am b/kopete/plugins/highlight/Makefile.am
index 489f911c..0340c2f5 100644
--- a/kopete/plugins/highlight/Makefile.am
+++ b/kopete/plugins/highlight/Makefile.am
@@ -18,4 +18,4 @@ service_DATA = kopete_highlight.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_highlight_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
diff --git a/kopete/plugins/history/CMakeLists.txt b/kopete/plugins/history/CMakeLists.txt
index aed227fc..8f44c108 100644
--- a/kopete/plugins/history/CMakeLists.txt
+++ b/kopete/plugins/history/CMakeLists.txt
@@ -28,7 +28,7 @@ link_directories(
 
 install( FILES kopete_history.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 install( FILES historyui.rc  historychatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_history )
-install( FILES kopete_history_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_history_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 install( FILES historyconfig.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 
 
diff --git a/kopete/plugins/history/Makefile.am b/kopete/plugins/history/Makefile.am
index c5139402..b43b8ed4 100644
--- a/kopete/plugins/history/Makefile.am
+++ b/kopete/plugins/history/Makefile.am
@@ -21,6 +21,6 @@ mydatadir = $(kde_datadir)/kopete_history
 mydata_DATA = historyui.rc  historychatui.rc
 
 kcm_DATA = kopete_history_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
 
 kde_kcfg_DATA = historyconfig.kcfg
diff --git a/kopete/plugins/history/converter.cpp b/kopete/plugins/history/converter.cpp
index 1c5c573d..34d2a426 100644
--- a/kopete/plugins/history/converter.cpp
+++ b/kopete/plugins/history/converter.cpp
@@ -20,7 +20,7 @@
 #include "kopeteprotocol.h"
 #include "kopeteuiglobal.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/kopete/plugins/history/historyconfig.kcfgc b/kopete/plugins/history/historyconfig.kcfgc
index 1e985622..8439dc23 100644
--- a/kopete/plugins/history/historyconfig.kcfgc
+++ b/kopete/plugins/history/historyconfig.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=historyconfig.kcfg
 ClassName=HistoryConfig
 Singleton=true
diff --git a/kopete/plugins/history/historyplugin.cpp b/kopete/plugins/history/historyplugin.cpp
index ce579ea8..c9dc5fd6 100644
--- a/kopete/plugins/history/historyplugin.cpp
+++ b/kopete/plugins/history/historyplugin.cpp
@@ -19,7 +19,7 @@
 #include <kaboutdata.h>
 #include <kaction.h>
 #include <kmessagebox.h>
-//#include <kconfig.h>
+//#include <tdeconfig.h>
 #include <kplugininfo.h>
 #include <tdeversion.h>
 
diff --git a/kopete/plugins/latex/CMakeLists.txt b/kopete/plugins/latex/CMakeLists.txt
index d71dc85d..e8215b92 100644
--- a/kopete/plugins/latex/CMakeLists.txt
+++ b/kopete/plugins/latex/CMakeLists.txt
@@ -27,7 +27,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_latex.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_latex_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_latex_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 install( PROGRAMS kopete_latexconvert.sh DESTINATION ${BIN_INSTALL_DIR} )
 install( FILES latexconfig.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 install( FILES latexchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_latex )
diff --git a/kopete/plugins/latex/Makefile.am b/kopete/plugins/latex/Makefile.am
index 7d71f9f1..74b977df 100644
--- a/kopete/plugins/latex/Makefile.am
+++ b/kopete/plugins/latex/Makefile.am
@@ -18,7 +18,7 @@ service_DATA = kopete_latex.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_latex_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
 
 bin_SCRIPTS = kopete_latexconvert.sh
 kde_kcfg_DATA = latexconfig.kcfg
diff --git a/kopete/plugins/latex/latexconfig.kcfgc b/kopete/plugins/latex/latexconfig.kcfgc
index 9e4e4fec..984349fd 100644
--- a/kopete/plugins/latex/latexconfig.kcfgc
+++ b/kopete/plugins/latex/latexconfig.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=latexconfig.kcfg
 ClassName=LatexConfig
 Singleton=true
diff --git a/kopete/plugins/latex/latexguiclient.h b/kopete/plugins/latex/latexguiclient.h
index 2534e9a5..b8e5efc5 100644
--- a/kopete/plugins/latex/latexguiclient.h
+++ b/kopete/plugins/latex/latexguiclient.h
@@ -23,7 +23,7 @@
 #include <tqobject.h>
 #include <kxmlguiclient.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "kopetemessage.h"
 #include "kopeteplugin.h"
diff --git a/kopete/plugins/motionautoaway/CMakeLists.txt b/kopete/plugins/motionautoaway/CMakeLists.txt
index 650766ef..a484ec5e 100644
--- a/kopete/plugins/motionautoaway/CMakeLists.txt
+++ b/kopete/plugins/motionautoaway/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_motionaway.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_motionaway_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_motionaway_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 install( FILES motionawayconfig.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 
 
diff --git a/kopete/plugins/motionautoaway/Makefile.am b/kopete/plugins/motionautoaway/Makefile.am
index ff2c5bd8..8f8bbaa3 100644
--- a/kopete/plugins/motionautoaway/Makefile.am
+++ b/kopete/plugins/motionautoaway/Makefile.am
@@ -18,7 +18,7 @@ service_DATA = kopete_motionaway.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_motionaway_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
 kde_kcfg_DATA = motionawayconfig.kcfg
 
 
diff --git a/kopete/plugins/motionautoaway/motionawayplugin.cpp b/kopete/plugins/motionautoaway/motionawayplugin.cpp
index ea4bf2bc..56aed0ff 100644
--- a/kopete/plugins/motionautoaway/motionawayplugin.cpp
+++ b/kopete/plugins/motionautoaway/motionawayplugin.cpp
@@ -38,7 +38,7 @@
 
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 
@@ -159,12 +159,12 @@ MotionAwayPlugin::~MotionAwayPlugin()
 }
 
 void MotionAwayPlugin::loadSettings(){
-	TDEConfig *kconfig = TDEGlobal::config();
-	kconfig->setGroup("MotionAway Plugin");
+	TDEConfig *tdeconfig = TDEGlobal::config();
+	tdeconfig->setGroup("MotionAway Plugin");
 
-	awayTimeout = kconfig->readNumEntry("AwayTimeout", 1);
-	becomeAvailableWithActivity = kconfig->readBoolEntry("BecomeAvailableWithActivity", true);
-	videoDevice = kconfig->readEntry("VideoDevice", "/dev/video0");
+	awayTimeout = tdeconfig->readNumEntry("AwayTimeout", 1);
+	becomeAvailableWithActivity = tdeconfig->readBoolEntry("BecomeAvailableWithActivity", true);
+	videoDevice = tdeconfig->readEntry("VideoDevice", "/dev/video0");
 	m_awayTimer->changeInterval(awayTimeout * 60 * 1000);
 }
 
diff --git a/kopete/plugins/netmeeting/CMakeLists.txt b/kopete/plugins/netmeeting/CMakeLists.txt
index a53e1ff2..dfda84e3 100644
--- a/kopete/plugins/netmeeting/CMakeLists.txt
+++ b/kopete/plugins/netmeeting/CMakeLists.txt
@@ -31,7 +31,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_netmeeting.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_netmeeting_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_netmeeting_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 install( FILES netmeetingchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_netmeeting )
 
 
diff --git a/kopete/plugins/netmeeting/Makefile.am b/kopete/plugins/netmeeting/Makefile.am
index 1710f136..27c5b0cb 100644
--- a/kopete/plugins/netmeeting/Makefile.am
+++ b/kopete/plugins/netmeeting/Makefile.am
@@ -20,4 +20,4 @@ kcm_kopete_netmeeting_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
 
 
 kcm_DATA = kopete_netmeeting_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
diff --git a/kopete/plugins/netmeeting/netmeetinginvitation.cpp b/kopete/plugins/netmeeting/netmeetinginvitation.cpp
index 7581ac62..4373cb05 100644
--- a/kopete/plugins/netmeeting/netmeetinginvitation.cpp
+++ b/kopete/plugins/netmeeting/netmeetinginvitation.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 
diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.cpp b/kopete/plugins/netmeeting/netmeetingpreferences.cpp
index 9981351d..3c63bc7e 100644
--- a/kopete/plugins/netmeeting/netmeetingpreferences.cpp
+++ b/kopete/plugins/netmeeting/netmeetingpreferences.cpp
@@ -21,7 +21,7 @@
 #include <klineedit.h>
 #include <tdeparts/componentfactory.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kcombobox.h>
 #include <klistview.h>
diff --git a/kopete/plugins/nowlistening/CMakeLists.txt b/kopete/plugins/nowlistening/CMakeLists.txt
index 55e1a5ca..29c1e03e 100644
--- a/kopete/plugins/nowlistening/CMakeLists.txt
+++ b/kopete/plugins/nowlistening/CMakeLists.txt
@@ -29,7 +29,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_nowlistening.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_nowlistening_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_nowlistening_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 install( FILES nowlisteningconfig.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 install( FILES nowlisteningui.rc nowlisteningchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete )
 
diff --git a/kopete/plugins/nowlistening/Makefile.am b/kopete/plugins/nowlistening/Makefile.am
index 8d991f3a..69dbb38e 100644
--- a/kopete/plugins/nowlistening/Makefile.am
+++ b/kopete/plugins/nowlistening/Makefile.am
@@ -16,7 +16,7 @@ service_DATA = kopete_nowlistening.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_nowlistening_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
 
 kde_kcfg_DATA = nowlisteningconfig.kcfg
 
diff --git a/kopete/plugins/nowlistening/nowlisteningconfig.kcfgc b/kopete/plugins/nowlistening/nowlisteningconfig.kcfgc
index 87c53b77..d562e0cb 100644
--- a/kopete/plugins/nowlistening/nowlisteningconfig.kcfgc
+++ b/kopete/plugins/nowlistening/nowlisteningconfig.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=nowlisteningconfig.kcfg
 ClassName=NowListeningConfig
 Singleton=true
diff --git a/kopete/plugins/smpppdcs/CMakeLists.txt b/kopete/plugins/smpppdcs/CMakeLists.txt
index cac131f9..ac985dd2 100644
--- a/kopete/plugins/smpppdcs/CMakeLists.txt
+++ b/kopete/plugins/smpppdcs/CMakeLists.txt
@@ -31,7 +31,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_smpppdcs.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_smpppdcs_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_smpppdcs_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 install( FILES smpppdcs.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 
 
diff --git a/kopete/plugins/smpppdcs/Makefile.am b/kopete/plugins/smpppdcs/Makefile.am
index 11173ac6..fe8792fc 100644
--- a/kopete/plugins/smpppdcs/Makefile.am
+++ b/kopete/plugins/smpppdcs/Makefile.am
@@ -26,7 +26,7 @@ service_DATA = kopete_smpppdcs.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_smpppdcs_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
 
 kde_kcfg_DATA = smpppdcs.kcfg
 
diff --git a/kopete/plugins/smpppdcs/detectorsmpppd.cpp b/kopete/plugins/smpppdcs/detectorsmpppd.cpp
index 772090d9..b6f6fc30 100644
--- a/kopete/plugins/smpppdcs/detectorsmpppd.cpp
+++ b/kopete/plugins/smpppdcs/detectorsmpppd.cpp
@@ -16,7 +16,7 @@
 
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 
 #include "iconnector.h"
diff --git a/kopete/plugins/texteffect/CMakeLists.txt b/kopete/plugins/texteffect/CMakeLists.txt
index e88a0e34..c56f73ad 100644
--- a/kopete/plugins/texteffect/CMakeLists.txt
+++ b/kopete/plugins/texteffect/CMakeLists.txt
@@ -28,7 +28,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_texteffect.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_texteffect_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_texteffect_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 
 
 ##### kopete_texteffect (module) ################
diff --git a/kopete/plugins/texteffect/Makefile.am b/kopete/plugins/texteffect/Makefile.am
index ee008e27..7f721dee 100644
--- a/kopete/plugins/texteffect/Makefile.am
+++ b/kopete/plugins/texteffect/Makefile.am
@@ -17,4 +17,4 @@ service_DATA = kopete_texteffect.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_texteffect_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
diff --git a/kopete/plugins/texteffect/texteffectconfig.cpp b/kopete/plugins/texteffect/texteffectconfig.cpp
index b1e2417c..a411b363 100644
--- a/kopete/plugins/texteffect/texteffectconfig.cpp
+++ b/kopete/plugins/texteffect/texteffectconfig.cpp
@@ -19,7 +19,7 @@
 #include <tqstring.h>
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "texteffectconfig.h"
 
diff --git a/kopete/plugins/translator/CMakeLists.txt b/kopete/plugins/translator/CMakeLists.txt
index 5dd274db..4c4e4756 100644
--- a/kopete/plugins/translator/CMakeLists.txt
+++ b/kopete/plugins/translator/CMakeLists.txt
@@ -25,7 +25,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_translator.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_translator_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_translator_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 install( FILES translatorui.rc translatorchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_translator )
 
 
diff --git a/kopete/plugins/translator/Makefile.am b/kopete/plugins/translator/Makefile.am
index 679c1ed8..fd58d26f 100644
--- a/kopete/plugins/translator/Makefile.am
+++ b/kopete/plugins/translator/Makefile.am
@@ -17,7 +17,7 @@ service_DATA = kopete_translator.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_translator_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
 
 mydatadir = $(kde_datadir)/kopete_translator
 mydata_DATA = translatorui.rc translatorchatui.rc
diff --git a/kopete/plugins/translator/translatorguiclient.h b/kopete/plugins/translator/translatorguiclient.h
index 21675216..2f7a9f0f 100644
--- a/kopete/plugins/translator/translatorguiclient.h
+++ b/kopete/plugins/translator/translatorguiclient.h
@@ -23,7 +23,7 @@
 #include <tqobject.h>
 #include <kxmlguiclient.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "kopetemessage.h"
 #include "kopeteplugin.h"
diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp
index a2614640..066f93a9 100644
--- a/kopete/plugins/translator/translatorplugin.cpp
+++ b/kopete/plugins/translator/translatorplugin.cpp
@@ -29,7 +29,7 @@
 #include <kaction.h>
 #include <kgenericfactory.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kaboutdata.h>
 
diff --git a/kopete/plugins/translator/translatorplugin.h b/kopete/plugins/translator/translatorplugin.h
index 762b6018..d7700d8e 100644
--- a/kopete/plugins/translator/translatorplugin.h
+++ b/kopete/plugins/translator/translatorplugin.h
@@ -27,7 +27,7 @@
 #include <tqintdict.h>
 
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "kopetemessage.h"
 #include "kopeteplugin.h"
diff --git a/kopete/plugins/webpresence/CMakeLists.txt b/kopete/plugins/webpresence/CMakeLists.txt
index bcba1176..a2b07be0 100644
--- a/kopete/plugins/webpresence/CMakeLists.txt
+++ b/kopete/plugins/webpresence/CMakeLists.txt
@@ -31,7 +31,7 @@ install( FILES
 
 install( FILES
     kopete_webpresence_config.desktop
-  DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+  DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 
 install( FILES
     webpresence_html.xsl webpresence_html_images.xsl
diff --git a/kopete/plugins/webpresence/Makefile.am b/kopete/plugins/webpresence/Makefile.am
index 6785efca..eb91a345 100644
--- a/kopete/plugins/webpresence/Makefile.am
+++ b/kopete/plugins/webpresence/Makefile.am
@@ -17,7 +17,7 @@ service_DATA = kopete_webpresence.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_webpresence_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
 
 mydata_DATA = webpresence_html.xsl\
 	      webpresence_html_images.xsl\
diff --git a/kopete/plugins/webpresence/webpresenceplugin.cpp b/kopete/plugins/webpresence/webpresenceplugin.cpp
index 82525619..48271559 100644
--- a/kopete/plugins/webpresence/webpresenceplugin.cpp
+++ b/kopete/plugins/webpresence/webpresenceplugin.cpp
@@ -25,7 +25,7 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
@@ -73,33 +73,33 @@ WebPresencePlugin::~WebPresencePlugin()
 
 void WebPresencePlugin::loadSettings()
 {
-	TDEConfig *kconfig = TDEGlobal::config();
-	kconfig->setGroup( "Web Presence Plugin" );
+	TDEConfig *tdeconfig = TDEGlobal::config();
+	tdeconfig->setGroup( "Web Presence Plugin" );
 
-	frequency = kconfig->readNumEntry("UploadFrequency", 15);
-	resultURL = kconfig->readPathEntry("uploadURL");
+	frequency = tdeconfig->readNumEntry("UploadFrequency", 15);
+	resultURL = tdeconfig->readPathEntry("uploadURL");
 
 	resultFormatting = WEB_UNDEFINED;
 
-	if ( kconfig->readBoolEntry( "formatHTML", false ) ) {
+	if ( tdeconfig->readBoolEntry( "formatHTML", false ) ) {
 		resultFormatting = WEB_HTML;
-	} else if ( kconfig->readBoolEntry( "formatXHTML", false ) ) {
+	} else if ( tdeconfig->readBoolEntry( "formatXHTML", false ) ) {
 		resultFormatting = WEB_XHTML;
-	} else if ( kconfig->readBoolEntry( "formatXML", false ) ) {
+	} else if ( tdeconfig->readBoolEntry( "formatXML", false ) ) {
 		resultFormatting = WEB_XML;
-	} else if ( kconfig->readBoolEntry( "formatStylesheet", false ) ) {
+	} else if ( tdeconfig->readBoolEntry( "formatStylesheet", false ) ) {
 		resultFormatting = WEB_CUSTOM;
-		userStyleSheet = kconfig->readEntry("formatStylesheetURL");
+		userStyleSheet = tdeconfig->readEntry("formatStylesheetURL");
 	}
 
 	// Default to HTML if we dont get anything useful from config file.
 	if ( resultFormatting == WEB_UNDEFINED )
 		resultFormatting = WEB_HTML;
 
-	useImagesInHTML = kconfig->readBoolEntry( "useImagesHTML", false );
-	useImName = kconfig->readBoolEntry("showName", true);
-	userName = kconfig->readEntry("showThisName");
-	showAddresses = kconfig->readBoolEntry("includeIMAddress", false);
+	useImagesInHTML = tdeconfig->readBoolEntry( "useImagesHTML", false );
+	useImName = tdeconfig->readBoolEntry("showName", true);
+	userName = tdeconfig->readEntry("showThisName");
+	showAddresses = tdeconfig->readBoolEntry("includeIMAddress", false);
 
 	// Update file when settings are changed.
 	slotWriteFile();
diff --git a/kopete/plugins/webpresence/webpresenceplugin.h b/kopete/plugins/webpresence/webpresenceplugin.h
index d5324a40..c739d10e 100644
--- a/kopete/plugins/webpresence/webpresenceplugin.h
+++ b/kopete/plugins/webpresence/webpresenceplugin.h
@@ -22,7 +22,7 @@
 
 #include <tqvaluestack.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "kopetecontact.h"
 #include "kopeteonlinestatus.h"
diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp
index c60f4051..f9a725ee 100644
--- a/kopete/protocols/gadu/gaduaccount.cpp
+++ b/kopete/protocols/gadu/gaduaccount.cpp
@@ -37,14 +37,14 @@
 #include "kopeteglobal.h"
 
 #include <kpassdlg.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kpopupmenu.h>
 #include <kmessagebox.h>
 #include <knotifyclient.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqapplication.h>
 #include <tqdialog.h>
diff --git a/kopete/protocols/gadu/gaduaccount.h b/kopete/protocols/gadu/gaduaccount.h
index 1ba9a5c2..dd3f6c68 100644
--- a/kopete/protocols/gadu/gaduaccount.h
+++ b/kopete/protocols/gadu/gaduaccount.h
@@ -37,7 +37,7 @@
 #include <tqstring.h>
 #include <tqptrlist.h>
 #include <kaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 class GaduAccountPrivate;
 
diff --git a/kopete/protocols/gadu/gaducontact.cpp b/kopete/protocols/gadu/gaducontact.cpp
index c9a68f25..9aea8fe5 100644
--- a/kopete/protocols/gadu/gaducontact.cpp
+++ b/kopete/protocols/gadu/gaducontact.cpp
@@ -23,7 +23,7 @@
 #include <klocale.h>
 #include <kaction.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 
 #include "gaduaccount.h"
diff --git a/kopete/protocols/gadu/gaduprotocol.cpp b/kopete/protocols/gadu/gaduprotocol.cpp
index 3ec773f0..4f77017a 100644
--- a/kopete/protocols/gadu/gaduprotocol.cpp
+++ b/kopete/protocols/gadu/gaduprotocol.cpp
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <libgadu.h>
 
diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp
index 40d04a3e..51be07e1 100644
--- a/kopete/protocols/groupwise/gwaccount.cpp
+++ b/kopete/protocols/groupwise/gwaccount.cpp
@@ -24,7 +24,7 @@
 
 #include <kaboutdata.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kinputdialog.h>
diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
index de50ba19..910c99f4 100644
--- a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
+++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
@@ -26,7 +26,7 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpassdlg.h>
diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp
index d4c65412..4c51487f 100644
--- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp
+++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp
@@ -19,7 +19,7 @@
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kopetecontact.h>
 #include <kopeteglobal.h>
diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp
index 46e325ac..7daf2f8d 100644
--- a/kopete/protocols/irc/ircaccount.cpp
+++ b/kopete/protocols/irc/ircaccount.cpp
@@ -43,7 +43,7 @@
 #include <kaction.h>
 #include <kaboutdata.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcompletionbox.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/kopete/protocols/irc/irccontactmanager.cpp b/kopete/protocols/irc/irccontactmanager.cpp
index 84c88f39..10ae8a69 100644
--- a/kopete/protocols/irc/irccontactmanager.cpp
+++ b/kopete/protocols/irc/irccontactmanager.cpp
@@ -31,7 +31,7 @@
 #include <kopetecontactlist.h>
 #include <kopeteview.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 #include <tqtimer.h>
@@ -67,7 +67,7 @@ IRCContactManager::IRCContactManager(const TQString &nickName, IRCAccount *accou
 			this, TQT_SLOT( slotContactAdded( Kopete::MetaContact* )));
 
 	socketTimeout = 15000;
-	TQString timeoutPath = locate( "config", "kioslaverc" );
+	TQString timeoutPath = locate( "config", "tdeioslaverc" );
 	if( !timeoutPath.isEmpty() )
 	{
 		TDEConfig config( timeoutPath );
diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp
index 96d905c0..e2d359dd 100644
--- a/kopete/protocols/irc/ircprotocol.cpp
+++ b/kopete/protocols/irc/ircprotocol.cpp
@@ -23,7 +23,7 @@
 #include "ircchannelcontact.h"
 #include "irccontactmanager.h"
 
-#include "networkconfig.h"
+#include "networtdeconfig.h"
 #include "channellist.h"
 #include "ircguiclient.h"
 #include "ircusercontact.h"
diff --git a/kopete/protocols/irc/ircusercontact.cpp b/kopete/protocols/irc/ircusercontact.cpp
index 54c40132..fa2ae7b5 100644
--- a/kopete/protocols/irc/ircusercontact.cpp
+++ b/kopete/protocols/irc/ircusercontact.cpp
@@ -28,7 +28,7 @@
 
 #include <kaction.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 
 #include <tqtimer.h>
diff --git a/kopete/protocols/irc/libkirc/kircengine.cpp b/kopete/protocols/irc/libkirc/kircengine.cpp
index 0fddaab7..79bc56df 100644
--- a/kopete/protocols/irc/libkirc/kircengine.cpp
+++ b/kopete/protocols/irc/libkirc/kircengine.cpp
@@ -24,7 +24,7 @@
 #include "kircengine.h"
 #include "ksslsocket.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kextsock.h>
 #include <klocale.h>
diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp
index 5db30998..d3615fc5 100644
--- a/kopete/protocols/irc/libkirc/ksslsocket.cpp
+++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp
@@ -184,16 +184,16 @@ void KSSLSocket::showInfoDialog()
 {
 	if( socketStatus() == connected )
 	{
-		if (!d->dcc->isApplicationRegistered("kio_uiserver"))
+		if (!d->dcc->isApplicationRegistered("tdeio_uiserver"))
 		{
-			TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",TQStringList());
+			TDEApplication::startServiceByDesktopPath("tdeio_uiserver.desktop",TQStringList());
 		}
 
 		TQByteArray data, ignore;
 		TQCString ignoretype;
 		TQDataStream arg(data, IO_WriteOnly);
 		arg << "irc://" + peerAddress()->pretty() + ":" + port() << d->metaData;
-		d->dcc->call("kio_uiserver", "UIServer",
+		d->dcc->call("tdeio_uiserver", "UIServer",
 			"showSSLInfoDialog(TQString,TDEIO::MetaData)", data, ignoretype, ignore);
 	}
 }
@@ -233,12 +233,12 @@ int KSSLSocket::messageBox( TDEIO::SlaveBase::MessageBoxType type, const TQStrin
 	TQDataStream arg(data, IO_WriteOnly);
 	arg << (int)1 << (int)type << text << caption << buttonYes << buttonNo;
 
-	if (!d->dcc->isApplicationRegistered("kio_uiserver"))
+	if (!d->dcc->isApplicationRegistered("tdeio_uiserver"))
 	{
-		TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",TQStringList());
+		TDEApplication::startServiceByDesktopPath("tdeio_uiserver.desktop",TQStringList());
 	}
 
-	d->dcc->call("kio_uiserver", "UIServer",
+	d->dcc->call("tdeio_uiserver", "UIServer",
 			"messageBox(int,int,TQString,TQString,TQString,TQString)", data, returnType, result);
 
 	if( returnType == "int" )
diff --git a/kopete/protocols/irc/libkirc/ksslsocket.h b/kopete/protocols/irc/libkirc/ksslsocket.h
index a036a71d..f0b8e76c 100644
--- a/kopete/protocols/irc/libkirc/ksslsocket.h
+++ b/kopete/protocols/irc/libkirc/ksslsocket.h
@@ -22,7 +22,7 @@
 
 #include <tqvariant.h>
 #include <kextsock.h>
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 
 class KSSLSocketPrivate;
 
diff --git a/kopete/protocols/irc/ui/CMakeLists.txt b/kopete/protocols/irc/ui/CMakeLists.txt
index 7d77d5b8..d90cdd65 100644
--- a/kopete/protocols/irc/ui/CMakeLists.txt
+++ b/kopete/protocols/irc/ui/CMakeLists.txt
@@ -26,5 +26,5 @@ include_directories(
 tde_add_library( kopeteircui STATIC_PIC AUTOMOC
   SOURCES
     ircadd.ui empty.cpp irceditaccountwidget.cpp irceditaccount.ui
-    channellist.cpp channellistdialog.cpp networkconfig.ui
+    channellist.cpp channellistdialog.cpp networtdeconfig.ui
 )
diff --git a/kopete/protocols/irc/ui/Makefile.am b/kopete/protocols/irc/ui/Makefile.am
index 854a7398..b31b75ea 100644
--- a/kopete/protocols/irc/ui/Makefile.am
+++ b/kopete/protocols/irc/ui/Makefile.am
@@ -8,5 +8,5 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) \
 
 
 libkopeteircui_la_SOURCES = ircadd.ui empty.cpp irceditaccountwidget.cpp \
-	irceditaccount.ui channellist.cpp channellistdialog.cpp networkconfig.ui
+	irceditaccount.ui channellist.cpp channellistdialog.cpp networtdeconfig.ui
 EXTRA_DIST = ircadd.ui ircprefs.ui empty.cpp
diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp
index f09ea21e..430282fb 100644
--- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp
+++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp
@@ -32,7 +32,7 @@
 #include <klistview.h>
 #include <kdebug.h>
 #include <kextsock.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kcharsets.h>
 
diff --git a/kopete/protocols/irc/ui/networkconfig.ui b/kopete/protocols/irc/ui/networtdeconfig.ui
index 09121e54..09121e54 100644
--- a/kopete/protocols/irc/ui/networkconfig.ui
+++ b/kopete/protocols/irc/ui/networtdeconfig.ui
diff --git a/kopete/protocols/irc/ui/networkconfig.ui.h b/kopete/protocols/irc/ui/networtdeconfig.ui.h
index 183ba57f..183ba57f 100644
--- a/kopete/protocols/irc/ui/networkconfig.ui.h
+++ b/kopete/protocols/irc/ui/networtdeconfig.ui.h
diff --git a/kopete/protocols/jabber/CMakeLists.txt b/kopete/protocols/jabber/CMakeLists.txt
index a5e53af2..61202e95 100644
--- a/kopete/protocols/jabber/CMakeLists.txt
+++ b/kopete/protocols/jabber/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_subdirectory( ui )
 add_subdirectory( icons )
 add_subdirectory( libiris )
-add_subdirectory( kioslave )
+add_subdirectory( tdeioslave )
 
 if( WITH_JINGLE )
   add_subdirectory( jingle )
diff --git a/kopete/protocols/jabber/Makefile.am b/kopete/protocols/jabber/Makefile.am
index f1706949..34337e63 100644
--- a/kopete/protocols/jabber/Makefile.am
+++ b/kopete/protocols/jabber/Makefile.am
@@ -5,7 +5,7 @@ JINGLE_INCLUDES=-I$(srcdir)/jingle -I$(top_builddir)/kopete/protocols/jabber/jin
 endif
 
 METASOURCES = AUTO
-SUBDIRS = ui icons libiris $(JINGLE) . kioslave
+SUBDIRS = ui icons libiris $(JINGLE) . tdeioslave
 AM_CPPFLAGS = $(KOPETE_INCLUDES) \
 	-I$(srcdir)/libiris/iris/include \
 	-I$(srcdir)/libiris/iris/xmpp-im \
diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp
index 0a803927..23f947fc 100644
--- a/kopete/protocols/jabber/jabberaccount.cpp
+++ b/kopete/protocols/jabber/jabberaccount.cpp
@@ -37,7 +37,7 @@
 #include <tqregexp.h>
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/kopete/protocols/jabber/jabberbasecontact.cpp b/kopete/protocols/jabber/jabberbasecontact.cpp
index d994487f..ec4b869f 100644
--- a/kopete/protocols/jabber/jabberbasecontact.cpp
+++ b/kopete/protocols/jabber/jabberbasecontact.cpp
@@ -24,7 +24,7 @@
 #include <tqimage.h>
 #include <tqregexp.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 
 #include <kopetegroup.h>
diff --git a/kopete/protocols/jabber/jabberchatsession.cpp b/kopete/protocols/jabber/jabberchatsession.cpp
index 75bcdd03..cbfc0eab 100644
--- a/kopete/protocols/jabber/jabberchatsession.cpp
+++ b/kopete/protocols/jabber/jabberchatsession.cpp
@@ -25,7 +25,7 @@
 #include <tqiconset.h>
 #include <tqregexp.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include "kopetechatsessionmanager.h"
@@ -38,7 +38,7 @@
 #include "jabbercontact.h"
 #include "jabberresource.h"
 #include "jabberresourcepool.h"
-#include "kioslave/jabberdisco.h"
+#include "tdeioslave/jabberdisco.h"
 
 
 JabberChatSession::JabberChatSession ( JabberProtocol *protocol, const JabberBaseContact *user,
diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp
index 58ca2409..1d7d2e3f 100644
--- a/kopete/protocols/jabber/jabbercontact.cpp
+++ b/kopete/protocols/jabber/jabbercontact.cpp
@@ -31,11 +31,11 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kaction.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kinputdialog.h>
 #include <kopeteview.h>
 
diff --git a/kopete/protocols/jabber/jabberfiletransfer.cpp b/kopete/protocols/jabber/jabberfiletransfer.cpp
index 00ecd535..e60116e5 100644
--- a/kopete/protocols/jabber/jabberfiletransfer.cpp
+++ b/kopete/protocols/jabber/jabberfiletransfer.cpp
@@ -21,7 +21,7 @@
 #include "jabberfiletransfer.h"
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "kopeteuiglobal.h"
 #include "kopetemetacontact.h"
 #include "kopetecontactlist.h"
diff --git a/kopete/protocols/jabber/jabbergroupcontact.cpp b/kopete/protocols/jabber/jabbergroupcontact.cpp
index 1fa6d884..96ab9bcd 100644
--- a/kopete/protocols/jabber/jabbergroupcontact.cpp
+++ b/kopete/protocols/jabber/jabbergroupcontact.cpp
@@ -20,7 +20,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kinputdialog.h>
 #include "jabberprotocol.h"
 #include "jabberaccount.h"
diff --git a/kopete/protocols/jabber/jabbergroupmembercontact.cpp b/kopete/protocols/jabber/jabbergroupmembercontact.cpp
index e9bae4c1..e1bbd04a 100644
--- a/kopete/protocols/jabber/jabbergroupmembercontact.cpp
+++ b/kopete/protocols/jabber/jabbergroupmembercontact.cpp
@@ -19,7 +19,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include "jabberprotocol.h"
 #include "jabberaccount.h"
 #include "jabberfiletransfer.h"
diff --git a/kopete/protocols/jabber/jabberprotocol.cpp b/kopete/protocols/jabber/jabberprotocol.cpp
index a7cf3a78..9e9cdc9a 100644
--- a/kopete/protocols/jabber/jabberprotocol.cpp
+++ b/kopete/protocols/jabber/jabberprotocol.cpp
@@ -19,7 +19,7 @@
 
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <kpopupmenu.h>
diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp
index 26d16b28..adc53b01 100644
--- a/kopete/protocols/jabber/jabbertransport.cpp
+++ b/kopete/protocols/jabber/jabbertransport.cpp
@@ -34,7 +34,7 @@
 #include <kaction.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "xmpp_tasks.h"
 
diff --git a/kopete/protocols/jabber/kioslave/CMakeLists.txt b/kopete/protocols/jabber/tdeioslave/CMakeLists.txt
index 24b4ce81..aaf788bd 100644
--- a/kopete/protocols/jabber/kioslave/CMakeLists.txt
+++ b/kopete/protocols/jabber/tdeioslave/CMakeLists.txt
@@ -37,6 +37,6 @@ tde_add_kpart( kio_jabberdisco AUTOMOC
   LINK
     jabberclient-static
     iris_xmpp_core-static iris_xmpp_im-static iris_jabber-static iris-static
-    qca-static cutestuff_network-static cutestuff_util-static kio-shared idn
+    qca-static cutestuff_network-static cutestuff_util-static tdeio-shared idn
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kopete/protocols/jabber/kioslave/Makefile.am b/kopete/protocols/jabber/tdeioslave/Makefile.am
index be3b2112..f8b9c651 100644
--- a/kopete/protocols/jabber/kioslave/Makefile.am
+++ b/kopete/protocols/jabber/tdeioslave/Makefile.am
@@ -22,4 +22,4 @@ protocol_DATA = jabberdisco.protocol
 protocoldir = $(kde_servicesdir)
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kio_jabberdisco.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_jabberdisco.pot
diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.cpp b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp
index 311cfafd..311cfafd 100644
--- a/kopete/protocols/jabber/kioslave/jabberdisco.cpp
+++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp
diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.h b/kopete/protocols/jabber/tdeioslave/jabberdisco.h
index 660ba269..a2bc92a4 100644
--- a/kopete/protocols/jabber/kioslave/jabberdisco.h
+++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.h
@@ -25,8 +25,8 @@
 #include <tqcstring.h>
 
 #include <kurl.h>
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 #include <jabberclient.h>
 
 #define JABBER_DISCO_DEBUG		0
diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.protocol b/kopete/protocols/jabber/tdeioslave/jabberdisco.protocol
index 01237e73..fcc0161b 100644
--- a/kopete/protocols/jabber/kioslave/jabberdisco.protocol
+++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.protocol
@@ -10,35 +10,35 @@ linking=false
 moving=false
 Icon=remote
 Description=A KIO slave for Jabber Service Discovery
-Description[be]=Модуль kioslave для пошуку сервісаў Jabber
+Description[be]=Модуль tdeioslave для пошуку сервісаў Jabber
 Description[bn]=Jabber সার্ভিস ডিসকভারির জন্য একটি কে-আই-ও স্লেভ
 Description[bs]=KIO slave za otkrivanje Jabber servisa
 Description[ca]=Un esclau KIO pel servei de de descoberta del Jabber
 Description[cs]=Pomocný protokol pro zjišťování služeb Jabber
-Description[da]=En kioslave til at opdage jabber service
+Description[da]=En tdeioslave til at opdage jabber service
 Description[de]=Ein Ein-/Ausgabemodul zum Auffinden von Jabber-Diensten
-Description[el]=Ένα kioslave για την ανίχνευση υπηρεσίας Jabber
-Description[es]=Un «kioslave» para el servicio de descubrimiento jabber
+Description[el]=Ένα tdeioslave για την ανίχνευση υπηρεσίας Jabber
+Description[es]=Un «tdeioslave» para el servicio de descubrimiento jabber
 Description[et]=Jabberi teenuste tuvastamise KIO-moodul
 Description[eu]=Jabber aurkikuntza zerbitzureako KIO morroi bat
 Description[fa]=یک پیرو KIO برای خدمت اکتشافی Jabber
 Description[fr]=Un module d'entrée / sortie pour la recherche de service Jabber
 Description[gl]=Un KIO slave para Jabber Service Discovery
 Description[hu]=KDE-protokoll a Jabber szolgáltatáskereső használatához
-Description[is]=kioslave fyrir Jabber þjónustu uppgötvun
+Description[is]=tdeioslave fyrir Jabber þjónustu uppgötvun
 Description[it]=Un KIO slave per il servizio di discovery per Jabber
 Description[ja]=Jabber Service Discovery の KIO スレーブ
 Description[ka]=KIO slave Jabber სერვისის დირექტორიისთვის
 Description[kk]=Jabber қызметін байқау KIO slave қызметі
 Description[km]=KIO slave មួយសម្រាប់របកគំហើញសេវា Jabber
-Description[lt]=Priedas (kioslave) FISH protokolui
-Description[nb]=En kioslave for Jabber tjenestesøk
+Description[lt]=Priedas (tdeioslave) FISH protokolui
+Description[nb]=En tdeioslave for Jabber tjenestesøk
 Description[nds]=En In-/Utgaavmoduul för't Finnen vun Jabber-Deensten
 Description[ne]=ज्याबर सेवा खोजीका लागि कियो स्लाभ
-Description[nl]=Een kioslave voor Jabber Service Discovery
+Description[nl]=Een tdeioslave voor Jabber Service Discovery
 Description[nn]=Ein KIO-slave for Jabber-tenesteoppdaging
 Description[pl]=Wtyczka protokołu KIO dla usługi odkrywania usług Jabbera (Jabber Service Discovery)
-Description[pt]=Um 'kioslave' para a Descoberta de Serviços do Jabber
+Description[pt]=Um 'tdeioslave' para a Descoberta de Serviços do Jabber
 Description[pt_BR]=Um KIO-Slave para a descoberta de serviço do Jabber
 Description[ru]=Обработчик KIO для обнаружения служб Jabber
 Description[sk]=KIO otrok pre Jabber Service Discovery
@@ -50,4 +50,4 @@ Description[tr]=Jabber Servis Bulucu için KIOSlave
 Description[uk]=Підлеглий В/В для виявлення служби Jabber
 Description[zh_CN]=Jabber 服务发现的 KIO slave
 Description[zh_HK]=用於發現 Jabber 服務的 KIO slave
-Description[zh_TW]=Jabber 服務的 kioslave
+Description[zh_TW]=Jabber 服務的 tdeioslave
diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
index 2da7740e..34a2eb35 100644
--- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
@@ -36,8 +36,8 @@
 #include <kurllabel.h>
 #include <kmessagebox.h>
 #include <krun.h>
-#include <kio/netaccess.h>
-#include <kfiledialog.h>
+#include <tdeio/netaccess.h>
+#include <tdefiledialog.h>
 #include <kpixmapregionselectordialog.h>
 #include <kstandarddirs.h>
 
diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.cpp b/kopete/protocols/jabber/ui/jabberchooseserver.cpp
index a9a00689..77356c55 100644
--- a/kopete/protocols/jabber/ui/jabberchooseserver.cpp
+++ b/kopete/protocols/jabber/ui/jabberchooseserver.cpp
@@ -21,9 +21,9 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <tqtable.h>
 #include <tqlabel.h>
 #include "jabberprotocol.h"
diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
index 71ad871f..a07c8f1d 100644
--- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
+++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
@@ -25,7 +25,7 @@
 #include <tqcombobox.h>
 #include <tqlabel.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kpassdlg.h>
diff --git a/kopete/protocols/meanwhile/meanwhileaccount.cpp b/kopete/protocols/meanwhile/meanwhileaccount.cpp
index 03f8e008..dc66a0cf 100644
--- a/kopete/protocols/meanwhile/meanwhileaccount.cpp
+++ b/kopete/protocols/meanwhile/meanwhileaccount.cpp
@@ -28,7 +28,7 @@
 #include <kaction.h>
 #include <kpopupmenu.h>
 #include <klocale.h>
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include "kopeteaway.h"
 #include <kinputdialog.h>
 #include <kmessagebox.h>
diff --git a/kopete/protocols/msn/config/CMakeLists.txt b/kopete/protocols/msn/config/CMakeLists.txt
index 7e0d1337..d9fd401b 100644
--- a/kopete/protocols/msn/config/CMakeLists.txt
+++ b/kopete/protocols/msn/config/CMakeLists.txt
@@ -25,7 +25,7 @@ link_directories(
 
 install( FILES
     kopete_msn_config.desktop
-  DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+  DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 
 
 ##### kcm_kopete_msn (module) ###################
diff --git a/kopete/protocols/msn/config/Makefile.am b/kopete/protocols/msn/config/Makefile.am
index b5e2026a..f01cb0f1 100644
--- a/kopete/protocols/msn/config/Makefile.am
+++ b/kopete/protocols/msn/config/Makefile.am
@@ -8,5 +8,5 @@ kcm_kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
 kcm_kopete_msn_la_LIBADD  = ../../../libkopete/libkopete.la $(LIB_KUTILS)
 
 service_DATA = kopete_msn_config.desktop
-servicedir = $(kde_servicesdir)/kconfiguredialog
+servicedir = $(kde_servicesdir)/tdeconfiguredialog
 
diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp
index 58072441..39033752 100644
--- a/kopete/protocols/msn/msnaccount.cpp
+++ b/kopete/protocols/msn/msnaccount.cpp
@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>
diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp
index df621d65..487f4aaa 100644
--- a/kopete/protocols/msn/msnchatsession.cpp
+++ b/kopete/protocols/msn/msnchatsession.cpp
@@ -24,7 +24,7 @@
 #include <tqiconset.h>
 
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
 #include <klocale.h>
diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp
index 84333bcf..c487f1df 100644
--- a/kopete/protocols/msn/msncontact.cpp
+++ b/kopete/protocols/msn/msncontact.cpp
@@ -26,17 +26,17 @@
 #undef KDE_NO_COMPAT
 #include <kaction.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <krun.h>
 #include <ktempfile.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <tqregexp.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "kopetecontactlist.h"
 #include "kopetechatsessionmanager.h"
diff --git a/kopete/protocols/msn/msnfiletransfersocket.cpp b/kopete/protocols/msn/msnfiletransfersocket.cpp
index cfe74905..3c480092 100644
--- a/kopete/protocols/msn/msnfiletransfersocket.cpp
+++ b/kopete/protocols/msn/msnfiletransfersocket.cpp
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <kserversocket.h>
 #include <kbufferedsocket.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 
 #include "kopetetransfermanager.h"
diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp
index 1093370a..5f20d9ca 100644
--- a/kopete/protocols/msn/msnnotifysocket.cpp
+++ b/kopete/protocols/msn/msnnotifysocket.cpp
@@ -40,9 +40,9 @@
 #include <kstandarddirs.h>
 #include <ktempfile.h>
 #include <krun.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <tqfile.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knotification.h>
 
 #include "kopeteuiglobal.h"
diff --git a/kopete/protocols/msn/msnprotocol.cpp b/kopete/protocols/msn/msnprotocol.cpp
index 9ef32e04..cab1407d 100644
--- a/kopete/protocols/msn/msnprotocol.cpp
+++ b/kopete/protocols/msn/msnprotocol.cpp
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kaboutdata.h>
 
diff --git a/kopete/protocols/msn/msnsecureloginhandler.cpp b/kopete/protocols/msn/msnsecureloginhandler.cpp
index 58f4f66f..f8431f9f 100644
--- a/kopete/protocols/msn/msnsecureloginhandler.cpp
+++ b/kopete/protocols/msn/msnsecureloginhandler.cpp
@@ -20,7 +20,7 @@
 #include <tqregexp.h>
 
 // KDE includes
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 #include <kdebug.h>
 
diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp
index 2496006b..32b3d17a 100644
--- a/kopete/protocols/msn/msnsocket.cpp
+++ b/kopete/protocols/msn/msnsocket.cpp
@@ -27,7 +27,7 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kbufferedsocket.h>
 #include <kserversocket.h>
 #include <kresolver.h>
diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp
index 7239e54f..9dc475ab 100644
--- a/kopete/protocols/msn/msnswitchboardsocket.cpp
+++ b/kopete/protocols/msn/msnswitchboardsocket.cpp
@@ -39,7 +39,7 @@
 #include <kapplication.h>
 #include <kaboutdata.h>
 #include <ktempfile.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
 #include <ktempfile.h>
diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
index 57764d14..57022e6d 100644
--- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp
+++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
@@ -31,15 +31,15 @@
 #include <kcombobox.h>
 
 #include <kautoconfig.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kdebug.h>
 #include <kpassdlg.h>
 #include <krun.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpixmapregionselectordialog.h>
 
 #include "kopeteuiglobal.h"
diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp
index fde51060..b7f991cd 100644
--- a/kopete/protocols/msn/webcam.cpp
+++ b/kopete/protocols/msn/webcam.cpp
@@ -28,7 +28,7 @@
 #include <tqtimer.h>
 #include <tqevent.h>
 #include <tqdatetime.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "dispatcher.h"
 
diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp
index ee9c0c4a..ba8d94b1 100644
--- a/kopete/protocols/oscar/aim/aimaccount.cpp
+++ b/kopete/protocols/oscar/aim/aimaccount.cpp
@@ -17,7 +17,7 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <klocale.h>
 #include <kpopupmenu.h>
diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp
index 2e0100ab..e3c1f62b 100644
--- a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp
+++ b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp
@@ -11,7 +11,7 @@
 #include <kdebug.h>
 #include <krun.h>
 #include <kpassdlg.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "kopetepassword.h"
 #include "kopetepasswordwidget.h"
diff --git a/kopete/protocols/oscar/icq/icqaccount.cpp b/kopete/protocols/oscar/icq/icqaccount.cpp
index f2a9bce9..9ca3baae 100644
--- a/kopete/protocols/oscar/icq/icqaccount.cpp
+++ b/kopete/protocols/oscar/icq/icqaccount.cpp
@@ -17,7 +17,7 @@
 
 #include <tqfile.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kpopupmenu.h>
diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp
index 04a312a4..edcf03ce 100644
--- a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp
+++ b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp
@@ -25,7 +25,7 @@
 #include <tqspinbox.h>
 #include <tqpushbutton.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klocale.h>
diff --git a/kopete/protocols/oscar/oscaraccount.cpp b/kopete/protocols/oscar/oscaraccount.cpp
index 719e9122..76c46be2 100644
--- a/kopete/protocols/oscar/oscaraccount.cpp
+++ b/kopete/protocols/oscar/oscaraccount.cpp
@@ -42,7 +42,7 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpassivepopup.h>
diff --git a/kopete/protocols/oscar/oscarversionupdater.cpp b/kopete/protocols/oscar/oscarversionupdater.cpp
index bcaf454e..e7cb0a7a 100644
--- a/kopete/protocols/oscar/oscarversionupdater.cpp
+++ b/kopete/protocols/oscar/oscarversionupdater.cpp
@@ -20,8 +20,8 @@
 #include <tqmutex.h>
 
 #include <kdebug.h>
-#include <kio/job.h>
-#include <kconfig.h>
+#include <tdeio/job.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 
diff --git a/kopete/protocols/sms/services/gsmlib.cpp b/kopete/protocols/sms/services/gsmlib.cpp
index 45ade4c1..e8a83d69 100644
--- a/kopete/protocols/sms/services/gsmlib.cpp
+++ b/kopete/protocols/sms/services/gsmlib.cpp
@@ -28,7 +28,7 @@
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <kdebug.h>
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 
 #include <unistd.h>
 #include <gsmlib/gsm_me_ta.h>
diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp
index 6b303104..c459bdd0 100644
--- a/kopete/protocols/sms/services/smsclient.cpp
+++ b/kopete/protocols/sms/services/smsclient.cpp
@@ -22,7 +22,7 @@
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <kdebug.h>
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 
 #include "kopeteaccount.h"
 #include "kopeteuiglobal.h"
diff --git a/kopete/protocols/sms/services/smssend.cpp b/kopete/protocols/sms/services/smssend.cpp
index 0c7c6cad..93e7e033 100644
--- a/kopete/protocols/sms/services/smssend.cpp
+++ b/kopete/protocols/sms/services/smssend.cpp
@@ -20,7 +20,7 @@
 #include <tqlabel.h>
 #include <tqtooltip.h>
 
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kurlrequester.h>
diff --git a/kopete/protocols/sms/services/smssendprovider.cpp b/kopete/protocols/sms/services/smssendprovider.cpp
index e2095d25..40a60baa 100644
--- a/kopete/protocols/sms/services/smssendprovider.cpp
+++ b/kopete/protocols/sms/services/smssendprovider.cpp
@@ -18,7 +18,7 @@
 #include <tqlabel.h>
 #include <tqfile.h>
 
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kprocess.h>
 #include <klineedit.h>
 #include <kmessagebox.h>
diff --git a/kopete/protocols/sms/smsaccount.cpp b/kopete/protocols/sms/smsaccount.cpp
index 10e09ae8..f3b8c35b 100644
--- a/kopete/protocols/sms/smsaccount.cpp
+++ b/kopete/protocols/sms/smsaccount.cpp
@@ -16,7 +16,7 @@
 
 #undef KDE_NO_COMPAT
 
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kaction.h>
 #include <kpopupmenu.h>
 #include <kprocess.h>
diff --git a/kopete/protocols/sms/smscontact.cpp b/kopete/protocols/sms/smscontact.cpp
index f47a0b46..d5980050 100644
--- a/kopete/protocols/sms/smscontact.cpp
+++ b/kopete/protocols/sms/smscontact.cpp
@@ -15,7 +15,7 @@
 */
 
 #undef KDE_NO_COMPAT
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kaction.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kopete/protocols/sms/smseditaccountwidget.cpp b/kopete/protocols/sms/smseditaccountwidget.cpp
index c2a1fb1e..f1872a21 100644
--- a/kopete/protocols/sms/smseditaccountwidget.cpp
+++ b/kopete/protocols/sms/smseditaccountwidget.cpp
@@ -22,7 +22,7 @@
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <krestrictedline.h>
diff --git a/kopete/protocols/sms/smsprotocol.cpp b/kopete/protocols/sms/smsprotocol.cpp
index cd32d959..f232edc3 100644
--- a/kopete/protocols/sms/smsprotocol.cpp
+++ b/kopete/protocols/sms/smsprotocol.cpp
@@ -16,7 +16,7 @@
 
 #include <kgenericfactory.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 
 #include "kopeteaccountmanager.h"
diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h
index 1213b3cf..39a098eb 100644
--- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h
+++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h
@@ -27,7 +27,7 @@
 
 // KDE Includes
 #include <kprocio.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 const TQString WP_POPUP_DIR = TQString::fromLatin1("/var/lib/winpopup");
 
diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp
index d7439628..994735cc 100644
--- a/kopete/protocols/winpopup/wpaccount.cpp
+++ b/kopete/protocols/winpopup/wpaccount.cpp
@@ -25,7 +25,7 @@
 #include <kdebug.h>
 #include <kpopupmenu.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 // Kopete Includes
 
diff --git a/kopete/protocols/winpopup/wpeditaccount.cpp b/kopete/protocols/winpopup/wpeditaccount.cpp
index 0e0b6f43..414a1af6 100644
--- a/kopete/protocols/winpopup/wpeditaccount.cpp
+++ b/kopete/protocols/winpopup/wpeditaccount.cpp
@@ -32,7 +32,7 @@
 #include <knuminput.h>
 #include <klineedit.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>
 
diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.cpp b/kopete/protocols/yahoo/libkyahoo/logintask.cpp
index b3c3f297..7e853fec 100644
--- a/kopete/protocols/yahoo/libkyahoo/logintask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/logintask.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <stdlib.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kmdcodec.h>
 
 extern "C"
diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
index cd77498e..668e29c3 100644
--- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
@@ -25,9 +25,9 @@
 #include <tqdatastream.h>
 #include <tqdom.h>
 #include <klocale.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kbufferedsocket.h>
 
 using namespace KNetwork;
diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
index 4528612b..532e21bf 100644
--- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
@@ -24,9 +24,9 @@
 #include <tqfile.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 
 ReceiveFileTask::ReceiveFileTask(Task* parent) : Task(parent)
 {
diff --git a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
index e435f568..9cfe6763 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
@@ -25,7 +25,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstreamsocket.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 using namespace KNetwork;
 
diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
index a5f8f821..95193241 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
@@ -22,9 +22,9 @@
 #include <tqstring.h>
 #include <tqfile.h>
 #include <tqdatastream.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kbufferedsocket.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
index 4eb82cc4..98df4ef0 100644
--- a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
@@ -22,9 +22,9 @@
 #include "client.h"
 #include <tqstring.h>
 #include <tqdatastream.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <klocale.h>
 
 YABTask::YABTask(Task* parent) : Task(parent)
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
index b9a270f8..96f96389 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
@@ -21,9 +21,9 @@
 // KDE Includes
 #include <kdebug.h>
 #include <ktempfile.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
index 3f8650f5..96cc20c5 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
@@ -22,9 +22,9 @@
 #include "client.h"
 #include <kdebug.h>
 #include <klocale.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <tqdom.h>
 
 YahooChatTask::YahooChatTask(Task* parent) : Task(parent)
diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp
index 53f7c2b4..7e36d04e 100644
--- a/kopete/protocols/yahoo/yahooaccount.cpp
+++ b/kopete/protocols/yahoo/yahooaccount.cpp
@@ -33,7 +33,7 @@
 
 // KDE
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kaction.h>
 #include <kpopupmenu.h>
diff --git a/kopete/protocols/yahoo/yahoochatsession.cpp b/kopete/protocols/yahoo/yahoochatsession.cpp
index 5402919c..3bb8e717 100644
--- a/kopete/protocols/yahoo/yahoochatsession.cpp
+++ b/kopete/protocols/yahoo/yahoochatsession.cpp
@@ -21,7 +21,7 @@
 #include <tqfile.h>
 #include <tqiconset.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
 #include <klocale.h>
diff --git a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp
index 8d34689b..8e6132b6 100644
--- a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp
+++ b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp
@@ -21,7 +21,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kopetecontactaction.h>
 #include <kopetecontactlist.h>
diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp
index 3bd55b85..f827bba3 100644
--- a/kopete/protocols/yahoo/yahoocontact.cpp
+++ b/kopete/protocols/yahoo/yahoocontact.cpp
@@ -52,13 +52,13 @@
 #include <kshortcut.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
-#include <kio/global.h>
-#include <kio/job.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
 #include <kurl.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 #include <kimageio.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 YahooContact::YahooContact( YahooAccount *account, const TQString &userId, const TQString &fullName, Kopete::MetaContact *metaContact )
 	: Kopete::Contact( account, userId, metaContact )
diff --git a/kopete/protocols/yahoo/yahooeditaccount.cpp b/kopete/protocols/yahoo/yahooeditaccount.cpp
index e047e849..8913eba3 100644
--- a/kopete/protocols/yahoo/yahooeditaccount.cpp
+++ b/kopete/protocols/yahoo/yahooeditaccount.cpp
@@ -32,9 +32,9 @@
 #include <kmessagebox.h>
 #include <krun.h>
 #include <kurl.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kpassdlg.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kpixmapregionselectordialog.h>
 
diff --git a/kopete/protocols/yahoo/yahooverifyaccount.cpp b/kopete/protocols/yahoo/yahooverifyaccount.cpp
index 14912167..62dde427 100644
--- a/kopete/protocols/yahoo/yahooverifyaccount.cpp
+++ b/kopete/protocols/yahoo/yahooverifyaccount.cpp
@@ -23,9 +23,9 @@
 #include <klineedit.h>
 #include <ktempfile.h>
 #include <klocale.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kstandarddirs.h>
 
 // Kopete Includes
author	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2013-01-27 01:04:58 -0600
committer	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2013-01-27 01:04:58 -0600
commit	b10a61b1fd2fe561ba61a384d4a344bae2a4aa29 (patch)
tree	99dc6b2584265b2df91f7dbc1dcbf7a54efd205e /kopete
parent	64c3be47ff36e40035ead93f913aeeb1e4f85e4b (diff)
download	tdenetwork-b10a61b1fd2fe561ba61a384d4a344bae2a4aa29.tar.gz tdenetwork-b10a61b1fd2fe561ba61a384d4a344bae2a4aa29.zip