From 6915c95d7c4a42d19ebbec3c87c1e308b20ec272 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:58:20 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 juk/advancedsearchdialog.cpp  | 2 +-
 juk/artsplayer.cpp            | 4 ++--
 juk/cache.cpp                 | 4 ++--
 juk/collectionlist.cpp        | 4 ++--
 juk/coverdialog.cpp           | 2 +-
 juk/coverinfo.cpp             | 2 +-
 juk/covermanager.cpp          | 2 +-
 juk/deletedialog.cpp          | 4 ++--
 juk/directorylist.cpp         | 2 +-
 juk/exampleoptions.cpp        | 2 +-
 juk/filerenamer.cpp           | 6 +++---
 juk/filerenamerconfigdlg.cpp  | 2 +-
 juk/filerenameroptions.cpp    | 2 +-
 juk/gstreamerplayer.cpp       | 2 +-
 juk/historyplaylist.cpp       | 4 ++--
 juk/juk.cpp                   | 2 +-
 juk/k3bexporter.cpp           | 4 ++--
 juk/keydialog.cpp             | 2 +-
 juk/ktrm.cpp                  | 2 +-
 juk/mediafiles.cpp            | 2 +-
 juk/musicbrainzquery.cpp      | 2 +-
 juk/nowplaying.cpp            | 2 +-
 juk/playermanager.cpp         | 2 +-
 juk/playlist.cpp              | 6 +++---
 juk/playlist.h                | 2 +-
 juk/playlistbox.cpp           | 2 +-
 juk/playlistcollection.cpp    | 2 +-
 juk/playlistcollection.h      | 2 +-
 juk/searchwidget.cpp          | 2 +-
 juk/slideraction.cpp          | 2 +-
 juk/splashscreen.cpp          | 2 +-
 juk/statuslabel.cpp           | 2 +-
 juk/systemtray.cpp            | 4 ++--
 juk/tageditor.cpp             | 4 ++--
 juk/tagguesser.cpp            | 2 +-
 juk/tagguesserconfigdlg.cpp   | 2 +-
 juk/tagrenameroptions.cpp     | 4 ++--
 juk/tagtransactionmanager.cpp | 4 ++--
 juk/trackpickerdialog.cpp     | 2 +-
 juk/tracksequencemanager.cpp  | 2 +-
 juk/treeviewitemplaylist.cpp  | 4 ++--
 juk/webimagefetcher.cpp       | 2 +-
 juk/webimagefetcherdialog.cpp | 4 ++--
 43 files changed, 59 insertions(+), 59 deletions(-)

(limited to 'juk')

diff --git a/juk/advancedsearchdialog.cpp b/juk/advancedsearchdialog.cpp
index 711c1275..8fc4c037 100644
--- a/juk/advancedsearchdialog.cpp
+++ b/juk/advancedsearchdialog.cpp
@@ -16,7 +16,7 @@
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqradiobutton.h>
 #include <tqvgroupbox.h>
diff --git a/juk/artsplayer.cpp b/juk/artsplayer.cpp
index d6905f0e..fc8269dd 100644
--- a/juk/artsplayer.cpp
+++ b/juk/artsplayer.cpp
@@ -34,9 +34,9 @@
 #include <cstdlib>
 #include <sys/wait.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kaudiomanagerplay.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 // public methods
diff --git a/juk/cache.cpp b/juk/cache.cpp
index d80cafa0..58062036 100644
--- a/juk/cache.cpp
+++ b/juk/cache.cpp
@@ -14,9 +14,9 @@
  ***************************************************************************/
 
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeactionclasses.h>
 #include <kdebug.h>
 
diff --git a/juk/collectionlist.cpp b/juk/collectionlist.cpp
index 2386f63e..770ed92f 100644
--- a/juk/collectionlist.cpp
+++ b/juk/collectionlist.cpp
@@ -14,8 +14,8 @@
  ***************************************************************************/
 
 #include <kurldrag.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
diff --git a/juk/coverdialog.cpp b/juk/coverdialog.cpp
index 3c6dfe19..00fd26b1 100644
--- a/juk/coverdialog.cpp
+++ b/juk/coverdialog.cpp
@@ -19,7 +19,7 @@
 #include <kiconloader.h>
 #include <tdeapplication.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqtimer.h>
 #include <tqtoolbutton.h>
