Rename additional header files to avoid conflicts with KDE4

20 files changed, 31 insertions, 31 deletions

diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
index 668e29c3..b81d5b29 100644
--- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
@@ -24,7 +24,7 @@
 #include <tqstring.h>
 #include <tqdatastream.h>
 #include <tqdom.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
diff --git a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp
index 07c3d225..c24f8a20 100644
--- a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp
@@ -22,7 +22,7 @@
 
 #include <tqstringlist.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 PictureNotifierTask::PictureNotifierTask(Task* parent) : Task(parent)
diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
index 532e21bf..d56666cd 100644
--- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
@@ -23,7 +23,7 @@
 #include <tqtimer.h>
 #include <tqfile.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
diff --git a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
index 4cb17847..e50f420a 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
@@ -23,7 +23,7 @@
 #include <tqtimer.h>
 #include <tdeapplication.h> // for random()
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstreamsocket.h>
 #include <tdeio/global.h>
 
diff --git a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp
index 828c6832..3f37cac0 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp
@@ -21,7 +21,7 @@
 #include "client.h"
 #include <tqstring.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 SendMessageTask::SendMessageTask(Task* parent) : Task(parent)
 {
diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
index 95193241..2fcc1d7e 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
@@ -27,7 +27,7 @@
 #include <tdeio/jobclasses.h>
 #include <kbufferedsocket.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace KNetwork;
 
diff --git a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp
index ddb249bd..d1c4926e 100644
--- a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp
@@ -22,7 +22,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 StatusNotifierTask::StatusNotifierTask(Task* parent) : Task(parent)
 {
diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
index 8a14b354..5856fa10 100644
--- a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
@@ -25,11 +25,11 @@
 #include <tqfile.h>
 #include <tqtimer.h>
 #include <tqpixmap.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kprocess.h>
 #include <kstreamsocket.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace KNetwork;
 
diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
index 98df4ef0..c48a2549 100644
--- a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
@@ -25,7 +25,7 @@
 #include <tdeio/global.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 YABTask::YABTask(Task* parent) : Task(parent)
 {
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
index 96f96389..569a4e45 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
@@ -20,13 +20,13 @@
 
 // KDE Includes
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "yahootypes.h"
 #include "client.h"
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
index 96cc20c5..9e5d7cd1 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
@@ -21,7 +21,7 @@
 #include "yahootypes.h"
 #include "client.h"
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp
index 023b50b5..f98b80a4 100644
--- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp
+++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp
@@ -29,10 +29,10 @@
 
 #include <kdatewidget.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kjanuswidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "yahooworkinfowidget.h"
 #include "yahoogeneralinfowidget.h"
diff --git a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp
index caa3c75a..a6f8cb1b 100644
--- a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp
+++ b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp
@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 #include <tqvbox.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <webcamwidget.h>
 
diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp
index 8a1f5a4e..56b71cc9 100644
--- a/kopete/protocols/yahoo/yahooaccount.cpp
+++ b/kopete/protocols/yahoo/yahooaccount.cpp
@@ -32,12 +32,12 @@
 #include <tqfileinfo.h>
 
 // KDE
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <krun.h>
 #include <kstandarddirs.h>
 
diff --git a/kopete/protocols/yahoo/yahoochatsession.cpp b/kopete/protocols/yahoo/yahoochatsession.cpp
index e59c5062..38c9c04f 100644
--- a/kopete/protocols/yahoo/yahoochatsession.cpp
+++ b/kopete/protocols/yahoo/yahoochatsession.cpp
@@ -24,10 +24,10 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdemainwindow.h>
 #include <tdetoolbar.h>
 #include <krun.h>
diff --git a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp
index c96d52da..244d2b4c 100644
--- a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp
+++ b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp
@@ -18,8 +18,8 @@
 
 #include <kdebug.h>
 #include <klineeditdlg.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <tdeconfig.h>
 
diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp
index 77e03b27..86f89076 100644
--- a/kopete/protocols/yahoo/yahoocontact.cpp
+++ b/kopete/protocols/yahoo/yahoocontact.cpp
@@ -47,11 +47,11 @@
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krun.h>
 #include <tdeshortcut.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
 #include <kurl.h>
diff --git a/kopete/protocols/yahoo/yahooeditaccount.cpp b/kopete/protocols/yahoo/yahooeditaccount.cpp
index 8913eba3..b5d61768 100644
--- a/kopete/protocols/yahoo/yahooeditaccount.cpp
+++ b/kopete/protocols/yahoo/yahooeditaccount.cpp
@@ -27,9 +27,9 @@
 #include <tqspinbox.h>
 
 // KDE Includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <krun.h>
 #include <kurl.h>
 #include <tdefiledialog.h>
diff --git a/kopete/protocols/yahoo/yahooverifyaccount.cpp b/kopete/protocols/yahoo/yahooverifyaccount.cpp
index 62dde427..55999195 100644
--- a/kopete/protocols/yahoo/yahooverifyaccount.cpp
+++ b/kopete/protocols/yahoo/yahooverifyaccount.cpp
@@ -21,8 +21,8 @@
 // KDE Includes
 #include <kdebug.h>
 #include <klineedit.h>
-#include <ktempfile.h>
-#include <klocale.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
diff --git a/kopete/protocols/yahoo/yahoowebcam.cpp b/kopete/protocols/yahoo/yahoowebcam.cpp
index 0ddf8a45..51d7b1bf 100644
--- a/kopete/protocols/yahoo/yahoowebcam.cpp
+++ b/kopete/protocols/yahoo/yahoowebcam.cpp
@@ -15,7 +15,7 @@
 
 #include <kdebug.h>
 #include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqtimer.h>
 
 #include "client.h"