Rename additional header files to avoid conflicts with KDE4

12 files changed, 22 insertions, 22 deletions

diff --git a/tdemid/channel.cpp b/tdemid/channel.cpp
index c97ea5c9..6b8e23cf 100644
--- a/tdemid/channel.cpp
+++ b/tdemid/channel.cpp
@@ -28,10 +28,10 @@
 #include <tqpainter.h>
 #include <tqcombobox.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include "tdemidbutton.h"
 
diff --git a/tdemid/channelcfgdlg.cpp b/tdemid/channelcfgdlg.cpp
index 7dee1dbb..e55aaa58 100644
--- a/tdemid/channelcfgdlg.cpp
+++ b/tdemid/channelcfgdlg.cpp
@@ -4,7 +4,7 @@
 #include <kdialogbase.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "channelview.h"
 #include "channelcfgdlg.h"
diff --git a/tdemid/channelview.cpp b/tdemid/channelview.cpp
index b2108e41..50a88f24 100644
--- a/tdemid/channelview.cpp
+++ b/tdemid/channelview.cpp
@@ -23,7 +23,7 @@
 ***************************************************************************/
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "channelview.h"
 #include "channel3d.h"
diff --git a/tdemid/collectdlg.cpp b/tdemid/collectdlg.cpp
index 8cbe6624..4df74df7 100644
--- a/tdemid/collectdlg.cpp
+++ b/tdemid/collectdlg.cpp
@@ -27,9 +27,9 @@
 
 #include <tdeapplication.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
diff --git a/tdemid/kdisptext.cpp b/tdemid/kdisptext.cpp
index 3152a277..d701ccb4 100644
--- a/tdemid/kdisptext.cpp
+++ b/tdemid/kdisptext.cpp
@@ -29,10 +29,10 @@
 #include <tqtextcodec.h>
 
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "version.h"
 
 
diff --git a/tdemid/main.cpp b/tdemid/main.cpp
index 10460e04..78fdaf94 100644
--- a/tdemid/main.cpp
+++ b/tdemid/main.cpp
@@ -29,7 +29,7 @@
 #include <tqtextcodec.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/job.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
diff --git a/tdemid/midicfgdlg.cpp b/tdemid/midicfgdlg.cpp
index c6741f87..446f7e03 100644
--- a/tdemid/midicfgdlg.cpp
+++ b/tdemid/midicfgdlg.cpp
@@ -28,13 +28,13 @@
 
 #include <tdeapplication.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <libtdemid/deviceman.h>
 
 #include "midicfgdlg.h"
 #include "version.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 MidiConfigDialog::MidiConfigDialog(DeviceManager *dm,
diff --git a/tdemid/slman.cpp b/tdemid/slman.cpp
index 39b10ca2..ca441850 100644
--- a/tdemid/slman.cpp
+++ b/tdemid/slman.cpp
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "version.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 SLManager::SLManager()
 {
diff --git a/tdemid/tdemid_part.cpp b/tdemid/tdemid_part.cpp
index bcfe054c..13a977e8 100644
--- a/tdemid/tdemid_part.cpp
+++ b/tdemid/tdemid_part.cpp
@@ -2,7 +2,7 @@
 
 #include <kinstance.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdeaction.h>
 #include <tqiconset.h>
diff --git a/tdemid/tdemidclient.cpp b/tdemid/tdemidclient.cpp
index 958c38c6..fa59e749 100644
--- a/tdemid/tdemidclient.cpp
+++ b/tdemid/tdemidclient.cpp
@@ -40,9 +40,9 @@
 #include <tdeapplication.h>
 #include <kcharsets.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <tdeaction.h>
diff --git a/tdemid/tdemidframe.cpp b/tdemid/tdemidframe.cpp
index feeb0ab8..870a1db1 100644
--- a/tdemid/tdemidframe.cpp
+++ b/tdemid/tdemidframe.cpp
@@ -37,10 +37,10 @@
 #include <tdecmdlineargs.h>
 #include <tdefiledialog.h>
 #include <tdefontdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdetoolbar.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/tdemid/tdemidframe.h b/tdemid/tdemidframe.h
index 2ce5226e..fe8c5aef 100644
--- a/tdemid/tdemidframe.h
+++ b/tdemid/tdemidframe.h
@@ -25,7 +25,7 @@
 #define _KMIDFRAME_H
 
 #include <tdemainwindow.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <libtdemid/midiout.h>
 #include <libtdemid/player.h>
 #include <libtdemid/track.h>