Rename additional header files to avoid conflicts with KDE4

18 files changed, 27 insertions, 27 deletions

diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp
index 29ea0496..1bd1fb6b 100644
--- a/noatun/library/app.cpp
+++ b/noatun/library/app.cpp
@@ -23,11 +23,11 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knotifyclient.h>
 #include <tdepopupmenu.h>
 #include <tqfile.h>
diff --git a/noatun/library/cmodule.cpp b/noatun/library/cmodule.cpp
index 1820e441..8e5f184a 100644
--- a/noatun/library/cmodule.cpp
+++ b/noatun/library/cmodule.cpp
@@ -8,7 +8,7 @@
 #include <tqradiobutton.h>
 #include <tqcheckbox.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdelistview.h>
 #include <tqsplitter.h>
diff --git a/noatun/library/downloader.cpp b/noatun/library/downloader.cpp
index 75653940..21fb7926 100644
--- a/noatun/library/downloader.cpp
+++ b/noatun/library/downloader.cpp
@@ -4,7 +4,7 @@
 #include <tqfile.h>
 #include <tqtimer.h>
 #include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 DownloadItem::DownloadItem()
 {
diff --git a/noatun/library/effectview.cpp b/noatun/library/effectview.cpp
index e332a456..f312d8fb 100644
--- a/noatun/library/effectview.cpp
+++ b/noatun/library/effectview.cpp
@@ -29,7 +29,7 @@
 #include <kcombobox.h>
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdragobject.h>
 #include <tqheader.h>
 #include <tqhgroupbox.h>
diff --git a/noatun/library/engine.cpp b/noatun/library/engine.cpp
index 995e9771..dbb4d978 100644
--- a/noatun/library/engine.cpp
+++ b/noatun/library/engine.cpp
@@ -9,8 +9,8 @@
 
 #include <string.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/noatun/library/equalizer.cpp b/noatun/library/equalizer.cpp
index 1c50370c..a59b9259 100644
--- a/noatun/library/equalizer.cpp
+++ b/noatun/library/equalizer.cpp
@@ -7,14 +7,14 @@
 #include <player.h>
 #include <soundserver.h>
 #include <noatunarts.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqdom.h>
 #include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
 #include <tqtextstream.h>
 #include <math.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "ksaver.h"
 
 #define EQ napp->equalizer()
diff --git a/noatun/library/equalizerview.cpp b/noatun/library/equalizerview.cpp
index 69acf562..a7a1d453 100644
--- a/noatun/library/equalizerview.cpp
+++ b/noatun/library/equalizerview.cpp
@@ -9,7 +9,7 @@
 #include <kdialog.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlayout.h>
 #include <tqslider.h>
diff --git a/noatun/library/ksaver.cpp b/noatun/library/ksaver.cpp
index 72b6218e..bd65db6d 100644
--- a/noatun/library/ksaver.cpp
+++ b/noatun/library/ksaver.cpp
@@ -27,8 +27,8 @@
 #include "config.h"
 #endif
 
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 
 #include "ksaver.h"
diff --git a/noatun/library/noatunstdaction.cpp b/noatun/library/noatunstdaction.cpp
index 767a3cc9..212fdc31 100644
--- a/noatun/library/noatunstdaction.cpp
+++ b/noatun/library/noatunstdaction.cpp
@@ -6,7 +6,7 @@
 
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kstdaction.h>
 #include <tqcursor.h>
diff --git a/noatun/library/noatuntags/tags.cpp b/noatun/library/noatuntags/tags.cpp
index 9125ff45..3c1bb2ac 100644
--- a/noatun/library/noatuntags/tags.cpp
+++ b/noatun/library/noatuntags/tags.cpp
@@ -1,6 +1,6 @@
 #include "tags.h"
 #include "tagsgetter.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqslider.h>
 #include <tqspinbox.h>
 #include <tdeconfig.h>
diff --git a/noatun/library/player.cpp b/noatun/library/player.cpp
index 0b90952c..5ab2aeba 100644
--- a/noatun/library/player.cpp
+++ b/noatun/library/player.cpp
@@ -7,7 +7,7 @@
 
 #include <klibloader.h>
 #include <knotifyclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 
 enum ArtsPOS { posIdle=0, posPlaying, posPaused };
diff --git a/noatun/library/playlistsaver.cpp b/noatun/library/playlistsaver.cpp
index a187b235..6a49f43f 100644
--- a/noatun/library/playlistsaver.cpp
+++ b/noatun/library/playlistsaver.cpp
@@ -7,7 +7,7 @@
 #include "ksaver.h"
 #include <ksimpleconfig.h>
 #include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqregexp.h>
 #include <tqxml.h>
 #include <kdebug.h>
diff --git a/noatun/library/pluginloader.cpp b/noatun/library/pluginloader.cpp
index 4ba9ce3d..2fecb898 100644
--- a/noatun/library/pluginloader.cpp
+++ b/noatun/library/pluginloader.cpp
@@ -1,10 +1,10 @@
 #include <tqfile.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqdir.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <knotifyclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <pluginloader.h>
 #include <plugin.h>
diff --git a/noatun/library/pluginmodule.cpp b/noatun/library/pluginmodule.cpp
index 72f58c9b..d6b86e86 100644
--- a/noatun/library/pluginmodule.cpp
+++ b/noatun/library/pluginmodule.cpp
@@ -23,8 +23,8 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqtabwidget.h>
 #include <tqheader.h>
 #include <tqlabel.h>
diff --git a/noatun/library/pref.cpp b/noatun/library/pref.cpp
index 2d30a413..9ed882c5 100644
--- a/noatun/library/pref.cpp
+++ b/noatun/library/pref.cpp
@@ -1,7 +1,7 @@
 #include "pref.h"
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <tqlayout.h>
diff --git a/noatun/library/titleproxy.cpp b/noatun/library/titleproxy.cpp
index 438504eb..65006135 100644
--- a/noatun/library/titleproxy.cpp
+++ b/noatun/library/titleproxy.cpp
@@ -18,7 +18,7 @@ email                : markey@web.de
 #include "titleproxy.h"
 
 #include <kdebug.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kmdcodec.h>
 
 #include <tqstring.h>
diff --git a/noatun/library/vequalizer.cpp b/noatun/library/vequalizer.cpp
index f4aa60d6..1275df80 100644
--- a/noatun/library/vequalizer.cpp
+++ b/noatun/library/vequalizer.cpp
@@ -50,11 +50,11 @@
 #include <artsflow.h>
 #include <soundserver.h>
 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqdom.h>
 #include <tqtextstream.h>
diff --git a/noatun/library/video.cpp b/noatun/library/video.cpp
index 2588a811..db6886b3 100644
--- a/noatun/library/video.cpp
+++ b/noatun/library/video.cpp
@@ -10,7 +10,7 @@
 
 #include <tqpopupmenu.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "globalvideo.h"