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

46 files changed, 148 insertions, 148 deletions

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