From 793cf2dff35dffe3ec4c7b24252947dde758a1b2 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:04:32 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 kmix/kmix.cpp            | 2 +-
 kmix/kmixapplet.cpp      | 2 +-
 kmix/kmixctrl.cpp        | 2 +-
 kmix/kmixerwidget.cpp    | 2 +-
 kmix/mdwenum.cpp         | 2 +-
 kmix/mdwslider.cpp       | 2 +-
 kmix/mdwswitch.cpp       | 2 +-
 kmix/mixdevice.h         | 2 +-
 kmix/mixdevicewidget.cpp | 2 +-
 kmix/mixer.cpp           | 2 +-
 kmix/mixset.cpp          | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'kmix')

diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp
index a9fb11d0..f583c352 100644
--- a/kmix/kmix.cpp
+++ b/kmix/kmix.cpp
@@ -35,7 +35,7 @@
 #include <kmenubar.h>
 #include <klineeditdlg.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaction.h>
 #include <kapplication.h>
 #include <kstdaction.h>
diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp
index 0af64588..c93f8ae9 100644
--- a/kmix/kmixapplet.cpp
+++ b/kmix/kmixapplet.cpp
@@ -41,7 +41,7 @@
 #include <kapplication.h>
 #include <kbugreport.h>
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalaccel.h>
diff --git a/kmix/kmixctrl.cpp b/kmix/kmixctrl.cpp
index 334dea71..ee7b8728 100644
--- a/kmix/kmixctrl.cpp
+++ b/kmix/kmixctrl.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <tqptrlist.h>
 
diff --git a/kmix/kmixerwidget.cpp b/kmix/kmixerwidget.cpp
index 4d4ae7ee..fec74d5b 100644
--- a/kmix/kmixerwidget.cpp
+++ b/kmix/kmixerwidget.cpp
@@ -28,7 +28,7 @@
 #include <tqapplication.h> // for TQApplication::revsreseLayout()
 
 // KDE
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp
index e5504534..d4381b04 100644
--- a/kmix/mdwenum.cpp
+++ b/kmix/mdwenum.cpp
@@ -26,7 +26,7 @@
 #include <tqtooltip.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kaction.h>
 #include <kpopupmenu.h>
diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp
index f2ff1b1f..7664811d 100644
--- a/kmix/mdwslider.cpp
+++ b/kmix/mdwslider.cpp
@@ -22,7 +22,7 @@
 #include <klocale.h>
 #include <kled.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaction.h>
 #include <kpopupmenu.h>
 #include <kglobalaccel.h>
diff --git a/kmix/mdwswitch.cpp b/kmix/mdwswitch.cpp
index 6fe1aeb4..5c931048 100644
--- a/kmix/mdwswitch.cpp
+++ b/kmix/mdwswitch.cpp
@@ -27,7 +27,7 @@
 #include <tqtooltip.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaction.h>
 #include <kpopupmenu.h>
 #include <kglobalaccel.h>
diff --git a/kmix/mixdevice.h b/kmix/mixdevice.h
index 33ef0d1b..cc048a62 100644
--- a/kmix/mixdevice.h
+++ b/kmix/mixdevice.h
@@ -3,7 +3,7 @@
 
 #include "volume.h"
 #include <tqstring.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqobject.h>
 #include <tqptrlist.h>
 
diff --git a/kmix/mixdevicewidget.cpp b/kmix/mixdevicewidget.cpp
index 9096c2c0..19b20514 100644
--- a/kmix/mixdevicewidget.cpp
+++ b/kmix/mixdevicewidget.cpp
@@ -22,7 +22,7 @@
 #include <klocale.h>
 #include <kled.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaction.h>
 #include <kpopupmenu.h>
 #include <kglobalaccel.h>
diff --git a/kmix/mixer.cpp b/kmix/mixer.cpp
index 99fd84b0..fc5a06f6 100644
--- a/kmix/mixer.cpp
+++ b/kmix/mixer.cpp
@@ -23,7 +23,7 @@
 #include <tqtimer.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <dcopobject.h>
diff --git a/kmix/mixset.cpp b/kmix/mixset.cpp
index 8f4ba438..18e7fe7c 100644
--- a/kmix/mixset.cpp
+++ b/kmix/mixset.cpp
@@ -23,7 +23,7 @@
 #include <tqstring.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "mixdevice.h"
 #include "mixset.h"
-- 
cgit v1.2.1