summaryrefslogtreecommitdiffstats
path: root/kopete/protocols
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols')
-rw-r--r--kopete/protocols/gadu/gaduaccount.cpp4
-rw-r--r--kopete/protocols/gadu/gaduaccount.h2
-rw-r--r--kopete/protocols/gadu/gaducontact.cpp2
-rw-r--r--kopete/protocols/gadu/gaduprotocol.cpp2
-rw-r--r--kopete/protocols/groupwise/gwaccount.cpp2
-rw-r--r--kopete/protocols/groupwise/ui/gweditaccountwidget.cpp2
-rw-r--r--kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp2
-rw-r--r--kopete/protocols/irc/ircaccount.cpp2
-rw-r--r--kopete/protocols/irc/irccontactmanager.cpp4
-rw-r--r--kopete/protocols/irc/ircprotocol.cpp2
-rw-r--r--kopete/protocols/irc/ircusercontact.cpp2
-rw-r--r--kopete/protocols/irc/libkirc/kircengine.cpp2
-rw-r--r--kopete/protocols/irc/libkirc/ksslsocket.cpp12
-rw-r--r--kopete/protocols/irc/libkirc/ksslsocket.h2
-rw-r--r--kopete/protocols/irc/ui/CMakeLists.txt2
-rw-r--r--kopete/protocols/irc/ui/Makefile.am2
-rw-r--r--kopete/protocols/irc/ui/irceditaccountwidget.cpp2
-rw-r--r--kopete/protocols/irc/ui/networtdeconfig.ui (renamed from kopete/protocols/irc/ui/networkconfig.ui)0
-rw-r--r--kopete/protocols/irc/ui/networtdeconfig.ui.h (renamed from kopete/protocols/irc/ui/networkconfig.ui.h)0
-rw-r--r--kopete/protocols/jabber/CMakeLists.txt2
-rw-r--r--kopete/protocols/jabber/Makefile.am2
-rw-r--r--kopete/protocols/jabber/jabberaccount.cpp2
-rw-r--r--kopete/protocols/jabber/jabberbasecontact.cpp2
-rw-r--r--kopete/protocols/jabber/jabberchatsession.cpp4
-rw-r--r--kopete/protocols/jabber/jabbercontact.cpp4
-rw-r--r--kopete/protocols/jabber/jabberfiletransfer.cpp2
-rw-r--r--kopete/protocols/jabber/jabbergroupcontact.cpp2
-rw-r--r--kopete/protocols/jabber/jabbergroupmembercontact.cpp2
-rw-r--r--kopete/protocols/jabber/jabberprotocol.cpp2
-rw-r--r--kopete/protocols/jabber/jabbertransport.cpp2
-rw-r--r--kopete/protocols/jabber/tdeioslave/CMakeLists.txt (renamed from kopete/protocols/jabber/kioslave/CMakeLists.txt)2
-rw-r--r--kopete/protocols/jabber/tdeioslave/Makefile.am (renamed from kopete/protocols/jabber/kioslave/Makefile.am)2
-rw-r--r--kopete/protocols/jabber/tdeioslave/jabberdisco.cpp (renamed from kopete/protocols/jabber/kioslave/jabberdisco.cpp)0
-rw-r--r--kopete/protocols/jabber/tdeioslave/jabberdisco.h (renamed from kopete/protocols/jabber/kioslave/jabberdisco.h)4
-rw-r--r--kopete/protocols/jabber/tdeioslave/jabberdisco.protocol (renamed from kopete/protocols/jabber/kioslave/jabberdisco.protocol)20
-rw-r--r--kopete/protocols/jabber/ui/dlgjabbervcard.cpp4
-rw-r--r--kopete/protocols/jabber/ui/jabberchooseserver.cpp6
-rw-r--r--kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp2
-rw-r--r--kopete/protocols/meanwhile/meanwhileaccount.cpp2
-rw-r--r--kopete/protocols/msn/config/CMakeLists.txt2
-rw-r--r--kopete/protocols/msn/config/Makefile.am2
-rw-r--r--kopete/protocols/msn/msnaccount.cpp2
-rw-r--r--kopete/protocols/msn/msnchatsession.cpp2
-rw-r--r--kopete/protocols/msn/msncontact.cpp6
-rw-r--r--kopete/protocols/msn/msnfiletransfersocket.cpp2
-rw-r--r--kopete/protocols/msn/msnnotifysocket.cpp4
-rw-r--r--kopete/protocols/msn/msnprotocol.cpp2
-rw-r--r--kopete/protocols/msn/msnsecureloginhandler.cpp2
-rw-r--r--kopete/protocols/msn/msnsocket.cpp2
-rw-r--r--kopete/protocols/msn/msnswitchboardsocket.cpp2
-rw-r--r--kopete/protocols/msn/ui/msneditaccountwidget.cpp6
-rw-r--r--kopete/protocols/msn/webcam.cpp2
-rw-r--r--kopete/protocols/oscar/aim/aimaccount.cpp2
-rw-r--r--kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp2
-rw-r--r--kopete/protocols/oscar/icq/icqaccount.cpp2
-rw-r--r--kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp2
-rw-r--r--kopete/protocols/oscar/oscaraccount.cpp2
-rw-r--r--kopete/protocols/oscar/oscarversionupdater.cpp4
-rw-r--r--kopete/protocols/sms/services/gsmlib.cpp2
-rw-r--r--kopete/protocols/sms/services/smsclient.cpp2
-rw-r--r--kopete/protocols/sms/services/smssend.cpp2
-rw-r--r--kopete/protocols/sms/services/smssendprovider.cpp2
-rw-r--r--kopete/protocols/sms/smsaccount.cpp2
-rw-r--r--kopete/protocols/sms/smscontact.cpp2
-rw-r--r--kopete/protocols/sms/smseditaccountwidget.cpp2
-rw-r--r--kopete/protocols/sms/smsprotocol.cpp2
-rw-r--r--kopete/protocols/winpopup/libwinpopup/libwinpopup.h2
-rw-r--r--kopete/protocols/winpopup/wpaccount.cpp2
-rw-r--r--kopete/protocols/winpopup/wpeditaccount.cpp2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/logintask.cpp2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp6
-rw-r--r--kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp6
-rw-r--r--kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp6
-rw-r--r--kopete/protocols/yahoo/libkyahoo/yabtask.cpp6
-rw-r--r--kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp6
-rw-r--r--kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp6
-rw-r--r--kopete/protocols/yahoo/yahooaccount.cpp2
-rw-r--r--kopete/protocols/yahoo/yahoochatsession.cpp2
-rw-r--r--kopete/protocols/yahoo/yahooconferencemessagemanager.cpp2
-rw-r--r--kopete/protocols/yahoo/yahoocontact.cpp8
-rw-r--r--kopete/protocols/yahoo/yahooeditaccount.cpp4
-rw-r--r--kopete/protocols/yahoo/yahooverifyaccount.cpp6
83 files changed, 126 insertions, 126 deletions
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