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/irc/ircaccount.cpp              | 4 ++--
 kopete/protocols/irc/ircguiclient.cpp            | 4 ++--
 kopete/protocols/irc/ircprotocol.cpp             | 2 +-
 kopete/protocols/irc/ircservercontact.cpp        | 2 +-
 kopete/protocols/irc/ircusercontact.cpp          | 2 +-
 kopete/protocols/irc/kcodecaction.h              | 4 ++--
 kopete/protocols/irc/ui/channellist.cpp          | 2 +-
 kopete/protocols/irc/ui/irceditaccount.ui        | 2 +-
 kopete/protocols/irc/ui/irceditaccountwidget.cpp | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'kopete/protocols/irc')

diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp
index 3c8c5b85..9a316854 100644
--- a/kopete/protocols/irc/ircaccount.cpp
+++ b/kopete/protocols/irc/ircaccount.cpp
@@ -40,7 +40,7 @@
 #include "kopeteview.h"
 #include "kopetepassword.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
@@ -52,7 +52,7 @@
 #include <klineeditdlg.h>
 #include <kmessagebox.h>
 #include <knotifyclient.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tqlayout.h>
 #include <tqtimer.h>
diff --git a/kopete/protocols/irc/ircguiclient.cpp b/kopete/protocols/irc/ircguiclient.cpp
index 702aafa9..3724781d 100644
--- a/kopete/protocols/irc/ircguiclient.cpp
+++ b/kopete/protocols/irc/ircguiclient.cpp
@@ -18,13 +18,13 @@
 
 #include <tdeversion.h>
 #if KDE_IS_VERSION( 3, 1, 90 )
-	#include <kactioncollection.h>
+	#include <tdeactioncollection.h>
 #else
 // ------------------------------------------------------------
 // TODO: UGLY HACK, remove when we drop KDE 3.1 compatibility
 #ifdef KDE_NO_COMPAT
 #undef KDE_NO_COMPAT
-#include <kaction.h>
+#include <tdeaction.h>
 #define KDE_NO_COMPAT 1
 #endif
 // ------------------------------------------------------------
diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp
index 2f39a329..9c6b9df4 100644
--- a/kopete/protocols/irc/ircprotocol.cpp
+++ b/kopete/protocols/irc/ircprotocol.cpp
@@ -41,7 +41,7 @@
 #include "kopeteuiglobal.h"
 
 #undef KDE_NO_COMPAT
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcharsets.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
diff --git a/kopete/protocols/irc/ircservercontact.cpp b/kopete/protocols/irc/ircservercontact.cpp
index 5be40dff..e5018ccd 100644
--- a/kopete/protocols/irc/ircservercontact.cpp
+++ b/kopete/protocols/irc/ircservercontact.cpp
@@ -24,7 +24,7 @@
 #include "kopetechatsessionmanager.h"
 #include "kopeteview.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/kopete/protocols/irc/ircusercontact.cpp b/kopete/protocols/irc/ircusercontact.cpp
index 03806208..07515c75 100644
--- a/kopete/protocols/irc/ircusercontact.cpp
+++ b/kopete/protocols/irc/ircusercontact.cpp
@@ -26,7 +26,7 @@
 #include "kopetemetacontact.h"
 #include "kopeteview.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <klocale.h>
diff --git a/kopete/protocols/irc/kcodecaction.h b/kopete/protocols/irc/kcodecaction.h
index e581e713..769ce324 100644
--- a/kopete/protocols/irc/kcodecaction.h
+++ b/kopete/protocols/irc/kcodecaction.h
@@ -21,9 +21,9 @@
 #include <tqintdict.h>
 
 #if KDE_IS_VERSION( 3, 1, 90 )
-	#include <kactionclasses.h>
+	#include <tdeactionclasses.h>
 #else
-	#include <kaction.h>
+	#include <tdeaction.h>
 #endif
 
 class KCodecAction : public TDESelectAction
diff --git a/kopete/protocols/irc/ui/channellist.cpp b/kopete/protocols/irc/ui/channellist.cpp
index 2d4e357b..6f26b0e4 100644
--- a/kopete/protocols/irc/ui/channellist.cpp
+++ b/kopete/protocols/irc/ui/channellist.cpp
@@ -31,7 +31,7 @@
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqheader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqtimer.h>
diff --git a/kopete/protocols/irc/ui/irceditaccount.ui b/kopete/protocols/irc/ui/irceditaccount.ui
index 4b308655..8bdb552a 100644
--- a/kopete/protocols/irc/ui/irceditaccount.ui
+++ b/kopete/protocols/irc/ui/irceditaccount.ui
@@ -1017,6 +1017,6 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp
index 12784ae5..0b357726 100644
--- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp
+++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp
@@ -29,7 +29,7 @@
 
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 #include <kextsock.h>
 #include <tdeconfig.h>
-- 
cgit v1.2.1