Rename additional header files to avoid conflicts with KDE4

15 files changed, 31 insertions, 31 deletions

diff --git a/kopete/protocols/msn/dispatcher.cpp b/kopete/protocols/msn/dispatcher.cpp
index f81ef8cc..70d43a14 100644
--- a/kopete/protocols/msn/dispatcher.cpp
+++ b/kopete/protocols/msn/dispatcher.cpp
@@ -34,7 +34,7 @@ using P2P::OutgoingTransfer;
 #include <kdebug.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 // TQt includes
 #include <tqdatastream.h>
diff --git a/kopete/protocols/msn/incomingtransfer.cpp b/kopete/protocols/msn/incomingtransfer.cpp
index a4f31216..0da4a04c 100644
--- a/kopete/protocols/msn/incomingtransfer.cpp
+++ b/kopete/protocols/msn/incomingtransfer.cpp
@@ -22,10 +22,10 @@ using P2P::Message;
 // Kde includes
 #include <kbufferedsocket.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kserversocket.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 using namespace KNetwork;
 
 // TQt includes
diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp
index 6c7dbb41..c987bf1d 100644
--- a/kopete/protocols/msn/msnaccount.cpp
+++ b/kopete/protocols/msn/msnaccount.cpp
@@ -25,11 +25,11 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kmdcodec.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 #include <tqregexp.h>
@@ -54,7 +54,7 @@
 
 #if !defined NDEBUG
 #include "msndebugrawcmddlg.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #endif
 
 #if MSN_WEBCAM
diff --git a/kopete/protocols/msn/msnaddcontactpage.cpp b/kopete/protocols/msn/msnaddcontactpage.cpp
index 8bdf77a1..74102e1d 100644
--- a/kopete/protocols/msn/msnaddcontactpage.cpp
+++ b/kopete/protocols/msn/msnaddcontactpage.cpp
@@ -16,8 +16,8 @@
 #include <tqlayout.h>
 #include <tqlineedit.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "msnadd.h"
 #include "msnaddcontactpage.h"
diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp
index 6137e17b..fabd62ab 100644
--- a/kopete/protocols/msn/msnchatsession.cpp
+++ b/kopete/protocols/msn/msnchatsession.cpp
@@ -27,10 +27,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/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp
index 25041d72..40d45b51 100644
--- a/kopete/protocols/msn/msncontact.cpp
+++ b/kopete/protocols/msn/msncontact.cpp
@@ -28,13 +28,13 @@
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <krun.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqregexp.h>
 #include <tdeio/job.h>
 
diff --git a/kopete/protocols/msn/msndebugrawcmddlg.cpp b/kopete/protocols/msn/msndebugrawcmddlg.cpp
index 48c4050e..b2a4ebbd 100644
--- a/kopete/protocols/msn/msndebugrawcmddlg.cpp
+++ b/kopete/protocols/msn/msndebugrawcmddlg.cpp
@@ -25,7 +25,7 @@
 #include <tqlineedit.h>
 #include <ktextedit.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 MSNDebugRawCmdDlg::MSNDebugRawCmdDlg( TQWidget *parent )
 : KDialogBase( parent, 0L, true,
diff --git a/kopete/protocols/msn/msnfiletransfersocket.cpp b/kopete/protocols/msn/msnfiletransfersocket.cpp
index 3c480092..b7121c30 100644
--- a/kopete/protocols/msn/msnfiletransfersocket.cpp
+++ b/kopete/protocols/msn/msnfiletransfersocket.cpp
@@ -28,7 +28,7 @@
 #include <kserversocket.h>
 #include <kbufferedsocket.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kopetetransfermanager.h"
 #include "kopetecontact.h"
diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp
index 5f20d9ca..ec9b27c8 100644
--- a/kopete/protocols/msn/msnnotifysocket.cpp
+++ b/kopete/protocols/msn/msnnotifysocket.cpp
@@ -34,11 +34,11 @@
 
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <krun.h>
 #include <tdeio/job.h>
 #include <tqfile.h>
diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp
index 32b3d17a..2bb33c97 100644
--- a/kopete/protocols/msn/msnsocket.cpp
+++ b/kopete/protocols/msn/msnsocket.cpp
@@ -31,8 +31,8 @@
 #include <kbufferedsocket.h>
 #include <kserversocket.h>
 #include <kresolver.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 
 #include "kopeteuiglobal.h"
diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp
index 179b45e3..77b7b550 100644
--- a/kopete/protocols/msn/msnswitchboardsocket.cpp
+++ b/kopete/protocols/msn/msnswitchboardsocket.cpp
@@ -35,14 +35,14 @@
 
 // kde
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeconfig.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 // for the display picture
 #include <msncontact.h>
diff --git a/kopete/protocols/msn/outgoingtransfer.cpp b/kopete/protocols/msn/outgoingtransfer.cpp
index ce34f4a9..5d66c495 100644
--- a/kopete/protocols/msn/outgoingtransfer.cpp
+++ b/kopete/protocols/msn/outgoingtransfer.cpp
@@ -21,7 +21,7 @@
 // Kde includes
 #include <kbufferedsocket.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
 using namespace KNetwork;
 
diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
index 57022e6d..41a007f9 100644
--- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp
+++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
@@ -32,8 +32,8 @@
 
 #include <kautoconfig.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdeio/netaccess.h>
 #include <kdebug.h>
diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp
index b7f991cd..60046d17 100644
--- a/kopete/protocols/msn/webcam.cpp
+++ b/kopete/protocols/msn/webcam.cpp
@@ -20,9 +20,9 @@
 #include <kdebug.h>
 #include <tqregexp.h>
 #include <kbufferedsocket.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kserversocket.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqlabel.h>
 #include <tqguardedptr.h>
 #include <tqtimer.h>
diff --git a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp
index 39b7049b..f10d6abe 100644
--- a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp
+++ b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp
@@ -23,7 +23,7 @@
 #include <tqobject.h>
 #include <tqwidget.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>