From 5497356b6c12e5854b297bfa0d9c2a9f20cb4ca0 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 14 Feb 2013 17:18:22 -0600
Subject: Rename common header files for consistency with class renaming

---
 kopete/kopete/addcontactwizard/addcontactwizard.cpp              | 2 +-
 kopete/kopete/chatwindow/chatmessagepart.cpp                     | 2 +-
 kopete/kopete/chatwindow/kopetechatwindow.cpp                    | 2 +-
 kopete/kopete/chatwindow/kopeteemailwindow.cpp                   | 2 +-
 kopete/kopete/chatwindow/kopeteemoticonaction.cpp                | 2 +-
 kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp | 2 +-
 kopete/kopete/config/appearance/appearanceconfig.cpp             | 2 +-
 kopete/kopete/contactlist/kopetecontactlistview.cpp              | 2 +-
 kopete/kopete/contactlist/kopetegroupviewitem.cpp                | 2 +-
 kopete/kopete/contactlist/kopetemetacontactlvi.cpp               | 2 +-
 kopete/kopete/kimifaceimpl.cpp                                   | 2 +-
 kopete/kopete/kopeteapplication.cpp                              | 2 +-
 kopete/kopete/kopeteballoon.cpp                                  | 2 +-
 kopete/kopete/main.cpp                                           | 4 ++--
 kopete/kopete/systemtray.cpp                                     | 4 ++--
 kopete/libkopete/avdevice/videodevicepool.h                      | 2 +-
 kopete/libkopete/connectionmanager.cpp                           | 2 +-
 kopete/libkopete/kautoconfig.cpp                                 | 2 +-
 kopete/libkopete/knotification.cpp                               | 2 +-
 kopete/libkopete/kopeteaway.cpp                                  | 2 +-
 kopete/libkopete/kopetechatsessionmanager.cpp                    | 2 +-
 kopete/libkopete/kopetecommandhandler.cpp                        | 2 +-
 kopete/libkopete/kopetecontactlist.cpp                           | 2 +-
 kopete/libkopete/kopeteglobal.cpp                                | 2 +-
 kopete/libkopete/kopetemetacontact.cpp                           | 2 +-
 kopete/libkopete/kopetemimetypehandler.cpp                       | 2 +-
 kopete/libkopete/kopeteonlinestatus.cpp                          | 2 +-
 kopete/libkopete/kopeteonlinestatusmanager.cpp                   | 2 +-
 kopete/libkopete/kopetepassword.cpp                              | 2 +-
 kopete/libkopete/kopetepluginmanager.cpp                         | 2 +-
 kopete/libkopete/kopeteprefs.cpp                                 | 2 +-
 kopete/libkopete/kopeteutils.cpp                                 | 2 +-
 kopete/libkopete/private/kopetecommand.cpp                       | 2 +-
 kopete/libkopete/private/kopeteemoticons.cpp                     | 2 +-
 kopete/libkopete/private/kopeteviewmanager.cpp                   | 2 +-
 kopete/libkopete/tests/kopeteemoticontest.cpp                    | 2 +-
 kopete/libkopete/tests/kopetemessage_test.cpp                    | 2 +-
 kopete/libkopete/tests/kopetepasswordtest_program.cpp            | 6 +++---
 kopete/libkopete/tests/kopetepropertiestest.cpp                  | 4 ++--
 kopete/libkopete/tests/kopetewallettest_program.cpp              | 6 +++---
 kopete/libkopete/ui/addressbookselectorwidget.cpp                | 2 +-
 kopete/libkopete/ui/metacontactselectorwidget.cpp                | 2 +-
 kopete/libkopete/ui/userinfodialog.cpp                           | 2 +-
 kopete/plugins/cryptography/cryptographyplugin.cpp               | 2 +-
 kopete/plugins/history/converter.cpp                             | 2 +-
 kopete/plugins/history/historydialog.cpp                         | 2 +-
 kopete/plugins/history/historyplugin.cpp                         | 2 +-
 kopete/plugins/netmeeting/netmeetingplugin.cpp                   | 2 +-
 kopete/plugins/nowlistening/nowlisteningplugin.cpp               | 2 +-
 kopete/plugins/smpppdcs/detectordcop.cpp                         | 2 +-
 kopete/plugins/smpppdcs/detectorsmpppd.cpp                       | 2 +-
 kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp                    | 2 +-
 kopete/plugins/smpppdcs/unittest/main.cpp                        | 8 ++++----
 kopete/plugins/statistics/statisticsdb.cpp                       | 2 +-
 kopete/plugins/statistics/statisticsplugin.cpp                   | 2 +-
 kopete/plugins/translator/translatorplugin.cpp                   | 2 +-
 kopete/protocols/groupwise/gwaccount.cpp                         | 4 ++--
 kopete/protocols/groupwise/ui/gwcontactproperties.cpp            | 2 +-
 kopete/protocols/groupwise/ui/gweditaccountwidget.cpp            | 2 +-
 kopete/protocols/irc/ircaccount.cpp                              | 4 ++--
 kopete/protocols/irc/ircchannelcontact.cpp                       | 4 ++--
 kopete/protocols/irc/libkirc/ksslsocket.cpp                      | 2 +-
 kopete/protocols/jabber/jabberaccount.cpp                        | 4 ++--
 kopete/protocols/jabber/jabbercontact.cpp                        | 2 +-
 kopete/protocols/jabber/tdeioslave/jabberdisco.cpp               | 2 +-
 kopete/protocols/msn/msnprotocol.cpp                             | 2 +-
 kopete/protocols/msn/msnswitchboardsocket.cpp                    | 4 ++--
 kopete/protocols/oscar/aim/aimcontact.cpp                        | 2 +-
 kopete/protocols/oscar/aim/aimuserinfo.cpp                       | 2 +-
 kopete/protocols/oscar/icq/icqcontact.cpp                        | 2 +-
 kopete/protocols/oscar/liboscar/buffer.cpp                       | 2 +-
 kopete/protocols/oscar/liboscar/chatservicetask.cpp              | 2 +-
 kopete/protocols/oscar/liboscar/connection.cpp                   | 2 +-
 kopete/protocols/oscar/liboscar/oscarutils.cpp                   | 2 +-
 kopete/protocols/oscar/liboscar/sendmessagetask.cpp              | 2 +-
 kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp            | 2 +-
 kopete/protocols/winpopup/wpeditaccount.cpp                      | 2 +-
 kopete/protocols/winpopup/wpprotocol.cpp                         | 2 +-
 kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp                | 2 +-
 kopete/protocols/yahoo/yahoocontact.cpp                          | 2 +-
 80 files changed, 95 insertions(+), 95 deletions(-)