diff --git a/juk/coverinfo.cpp b/juk/coverinfo.cpp
index b16bebb8..dca657d8 100644
--- a/juk/coverinfo.cpp
+++ b/juk/coverinfo.cpp
@@ -13,7 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/juk/covermanager.cpp b/juk/covermanager.cpp
index fc814bf2..77719767 100644
--- a/juk/covermanager.cpp
+++ b/juk/covermanager.cpp
@@ -28,7 +28,7 @@
 #include <kdebug.h>
 #include <kstaticdeleter.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "covermanager.h"
 
diff --git a/juk/deletedialog.cpp b/juk/deletedialog.cpp
index 5062624a..1afc9261 100644
--- a/juk/deletedialog.cpp
+++ b/juk/deletedialog.cpp
@@ -14,9 +14,9 @@
  ***************************************************************************/
 
 #include <kdialogbase.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstdguiitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 
diff --git a/juk/directorylist.cpp b/juk/directorylist.cpp
index edc0806d..cc1f2031 100644
--- a/juk/directorylist.cpp
+++ b/juk/directorylist.cpp
@@ -14,7 +14,7 @@
  ***************************************************************************/
 
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kpushbutton.h>
 
diff --git a/juk/exampleoptions.cpp b/juk/exampleoptions.cpp
index e365546a..2763da9b 100644
--- a/juk/exampleoptions.cpp
+++ b/juk/exampleoptions.cpp
@@ -14,7 +14,7 @@
  ***************************************************************************/
 
 #include <kurlrequester.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqradiobutton.h>
 #include <tqlayout.h>
diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp
index fb55bb55..42c44c84 100644
--- a/juk/filerenamer.cpp
+++ b/juk/filerenamer.cpp
@@ -26,12 +26,12 @@
 #include <tdeio/netaccess.h>
 #include <tdeconfigbase.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksimpleconfig.h>
 
 #include <tqfile.h>
diff --git a/juk/filerenamerconfigdlg.cpp b/juk/filerenamerconfigdlg.cpp
index 8a741d03..27a3c3ec 100644
--- a/juk/filerenamerconfigdlg.cpp
+++ b/juk/filerenamerconfigdlg.cpp
@@ -14,7 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "filerenamer.h"
 #include "filerenamerconfigdlg.h"
diff --git a/juk/filerenameroptions.cpp b/juk/filerenameroptions.cpp
index 0e13fe4f..0442be70 100644
--- a/juk/filerenameroptions.cpp
+++ b/juk/filerenameroptions.cpp
@@ -13,7 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <knuminput.h>
 
diff --git a/juk/gstreamerplayer.cpp b/juk/gstreamerplayer.cpp
index 81df1f03..e77c0ff6 100644
--- a/juk/gstreamerplayer.cpp
+++ b/juk/gstreamerplayer.cpp
@@ -18,7 +18,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <tqfile.h>
diff --git a/juk/historyplaylist.cpp b/juk/historyplaylist.cpp
index ead67edc..47e6fddb 100644
--- a/juk/historyplaylist.cpp
+++ b/juk/historyplaylist.cpp
@@ -13,8 +13,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include "historyplaylist.h"
diff --git a/juk/juk.cpp b/juk/juk.cpp
index 15742ba9..80a8a7a8 100644
--- a/juk/juk.cpp
+++ b/juk/juk.cpp
@@ -18,7 +18,7 @@
 #include <tdecmdlineargs.h>
 #include <kstatusbar.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 
diff --git a/juk/k3bexporter.cpp b/juk/k3bexporter.cpp
index 502b946c..a8e50aa8 100644
--- a/juk/k3bexporter.cpp
+++ b/juk/k3bexporter.cpp
@@ -14,9 +14,9 @@
  ***************************************************************************/
 
 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdeactioncollection.h>
 #include <kstandarddirs.h>
diff --git a/juk/keydialog.cpp b/juk/keydialog.cpp
index 3e8d7e83..bc1d13a9 100644
--- a/juk/keydialog.cpp
+++ b/juk/keydialog.cpp
@@ -16,7 +16,7 @@
 #include "keydialog.h"
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqradiobutton.h>
 #include <tqvbox.h>
