Rename additional header files to avoid conflicts with KDE4

40 files changed, 52 insertions, 52 deletions

diff --git a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp
index 8fe0fed1..b1e1b0c1 100644
--- a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp
+++ b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp
@@ -11,7 +11,7 @@
 //
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "addbookmarksprefssettings.h"
 
diff --git a/kopete/plugins/alias/aliaspreferences.cpp b/kopete/plugins/alias/aliaspreferences.cpp
index 6b91418d..2c160abd 100644
--- a/kopete/plugins/alias/aliaspreferences.cpp
+++ b/kopete/plugins/alias/aliaspreferences.cpp
@@ -9,11 +9,11 @@
 
 #include <kpushbutton.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <tqregexp.h>
 #include <tqlayout.h>
diff --git a/kopete/plugins/autoreplace/autoreplaceconfig.cpp b/kopete/plugins/autoreplace/autoreplaceconfig.cpp
index ce0ca264..6e8ef3bd 100644
--- a/kopete/plugins/autoreplace/autoreplaceconfig.cpp
+++ b/kopete/plugins/autoreplace/autoreplaceconfig.cpp
@@ -19,8 +19,8 @@
 #include "autoreplaceconfig.h"
 
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 AutoReplaceConfig::AutoReplaceConfig()
 {
diff --git a/kopete/plugins/autoreplace/autoreplacepreferences.cpp b/kopete/plugins/autoreplace/autoreplacepreferences.cpp
index 48062fb5..f8bb68c9 100644
--- a/kopete/plugins/autoreplace/autoreplacepreferences.cpp
+++ b/kopete/plugins/autoreplace/autoreplacepreferences.cpp
@@ -22,9 +22,9 @@
 #include <tqheader.h>
 #include <tqlistview.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kgenericfactory.h>
 #include <kautoconfig.h>
 
diff --git a/kopete/plugins/contactnotes/contactnotesedit.cpp b/kopete/plugins/contactnotes/contactnotesedit.cpp
index 782476b9..39802a6a 100644
--- a/kopete/plugins/contactnotes/contactnotesedit.cpp
+++ b/kopete/plugins/contactnotes/contactnotesedit.cpp
@@ -19,7 +19,7 @@
 #include <tqtextedit.h>
 #include <tqvbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kopetemetacontact.h"
 
diff --git a/kopete/plugins/cryptography/cryptographyguiclient.cpp b/kopete/plugins/cryptography/cryptographyguiclient.cpp
index d8cafd85..8adf8fab 100644
--- a/kopete/plugins/cryptography/cryptographyguiclient.cpp
+++ b/kopete/plugins/cryptography/cryptographyguiclient.cpp
@@ -22,7 +22,7 @@
 
 #include <tdeaction.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 
 class CryptographyPlugin;
diff --git a/kopete/plugins/cryptography/cryptographyselectuserkey.cpp b/kopete/plugins/cryptography/cryptographyselectuserkey.cpp
index ae92647b..26551a7e 100644
--- a/kopete/plugins/cryptography/cryptographyselectuserkey.cpp
+++ b/kopete/plugins/cryptography/cryptographyselectuserkey.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
diff --git a/kopete/plugins/cryptography/kgpginterface.cpp b/kopete/plugins/cryptography/kgpginterface.cpp
index 73858012..5763e910 100644
--- a/kopete/plugins/cryptography/kgpginterface.cpp
+++ b/kopete/plugins/cryptography/kgpginterface.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpassdlg.h>
 
 #include <stdlib.h>
diff --git a/kopete/plugins/cryptography/kgpgselkey.cpp b/kopete/plugins/cryptography/kgpgselkey.cpp
index 8604e97c..403efbb7 100644
--- a/kopete/plugins/cryptography/kgpgselkey.cpp
+++ b/kopete/plugins/cryptography/kgpgselkey.cpp
@@ -27,7 +27,7 @@
 #include <tqlabel.h>
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcheckbox.h>
 #include <kprocess.h>
 #include <kiconloader.h>
diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp
index 7263e95c..e5aaeebf 100644
--- a/kopete/plugins/cryptography/popuppublic.cpp
+++ b/kopete/plugins/cryptography/popuppublic.cpp
@@ -35,7 +35,7 @@
 #include <tdelistview.h>
 #include <kprocess.h>
 #include <kprocio.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaccel.h>
 #include <tdelistviewsearchline.h>
 #include <kactivelabel.h>
diff --git a/kopete/plugins/highlight/highlightconfig.cpp b/kopete/plugins/highlight/highlightconfig.cpp
index d6e04d7f..02f28f7a 100644
--- a/kopete/plugins/highlight/highlightconfig.cpp
+++ b/kopete/plugins/highlight/highlightconfig.cpp
@@ -24,7 +24,7 @@
 
 #include <ksavefile.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "filter.h"
 #include "highlightconfig.h"
diff --git a/kopete/plugins/highlight/highlightpreferences.cpp b/kopete/plugins/highlight/highlightpreferences.cpp
index 34a7a1cc..524a7044 100644
--- a/kopete/plugins/highlight/highlightpreferences.cpp
+++ b/kopete/plugins/highlight/highlightpreferences.cpp
@@ -21,7 +21,7 @@
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <tdeparts/componentfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kgenericfactory.h>
 #include <kcolorbutton.h>
diff --git a/kopete/plugins/history/converter.cpp b/kopete/plugins/history/converter.cpp
index f3616ee4..ca3c2e74 100644
--- a/kopete/plugins/history/converter.cpp
+++ b/kopete/plugins/history/converter.cpp
@@ -22,9 +22,9 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprogress.h>
 #include <tdeapplication.h>
 #include <ksavefile.h>
diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp
index 37ddb921..aedd3e8a 100644
--- a/kopete/plugins/history/historydialog.cpp
+++ b/kopete/plugins/history/historydialog.cpp
@@ -45,7 +45,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krun.h>
 #include <kstandarddirs.h>
 #include <tdelistview.h>
diff --git a/kopete/plugins/history/historyguiclient.cpp b/kopete/plugins/history/historyguiclient.cpp
index eeda505c..54cc3401 100644
--- a/kopete/plugins/history/historyguiclient.cpp
+++ b/kopete/plugins/history/historyguiclient.cpp
@@ -22,7 +22,7 @@
 #include "kopeteview.h"
 
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 
 class HistoryPlugin;
diff --git a/kopete/plugins/history/historyplugin.cpp b/kopete/plugins/history/historyplugin.cpp
index bf53fee4..fb48e79f 100644
--- a/kopete/plugins/history/historyplugin.cpp
+++ b/kopete/plugins/history/historyplugin.cpp
@@ -18,7 +18,7 @@
 #include <kgenericfactory.h>
 #include <tdeaboutdata.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 //#include <tdeconfig.h>
 #include <kplugininfo.h>
 #include <tdeversion.h>
diff --git a/kopete/plugins/latex/latexguiclient.cpp b/kopete/plugins/latex/latexguiclient.cpp
index d62be944..6e704847 100644
--- a/kopete/plugins/latex/latexguiclient.cpp
+++ b/kopete/plugins/latex/latexguiclient.cpp
@@ -20,8 +20,8 @@
 #include <tqvariant.h>
 
 #include <tdeaction.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqimage.h>
 #include <tqregexp.h>
 #include <tqstylesheet.h>
diff --git a/kopete/plugins/latex/latexplugin.cpp b/kopete/plugins/latex/latexplugin.cpp
index 17ef8c15..2773d21f 100644
--- a/kopete/plugins/latex/latexplugin.cpp
+++ b/kopete/plugins/latex/latexplugin.cpp
@@ -25,9 +25,9 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kopetechatsessionmanager.h"
 #include "kopeteuiglobal.h"
diff --git a/kopete/plugins/latex/latexplugin.h b/kopete/plugins/latex/latexplugin.h
index 52be1c69..5b88e791 100644
--- a/kopete/plugins/latex/latexplugin.h
+++ b/kopete/plugins/latex/latexplugin.h
@@ -24,7 +24,7 @@
 #include <tqobject.h>
 #include <tqstring.h>
 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include "kopetemessage.h"
 #include "kopeteplugin.h"
diff --git a/kopete/plugins/latex/latexpreferences.cpp b/kopete/plugins/latex/latexpreferences.cpp
index 9014fff1..505b81e2 100644
--- a/kopete/plugins/latex/latexpreferences.cpp
+++ b/kopete/plugins/latex/latexpreferences.cpp
@@ -17,7 +17,7 @@
 
 #include <tqlayout.h>
 #include <tdeparts/componentfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 #include <knuminput.h>
diff --git a/kopete/plugins/netmeeting/netmeetingguiclient.cpp b/kopete/plugins/netmeeting/netmeetingguiclient.cpp
index e47386a2..bf457b90 100644
--- a/kopete/plugins/netmeeting/netmeetingguiclient.cpp
+++ b/kopete/plugins/netmeeting/netmeetingguiclient.cpp
@@ -21,7 +21,7 @@
 
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 
 #include "msnchatsession.h"
diff --git a/kopete/plugins/netmeeting/netmeetinginvitation.cpp b/kopete/plugins/netmeeting/netmeetinginvitation.cpp
index 4373cb05..b42f9e93 100644
--- a/kopete/plugins/netmeeting/netmeetinginvitation.cpp
+++ b/kopete/plugins/netmeeting/netmeetinginvitation.cpp
@@ -22,11 +22,11 @@
 #include "msncontact.h"
 #include "kopetemetacontact.h"
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 
 #include <tqtimer.h>
diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.cpp b/kopete/plugins/netmeeting/netmeetingpreferences.cpp
index 207fd6cd..309d4d15 100644
--- a/kopete/plugins/netmeeting/netmeetingpreferences.cpp
+++ b/kopete/plugins/netmeeting/netmeetingpreferences.cpp
@@ -20,9 +20,9 @@
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <tdeparts/componentfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcombobox.h>
 #include <tdelistview.h>
 #include <kgenericfactory.h>
diff --git a/kopete/plugins/nowlistening/nowlisteningconfig.kcfgc b/kopete/plugins/nowlistening/nowlisteningconfig.kcfgc
index d562e0cb..af76d576 100644
--- a/kopete/plugins/nowlistening/nowlisteningconfig.kcfgc
+++ b/kopete/plugins/nowlistening/nowlisteningconfig.kcfgc
@@ -5,4 +5,4 @@ Singleton=true
 Mutators=true
 MemberVariables=private
 GlobalEnums=true
-IncludeFiles=klocale.h
+IncludeFiles=tdelocale.h
diff --git a/kopete/plugins/nowlistening/nowlisteningguiclient.cpp b/kopete/plugins/nowlistening/nowlisteningguiclient.cpp
index 702bdeca..f9c4d631 100644
--- a/kopete/plugins/nowlistening/nowlisteningguiclient.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningguiclient.cpp
@@ -26,8 +26,8 @@
 
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 NowListeningGUIClient::NowListeningGUIClient( Kopete::ChatSession *parent, NowListeningPlugin *plugin )
 		: TQObject(parent) , KXMLGUIClient(parent)
diff --git a/kopete/plugins/nowlistening/nowlisteningpreferences.cpp b/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
index 47eb51b4..85cd864b 100644
--- a/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
@@ -23,7 +23,7 @@
 #include <tqradiobutton.h>
 
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 
 #include "config.h" // for HAVE_XMMS
diff --git a/kopete/plugins/smpppdcs/detectorsmpppd.cpp b/kopete/plugins/smpppdcs/detectorsmpppd.cpp
index 57ca728d..009780c8 100644
--- a/kopete/plugins/smpppdcs/detectorsmpppd.cpp
+++ b/kopete/plugins/smpppdcs/detectorsmpppd.cpp
@@ -15,7 +15,7 @@
 */
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 
diff --git a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
index 931fbb83..75976df5 100644
--- a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
+++ b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
@@ -24,7 +24,7 @@
 #include <kpushbutton.h>
 #include <kresolver.h>
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kopetepluginmanager.h"
diff --git a/kopete/plugins/smpppdcs/unittest/main.cpp b/kopete/plugins/smpppdcs/unittest/main.cpp
index 79b0656c..09779d27 100644
--- a/kopete/plugins/smpppdcs/unittest/main.cpp
+++ b/kopete/plugins/smpppdcs/unittest/main.cpp
@@ -18,7 +18,7 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeunittest/runnergui.h>
 
 #include "clienttest.h"
diff --git a/kopete/plugins/statistics/statisticscontact.cpp b/kopete/plugins/statistics/statisticscontact.cpp
index badaf147..8ec488ec 100644
--- a/kopete/plugins/statistics/statisticscontact.cpp
+++ b/kopete/plugins/statistics/statisticscontact.cpp
@@ -20,7 +20,7 @@
 #include <tquuid.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kopetemetacontact.h"
 #include "kopeteonlinestatus.h"
diff --git a/kopete/plugins/statistics/statisticsdb.cpp b/kopete/plugins/statistics/statisticsdb.cpp
index 0feed26c..48378f3c 100644
--- a/kopete/plugins/statistics/statisticsdb.cpp
+++ b/kopete/plugins/statistics/statisticsdb.cpp
@@ -22,7 +22,7 @@
 #include <tdeaboutdata.h>
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdeversion.h>
 
diff --git a/kopete/plugins/statistics/statisticsdialog.cpp b/kopete/plugins/statistics/statisticsdialog.cpp
index fb7ac6d8..a696c9df 100644
--- a/kopete/plugins/statistics/statisticsdialog.cpp
+++ b/kopete/plugins/statistics/statisticsdialog.cpp
@@ -24,7 +24,7 @@
 #include <tqstring.h>
 
 #include "kdialogbase.h"
-#include "klocale.h"
+#include "tdelocale.h"
 #include "tdelistview.h"
 #include "tdehtml_part.h"
 #include "kstandarddirs.h"
diff --git a/kopete/plugins/statistics/statisticsplugin.cpp b/kopete/plugins/statistics/statisticsplugin.cpp
index 49ddfb18..2cfe0290 100644
--- a/kopete/plugins/statistics/statisticsplugin.cpp
+++ b/kopete/plugins/statistics/statisticsplugin.cpp
@@ -21,7 +21,7 @@
 #include <kgenericfactory.h>
 #include <tdeaboutdata.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdeversion.h>
 
diff --git a/kopete/plugins/texteffect/texteffectconfig.cpp b/kopete/plugins/texteffect/texteffectconfig.cpp
index a411b363..7f983e0c 100644
--- a/kopete/plugins/texteffect/texteffectconfig.cpp
+++ b/kopete/plugins/texteffect/texteffectconfig.cpp
@@ -18,7 +18,7 @@
 
 #include <tqstring.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 
 #include "texteffectconfig.h"
diff --git a/kopete/plugins/texteffect/texteffectpreferences.cpp b/kopete/plugins/texteffect/texteffectpreferences.cpp
index e2a05469..b178aaf1 100644
--- a/kopete/plugins/texteffect/texteffectpreferences.cpp
+++ b/kopete/plugins/texteffect/texteffectpreferences.cpp
@@ -20,7 +20,7 @@
 #include <tqcheckbox.h>
 #include <tqpushbutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcolordialog.h>
 #include <kgenericfactory.h>
 #include <kautoconfig.h>
diff --git a/kopete/plugins/translator/translatordialog.cpp b/kopete/plugins/translator/translatordialog.cpp
index 02e405ec..2bbd0114 100644
--- a/kopete/plugins/translator/translatordialog.cpp
+++ b/kopete/plugins/translator/translatordialog.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktextedit.h>
  
 #include "translatordialog.h"
diff --git a/kopete/plugins/translator/translatorguiclient.cpp b/kopete/plugins/translator/translatorguiclient.cpp
index 0a2e8ed2..5d245c0f 100644
--- a/kopete/plugins/translator/translatorguiclient.cpp
+++ b/kopete/plugins/translator/translatorguiclient.cpp
@@ -21,7 +21,7 @@
 
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kopetechatsession.h"
 #include "kopeteview.h"
diff --git a/kopete/plugins/translator/translatorlanguages.cpp b/kopete/plugins/translator/translatorlanguages.cpp
index 5eecbf22..be532847 100644
--- a/kopete/plugins/translator/translatorlanguages.cpp
+++ b/kopete/plugins/translator/translatorlanguages.cpp
@@ -21,7 +21,7 @@
 
 #include <tqstring.h>
 #include <tqmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "translatorlanguages.h"
 
diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp
index f052af16..223d1d70 100644
--- a/kopete/plugins/translator/translatorplugin.cpp
+++ b/kopete/plugins/translator/translatorplugin.cpp
@@ -28,7 +28,7 @@
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <kgenericfactory.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <tdeversion.h>
 #include <tdeaboutdata.h>
diff --git a/kopete/plugins/webpresence/webpresenceplugin.cpp b/kopete/plugins/webpresence/webpresenceplugin.cpp
index 48271559..4265c7aa 100644
--- a/kopete/plugins/webpresence/webpresenceplugin.cpp
+++ b/kopete/plugins/webpresence/webpresenceplugin.cpp
@@ -27,8 +27,8 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <kgenericfactory.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <kstandarddirs.h>
 
 #ifdef HAVE_XSLT