Rename additional header files to avoid conflicts with KDE4

26 files changed, 36 insertions, 36 deletions

diff --git a/kmix/colorwidget.ui b/kmix/colorwidget.ui
index 27739653..7058fe5a 100644
--- a/kmix/colorwidget.ui
+++ b/kmix/colorwidget.ui
@@ -269,7 +269,7 @@
     <tabstop>mutedBack</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">klocale.h</include>
+    <include location="global" impldecl="in declaration">tdelocale.h</include>
     <include location="global" impldecl="in declaration">kseparator.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
diff --git a/kmix/dialogselectmaster.cpp b/kmix/dialogselectmaster.cpp
index 08c8f760..ec957d4b 100644
--- a/kmix/dialogselectmaster.cpp
+++ b/kmix/dialogselectmaster.cpp
@@ -31,7 +31,7 @@
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "dialogselectmaster.h"
 #include "mixdevice.h"
diff --git a/kmix/dialogviewconfiguration.cpp b/kmix/dialogviewconfiguration.cpp
index 09e88d23..d6deb523 100644
--- a/kmix/dialogviewconfiguration.cpp
+++ b/kmix/dialogviewconfiguration.cpp
@@ -26,7 +26,7 @@
 
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "dialogviewconfiguration.h"
 #include "mixdevicewidget.h"
diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp
index e4eefa31..f50e7baa 100644
--- a/kmix/kmix.cpp
+++ b/kmix/kmix.cpp
@@ -31,10 +31,10 @@
 // include files for KDE
 #include <kcombobox.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
-#include <kmenubar.h>
+#include <tdemessagebox.h>
+#include <tdemenubar.h>
 #include <klineeditdlg.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeaction.h>
 #include <tdeapplication.h>
diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp
index 31f69c5a..23c3768f 100644
--- a/kmix/kmixapplet.cpp
+++ b/kmix/kmixapplet.cpp
@@ -43,13 +43,13 @@
 #include <kcolorbutton.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kglobalaccel.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 // // KMix
diff --git a/kmix/kmixctrl.cpp b/kmix/kmixctrl.cpp
index f95274f5..9f6188c7 100644
--- a/kmix/kmixctrl.cpp
+++ b/kmix/kmixctrl.cpp
@@ -22,8 +22,8 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kmix/kmixdockwidget.cpp b/kmix/kmixdockwidget.cpp
index 87027ec1..a185ef29 100644
--- a/kmix/kmixdockwidget.cpp
+++ b/kmix/kmixdockwidget.cpp
@@ -23,11 +23,11 @@
  */
 
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kpanelapplet.h>
 #include <tdepopupmenu.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdialog.h>
 #include <kaudioplayer.h>
 #include <kiconloader.h>
diff --git a/kmix/kmixerwidget.cpp b/kmix/kmixerwidget.cpp
index fec74d5b..94965122 100644
--- a/kmix/kmixerwidget.cpp
+++ b/kmix/kmixerwidget.cpp
@@ -30,8 +30,8 @@
 // KDE
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <ktabwidget.h>
 
 // KMix
diff --git a/kmix/kmixprefdlg.cpp b/kmix/kmixprefdlg.cpp
index 876fafcb..5489eea2 100644
--- a/kmix/kmixprefdlg.cpp
+++ b/kmix/kmixprefdlg.cpp
@@ -27,7 +27,7 @@
 #include <tqlabel.h>
 #include <tqradiobutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 // For "kapp"
 #include <tdeapplication.h>
 
diff --git a/kmix/kmixtoolbox.cpp b/kmix/kmixtoolbox.cpp
index 2a472d6d..7e0d57c4 100644
--- a/kmix/kmixtoolbox.cpp
+++ b/kmix/kmixtoolbox.cpp
@@ -26,7 +26,7 @@
 
 //#include <kdebug.h>
 #include <kglobalaccel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "mdwslider.h"
 #include "mdwswitch.h"
diff --git a/kmix/ksmallslider.cpp b/kmix/ksmallslider.cpp
index 08bee03b..c976d3cb 100644
--- a/kmix/ksmallslider.cpp
+++ b/kmix/ksmallslider.cpp
@@ -27,7 +27,7 @@
 #include <tqbrush.h>
 #include <tqstyle.h>
 