diff --git a/juk/ktrm.cpp b/juk/ktrm.cpp
index 74abd3c0..1d762a44 100644
--- a/juk/ktrm.cpp
+++ b/juk/ktrm.cpp
@@ -25,7 +25,7 @@
 
 #include <tdeapplication.h>
 #include <kresolver.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kurl.h>
 #include <kdebug.h>
 
diff --git a/juk/mediafiles.cpp b/juk/mediafiles.cpp
index 94382b23..6c1626fb 100644
--- a/juk/mediafiles.cpp
+++ b/juk/mediafiles.cpp
@@ -15,7 +15,7 @@
 
 #include <tdefiledialog.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 
 #include "mediafiles.h"
diff --git a/juk/musicbrainzquery.cpp b/juk/musicbrainzquery.cpp
index 9f607f3d..652bb30d 100644
--- a/juk/musicbrainzquery.cpp
+++ b/juk/musicbrainzquery.cpp
@@ -25,7 +25,7 @@
 #include <tdemainwindow.h>
 #include <tdeapplication.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqfileinfo.h>
diff --git a/juk/nowplaying.cpp b/juk/nowplaying.cpp
index 03f679ae..f603ad80 100644
--- a/juk/nowplaying.cpp
+++ b/juk/nowplaying.cpp
@@ -14,7 +14,7 @@
  ***************************************************************************/
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurldrag.h>
 #include <tdeio/netaccess.h>
diff --git a/juk/playermanager.cpp b/juk/playermanager.cpp
index 26fde611..7fc8727f 100644
--- a/juk/playermanager.cpp
+++ b/juk/playermanager.cpp
@@ -23,7 +23,7 @@
  */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqslider.h>
 #include <tqtimer.h>
diff --git a/juk/playlist.cpp b/juk/playlist.cpp
index dec88839..51ccb61c 100644
--- a/juk/playlist.cpp
+++ b/juk/playlist.cpp
@@ -14,17 +14,17 @@
  ***************************************************************************/
 
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurldrag.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
 #include <tdefiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>
diff --git a/juk/playlist.h b/juk/playlist.h
index fec38044..e06744b3 100644
--- a/juk/playlist.h
+++ b/juk/playlist.h
@@ -19,7 +19,7 @@
 #include <tdelistview.h>
 #include <kurldrag.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tqvaluevector.h>
 #include <tqfileinfo.h>
diff --git a/juk/playlistbox.cpp b/juk/playlistbox.cpp
index 6502d4d5..3da042d2 100644
--- a/juk/playlistbox.cpp
+++ b/juk/playlistbox.cpp
@@ -15,7 +15,7 @@
 
 #include <kiconloader.h>
 #include <kurldrag.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <tdeaction.h>
 #include <kdebug.h>
diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp
index f6eb2fdc..c5e61645 100644
--- a/juk/playlistcollection.cpp
+++ b/juk/playlistcollection.cpp
@@ -38,7 +38,7 @@
 #include <tdeactionclasses.h>
 #include <tdeapplication.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 
 #include <tqwidgetstack.h>
diff --git a/juk/playlistcollection.h b/juk/playlistcollection.h
index b1ac9203..e5bf42e0 100644
--- a/juk/playlistcollection.h
+++ b/juk/playlistcollection.h
@@ -20,7 +20,7 @@
 #include "jukIface.h"
 
 #include <tdeshortcut.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdirlister.h>
 
 #include <tqguardedptr.h>
diff --git a/juk/searchwidget.cpp b/juk/searchwidget.cpp
index 49296511..e6fd0622 100644
--- a/juk/searchwidget.cpp
+++ b/juk/searchwidget.cpp
@@ -16,7 +16,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kiconloader.h>
 #include <kcombobox.h>
diff --git a/juk/slideraction.cpp b/juk/slideraction.cpp
index d8306e00..1b97b115 100644
--- a/juk/slideraction.cpp
+++ b/juk/slideraction.cpp
@@ -14,7 +14,7 @@
  ***************************************************************************/
 
 #include <tdetoolbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
