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/liboscar/aimlogintask.cpp        | 2 +-
 kopete/protocols/oscar/liboscar/client.cpp              | 2 +-
 kopete/protocols/oscar/liboscar/closeconnectiontask.cpp | 2 +-
 kopete/protocols/oscar/liboscar/logintask.cpp           | 2 +-
 kopete/protocols/oscar/liboscar/ssimodifytask.cpp       | 2 +-
 kopete/protocols/oscar/liboscar/userdetails.cpp         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/kopete/protocols/oscar/liboscar/aimlogintask.cpp b/kopete/protocols/oscar/liboscar/aimlogintask.cpp
index 9c669dcd..a371b0df 100644
--- a/kopete/protocols/oscar/liboscar/aimlogintask.cpp
+++ b/kopete/protocols/oscar/liboscar/aimlogintask.cpp
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "connection.h"
 #include "oscartypes.h"
 #include "oscarutils.h"
diff --git a/kopete/protocols/oscar/liboscar/client.cpp b/kopete/protocols/oscar/liboscar/client.cpp
index f0073b47..fe24fdb3 100644
--- a/kopete/protocols/oscar/liboscar/client.cpp
+++ b/kopete/protocols/oscar/liboscar/client.cpp
@@ -24,7 +24,7 @@
 #include <tqtextcodec.h>
 
 #include <kdebug.h> //for kdDebug()
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "buddyicontask.h"
 #include "clientreadytask.h"
diff --git a/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp b/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp
index 3b062b2a..338d1125 100644
--- a/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp
+++ b/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp
@@ -21,7 +21,7 @@
 #include <tqstring.h>
 #include <tqvaluelist.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "connection.h"
 #include "transfer.h"
 #include "oscarutils.h"
diff --git a/kopete/protocols/oscar/liboscar/logintask.cpp b/kopete/protocols/oscar/liboscar/logintask.cpp
index f7b55531..73379e40 100644
--- a/kopete/protocols/oscar/liboscar/logintask.cpp
+++ b/kopete/protocols/oscar/liboscar/logintask.cpp
@@ -20,7 +20,7 @@
 
 #include <tqtimer.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "aimlogintask.h"
 #include "connection.h"
diff --git a/kopete/protocols/oscar/liboscar/ssimodifytask.cpp b/kopete/protocols/oscar/liboscar/ssimodifytask.cpp
index 80a9346c..6392bb9c 100644
--- a/kopete/protocols/oscar/liboscar/ssimodifytask.cpp
+++ b/kopete/protocols/oscar/liboscar/ssimodifytask.cpp
@@ -21,7 +21,7 @@
 #include "ssimodifytask.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstring.h>
 #include "connection.h"
 #include "oscarutils.h"
diff --git a/kopete/protocols/oscar/liboscar/userdetails.cpp b/kopete/protocols/oscar/liboscar/userdetails.cpp
index f8737026..c88bc54b 100644
--- a/kopete/protocols/oscar/liboscar/userdetails.cpp
+++ b/kopete/protocols/oscar/liboscar/userdetails.cpp
@@ -22,7 +22,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqptrlist.h>
 #include "oscarutils.h"
 #include "oscardebug.h"
-- 
cgit v1.2.3