From 389eafdbc58b29246500ba26fea7a361e709b2bb Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:51:43 -0600
Subject: [PATCH] Rename additional header files to avoid conflicts with KDE4

---
 src/cddb.cpp                                | 2 +-
 src/cdmanager.cpp                           | 4 ++--
 src/cdopener.cpp                            | 4 ++--
 src/config.cpp                              | 4 ++--
 src/configbackendspage.cpp                  | 2 +-
 src/configdialog.cpp                        | 2 +-
 src/configenvironmentpage.cpp               | 2 +-
 src/configgeneralpage.cpp                   | 2 +-
 src/configpluginspage.cpp                   | 4 ++--
 src/convert.cpp                             | 6 +++---
 src/cuesheeteditor.cpp                      | 4 ++--
 src/dirdialog.cpp                           | 2 +-
 src/filelist.cpp                            | 2 +-
 src/logger.cpp                              | 2 +-
 src/logviewer.cpp                           | 2 +-
 src/main.cpp                                | 2 +-
 src/options.cpp                             | 2 +-
 src/optionsdetailed.cpp                     | 4 ++--
 src/optionseditor.cpp                       | 4 ++--
 src/optionsrequester.cpp                    | 2 +-
 src/optionssimple.cpp                       | 4 ++--
 src/outputdirectory.cpp                     | 4 ++--
 src/paranoia.cpp                            | 4 ++--
 src/pluginloader/convertpluginloader.cpp    | 4 ++--
 src/pluginloader/formatinfoloader.cpp       | 4 ++--
 src/pluginloader/replaygainpluginloader.cpp | 2 +-
 src/pluginloader/ripperpluginloader.cpp     | 2 +-
 src/progressindicator.cpp                   | 4 ++--
 src/replaygain.cpp                          | 2 +-
 src/replaygainfilelist.cpp                  | 4 ++--
 src/replaygainscanner.cpp                   | 2 +-
 src/soundkonverter.cpp                      | 6 +++---
 src/soundkonverterapp.cpp                   | 4 ++--
 33 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/src/cddb.cpp b/src/cddb.cpp
index ebc2501..8e4450f 100755
--- a/src/cddb.cpp
+++ b/src/cddb.cpp
@@ -38,7 +38,7 @@
 //#include <kdebug.h>
 #include <ksock.h>
 #include <kextsock.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinputdialog.h>
 
 #include "cddb.h"
diff --git a/src/cdmanager.cpp b/src/cdmanager.cpp
index 758c7ee..6ec7b97 100755
--- a/src/cdmanager.cpp
+++ b/src/cdmanager.cpp
@@ -7,8 +7,8 @@
 #include <tqstringlist.h>
 #include <tqvaluelist.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
 #include <dcopref.h>
 
diff --git a/src/cdopener.cpp b/src/cdopener.cpp
index 0c599cc..a7e6891 100755
--- a/src/cdopener.cpp
+++ b/src/cdopener.cpp
@@ -7,7 +7,7 @@
 #include "combobutton.h"
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
@@ -15,7 +15,7 @@
 #include <knuminput.h>
 #include <ktextedit.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/src/config.cpp b/src/config.cpp
index c01f3a8..52ebd50 100755
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -9,8 +9,8 @@
 #include <tqdir.h>
 #include <tqfile.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kmimetype.h>
 #include <tdeapplication.h>
diff --git a/src/configbackendspage.cpp b/src/configbackendspage.cpp
index b8bf272..6abef08 100755
--- a/src/configbackendspage.cpp
+++ b/src/configbackendspage.cpp
@@ -14,7 +14,7 @@
 #include <tqcheckbox.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <kscrollview.h>
 #include <kstandarddirs.h>
diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index 0d539dd..bef4eda 100755
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -22,7 +22,7 @@
 */
 //#include <tdeconfig.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 ConfigDialog::ConfigDialog( Config* _config, TQWidget *parent, const char *name, Page startPage )
diff --git a/src/configenvironmentpage.cpp b/src/configenvironmentpage.cpp
index 7188927..318db5c 100755
--- a/src/configenvironmentpage.cpp
+++ b/src/configenvironmentpage.cpp
@@ -3,7 +3,7 @@
 
 #include "config.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <tdelistbox.h>
diff --git a/src/configgeneralpage.cpp b/src/configgeneralpage.cpp
index 22ff4fd..bef1162 100755
--- a/src/configgeneralpage.cpp
+++ b/src/configgeneralpage.cpp
@@ -3,7 +3,7 @@
 
 #include "config.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <knuminput.h>
 #include <kiconloader.h>
diff --git a/src/configpluginspage.cpp b/src/configpluginspage.cpp
index d8c7f64..2664a37 100755
--- a/src/configpluginspage.cpp
+++ b/src/configpluginspage.cpp
@@ -16,11 +16,11 @@
 #include <tqlocale.h>
 // #include <tqurl.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <tdeio/job.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <tdelistbox.h>
