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

---
 kicker-applets/mediacontrol/mediacontrol.cpp            | 2 +-
 kicker-applets/mediacontrol/mediacontrolconfig.cpp      | 2 +-
 kicker-applets/mediacontrol/mediacontrolconfigwidget.ui | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kicker-applets/mediacontrol')

diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp
index ec09ddb..23cfd83 100644
--- a/kicker-applets/mediacontrol/mediacontrol.cpp
+++ b/kicker-applets/mediacontrol/mediacontrol.cpp
@@ -42,7 +42,7 @@
 #include <tqslider.h>
 #include <tqpainter.h>
 #include <tqiconset.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <kapplication.h>
 #include <kipc.h>
diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.cpp b/kicker-applets/mediacontrol/mediacontrolconfig.cpp
index 8a10717..b423fdb 100644
--- a/kicker-applets/mediacontrol/mediacontrolconfig.cpp
+++ b/kicker-applets/mediacontrol/mediacontrolconfig.cpp
@@ -37,7 +37,7 @@
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <knuminput.h>
 #include <kstandarddirs.h>
diff --git a/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui b/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui
index 1f1b835..6d28ca3 100644
--- a/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui
+++ b/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui
@@ -359,16 +359,16 @@
     <include location="local" impldecl="in implementation"></include>
     <include location="local" impldecl="in declaration"></include>
     <include location="global" impldecl="in declaration">knuminput.h</include>
-    <include location="global" impldecl="in declaration">klistview.h</include>
-    <include location="global" impldecl="in declaration">klistbox.h</include>
+    <include location="global" impldecl="in declaration">tdelistview.h</include>
+    <include location="global" impldecl="in declaration">tdelistbox.h</include>
 </includes>
 <Q_SIGNALS>
     <signal>toggled(bool)</signal>
 </Q_SIGNALS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>knuminput.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>
-- 
cgit v1.2.1