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

---
 kmix/kmix.cpp              | 8 ++++----
 kmix/kmix.h                | 2 +-
 kmix/kmixapplet.cpp        | 2 +-
 kmix/kmixdockwidget.cpp    | 4 ++--
 kmix/mdwenum.cpp           | 4 ++--
 kmix/mdwslider.cpp         | 4 ++--
 kmix/mdwswitch.cpp         | 4 ++--
 kmix/mixdevicewidget.cpp   | 4 ++--
 kmix/viewapplet.cpp        | 2 +-
 kmix/viewbase.cpp          | 4 ++--
 kmix/viewdockareapopup.cpp | 2 +-
 11 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'kmix')

diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp
index c0643331..4ba34863 100644
--- a/kmix/kmix.cpp
+++ b/kmix/kmix.cpp
@@ -36,17 +36,17 @@
 #include <klineeditdlg.h>
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kstdaction.h>
 #include <kpanelapplet.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <khelpmenu.h>
 #include <kdebug.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kglobalaccel.h>
 #include <kkeydialog.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 // application specific includes
 #include "mixertoolbox.h"
diff --git a/kmix/kmix.h b/kmix/kmix.h
index 3b2786c3..e04aee43 100644
--- a/kmix/kmix.h
+++ b/kmix/kmix.h
@@ -35,7 +35,7 @@ class TQHBox;
 class TQWidgetStack;
 
 // include files for KDE
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class TDEAccel;
 class TDEGlobalAccel;
diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp
index d72d4eb5..db2d1cc9 100644
--- a/kmix/kmixapplet.cpp
+++ b/kmix/kmixapplet.cpp
@@ -37,7 +37,7 @@
 // KDE
 #include <kaboutapplication.h>
 #include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kbugreport.h>
 #include <kcolorbutton.h>
diff --git a/kmix/kmixdockwidget.cpp b/kmix/kmixdockwidget.cpp
index e4f30b05..7743392f 100644
--- a/kmix/kmixdockwidget.cpp
+++ b/kmix/kmixdockwidget.cpp
@@ -22,11 +22,11 @@
  * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kapplication.h>
 #include <kpanelapplet.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kglobalsettings.h>
 #include <kdialog.h>
 #include <kaudioplayer.h>
diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp
index b4b803e1..eae521e2 100644
--- a/kmix/mdwenum.cpp
+++ b/kmix/mdwenum.cpp
@@ -28,8 +28,8 @@
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kcombobox.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 
 #include <kglobalaccel.h>
 #include <kkeydialog.h>
diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp
index 3bfb6bdf..87bad20a 100644
--- a/kmix/mdwslider.cpp
+++ b/kmix/mdwslider.cpp
@@ -23,8 +23,8 @@
 #include <kled.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kglobalaccel.h>
 #include <kkeydialog.h>
 #include <kdebug.h>
diff --git a/kmix/mdwswitch.cpp b/kmix/mdwswitch.cpp
index 709a6d8c..b002469e 100644
--- a/kmix/mdwswitch.cpp
+++ b/kmix/mdwswitch.cpp
@@ -28,8 +28,8 @@
 
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kglobalaccel.h>
 #include <kkeydialog.h>
 #include <kdebug.h>
diff --git a/kmix/mixdevicewidget.cpp b/kmix/mixdevicewidget.cpp
index 979708ea..6173fdf5 100644
--- a/kmix/mixdevicewidget.cpp
+++ b/kmix/mixdevicewidget.cpp
@@ -23,8 +23,8 @@
 #include <kled.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kglobalaccel.h>
 #include <kkeydialog.h>
 #include <kdebug.h>
diff --git a/kmix/viewapplet.cpp b/kmix/viewapplet.cpp
index 1d4de379..87020b95 100644
--- a/kmix/viewapplet.cpp
+++ b/kmix/viewapplet.cpp
@@ -26,7 +26,7 @@
 #include <tqsize.h>
 
 // KDE
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kdebug.h>
 #include <kpanelapplet.h>
 #include <kstdaction.h>
diff --git a/kmix/viewbase.cpp b/kmix/viewbase.cpp
index 01e1b9cf..948e8d7d 100644
--- a/kmix/viewbase.cpp
+++ b/kmix/viewbase.cpp
@@ -26,8 +26,8 @@
 #include <tqcursor.h>
 
 // KDE
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kiconloader.h>
 
diff --git a/kmix/viewdockareapopup.cpp b/kmix/viewdockareapopup.cpp
index 4fac6d81..d84a36e5 100644
--- a/kmix/viewdockareapopup.cpp
+++ b/kmix/viewdockareapopup.cpp
@@ -31,7 +31,7 @@
 
 // KDE
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <klocale.h>
 
-- 
cgit v1.2.3