(limited to 'kopete')

diff --git a/kopete/kopete/addcontactwizard/addcontactwizard.cpp b/kopete/kopete/addcontactwizard/addcontactwizard.cpp
index 97907246..7f43c5c8 100644
--- a/kopete/kopete/addcontactwizard/addcontactwizard.cpp
+++ b/kopete/kopete/addcontactwizard/addcontactwizard.cpp
@@ -45,7 +45,7 @@
 #include <tqcheckbox.h>
 #include <tqlayout.h>
 #include <tqvbox.h>
-#include <kapplication.h>
+#include <tdeapplication.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 0e95021f..d5215c40 100644
--- a/kopete/kopete/chatwindow/chatmessagepart.cpp
+++ b/kopete/kopete/chatwindow/chatmessagepart.cpp
@@ -47,7 +47,7 @@
 
 
 // KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <tdefiledialog.h>
diff --git a/kopete/kopete/chatwindow/kopetechatwindow.cpp b/kopete/kopete/chatwindow/kopetechatwindow.cpp
index 5e056d5e..28a58abf 100644
--- a/kopete/kopete/chatwindow/kopetechatwindow.cpp
+++ b/kopete/kopete/chatwindow/kopetechatwindow.cpp
@@ -26,7 +26,7 @@
 #include <tqtooltip.h>
 #include <tqfileinfo.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <klocale.h>
 #include <kmenubar.h>
diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
index 48d9381a..3981b9bf 100644
--- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp
+++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
@@ -32,7 +32,7 @@
 #include "kopeteviewmanager.h"
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolordialog.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
index 747cb1ee..6cf32161 100644
--- a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
+++ b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
@@ -24,7 +24,7 @@
 
 #include <tqwhatsthis.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmenubar.h>
diff --git a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
index 27d54264..21cf6988 100644
--- a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
+++ b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
@@ -27,7 +27,7 @@
 #include <tqtextstream.h>
 
 // KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeunittest/module.h>
 #include <kinstance.h>
 #include <kdebug.h>
diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp
index 89f7655e..d308c57c 100644
--- a/kopete/kopete/config/appearance/appearanceconfig.cpp
+++ b/kopete/kopete/config/appearance/appearanceconfig.cpp
@@ -40,7 +40,7 @@
 #include <tdeversion.h>
 #include <kinputdialog.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolorcombo.h>
 #include <kcolorbutton.h>
 #include <tdeconfig.h> // for KNewStuff emoticon fetching
diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp
index bafc62c5..c161eeff 100644
--- a/kopete/kopete/contactlist/kopetecontactlistview.cpp
+++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp
@@ -34,7 +34,7 @@
 #include <tqguardedptr.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/kopete/kopete/contactlist/kopetegroupviewitem.cpp b/kopete/kopete/contactlist/kopetegroupviewitem.cpp
index 988ef1d8..67fc9b79 100644
--- a/kopete/kopete/contactlist/kopetegroupviewitem.cpp
+++ b/kopete/kopete/contactlist/kopetegroupviewitem.cpp
@@ -21,7 +21,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "kopetecontactlistview.h"
 #include "kopetegroupviewitem.h"
diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
index b791dc5b..8b583856 100644
--- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
+++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
@@ -35,7 +35,7 @@
 #include <tdepopupmenu.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <kabc/addressbook.h>
 #include <kabc/addressee.h>
diff --git a/kopete/kopete/kimifaceimpl.cpp b/kopete/kopete/kimifaceimpl.cpp
index 27aa0ecc..fd7bc38d 100644
--- a/kopete/kopete/kimifaceimpl.cpp
+++ b/kopete/kopete/kimifaceimpl.cpp
@@ -18,7 +18,7 @@
 #include <tqstringlist.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kopete/kopete/kopeteapplication.cpp b/kopete/kopete/kopeteapplication.cpp
index 5b07089f..c3b94e06 100644
--- a/kopete/kopete/kopeteapplication.cpp
+++ b/kopete/kopete/kopeteapplication.cpp
@@ -26,7 +26,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kmessagebox.h>
 
 #include "addaccountwizard.h"
diff --git a/kopete/kopete/kopeteballoon.cpp b/kopete/kopete/kopeteballoon.cpp
index c961a91a..88e68645 100644
--- a/kopete/kopete/kopeteballoon.cpp
+++ b/kopete/kopete/kopeteballoon.cpp
@@ -27,7 +27,7 @@
 #include <tdeversion.h>
 #include <kglobalsettings.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/kopete/kopete/main.cpp b/kopete/kopete/main.cpp
index 27870226..4008dfe5 100644
--- a/kopete/kopete/main.cpp
+++ b/kopete/kopete/main.cpp
@@ -17,8 +17,8 @@
     *************************************************************************
 */
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include "kopeteapplication.h"
 
 #include <dcopclient.h>
diff --git a/kopete/kopete/systemtray.cpp b/kopete/kopete/systemtray.cpp
index eda74da0..6d7bcf75 100644
--- a/kopete/kopete/systemtray.cpp
+++ b/kopete/kopete/systemtray.cpp
@@ -24,9 +24,9 @@
 #include <tqregexp.h>
 
 #include <twin.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeactioncollection.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include "kopeteuiglobal.h"
diff --git a/kopete/libkopete/avdevice/videodevicepool.h b/kopete/libkopete/avdevice/videodevicepool.h
index 2a42f97f..b793172d 100644
--- a/kopete/libkopete/avdevice/videodevicepool.h
+++ b/kopete/libkopete/avdevice/videodevicepool.h
@@ -31,7 +31,7 @@
 #include <kcombobox.h>
 #include "videodevice.h"
 #include "kopete_export.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 
