From da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:21:47 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 kopete/protocols/oscar/aim/aimaccount.cpp           | 2 +-
 kopete/protocols/oscar/aim/aimcontact.cpp           | 2 +-
 kopete/protocols/oscar/icq/icqaccount.cpp           | 2 +-
 kopete/protocols/oscar/icq/icqcontact.cpp           | 4 ++--
 kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp | 2 +-
 kopete/protocols/oscar/icq/ui/icqsearchbase.ui      | 2 +-
 kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp   | 2 +-
 kopete/protocols/oscar/oscarcontact.cpp             | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'kopete/protocols/oscar')

diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp
index cd9e30a3..37bfb1dc 100644
--- a/kopete/protocols/oscar/aim/aimaccount.cpp
+++ b/kopete/protocols/oscar/aim/aimaccount.cpp
@@ -20,7 +20,7 @@
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 #include <kmdcodec.h>
 
diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp
index 2a8b0320..29cd585a 100644
--- a/kopete/protocols/oscar/aim/aimcontact.cpp
+++ b/kopete/protocols/oscar/aim/aimcontact.cpp
@@ -22,7 +22,7 @@
 #include <tqtextcodec.h>
 
 #include <kapplication.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
diff --git a/kopete/protocols/oscar/icq/icqaccount.cpp b/kopete/protocols/oscar/icq/icqaccount.cpp
index 7627648c..53ca409a 100644
--- a/kopete/protocols/oscar/icq/icqaccount.cpp
+++ b/kopete/protocols/oscar/icq/icqaccount.cpp
@@ -20,7 +20,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmdcodec.h>
 #include <kmessagebox.h>
 
diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp
index 19d2ee7f..5acd5859 100644
--- a/kopete/protocols/oscar/icq/icqcontact.cpp
+++ b/kopete/protocols/oscar/icq/icqcontact.cpp
@@ -21,8 +21,8 @@
 #include <tqimage.h>
 #include <tqfile.h>
 
-#include <kaction.h>
-#include <kactionclasses.h>
+#include <tdeaction.h>
+#include <tdeactionclasses.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp
index 935b9853..a5071753 100644
--- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp
+++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp
@@ -28,7 +28,7 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kmessagebox.h>
diff --git a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui
index a027985f..e2fb2c6b 100644
--- a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui
+++ b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui
@@ -486,7 +486,7 @@
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp
index f8b16198..59cf7e92 100644
--- a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp
+++ b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp
@@ -26,7 +26,7 @@
 #include <tqtabwidget.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kmessagebox.h>
diff --git a/kopete/protocols/oscar/oscarcontact.cpp b/kopete/protocols/oscar/oscarcontact.cpp
index c145b467..f9bf5fae 100644
--- a/kopete/protocols/oscar/oscarcontact.cpp
+++ b/kopete/protocols/oscar/oscarcontact.cpp
@@ -21,7 +21,7 @@
 #include <tqapplication.h>
 #include <tqtextcodec.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-- 
cgit v1.2.1