diff --git a/juk/splashscreen.cpp b/juk/splashscreen.cpp
index 38bbfc47..ae72f05b 100644
--- a/juk/splashscreen.cpp
+++ b/juk/splashscreen.cpp
@@ -15,7 +15,7 @@
 
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 
diff --git a/juk/statuslabel.cpp b/juk/statuslabel.cpp
index 00690b07..618668b4 100644
--- a/juk/statuslabel.cpp
+++ b/juk/statuslabel.cpp
@@ -17,7 +17,7 @@
 #include <kpushbutton.h>
 #include <kiconloader.h>
 #include <ksqueezedtextlabel.h> 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqtooltip.h>
diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp
index 48e6ba5f..92d14081 100644
--- a/juk/systemtray.cpp
+++ b/juk/systemtray.cpp
@@ -15,13 +15,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kpassivepopup.h>
 #include <kiconeffect.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
 
 #include <tqvbox.h>
diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp
index 04064ded..fc2835ea 100644
--- a/juk/tageditor.cpp
+++ b/juk/tageditor.cpp
@@ -24,9 +24,9 @@
 #include <klineedit.h>
 #include <knuminput.h>
 #include <keditcl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdeactionclasses.h>
diff --git a/juk/tagguesser.cpp b/juk/tagguesser.cpp
index eec8afb5..8d256363 100644
--- a/juk/tagguesser.cpp
+++ b/juk/tagguesser.cpp
@@ -11,7 +11,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kmacroexpander.h>
 
 FileNameScheme::FileNameScheme(const TQString &s)
diff --git a/juk/tagguesserconfigdlg.cpp b/juk/tagguesserconfigdlg.cpp
index 15263ff1..b5ceaac9 100644
--- a/juk/tagguesserconfigdlg.cpp
+++ b/juk/tagguesserconfigdlg.cpp
@@ -12,7 +12,7 @@
 
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
 #include <tdeapplication.h>
diff --git a/juk/tagrenameroptions.cpp b/juk/tagrenameroptions.cpp
index 50c3083b..172637a5 100644
--- a/juk/tagrenameroptions.cpp
+++ b/juk/tagrenameroptions.cpp
@@ -14,8 +14,8 @@
  ***************************************************************************/
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeconfigbase.h>
 
diff --git a/juk/tagtransactionmanager.cpp b/juk/tagtransactionmanager.cpp
index 27e4a382..6ba46e34 100644
--- a/juk/tagtransactionmanager.cpp
+++ b/juk/tagtransactionmanager.cpp
@@ -14,8 +14,8 @@
  ***************************************************************************/
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
 #include <tdeapplication.h>
 
diff --git a/juk/trackpickerdialog.cpp b/juk/trackpickerdialog.cpp
index c9930354..892b2156 100644
--- a/juk/trackpickerdialog.cpp
+++ b/juk/trackpickerdialog.cpp
@@ -20,7 +20,7 @@
 #include <tqlabel.h>
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "trackpickerdialog.h"
 #include "trackpickerdialogbase.h"
diff --git a/juk/tracksequencemanager.cpp b/juk/tracksequencemanager.cpp
index 9a4f81e8..6475043f 100644
--- a/juk/tracksequencemanager.cpp
+++ b/juk/tracksequencemanager.cpp
@@ -14,7 +14,7 @@
  ***************************************************************************/
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
 
diff --git a/juk/treeviewitemplaylist.cpp b/juk/treeviewitemplaylist.cpp
index a130c4ea..68de8401 100644
--- a/juk/treeviewitemplaylist.cpp
+++ b/juk/treeviewitemplaylist.cpp
@@ -15,8 +15,8 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <tqstringlist.h>
 #include <tqlistview.h>
diff --git a/juk/webimagefetcher.cpp b/juk/webimagefetcher.cpp
index b05bdff3..142b1eb9 100644
--- a/juk/webimagefetcher.cpp
+++ b/juk/webimagefetcher.cpp
@@ -20,7 +20,7 @@
 #include <kstatusbar.h>
 #include <kdebug.h>
 #include <tdemainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinputdialog.h>
 #include <kurl.h>
 
diff --git a/juk/webimagefetcherdialog.cpp b/juk/webimagefetcherdialog.cpp
index 6eb0735e..17fe44e3 100644
--- a/juk/webimagefetcherdialog.cpp
+++ b/juk/webimagefetcherdialog.cpp
@@ -16,9 +16,9 @@
 
 #include <tdeapplication.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <krun.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
-- 
cgit v1.2.1