Rename additional header files to avoid conflicts with KDE4

37 files changed, 57 insertions, 57 deletions

diff --git a/noatun-plugins/alarm/wakeup.cpp b/noatun-plugins/alarm/wakeup.cpp
index daa532e..0fa847e 100644
--- a/noatun-plugins/alarm/wakeup.cpp
+++ b/noatun-plugins/alarm/wakeup.cpp
@@ -19,7 +19,7 @@
 #include <noatun/player.h>
 #include <noatun/app.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <tqspinbox.h>
@@ -34,7 +34,7 @@
 #include <kiconloader.h>
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include "wakeup.h"
 #include "kminutespinbox.h"
 #include "kpercentspinbox.h"
diff --git a/noatun-plugins/alsaplayer/alsaplayerui.cpp b/noatun-plugins/alsaplayer/alsaplayerui.cpp
index 0cd21a8..e7a5e6b 100644
--- a/noatun-plugins/alsaplayer/alsaplayerui.cpp
+++ b/noatun-plugins/alsaplayer/alsaplayerui.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "userinterface.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 extern "C"
 {
diff --git a/noatun-plugins/alsaplayer/configmodule.cpp b/noatun-plugins/alsaplayer/configmodule.cpp
index ec0b123..58a35f8 100644
--- a/noatun-plugins/alsaplayer/configmodule.cpp
+++ b/noatun-plugins/alsaplayer/configmodule.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 
 #include <tqcheckbox.h>
diff --git a/noatun-plugins/alsaplayer/userinterface.cpp b/noatun-plugins/alsaplayer/userinterface.cpp
index 4ec4867..146f503 100644
--- a/noatun-plugins/alsaplayer/userinterface.cpp
+++ b/noatun-plugins/alsaplayer/userinterface.cpp
@@ -37,9 +37,9 @@
 #include <kstatusbar.h>
 #include <tdepopupmenu.h>
 #include <kurldrag.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kurldrag.h>
 #include <noatun/playlist.h>
diff --git a/noatun-plugins/charlatan/charlatanui.cpp b/noatun-plugins/charlatan/charlatanui.cpp
index 36113ff..b4fa7f6 100644
--- a/noatun-plugins/charlatan/charlatanui.cpp
+++ b/noatun-plugins/charlatan/charlatanui.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "userinterface.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 extern "C"
 {
diff --git a/noatun-plugins/charlatan/configmodule.cpp b/noatun-plugins/charlatan/configmodule.cpp
index f3ba458..97676f9 100644
--- a/noatun-plugins/charlatan/configmodule.cpp
+++ b/noatun-plugins/charlatan/configmodule.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 
 #include <tqcheckbox.h>
diff --git a/noatun-plugins/charlatan/userinterface.cpp b/noatun-plugins/charlatan/userinterface.cpp
index 11c4988..85699bb 100644
--- a/noatun-plugins/charlatan/userinterface.cpp
+++ b/noatun-plugins/charlatan/userinterface.cpp
@@ -35,9 +35,9 @@
 #include <tqframe.h>
 #include <kurldrag.h>
 #include <kstatusbar.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurldrag.h>
 #include <kiconloader.h>
 #include <noatun/playlist.h>
diff --git a/noatun-plugins/dub/dub/dub.cpp b/noatun-plugins/dub/dub/dub.cpp
index 55cfbb1..cb67a1b 100644
--- a/noatun-plugins/dub/dub/dub.cpp
+++ b/noatun-plugins/dub/dub/dub.cpp
@@ -24,9 +24,9 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstdaction.h>
 #include <kurl.h>
diff --git a/noatun-plugins/dub/dub/dubapp.cpp b/noatun-plugins/dub/dub/dubapp.cpp
index 63eb766..4107afd 100644
--- a/noatun-plugins/dub/dub/dubapp.cpp
+++ b/noatun-plugins/dub/dub/dubapp.cpp
@@ -20,9 +20,9 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstdaction.h>
 #include <noatun/playlist.h>
diff --git a/noatun-plugins/dub/dub/dubconfigmodule.cpp b/noatun-plugins/dub/dub/dubconfigmodule.cpp
index 9de7eee..e6d3c23 100644
--- a/noatun-plugins/dub/dub/dubconfigmodule.cpp
+++ b/noatun-plugins/dub/dub/dubconfigmodule.cpp
@@ -13,8 +13,8 @@
 
 #include <tdeconfig.h>
 #include <kdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <kdebug.h>
 
diff --git a/noatun-plugins/dub/dub/dubplaylist.cpp b/noatun-plugins/dub/dub/dubplaylist.cpp
index e7e1bef..20537a7 100644
--- a/noatun-plugins/dub/dub/dubplaylist.cpp
+++ b/noatun-plugins/dub/dub/dubplaylist.cpp
@@ -13,10 +13,10 @@
 
 //#include dubplaylist.cpp
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <noatun/playlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "dub.h"
 #include "dubconfigmodule.h"
diff --git a/noatun-plugins/dub/dub/dubplaylistitem.cpp b/noatun-plugins/dub/dub/dubplaylistitem.cpp
index 065ebe9..50405b3 100644
--- a/noatun-plugins/dub/dub/dubplaylistitem.cpp
+++ b/noatun-plugins/dub/dub/dubplaylistitem.cpp
@@ -18,8 +18,8 @@
 #include <tdefile.h>
 #include <tdefileitem.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 DubPlaylistItem::DubPlaylistItem(const KFileItem& fItem)
  : fileItem(fItem)
diff --git a/noatun-plugins/dub/dub/fileselectorwidget.cpp b/noatun-plugins/dub/dub/fileselectorwidget.cpp
index 437f943..46ee269 100644
--- a/noatun-plugins/dub/dub/fileselectorwidget.cpp
+++ b/noatun-plugins/dub/dub/fileselectorwidget.cpp
@@ -25,9 +25,9 @@
 #include <kurlcombobox.h>
 #include <kurlcompletion.h>
 #include <kprotocolinfo.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 
 #include <kdebug.h>
diff --git a/noatun-plugins/dub/dub/fileselectorwidget.h b/noatun-plugins/dub/dub/fileselectorwidget.h
index 3f32cec..2bfc489 100644
--- a/noatun-plugins/dub/dub/fileselectorwidget.h
+++ b/noatun-plugins/dub/dub/fileselectorwidget.h
@@ -27,7 +27,7 @@
 #include <kurlcompletion.h>
 #include <kcombobox.h>
 #include <kprotocolinfo.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 
 class DubPlayListItem;
 
diff --git a/noatun-plugins/ffrs/ffrs.cpp b/noatun-plugins/ffrs/ffrs.cpp
index 04ae3ef..1d219fa 100644
--- a/noatun-plugins/ffrs/ffrs.cpp
+++ b/noatun-plugins/ffrs/ffrs.cpp
@@ -5,7 +5,7 @@
 #include <math.h>
 #include <tqpainter.h>
 #include <tqbitmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tqcursor.h>
 #include <tqtooltip.h>
diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp
index 5db1338..51aef3f 100644
--- a/noatun-plugins/lyrics/cmodule.cpp
+++ b/noatun-plugins/lyrics/cmodule.cpp
@@ -3,13 +3,13 @@
 #include <tqlayout.h>
 #include <tqstringlist.h>
 #include <tqlabel.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqvgroupbox.h>
 #include <tqgrid.h>
 #include <tdelistbox.h>
 #include <klineedit.h>
 #include <kbuttonbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
diff --git a/noatun-plugins/lyrics/cmodule.h b/noatun-plugins/lyrics/cmodule.h
index 792625a..5bbcadc 100644
--- a/noatun-plugins/lyrics/cmodule.h
+++ b/noatun-plugins/lyrics/cmodule.h
@@ -3,7 +3,7 @@
 
 #include <noatun/pref.h>
 #include <tqvaluevector.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class KLineEdit;
 class TDEListBox;
diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp
index ee359b3..a08726e 100644
--- a/noatun-plugins/lyrics/lyrics.cpp
+++ b/noatun-plugins/lyrics/lyrics.cpp
@@ -1,7 +1,7 @@
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineeditdlg.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdehtmlview.h>
 #include <kstdaction.h>
 #include <kstatusbar.h>
diff --git a/noatun-plugins/nexscope/gui.cpp b/noatun-plugins/nexscope/gui.cpp
index 62cd27a..c1b6756 100644
--- a/noatun-plugins/nexscope/gui.cpp
+++ b/noatun-plugins/nexscope/gui.cpp
@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqheader.h>
 #include <tqlayout.h>
 #include <tqdragobject.h>
diff --git a/noatun-plugins/nexscope/nex.cpp b/noatun-plugins/nexscope/nex.cpp
index d1cddc6..6d3cbd2 100644
--- a/noatun-plugins/nexscope/nex.cpp
+++ b/noatun-plugins/nexscope/nex.cpp
@@ -6,7 +6,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/noatun-plugins/nexscope/noatunplugin.cpp b/noatun-plugins/nexscope/noatunplugin.cpp
index e4401ad..25deaf6 100644
--- a/noatun-plugins/nexscope/noatunplugin.cpp
+++ b/noatun-plugins/nexscope/noatunplugin.cpp
@@ -2,8 +2,8 @@
 #include "noatunplugin.h"
 
 #include <kprocess.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 extern "C"
diff --git a/noatun-plugins/nexscope/renderers.cpp b/noatun-plugins/nexscope/renderers.cpp
index 538fa43..a0305ab 100644
--- a/noatun-plugins/nexscope/renderers.cpp
+++ b/noatun-plugins/nexscope/renderers.cpp
@@ -4,7 +4,7 @@
 #include <math.h>
 #include <iostream>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 structQt::HorizontalPair : public Renderer
 {
diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp
index 7882ff4..ce5caea 100644
--- a/noatun-plugins/oblique/cmodule.cpp
+++ b/noatun-plugins/oblique/cmodule.cpp
@@ -7,7 +7,7 @@
 
 #include <kregexpeditorinterface.h>
 #include <tdeparts/componentfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <klineedit.h>
 #include <kiconloader.h>
diff --git a/noatun-plugins/oblique/file.cpp b/noatun-plugins/oblique/file.cpp
index 6b0fd01..e51a5b0 100644
--- a/noatun-plugins/oblique/file.cpp
+++ b/noatun-plugins/oblique/file.cpp
@@ -7,7 +7,7 @@
 
 #include <iostream>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefilemetainfo.h>
 #include <kmimetype.h>
 
diff --git a/noatun-plugins/oblique/kdatacollection.cpp b/noatun-plugins/oblique/kdatacollection.cpp
index 4209d9b..443fc11 100644
--- a/noatun-plugins/oblique/kdatacollection.cpp
+++ b/noatun-plugins/oblique/kdatacollection.cpp
@@ -20,7 +20,7 @@
 #include "kdatacollection.h"
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include <tqfile.h>
diff --git a/noatun-plugins/oblique/menu.cpp b/noatun-plugins/oblique/menu.cpp
index b04945d..84a46c8 100644
--- a/noatun-plugins/oblique/menu.cpp
+++ b/noatun-plugins/oblique/menu.cpp
@@ -3,7 +3,7 @@
 
 #include "menu.h"
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "tree.h"
 
diff --git a/noatun-plugins/oblique/query.cpp b/noatun-plugins/oblique/query.cpp
index 34ebe72..ed83c27 100644
--- a/noatun-plugins/oblique/query.cpp
+++ b/noatun-plugins/oblique/query.cpp
@@ -6,7 +6,7 @@
 
 #include <iostream>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqdom.h>
 #include <tqfile.h>
diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp
index 4c83cc8..f86f624 100644
--- a/noatun-plugins/oblique/tree.cpp
+++ b/noatun-plugins/oblique/tree.cpp
@@ -10,7 +10,7 @@
 #include <tqpainter.h>
 #include <iostream>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <string.h>
 
 #include <noatun/player.h>
diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp
index 30da384..242e378 100644
--- a/noatun-plugins/oblique/view.cpp
+++ b/noatun-plugins/oblique/view.cpp
@@ -8,12 +8,12 @@
 #include <noatun/app.h>
 
 #include <kstdaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kedittoolbar.h>
 #include <tdefiledialog.h>
 #include <tqlabel.h>
 #include <klineeditdlg.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ktabwidget.h>
 #include <tqtabbar.h>
 
diff --git a/noatun-plugins/pitchablespeed/pitchablespeed.cpp b/noatun-plugins/pitchablespeed/pitchablespeed.cpp
index 385ce53..5ebaf27 100644
--- a/noatun-plugins/pitchablespeed/pitchablespeed.cpp
+++ b/noatun-plugins/pitchablespeed/pitchablespeed.cpp
@@ -20,7 +20,7 @@
 #include <tqslider.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 extern "C"
diff --git a/noatun-plugins/synaescope/cmodule.cpp b/noatun-plugins/synaescope/cmodule.cpp
index a35de7c..d32bb17 100644
--- a/noatun-plugins/synaescope/cmodule.cpp
+++ b/noatun-plugins/synaescope/cmodule.cpp
@@ -19,9 +19,9 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqpushbutton.h>
diff --git a/noatun-plugins/synaescope/main.cpp b/noatun-plugins/synaescope/main.cpp
index 4ff7148..4871d81 100644
--- a/noatun-plugins/synaescope/main.cpp
+++ b/noatun-plugins/synaescope/main.cpp
@@ -173,7 +173,7 @@ void warning(const char *str, bool)
 }
 
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 
 int main(void)
diff --git a/noatun-plugins/synaescope/synaescope.cpp b/noatun-plugins/synaescope/synaescope.cpp
index 42ba321..e69e7af 100644
--- a/noatun-plugins/synaescope/synaescope.cpp
+++ b/noatun-plugins/synaescope/synaescope.cpp
@@ -9,8 +9,8 @@
 #include "cmodule.h"
 
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 extern "C"
diff --git a/noatun-plugins/tippercanoe/synaescope.cpp b/noatun-plugins/tippercanoe/synaescope.cpp
index 9818ab9..6100796 100644
--- a/noatun-plugins/tippercanoe/synaescope.cpp
+++ b/noatun-plugins/tippercanoe/synaescope.cpp
@@ -9,8 +9,8 @@
 #include <noatun/conversion.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <tqframe.h>
diff --git a/noatun-plugins/tyler/file.cpp b/noatun-plugins/tyler/file.cpp
index 9e5b209..432a7be 100644
--- a/noatun-plugins/tyler/file.cpp
+++ b/noatun-plugins/tyler/file.cpp
@@ -23,7 +23,7 @@ extern "C"
 }
 
 #include <tqfile.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 static TQString getDataPath(void)
diff --git a/noatun-plugins/tyler/tyler.cpp b/noatun-plugins/tyler/tyler.cpp
index 25d844b..022f22a 100644
--- a/noatun-plugins/tyler/tyler.cpp
+++ b/noatun-plugins/tyler/tyler.cpp
@@ -5,8 +5,8 @@
 
 #include <noatun/conversion.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <noatun/app.h>
diff --git a/noatun-plugins/wavecapture/wavecapture.cpp b/noatun-plugins/wavecapture/wavecapture.cpp
index 44a1a77..2fe6f08 100644
--- a/noatun-plugins/wavecapture/wavecapture.cpp
+++ b/noatun-plugins/wavecapture/wavecapture.cpp
@@ -26,7 +26,7 @@
 #include <arts/soundserver.h>
 #include <arts/mcoputils.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <tdefiledialog.h>
 #include <kurl.h>