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/irc/ircaccount.cpp | 4 ++--
kopete/protocols/irc/ircaddcontactpage.cpp | 4 ++--
kopete/protocols/irc/ircchannelcontact.cpp | 4 ++--
kopete/protocols/irc/irccontact.cpp | 2 +-
kopete/protocols/irc/ircguiclient.cpp | 2 +-
kopete/protocols/irc/ircprotocol.cpp | 4 ++--
kopete/protocols/irc/ircservercontact.cpp | 2 +-
kopete/protocols/irc/ircusercontact.cpp | 2 +-
kopete/protocols/irc/libkirc/kircengine.cpp | 2 +-
kopete/protocols/irc/libkirc/kircmessage.cpp | 4 ++--
kopete/protocols/irc/libkirc/kirctransfer.cpp | 2 +-
kopete/protocols/irc/libkirc/kirctransferhandler.cpp | 4 ++--
kopete/protocols/irc/libkirc/ksslsocket.cpp | 4 ++--
kopete/protocols/irc/ui/channellist.cpp | 4 ++--
kopete/protocols/irc/ui/irceditaccountwidget.cpp | 6 +++---
15 files changed, 25 insertions(+), 25 deletions(-)
(limited to 'kopete/protocols/irc')
diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp
index 2b8dc549..e586dd6a 100644
--- a/kopete/protocols/irc/ircaccount.cpp
+++ b/kopete/protocols/irc/ircaccount.cpp
@@ -46,11 +46,11 @@
#include <tdeconfig.h>
#include <tdecompletionbox.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kinputdialog.h>
#include <klineedit.h>
#include <klineeditdlg.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knotifyclient.h>
#include <tdepopupmenu.h>
diff --git a/kopete/protocols/irc/ircaddcontactpage.cpp b/kopete/protocols/irc/ircaddcontactpage.cpp
index 6b19721c..35bc4fc2 100644
--- a/kopete/protocols/irc/ircaddcontactpage.cpp
+++ b/kopete/protocols/irc/ircaddcontactpage.cpp
@@ -28,8 +28,8 @@
#include <tqframe.h>
#include <tqtabwidget.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
IRCAddContactPage::IRCAddContactPage( TQWidget *parent, IRCAccount *a ) : AddContactPage(parent, 0)
{
diff --git a/kopete/protocols/irc/ircchannelcontact.cpp b/kopete/protocols/irc/ircchannelcontact.cpp
index 91b7459f..c11aec03 100644
--- a/kopete/protocols/irc/ircchannelcontact.cpp
+++ b/kopete/protocols/irc/ircchannelcontact.cpp
@@ -34,8 +34,8 @@
#include <kinputdialog.h>
#include <tdeapplication.h>
#include <tdeaboutdata.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
#include <tqtimer.h>
diff --git a/kopete/protocols/irc/irccontact.cpp b/kopete/protocols/irc/irccontact.cpp
index c45b5303..1df631f9 100644
--- a/kopete/protocols/irc/irccontact.cpp
+++ b/kopete/protocols/irc/irccontact.cpp
@@ -18,7 +18,7 @@
*/
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqregexp.h>
#include <tqtimer.h>
diff --git a/kopete/protocols/irc/ircguiclient.cpp b/kopete/protocols/irc/ircguiclient.cpp
index 3724781d..9ce7f73a 100644
--- a/kopete/protocols/irc/ircguiclient.cpp
+++ b/kopete/protocols/irc/ircguiclient.cpp
@@ -14,7 +14,7 @@
*************************************************************************
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeversion.h>
#if KDE_IS_VERSION( 3, 1, 90 )
diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp
index 8c8e6291..2c35d737 100644
--- a/kopete/protocols/irc/ircprotocol.cpp
+++ b/kopete/protocols/irc/ircprotocol.cpp
@@ -45,10 +45,10 @@
#include <kcharsets.h>
#include <kdebug.h>
#include <kgenericfactory.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kinputdialog.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
#include <kuser.h>
diff --git a/kopete/protocols/irc/ircservercontact.cpp b/kopete/protocols/irc/ircservercontact.cpp
index e5018ccd..7c7a9d50 100644
--- a/kopete/protocols/irc/ircservercontact.cpp
+++ b/kopete/protocols/irc/ircservercontact.cpp
@@ -26,7 +26,7 @@
#include <tdeaction.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqtimer.h>
diff --git a/kopete/protocols/irc/ircusercontact.cpp b/kopete/protocols/irc/ircusercontact.cpp
index 07515c75..1254b9d9 100644
--- a/kopete/protocols/irc/ircusercontact.cpp
+++ b/kopete/protocols/irc/ircusercontact.cpp
@@ -29,7 +29,7 @@
#include <tdeaction.h>
#include <kdebug.h>
#include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqtimer.h>
diff --git a/kopete/protocols/irc/libkirc/kircengine.cpp b/kopete/protocols/irc/libkirc/kircengine.cpp
index 79bc56df..4ca09bfc 100644
--- a/kopete/protocols/irc/libkirc/kircengine.cpp
+++ b/kopete/protocols/irc/libkirc/kircengine.cpp
@@ -27,7 +27,7 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <kextsock.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tqtextcodec.h>
diff --git a/kopete/protocols/irc/libkirc/kircmessage.cpp b/kopete/protocols/irc/libkirc/kircmessage.cpp
index 8a48ce52..7eb7b7b0 100644
--- a/kopete/protocols/irc/libkirc/kircmessage.cpp
+++ b/kopete/protocols/irc/libkirc/kircmessage.cpp
@@ -24,8 +24,8 @@
#include <kdebug.h>
#include <kextsock.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
using namespace KIRC;
diff --git a/kopete/protocols/irc/libkirc/kirctransfer.cpp b/kopete/protocols/irc/libkirc/kirctransfer.cpp
index 68e28f0c..cbcb6682 100644
--- a/kopete/protocols/irc/libkirc/kirctransfer.cpp
+++ b/kopete/protocols/irc/libkirc/kirctransfer.cpp
@@ -17,7 +17,7 @@
#include <kdebug.h>
#include <kextsock.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqfile.h>
#include <tqtimer.h>
diff --git a/kopete/protocols/irc/libkirc/kirctransferhandler.cpp b/kopete/protocols/irc/libkirc/kirctransferhandler.cpp
index 3a5ef27c..c86124cb 100644
--- a/kopete/protocols/irc/libkirc/kirctransferhandler.cpp
+++ b/kopete/protocols/irc/libkirc/kirctransferhandler.cpp
@@ -15,8 +15,8 @@
*************************************************************************
*/
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kextsock.h>
#include <tqfile.h>
diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp
index 8d248152..23e7a10c 100644
--- a/kopete/protocols/irc/libkirc/ksslsocket.cpp
+++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp
@@ -19,7 +19,7 @@
#include <tqsocketnotifier.h>
#include <dcopclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kssl.h>
#include <ksslinfodlg.h>
@@ -27,7 +27,7 @@
#include <ksslcertchain.h>
#include <ksslcertificatecache.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "ksslsocket.h"
diff --git a/kopete/protocols/irc/ui/channellist.cpp b/kopete/protocols/irc/ui/channellist.cpp
index 6f26b0e4..9ee7bbcb 100644
--- a/kopete/protocols/irc/ui/channellist.cpp
+++ b/kopete/protocols/irc/ui/channellist.cpp
@@ -19,8 +19,8 @@
#include "kircengine.h"
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqvariant.h>
#include <tqlabel.h>
diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp
index 0b357726..854eff97 100644
--- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp
+++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp
@@ -27,13 +27,13 @@
#include "kopetepasswordwidget.h"
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <tdelistview.h>
#include <kdebug.h>
#include <kextsock.h>
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kcharsets.h>
#include <tqlabel.h>
--
cgit v1.2.1