-#include "kglobalsettings.h"
+#include "tdeglobalsettings.h"
 #include "ksmallslider.h"
 
 /*
diff --git a/kmix/main.cpp b/kmix/main.cpp
index 358b6ad7..16074aee 100644
--- a/kmix/main.cpp
+++ b/kmix/main.cpp
@@ -21,8 +21,8 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include "KMixApp.h"
diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp
index eae521e2..708000f2 100644
--- a/kmix/mdwenum.cpp
+++ b/kmix/mdwenum.cpp
@@ -25,7 +25,7 @@
 #include <tqobject.h>
 #include <tqtooltip.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kcombobox.h>
 #include <tdeaction.h>
diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp
index 87bad20a..042f3723 100644
--- a/kmix/mdwslider.cpp
+++ b/kmix/mdwslider.cpp
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kled.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
diff --git a/kmix/mdwswitch.cpp b/kmix/mdwswitch.cpp
index b002469e..94acf747 100644
--- a/kmix/mdwswitch.cpp
+++ b/kmix/mdwswitch.cpp
@@ -26,7 +26,7 @@
 #include <tqslider.h>
 #include <tqtooltip.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
diff --git a/kmix/mixdevice.cpp b/kmix/mixdevice.cpp
index 4b0649d0..243ae3d1 100644
--- a/kmix/mixdevice.cpp
+++ b/kmix/mixdevice.cpp
@@ -20,7 +20,7 @@
  */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "mixdevice.h"
 
diff --git a/kmix/mixdevicewidget.cpp b/kmix/mixdevicewidget.cpp
index 6173fdf5..d6bf2ff1 100644
--- a/kmix/mixdevicewidget.cpp
+++ b/kmix/mixdevicewidget.cpp
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kled.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
diff --git a/kmix/mixer.cpp b/kmix/mixer.cpp
index fc5a06f6..ba3bfee8 100644
--- a/kmix/mixer.cpp
+++ b/kmix/mixer.cpp
@@ -22,9 +22,9 @@
 
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <dcopobject.h>
 
diff --git a/kmix/mixer_alsa9.cpp b/kmix/mixer_alsa9.cpp
index 6c8c1783..e23e2b57 100644
--- a/kmix/mixer_alsa9.cpp
+++ b/kmix/mixer_alsa9.cpp
@@ -35,7 +35,7 @@ extern "C"
 }
 
 // KDE Headers
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // Local Headers
diff --git a/kmix/mixer_backend.cpp b/kmix/mixer_backend.cpp
index 4f15a564..ffd6ced0 100644
--- a/kmix/mixer_backend.cpp
+++ b/kmix/mixer_backend.cpp
@@ -17,7 +17,7 @@
  * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "mixer_backend.h"
 // for the "ERR_" declartions, #include mixer.h
diff --git a/kmix/mixer_oss.cpp b/kmix/mixer_oss.cpp
index 7fcfb38e..62ab0bcc 100644
--- a/kmix/mixer_oss.cpp
+++ b/kmix/mixer_oss.cpp
@@ -34,7 +34,7 @@
 #endif
 
 #include "mixer_oss.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 /*
   I am using a fixed MAX_MIXDEVS #define here.
diff --git a/kmix/mixer_oss4.cpp b/kmix/mixer_oss4.cpp
index 01b167aa..ffb2cddd 100644
--- a/kmix/mixer_oss4.cpp
+++ b/kmix/mixer_oss4.cpp
@@ -40,7 +40,7 @@
 #endif
 
 #include "mixer_oss4.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 Mixer_Backend* OSS4_getMixer(int device)
 {
diff --git a/kmix/mixertoolbox.cpp b/kmix/mixertoolbox.cpp
index 66e0241c..b474eca6 100644
--- a/kmix/mixertoolbox.cpp
+++ b/kmix/mixertoolbox.cpp
@@ -24,7 +24,7 @@
 #include "tqstring.h"
 
 //#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "mixdevice.h"
 #include "mixer.h"
diff --git a/kmix/viewbase.cpp b/kmix/viewbase.cpp
index 948e8d7d..11bb06a8 100644
--- a/kmix/viewbase.cpp
+++ b/kmix/viewbase.cpp
@@ -28,7 +28,7 @@
 // KDE
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 // KMix
diff --git a/kmix/viewdockareapopup.cpp b/kmix/viewdockareapopup.cpp
index 1d4ea37b..081aec18 100644
--- a/kmix/viewdockareapopup.cpp
+++ b/kmix/viewdockareapopup.cpp
@@ -33,7 +33,7 @@
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // KMix
 #include "mdwslider.h"
diff --git a/kmix/viewswitches.cpp b/kmix/viewswitches.cpp
index 2bb39a6d..06b346e5 100644
--- a/kmix/viewswitches.cpp
+++ b/kmix/viewswitches.cpp
@@ -25,7 +25,7 @@
 #include <tqwidget.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "mdwswitch.h"
 #include "mdwenum.h"