diff --git a/kopete/libkopete/connectionmanager.cpp b/kopete/libkopete/connectionmanager.cpp
index 4530fa9e..781ea22f 100644
--- a/kopete/libkopete/connectionmanager.cpp
+++ b/kopete/libkopete/connectionmanager.cpp
@@ -1,4 +1,4 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kopete/libkopete/kautoconfig.cpp b/kopete/libkopete/kautoconfig.cpp
index b3595516..3ac39409 100644
--- a/kopete/libkopete/kautoconfig.cpp
+++ b/kopete/libkopete/kautoconfig.cpp
@@ -24,7 +24,7 @@
 #include <tqsqlpropertymap.h>
 #include <tqobjectlist.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeversion.h>
 
 /**
diff --git a/kopete/libkopete/knotification.cpp b/kopete/libkopete/knotification.cpp
index ea28132f..44529554 100644
--- a/kopete/libkopete/knotification.cpp
+++ b/kopete/libkopete/knotification.cpp
@@ -19,7 +19,7 @@
 #include "knotification.h"
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knotifyclient.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/kopete/libkopete/kopeteaway.cpp b/kopete/libkopete/kopeteaway.cpp
index e0bf1553..fe23ee9e 100644
--- a/kopete/libkopete/kopeteaway.cpp
+++ b/kopete/libkopete/kopeteaway.cpp
@@ -31,7 +31,7 @@
 
 #include <tdeconfig.h>
 #include <tqtimer.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopref.h>
 
 #include <klocale.h>
diff --git a/kopete/libkopete/kopetechatsessionmanager.cpp b/kopete/libkopete/kopetechatsessionmanager.cpp
index 63cf8e38..a5e2810a 100644
--- a/kopete/libkopete/kopetechatsessionmanager.cpp
+++ b/kopete/libkopete/kopetechatsessionmanager.cpp
@@ -18,7 +18,7 @@
 #include "kopetechatsessionmanager.h"
 #include "kopeteviewmanager.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include "ui/kopeteview.h"
diff --git a/kopete/libkopete/kopetecommandhandler.cpp b/kopete/libkopete/kopetecommandhandler.cpp
index cb96ee5c..481f8b88 100644
--- a/kopete/libkopete/kopetecommandhandler.cpp
+++ b/kopete/libkopete/kopetecommandhandler.cpp
@@ -14,7 +14,7 @@
     *************************************************************************
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqregexp.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kopete/libkopete/kopetecontactlist.cpp b/kopete/libkopete/kopetecontactlist.cpp
index 95c625c3..ca947582 100644
--- a/kopete/libkopete/kopetecontactlist.cpp
+++ b/kopete/libkopete/kopetecontactlist.cpp
@@ -24,7 +24,7 @@
 #include <tqregexp.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kabc/stdaddressbook.h>
 #include <kdebug.h>
 #include <ksavefile.h>
diff --git a/kopete/libkopete/kopeteglobal.cpp b/kopete/libkopete/kopeteglobal.cpp
index 4b77444d..bf4a89d3 100644
--- a/kopete/libkopete/kopeteglobal.cpp
+++ b/kopete/libkopete/kopeteglobal.cpp
@@ -18,7 +18,7 @@
 #include "kopeteglobal.h"
 #include "kopeteuiglobal.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <tdeio/netaccess.h>
diff --git a/kopete/libkopete/kopetemetacontact.cpp b/kopete/libkopete/kopetemetacontact.cpp
index 7bfd87e7..d71962e4 100644
--- a/kopete/libkopete/kopetemetacontact.cpp
+++ b/kopete/libkopete/kopetemetacontact.cpp
@@ -20,7 +20,7 @@
 
 #include "kopetemetacontact.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <kabc/addressbook.h>
 #include <kabc/addressee.h>
diff --git a/kopete/libkopete/kopetemimetypehandler.cpp b/kopete/libkopete/kopetemimetypehandler.cpp
index 90da909b..8f4741b8 100644
--- a/kopete/libkopete/kopetemimetypehandler.cpp
+++ b/kopete/libkopete/kopetemimetypehandler.cpp
@@ -21,7 +21,7 @@
 
 #include <tqwidget.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <tdeio/netaccess.h>
diff --git a/kopete/libkopete/kopeteonlinestatus.cpp b/kopete/libkopete/kopeteonlinestatus.cpp
index 35ec4e4f..f37c18f8 100644
--- a/kopete/libkopete/kopeteonlinestatus.cpp
+++ b/kopete/libkopete/kopeteonlinestatus.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstaticdeleter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 
 
diff --git a/kopete/libkopete/kopeteonlinestatusmanager.cpp b/kopete/libkopete/kopeteonlinestatusmanager.cpp
index 02daf0ab..e5c2476f 100644
--- a/kopete/libkopete/kopeteonlinestatusmanager.cpp
+++ b/kopete/libkopete/kopeteonlinestatusmanager.cpp
@@ -28,7 +28,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstaticdeleter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcpuinfo.h> // for WORDS_BIGENDIAN
 
 #include <algorithm> // for min
diff --git a/kopete/libkopete/kopetepassword.cpp b/kopete/libkopete/kopetepassword.cpp
index 766dfb46..62ba7d42 100644
--- a/kopete/libkopete/kopetepassword.cpp
+++ b/kopete/libkopete/kopetepassword.cpp
@@ -27,7 +27,7 @@
 #include <tqcheckbox.h>
 
 #include <kactivelabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp
index 4c94a326..85a0d1fe 100644
--- a/kopete/libkopete/kopetepluginmanager.cpp
+++ b/kopete/libkopete/kopetepluginmanager.cpp
@@ -33,7 +33,7 @@
 #include <tqtimer.h>
 #include <tqvaluestack.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeparts/componentfactory.h>
 #include <kplugininfo.h>
diff --git a/kopete/libkopete/kopeteprefs.cpp b/kopete/libkopete/kopeteprefs.cpp
index 77e8381a..4701edfb 100644
--- a/kopete/libkopete/kopeteprefs.cpp
+++ b/kopete/libkopete/kopeteprefs.cpp
@@ -20,7 +20,7 @@
 #include <tqfont.h>
 #include <tqmetaobject.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kopete/libkopete/kopeteutils.cpp b/kopete/libkopete/kopeteutils.cpp
index 0681b4c7..efd632bd 100644
--- a/kopete/libkopete/kopeteutils.cpp
+++ b/kopete/libkopete/kopeteutils.cpp
@@ -22,7 +22,7 @@
 #include <kmessagebox.h>
 #include <knotifyclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <dcopclient.h>
 #include <kdatastream.h>
diff --git a/kopete/libkopete/private/kopetecommand.cpp b/kopete/libkopete/private/kopetecommand.cpp
index 116fee30..1c7ff584 100644
--- a/kopete/libkopete/private/kopetecommand.cpp
+++ b/kopete/libkopete/private/kopetecommand.cpp
@@ -14,7 +14,7 @@
 */
 
 #include <tqstringlist.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
 #include <klocale.h>
