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/plugins/nowlistening/nowlisteningguiclient.cpp   | 2 +-
 kopete/plugins/nowlistening/nowlisteningplugin.cpp      | 2 +-
 kopete/plugins/nowlistening/nowlisteningpreferences.cpp | 2 +-
 kopete/plugins/nowlistening/nowlisteningprefs.ui        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kopete/plugins/nowlistening')

diff --git a/kopete/plugins/nowlistening/nowlisteningguiclient.cpp b/kopete/plugins/nowlistening/nowlisteningguiclient.cpp
index 29f03175..702bdeca 100644
--- a/kopete/plugins/nowlistening/nowlisteningguiclient.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningguiclient.cpp
@@ -25,7 +25,7 @@
 #include "kopeteview.h"
 
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.cpp b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
index 1f1fed51..3ab8539b 100644
--- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
@@ -27,7 +27,7 @@
 #include <kgenericfactory.h>
 #include <kapplication.h>
 #include <dcopclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "config.h"
 #include "kopetechatsessionmanager.h"
diff --git a/kopete/plugins/nowlistening/nowlisteningpreferences.cpp b/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
index d7117852..47eb51b4 100644
--- a/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 #include <tqradiobutton.h>
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kgenericfactory.h>
 
diff --git a/kopete/plugins/nowlistening/nowlisteningprefs.ui b/kopete/plugins/nowlistening/nowlisteningprefs.ui
index ff3307e9..3fb6a340 100644
--- a/kopete/plugins/nowlistening/nowlisteningprefs.ui
+++ b/kopete/plugins/nowlistening/nowlisteningprefs.ui
@@ -371,6 +371,6 @@ in place of your status message.</string>
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>
-- 
cgit v1.2.1