diff --git a/src/convert.cpp b/src/convert.cpp
index 070b9b3..d1a2149 100755
--- a/src/convert.cpp
+++ b/src/convert.cpp
@@ -14,10 +14,10 @@
 
 #include <math.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 //#include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/job.h>
 //#include <kprocess.h>
 #include <kstandarddirs.h>
diff --git a/src/cuesheeteditor.cpp b/src/cuesheeteditor.cpp
index 65185fa..e585657 100755
--- a/src/cuesheeteditor.cpp
+++ b/src/cuesheeteditor.cpp
@@ -4,10 +4,10 @@
 #include <tqlayout.h>
 #include <tqstring.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 //#include <ktextedit.h>
 
 /*#include <tdeparts/factory.h> // KPart Factory
diff --git a/src/dirdialog.cpp b/src/dirdialog.cpp
index 2d2dbe9..8b6a51a 100755
--- a/src/dirdialog.cpp
+++ b/src/dirdialog.cpp
@@ -7,7 +7,7 @@
 #include <tqdir.h>
 #include <tqcheckbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
diff --git a/src/filelist.cpp b/src/filelist.cpp
index f9c510c..0f327ab 100755
--- a/src/filelist.cpp
+++ b/src/filelist.cpp
@@ -10,7 +10,7 @@
 #include "logger.h"
 #include "convertpluginloader.h" // NOTE DEBUG
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <tdeaction.h>
 #include <tdeactioncollection.h>
diff --git a/src/logger.cpp b/src/logger.cpp
index 5566c07..90491eb 100755
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -1,7 +1,7 @@
 
 #include "logger.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <cstdlib>
diff --git a/src/logviewer.cpp b/src/logviewer.cpp
index 687e751..8c6b09e 100755
--- a/src/logviewer.cpp
+++ b/src/logviewer.cpp
@@ -7,7 +7,7 @@
 #include <tqheader.h>
 #include <tqcolor.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
 #include <kpushbutton.h>
diff --git a/src/main.cpp b/src/main.cpp
index 8beedaa..a06d59d 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6,7 +6,7 @@
 
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
     I18N_NOOP("soundKonverter is a frontend to various audio converters, Replay Gain tools and CD rippers.\n\nPlease file bug reports at https://bugs.launchpad.net/ubuntu/+source/soundkonverter\nor simply send me a mail to hessijames@gmail.com");
diff --git a/src/options.cpp b/src/options.cpp
index acafaa9..8522715 100755
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -9,7 +9,7 @@
 #include <tqfile.h>
 #include <tqcolor.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktabwidget.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
diff --git a/src/optionsdetailed.cpp b/src/optionsdetailed.cpp
index 3b84dc9..2d526e8 100755
--- a/src/optionsdetailed.cpp
+++ b/src/optionsdetailed.cpp
@@ -10,14 +10,14 @@
 #include <tqwhatsthis.h>
 
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <tdetoolbarbutton.h>
 #include <klineedit.h>
 #include <kinputdialog.h>
 //#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <math.h>
 
diff --git a/src/optionseditor.cpp b/src/optionseditor.cpp
index 5ce3e01..a5d5ea3 100755
--- a/src/optionseditor.cpp
+++ b/src/optionseditor.cpp
@@ -11,10 +11,10 @@
 #include <tqlabel.h>
 #include <tqdatetime.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
-//#include <kmessagebox.h>
+//#include <tdemessagebox.h>
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <knuminput.h>
diff --git a/src/optionsrequester.cpp b/src/optionsrequester.cpp
index b2b36d3..b789383 100755
--- a/src/optionsrequester.cpp
+++ b/src/optionsrequester.cpp
@@ -7,7 +7,7 @@
 #include <tqlabel.h>
 #include <tqstringlist.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
 
diff --git a/src/optionssimple.cpp b/src/optionssimple.cpp
index e6f6131..7824c3b 100755
--- a/src/optionssimple.cpp
+++ b/src/optionssimple.cpp
@@ -9,10 +9,10 @@
 #include <tqstring.h>
 #include <tqtooltip.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdetoolbarbutton.h>
 //#include <kdebug.h>
 #include <kpushbutton.h>
diff --git a/src/outputdirectory.cpp b/src/outputdirectory.cpp
index a4ba49f..16a8a35 100755
--- a/src/outputdirectory.cpp
+++ b/src/outputdirectory.cpp
@@ -14,9 +14,9 @@
 #include <tqstringlist.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <tdetoolbarbutton.h>
 #include <kcombobox.h>
diff --git a/src/paranoia.cpp b/src/paranoia.cpp
index 66db95c..e3acc21 100755
--- a/src/paranoia.cpp
+++ b/src/paranoia.cpp
@@ -29,8 +29,8 @@
 
 #include <tqcombobox.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 //#include <kdebug.h>
 #include <ktrader.h>
 #include <kpushbutton.h>
diff --git a/src/pluginloader/convertpluginloader.cpp b/src/pluginloader/convertpluginloader.cpp
index 0b4bd65..c3d5900 100755
--- a/src/pluginloader/convertpluginloader.cpp
+++ b/src/pluginloader/convertpluginloader.cpp
@@ -3,8 +3,8 @@
 
 #include <tqfile.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 // TODO check whether it is possible to implement presets in the lame plugin
 
diff --git a/src/pluginloader/formatinfoloader.cpp b/src/pluginloader/formatinfoloader.cpp
index c056037..6e3d564 100755
--- a/src/pluginloader/formatinfoloader.cpp
+++ b/src/pluginloader/formatinfoloader.cpp
@@ -3,8 +3,8 @@
 
 #include <tqfile.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 FormatInfo::FormatInfo()
 {}
diff --git a/src/pluginloader/replaygainpluginloader.cpp b/src/pluginloader/replaygainpluginloader.cpp
index 2e37081..dcc7578 100755
--- a/src/pluginloader/replaygainpluginloader.cpp
+++ b/src/pluginloader/replaygainpluginloader.cpp
@@ -3,7 +3,7 @@
 
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 ReplayGainPlugin::ReplayGainPlugin()
diff --git a/src/pluginloader/ripperpluginloader.cpp b/src/pluginloader/ripperpluginloader.cpp
index 780efc8..743ca40 100755
--- a/src/pluginloader/ripperpluginloader.cpp
+++ b/src/pluginloader/ripperpluginloader.cpp
@@ -3,7 +3,7 @@
 
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 RipperPlugin::RipperPlugin()
diff --git a/src/progressindicator.cpp b/src/progressindicator.cpp
index e2255a3..e754361 100755
--- a/src/progressindicator.cpp
+++ b/src/progressindicator.cpp
@@ -6,10 +6,10 @@
 #include <tqprogressbar.h>
 #include <tqtooltip.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksystemtray.h>
 //#include <kiconloader.h>
-//#include <kmessagebox.h>
+//#include <tdemessagebox.h>
 // #include <kdebug.h>
 
 
diff --git a/src/replaygain.cpp b/src/replaygain.cpp
index 2f897dc..abf29c4 100755
--- a/src/replaygain.cpp
+++ b/src/replaygain.cpp
@@ -7,7 +7,7 @@
 #include <tqfile.h>
 
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 
 ReplayGain::ReplayGain( Config* _config, Logger* _logger )
diff --git a/src/replaygainfilelist.cpp b/src/replaygainfilelist.cpp
index c0fe715..19d33cf 100755
--- a/src/replaygainfilelist.cpp
+++ b/src/replaygainfilelist.cpp
@@ -14,13 +14,13 @@
 #include <tqlayout.h>
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kurldrag.h>
 #include <tdepopupmenu.h>
 #include <tdeaction.h>
 #include <tdeactioncollection.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmountpoint.h>
 #include <kprogress.h>
 #include <kprocess.h>
diff --git a/src/replaygainscanner.cpp b/src/replaygainscanner.cpp
index 9dd378e..ed183a4 100755
--- a/src/replaygainscanner.cpp
+++ b/src/replaygainscanner.cpp
@@ -11,7 +11,7 @@
 #include <tqcheckbox.h>
 #include <tqtooltip.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <kpushbutton.h>
diff --git a/src/soundkonverter.cpp b/src/soundkonverter.cpp
index 49e3e27..79229c1 100755
--- a/src/soundkonverter.cpp
+++ b/src/soundkonverter.cpp
@@ -20,17 +20,17 @@
 #include "dirdialog.h"
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <kinputdialog.h>
 #include <kpushbutton.h>
 #include <tdepopupmenu.h>
-//#include <kmenubar.h>
+//#include <tdemenubar.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <kedittoolbar.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstddirs.h>
 #include <tdeio/job.h>
 #include <kprocess.h>
diff --git a/src/soundkonverterapp.cpp b/src/soundkonverterapp.cpp
index 9ff3949..0e2d52a 100755
--- a/src/soundkonverterapp.cpp
+++ b/src/soundkonverterapp.cpp
@@ -6,8 +6,8 @@
 #include <tqfile.h>
 #include <tqmovie.h>
 
-#include <kglobal.h>
-#include <kstartupinfo.h>
+#include <tdeglobal.h>
+#include <tdestartupinfo.h>
 #include <tdecmdlineargs.h>
 #include <dcopclient.h>
 #include <ksystemtray.h>