diff --git a/kopete/libkopete/private/kopeteemoticons.cpp b/kopete/libkopete/private/kopeteemoticons.cpp
index 2109a3d8..4a18e924 100644
--- a/kopete/libkopete/private/kopeteemoticons.cpp
+++ b/kopete/libkopete/private/kopeteemoticons.cpp
@@ -27,7 +27,7 @@
 #include <tqimage.h>
 #include <tqdatetime.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <tdeversion.h>
diff --git a/kopete/libkopete/private/kopeteviewmanager.cpp b/kopete/libkopete/private/kopeteviewmanager.cpp
index 9fbc19c7..a3150403 100644
--- a/kopete/libkopete/private/kopeteviewmanager.cpp
+++ b/kopete/libkopete/private/kopeteviewmanager.cpp
@@ -15,7 +15,7 @@
 */
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kopete/libkopete/tests/kopeteemoticontest.cpp b/kopete/libkopete/tests/kopeteemoticontest.cpp
index fe1f8a35..b38c3572 100644
--- a/kopete/libkopete/tests/kopeteemoticontest.cpp
+++ b/kopete/libkopete/tests/kopeteemoticontest.cpp
@@ -22,7 +22,7 @@
 #include <tqdir.h>
 #include <tqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/kopete/libkopete/tests/kopetemessage_test.cpp b/kopete/libkopete/tests/kopetemessage_test.cpp
index 238bdb57..43f66f88 100644
--- a/kopete/libkopete/tests/kopetemessage_test.cpp
+++ b/kopete/libkopete/tests/kopetemessage_test.cpp
@@ -21,7 +21,7 @@
 
 #include <tqdir.h>
 #include <tqfile.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kinstance.h>
 #include <kprocess.h>
diff --git a/kopete/libkopete/tests/kopetepasswordtest_program.cpp b/kopete/libkopete/tests/kopetepasswordtest_program.cpp
index 45f0b0f9..8239ca86 100644
--- a/kopete/libkopete/tests/kopetepasswordtest_program.cpp
+++ b/kopete/libkopete/tests/kopetepasswordtest_program.cpp
@@ -21,9 +21,9 @@
 #include <tqpixmap.h>
 #include <tqtimer.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
diff --git a/kopete/libkopete/tests/kopetepropertiestest.cpp b/kopete/libkopete/tests/kopetepropertiestest.cpp
index e9405c66..f7ce6e5e 100644
--- a/kopete/libkopete/tests/kopetepropertiestest.cpp
+++ b/kopete/libkopete/tests/kopetepropertiestest.cpp
@@ -23,8 +23,8 @@
 #include <tqstring.h>
 #include <tqtextstream.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 
diff --git a/kopete/libkopete/tests/kopetewallettest_program.cpp b/kopete/libkopete/tests/kopetewallettest_program.cpp
index 953124b0..85201f40 100644
--- a/kopete/libkopete/tests/kopetewallettest_program.cpp
+++ b/kopete/libkopete/tests/kopetewallettest_program.cpp
@@ -17,9 +17,9 @@
 #include <tqtextstream.h>
 #include <tqtimer.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
diff --git a/kopete/libkopete/ui/addressbookselectorwidget.cpp b/kopete/libkopete/ui/addressbookselectorwidget.cpp
index 6ae61bff..9e03292b 100644
--- a/kopete/libkopete/ui/addressbookselectorwidget.cpp
+++ b/kopete/libkopete/ui/addressbookselectorwidget.cpp
@@ -26,7 +26,7 @@
 */
 
 #include <tqcheckbox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/kopete/libkopete/ui/metacontactselectorwidget.cpp b/kopete/libkopete/ui/metacontactselectorwidget.cpp
