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/oscar/aim/aimaccount.cpp           | 4 ++--
 kopete/protocols/oscar/aim/aimcontact.cpp           | 4 ++--
 kopete/protocols/oscar/aim/aimjoinchat.cpp          | 2 +-
 kopete/protocols/oscar/aim/aimprotocol.cpp          | 4 ++--
 kopete/protocols/oscar/aim/aimuserinfo.cpp          | 2 +-
 kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'kopete/protocols/oscar/aim')

diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp
index 37bfb1dc..f6be26b7 100644
--- a/kopete/protocols/oscar/aim/aimaccount.cpp
+++ b/kopete/protocols/oscar/aim/aimaccount.cpp
@@ -19,9 +19,9 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmdcodec.h>
 
 #include "kopeteawayaction.h"
diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp
index fcd51501..2fa79bf1 100644
--- a/kopete/protocols/oscar/aim/aimcontact.cpp
+++ b/kopete/protocols/oscar/aim/aimcontact.cpp
@@ -23,9 +23,9 @@
 
 #include <tdeapplication.h>
 #include <tdeactionclasses.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kopeteaway.h"
 #include "kopetechatsession.h"
diff --git a/kopete/protocols/oscar/aim/aimjoinchat.cpp b/kopete/protocols/oscar/aim/aimjoinchat.cpp
index 2ccec9b2..bc4a3edf 100644
--- a/kopete/protocols/oscar/aim/aimjoinchat.cpp
+++ b/kopete/protocols/oscar/aim/aimjoinchat.cpp
@@ -21,7 +21,7 @@
 
 #include <tqlineedit.h>
 #include <tqcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "aimjoinchatbase.h"
 #include "aimaccount.h"
diff --git a/kopete/protocols/oscar/aim/aimprotocol.cpp b/kopete/protocols/oscar/aim/aimprotocol.cpp
index 0b70ac89..f71e1848 100644
--- a/kopete/protocols/oscar/aim/aimprotocol.cpp
+++ b/kopete/protocols/oscar/aim/aimprotocol.cpp
@@ -17,7 +17,7 @@
 
 #include <tqstringlist.h>
 #include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include "aimprotocol.h"
@@ -34,7 +34,7 @@
 #include "kopetemetacontact.h"
 
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kimageio.h>
 
 typedef KGenericFactory<AIMProtocol> AIMProtocolFactory;
diff --git a/kopete/protocols/oscar/aim/aimuserinfo.cpp b/kopete/protocols/oscar/aim/aimuserinfo.cpp
index eb013a4a..0cce3a5c 100644
--- a/kopete/protocols/oscar/aim/aimuserinfo.cpp
+++ b/kopete/protocols/oscar/aim/aimuserinfo.cpp
@@ -27,7 +27,7 @@
 #include <tqpushbutton.h>
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <ktextbrowser.h>
 #include <kdebug.h>
diff --git a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp
index f00741c9..c6612027 100644
--- a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp
+++ b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp
@@ -22,8 +22,8 @@
 
 #include <tqlayout.h>
 #include <tqlineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 AIMAddContactPage::AIMAddContactPage(bool connected, TQWidget *parent,
 					 const char *name )
-- 
cgit v1.2.1