From 0e88a100de93641e5aeacd8c65e8076c948a5c20 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:59:01 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 kopete/protocols/jabber/ui/dlgjabberbrowse.cpp         | 4 ++--
 kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp | 4 ++--
 kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp       | 2 +-
 kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp  | 4 ++--
 kopete/protocols/jabber/ui/dlgjabberregister.cpp       | 4 ++--
 kopete/protocols/jabber/ui/dlgjabberservices.cpp       | 4 ++--
 kopete/protocols/jabber/ui/dlgjabbervcard.cpp          | 4 ++--
 kopete/protocols/jabber/ui/jabberaddcontactpage.cpp    | 2 +-
 kopete/protocols/jabber/ui/jabberchooseserver.cpp      | 2 +-
 kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp | 4 ++--
 kopete/protocols/jabber/ui/jabberregisteraccount.cpp   | 6 +++---
 11 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'kopete/protocols/jabber/ui')

diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp
index be558388..10c11b0f 100644
--- a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp
@@ -21,8 +21,8 @@
 #include <tqtable.h>
 #include <tqlabel.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include "jabberaccount.h"
 #include "jabberprotocol.h"
diff --git a/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp b/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp
index 948a594e..c665bf94 100644
--- a/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp
@@ -20,9 +20,9 @@
 #include "dlgjabberchangepassword.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpassdlg.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <kopetepassword.h>
diff --git a/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp b/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp
index 9d69beae..46071122 100644
--- a/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp
@@ -17,7 +17,7 @@
  ***************************************************************************/
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 
diff --git a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp
index 1803a013..3afea298 100644
--- a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp
@@ -9,8 +9,8 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqtable.h>
diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.cpp b/kopete/protocols/jabber/ui/dlgjabberregister.cpp
index ff324085..0f6f55f4 100644
--- a/kopete/protocols/jabber/ui/dlgjabberregister.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabberregister.cpp
@@ -18,8 +18,8 @@
 
 #include <tqpushbutton.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include "jabberaccount.h"
 #include "jabberprotocol.h"
diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.cpp b/kopete/protocols/jabber/ui/dlgjabberservices.cpp
index 1bd1310c..bf0eaa27 100644
--- a/kopete/protocols/jabber/ui/dlgjabberservices.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabberservices.cpp
@@ -16,8 +16,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqpushbutton.h>
diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
index 34a2eb35..0092742e 100644
--- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
@@ -32,9 +32,9 @@
 #include <kdebug.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurllabel.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <krun.h>
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>
diff --git a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp
index 076b92b8..3542cb0f 100644
--- a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp
+++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp
@@ -22,7 +22,7 @@
 
 #include <tqlayout.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kopeteaccount.h>
 #include <tqlabel.h>
 #include <kopetegroup.h>
diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.cpp b/kopete/protocols/jabber/ui/jabberchooseserver.cpp
index 77356c55..9221b2c4 100644
--- a/kopete/protocols/jabber/ui/jabberchooseserver.cpp
+++ b/kopete/protocols/jabber/ui/jabberchooseserver.cpp
@@ -20,7 +20,7 @@
 #include "jabberchooseserver.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/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
index a07c8f1d..4fecd6c4 100644
--- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
+++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
@@ -26,8 +26,8 @@
 #include <tqlabel.h>
 
 #include <tdeconfig.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kpassdlg.h>
 #include <kopetepassword.h>
 #include <kopetepasswordedaccount.h>
diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
index e18adbf9..febad40c 100644
--- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
+++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
@@ -20,10 +20,10 @@
 #include "jabberregisteraccount.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 #include <kpassdlg.h>
 #include <knuminput.h>
-- 
cgit v1.2.1