index ee6ab0d5..856e421e 100644
--- a/kopete/libkopete/ui/metacontactselectorwidget.cpp
+++ b/kopete/libkopete/ui/metacontactselectorwidget.cpp
@@ -26,7 +26,7 @@
 #include <tqlayout.h>
 #include <tqvaluelist.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/kopete/libkopete/ui/userinfodialog.cpp b/kopete/libkopete/ui/userinfodialog.cpp
index 130973ce..8c0b2765 100644
--- a/kopete/libkopete/ui/userinfodialog.cpp
+++ b/kopete/libkopete/ui/userinfodialog.cpp
@@ -20,7 +20,7 @@
 
 #include <tdehtml_part.h>
 #include <ktextbrowser.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp
index e402567c..5e10cec9 100644
--- a/kopete/plugins/cryptography/cryptographyplugin.cpp
+++ b/kopete/plugins/cryptography/cryptographyplugin.cpp
@@ -24,7 +24,7 @@
 #include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <tdeversion.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "kopetemetacontact.h"
 #include "kopetecontactlist.h"
diff --git a/kopete/plugins/history/converter.cpp b/kopete/plugins/history/converter.cpp
index 34d2a426..f3616ee4 100644
--- a/kopete/plugins/history/converter.cpp
+++ b/kopete/plugins/history/converter.cpp
@@ -26,7 +26,7 @@
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <kprogress.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ksavefile.h>
 #include <tqdir.h>
 #include <tqdom.h>
diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp
index b5b65b80..37ddb921 100644
--- a/kopete/plugins/history/historydialog.cpp
+++ b/kopete/plugins/history/historydialog.cpp
@@ -42,7 +42,7 @@
 #include <tqlabel.h>
 #include <tqclipboard.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/kopete/plugins/history/historyplugin.cpp b/kopete/plugins/history/historyplugin.cpp
index 83405ee2..bf53fee4 100644
--- a/kopete/plugins/history/historyplugin.cpp
+++ b/kopete/plugins/history/historyplugin.cpp
@@ -16,7 +16,7 @@
 */
 
 #include <kgenericfactory.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaction.h>
 #include <kmessagebox.h>
 //#include <tdeconfig.h>
diff --git a/kopete/plugins/netmeeting/netmeetingplugin.cpp b/kopete/plugins/netmeeting/netmeetingplugin.cpp
index eaf777dd..17dfcc0b 100644
--- a/kopete/plugins/netmeeting/netmeetingplugin.cpp
+++ b/kopete/plugins/netmeeting/netmeetingplugin.cpp
@@ -19,7 +19,7 @@
 #include <kgenericfactory.h>
 #include <tdeaction.h>
 #include <tdeversion.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "kopetepluginmanager.h"
 #include "kopetechatsessionmanager.h"
diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.cpp b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
index 3ab8539b..6fcc21cd 100644
--- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
@@ -25,7 +25,7 @@
 
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tdeaction.h>
 
diff --git a/kopete/plugins/smpppdcs/detectordcop.cpp b/kopete/plugins/smpppdcs/detectordcop.cpp
index f5f5f992..931d5e3a 100644
--- a/kopete/plugins/smpppdcs/detectordcop.cpp
+++ b/kopete/plugins/smpppdcs/detectordcop.cpp
@@ -14,7 +14,7 @@
     *************************************************************************
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kdebug.h>
 
diff --git a/kopete/plugins/smpppdcs/detectorsmpppd.cpp b/kopete/plugins/smpppdcs/detectorsmpppd.cpp
index b6f6fc30..57ca728d 100644
--- a/kopete/plugins/smpppdcs/detectorsmpppd.cpp
+++ b/kopete/plugins/smpppdcs/detectorsmpppd.cpp
@@ -17,7 +17,7 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "iconnector.h"
 #include "detectorsmpppd.h"
diff --git a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
index 64d5ffd2..931fbb83 100644
--- a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
+++ b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
@@ -20,7 +20,7 @@
 #include <tqradiobutton.h>
 
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpushbutton.h>
 #include <kresolver.h>
 #include <knuminput.h>
diff --git a/kopete/plugins/smpppdcs/unittest/main.cpp b/kopete/plugins/smpppdcs/unittest/main.cpp
index eefcd731..79b0656c 100644
--- a/kopete/plugins/smpppdcs/unittest/main.cpp
+++ b/kopete/plugins/smpppdcs/unittest/main.cpp
@@ -14,10 +14,10 @@
 	*************************************************************************
 */
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <tdeunittest/runnergui.h>
 
diff --git a/kopete/plugins/statistics/statisticsdb.cpp b/kopete/plugins/statistics/statisticsdb.cpp
index 6082158c..0feed26c 100644
--- a/kopete/plugins/statistics/statisticsdb.cpp
+++ b/kopete/plugins/statistics/statisticsdb.cpp
@@ -19,7 +19,7 @@
 #include "sqlite3.h"
 
 #include <kgenericfactory.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
diff --git a/kopete/plugins/statistics/statisticsplugin.cpp b/kopete/plugins/statistics/statisticsplugin.cpp
index c5da24bb..49ddfb18 100644
--- a/kopete/plugins/statistics/statisticsplugin.cpp
+++ b/kopete/plugins/statistics/statisticsplugin.cpp
@@ -19,7 +19,7 @@
 #include <tqtimer.h>
 
 #include <kgenericfactory.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaction.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp
index 6b8cb61d..f052af16 100644
--- a/kopete/plugins/translator/translatorplugin.cpp
+++ b/kopete/plugins/translator/translatorplugin.cpp
@@ -31,7 +31,7 @@
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <tdeversion.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "kopetemetacontact.h"
 #include "kopetecontactlist.h"
diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp
index c61f9dfc..622311c3 100644
--- a/kopete/protocols/groupwise/gwaccount.cpp
+++ b/kopete/protocols/groupwise/gwaccount.cpp
@@ -22,8 +22,8 @@
 
 #include <tqvalidator.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
index 53ec8224..94be6350 100644
--- a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
+++ b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
@@ -24,7 +24,7 @@
 #include <tqmap.h>
 #include <tqpopupmenu.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klocale.h>
diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
index 910c99f4..62ff00ae 100644
--- a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
+++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
@@ -24,7 +24,7 @@
 #include <tqlineedit.h>
 #include <tqspinbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <klocale.h>
diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp
index d4c0100c..2b8dc549 100644
--- a/kopete/protocols/irc/ircaccount.cpp
+++ b/kopete/protocols/irc/ircaccount.cpp
@@ -41,8 +41,8 @@
 #include "kopetepassword.h"
 
 #include <tdeaction.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdecompletionbox.h>
 #include <kdebug.h>
diff --git a/kopete/protocols/irc/ircchannelcontact.cpp b/kopete/protocols/irc/ircchannelcontact.cpp
index 71071610..91b7459f 100644
--- a/kopete/protocols/irc/ircchannelcontact.cpp
+++ b/kopete/protocols/irc/ircchannelcontact.cpp
@@ -32,8 +32,8 @@
 #include <kdebug.h>
 #include <krun.h>
 #include <kinputdialog.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 
diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp
index d3615fc5..8d248152 100644
--- a/kopete/protocols/irc/libkirc/ksslsocket.cpp
+++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp
@@ -26,7 +26,7 @@
 #include <ksslpeerinfo.h>
 #include <ksslcertchain.h>
 #include <ksslcertificatecache.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 
 #include "ksslsocket.h"
diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp
index 5d1caae1..29e542be 100644
--- a/kopete/protocols/jabber/jabberaccount.cpp
+++ b/kopete/protocols/jabber/jabberaccount.cpp
@@ -41,8 +41,8 @@
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <tdesocketbase.h>
 #include <kpassdlg.h>
 #include <kinputdialog.h>
diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp
index 54dc25d9..d019a734 100644
--- a/kopete/protocols/jabber/jabbercontact.cpp
+++ b/kopete/protocols/jabber/jabbercontact.cpp
@@ -33,7 +33,7 @@
 #include <kmessagebox.h>
 #include <tdefiledialog.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tdeio/netaccess.h>
 #include <kinputdialog.h>
diff --git a/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp
index 18cb9319..a075bbde 100644
--- a/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp
+++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp
@@ -26,7 +26,7 @@
 #include <tqthread.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 
 #include <xmpp_tasks.h>
diff --git a/kopete/protocols/msn/msnprotocol.cpp b/kopete/protocols/msn/msnprotocol.cpp
index cab1407d..2670d2a0 100644
--- a/kopete/protocols/msn/msnprotocol.cpp
+++ b/kopete/protocols/msn/msnprotocol.cpp
@@ -24,7 +24,7 @@
 #include <kgenericfactory.h>
 #include <tdeconfig.h>
 #include <tdeversion.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "kopeteaccountmanager.h"
 #include "kopeteglobal.h"
diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp
index 9dc475ab..179b45e3 100644
--- a/kopete/protocols/msn/msnswitchboardsocket.cpp
+++ b/kopete/protocols/msn/msnswitchboardsocket.cpp
@@ -36,8 +36,8 @@
 // kde
 #include <kdebug.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <ktempfile.h>
 #include <tdeconfig.h>
 #include <kmdcodec.h>
diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp
index 29cd585a..fcd51501 100644
--- a/kopete/protocols/oscar/aim/aimcontact.cpp
+++ b/kopete/protocols/oscar/aim/aimcontact.cpp
@@ -21,7 +21,7 @@
 #include <tqtimer.h>
 #include <tqtextcodec.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeactionclasses.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kopete/protocols/oscar/aim/aimuserinfo.cpp b/kopete/protocols/oscar/aim/aimuserinfo.cpp
index c1eef1ab..eb013a4a 100644
--- a/kopete/protocols/oscar/aim/aimuserinfo.cpp
+++ b/kopete/protocols/oscar/aim/aimuserinfo.cpp
@@ -31,7 +31,7 @@
 #include <kstandarddirs.h>
 #include <ktextbrowser.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <ktextedit.h>
 #include <krun.h>
diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp
index 5acd5859..a6bd9b83 100644
--- a/kopete/protocols/oscar/icq/icqcontact.cpp
+++ b/kopete/protocols/oscar/icq/icqcontact.cpp
@@ -23,7 +23,7 @@
 
 #include <tdeaction.h>
 #include <tdeactionclasses.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/kopete/protocols/oscar/liboscar/buffer.cpp b/kopete/protocols/oscar/liboscar/buffer.cpp
index 48f68349..e2466213 100644
--- a/kopete/protocols/oscar/liboscar/buffer.cpp
+++ b/kopete/protocols/oscar/liboscar/buffer.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "buffer.h"
 
 #include <ctype.h>
diff --git a/kopete/protocols/oscar/liboscar/chatservicetask.cpp b/kopete/protocols/oscar/liboscar/chatservicetask.cpp
index ec45b36c..3fb180d2 100644
--- a/kopete/protocols/oscar/liboscar/chatservicetask.cpp
+++ b/kopete/protocols/oscar/liboscar/chatservicetask.cpp
@@ -21,7 +21,7 @@
 #include "chatservicetask.h"
 
 #include <tqstring.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tqtextcodec.h>
 
diff --git a/kopete/protocols/oscar/liboscar/connection.cpp b/kopete/protocols/oscar/liboscar/connection.cpp
index 80bfa8d6..16757785 100644
--- a/kopete/protocols/oscar/liboscar/connection.cpp
+++ b/kopete/protocols/oscar/liboscar/connection.cpp
@@ -26,7 +26,7 @@
 #include "rateclassmanager.h"
 #include "task.h"
 #include "transfer.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include "oscartypeclasses.h"
diff --git a/kopete/protocols/oscar/liboscar/oscarutils.cpp b/kopete/protocols/oscar/liboscar/oscarutils.cpp
index 8dc7d9df..e157e346 100644
--- a/kopete/protocols/oscar/liboscar/oscarutils.cpp
+++ b/kopete/protocols/oscar/liboscar/oscarutils.cpp
@@ -18,7 +18,7 @@
 
 #include "oscarutils.h"
 #include <tqhostaddress.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 
diff --git a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
index 3856a994..5f4146e3 100644
--- a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
+++ b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
@@ -16,7 +16,7 @@
 
 #include "sendmessagetask.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include "connection.h"
 #include "oscartypes.h"
diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
index 05eabee7..605315fa 100644
--- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
+++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
@@ -21,7 +21,7 @@
 #include <tqregexp.h>
 
 // KDE Includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/kopete/protocols/winpopup/wpeditaccount.cpp b/kopete/protocols/winpopup/wpeditaccount.cpp
index 5673ed69..c66094fe 100644
--- a/kopete/protocols/winpopup/wpeditaccount.cpp
+++ b/kopete/protocols/winpopup/wpeditaccount.cpp
@@ -33,7 +33,7 @@
 #include <klineedit.h>
 #include <kmessagebox.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 
 
diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp
index 0e193c39..c3f3a038 100644
--- a/kopete/protocols/winpopup/wpprotocol.cpp
+++ b/kopete/protocols/winpopup/wpprotocol.cpp
@@ -23,7 +23,7 @@
 #include <tqdict.h>
 
 // KDE Includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kmessagebox.h>
diff --git a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
index 9cfe6763..4cb17847 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
@@ -21,7 +21,7 @@
 #include "client.h"
 #include <tqstring.h>
 #include <tqtimer.h>
-#include <kapplication.h> // for random()
+#include <tdeapplication.h> // for random()
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstreamsocket.h>
diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp
index 1ca1a3db..77e03b27 100644
--- a/kopete/protocols/yahoo/yahoocontact.cpp
+++ b/kopete/protocols/yahoo/yahoocontact.cpp
@@ -46,7 +46,7 @@
 // KDE Includes
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <krun.h>
 #include <tdeshortcut.h>
-- 
cgit v1.2.1