Rename additional header files to avoid conflicts with KDE4

11 years ago · 86aa055b23
parent cf6de3293d
commit 86aa055b23
46 changed files with 53 additions and 53 deletions
--- a/tderadio3/convert-presets/convert-presets.cpp
+++ b/tderadio3/convert-presets/convert-presets.cpp
@ -6,7 +6,7 @@
 #include <tqstring.h>
 #include <tqtextstream.h>
 #include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
--- a/tderadio3/plugins/alsa-sound/alsa-sound-configuration.cpp
+++ b/tderadio3/plugins/alsa-sound/alsa-sound-configuration.cpp
@ -25,7 +25,7 @@
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <ktabwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>

 #include "alsa-mixer-element.h"
 #include "alsa-sound-configuration.h"
--- a/tderadio3/plugins/alsa-sound/alsa-sound.cpp
+++ b/tderadio3/plugins/alsa-sound/alsa-sound.cpp
@ -15,7 +15,7 @@
 *                                                                         *
 ***************************************************************************/

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <sys/types.h>
 #include <sys/stat.h>
--- a/tderadio3/plugins/gui-docking-menu/docking-configuration.cpp
+++ b/tderadio3/plugins/gui-docking-menu/docking-configuration.cpp
@ -22,7 +22,7 @@
 #include <tqlayout.h>
 #include <tqframe.h>

-#include <klocale.h>
+#include <tdelocale.h>

 using namespace std;

--- a/tderadio3/plugins/gui-error-log/errorlog.cpp
+++ b/tderadio3/plugins/gui-error-log/errorlog.cpp
@ -21,12 +21,12 @@
 #include <tqdatetime.h>
 #include <tqlayout.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tqtextedit.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>

 #define PAGE_ID_INFO  0
--- a/tderadio3/plugins/gui-quickbar/quickbar.cpp
+++ b/tderadio3/plugins/gui-quickbar/quickbar.cpp
@ -22,8 +22,8 @@

 #include <tdetoolbarbutton.h>
 #include <twin.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <tdeaboutdata.h>

--- a/tderadio3/plugins/gui-standard-display/displaycfg.cpp
+++ b/tderadio3/plugins/gui-standard-display/displaycfg.cpp
@ -21,7 +21,7 @@
 #include <tdefontdialog.h>

 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqbuttongroup.h>

--- a/tderadio3/plugins/gui-standard-display/radioview.cpp
+++ b/tderadio3/plugins/gui-standard-display/radioview.cpp
@ -26,7 +26,7 @@

 #include <kcombobox.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <twin.h>
 #include <tdeconfig.h>
--- a/tderadio3/plugins/gui-standard-display/radioview_frequencyseeker.cpp
+++ b/tderadio3/plugins/gui-standard-display/radioview_frequencyseeker.cpp
@ -23,7 +23,7 @@
 #include <tqtooltip.h>

 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>

 #include "radioview_frequencyseeker.h"

--- a/tderadio3/plugins/gui-standard-display/radioview_volume.cpp
+++ b/tderadio3/plugins/gui-standard-display/radioview_volume.cpp
@ -21,7 +21,7 @@
 #include <tqaccel.h>
 #include <tqtooltip.h>

-#include <klocale.h>
+#include <tdelocale.h>

 #include "radioview_volume.h"
 #include "../../src/include/plugins.h"
--- a/tderadio3/plugins/lirc/lirc-configuration.cpp
+++ b/tderadio3/plugins/lirc/lirc-configuration.cpp
@ -16,7 +16,7 @@
 ***************************************************************************/

 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>

 #include <tqlistview.h>
 #include <tqlabel.h>
--- a/tderadio3/plugins/oss-sound/oss-sound.cpp
+++ b/tderadio3/plugins/oss-sound/oss-sound.cpp
@ -18,7 +18,7 @@
 #include "oss-sound.h"

 #include "../../src/include/aboutwidget.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <sys/types.h>
 #include <sys/stat.h>
--- a/tderadio3/plugins/radio/radio-configuration.cpp
+++ b/tderadio3/plugins/radio/radio-configuration.cpp
@ -46,7 +46,7 @@
 #include <tqregexp.h>
 #include <krun.h>
 #include <kurlrequester.h>
-#include <klocale.h>
+#include <tdelocale.h>

 RadioConfiguration::RadioConfiguration (TQWidget *parent, const IErrorLogClient &logger)
    : RadioConfigurationUI(parent),
--- a/tderadio3/plugins/recording/encoder.cpp
+++ b/tderadio3/plugins/recording/encoder.cpp
@ -30,7 +30,7 @@

 #include <tdeconfig.h>
 #include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>

 RecordingEncoding::RecordingEncoding(TQObject *parent,            SoundStreamID ssid,
                                     const RecordingConfig &cfg, const RadioStation *rs,
--- a/tderadio3/plugins/recording/encoder_mp3.cpp
+++ b/tderadio3/plugins/recording/encoder_mp3.cpp
@ -18,7 +18,7 @@
 #include "encoder_mp3.h"

 #include <tqmutex.h>
-#include <klocale.h>
+#include <tdelocale.h>

 RecordingEncodingMP3::RecordingEncodingMP3(TQObject *parent,            SoundStreamID ssid,
                                           const RecordingConfig &cfg, const RadioStation *rs,
--- a/tderadio3/plugins/recording/encoder_ogg.cpp
+++ b/tderadio3/plugins/recording/encoder_ogg.cpp
@ -17,7 +17,7 @@

 #include "encoder_ogg.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include <stdlib.h>

 RecordingEncodingOgg::RecordingEncodingOgg(TQObject *parent,            SoundStreamID ssid,
--- a/tderadio3/plugins/recording/encoder_pcm.cpp
+++ b/tderadio3/plugins/recording/encoder_pcm.cpp
@ -18,7 +18,7 @@
 #include "encoder_pcm.h"


-#include <klocale.h>
+#include <tdelocale.h>

 RecordingEncodingPCM::RecordingEncodingPCM(TQObject *parent,            SoundStreamID ssid,
                                           const RecordingConfig &cfg, const RadioStation *rs,
--- a/tderadio3/plugins/recording/recording-datamonitor.cpp
+++ b/tderadio3/plugins/recording/recording-datamonitor.cpp
@ -27,7 +27,7 @@
 #include <limits.h>
 #include <stdlib.h>

-#include <klocale.h>
+#include <tdelocale.h>

 #define CHANNEL_H_MIN   20
 #define BLOCK_W_MIN     10
--- a/tderadio3/plugins/recording/recording-monitor.cpp
+++ b/tderadio3/plugins/recording/recording-monitor.cpp
@ -25,7 +25,7 @@
 #include <tqcheckbox.h>
 #include <kcombobox.h>

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeaboutdata.h>

--- a/tderadio3/plugins/soundserver/soundserver.cpp
+++ b/tderadio3/plugins/soundserver/soundserver.cpp
@ -18,7 +18,7 @@
 #include "soundserver.h"

 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>


 ///////////////////////////////////////////////////////////////////////
--- a/tderadio3/plugins/streaming/streaming-configuration.cpp
+++ b/tderadio3/plugins/streaming/streaming-configuration.cpp
@ -23,7 +23,7 @@
 #include <kcombobox.h>
 #include <knuminput.h>

-#include <klocale.h>
+#include <tdelocale.h>

 #include "streaming-configuration.h"
 #include "streaming.h"
--- a/tderadio3/plugins/streaming/streaming.cpp
+++ b/tderadio3/plugins/streaming/streaming.cpp
@ -19,10 +19,10 @@

 #include "../../src/include/aboutwidget.h"
 #include "../../src/include/utils.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>

 #include "streaming-job.h"
 #include "streaming-configuration.h"
--- a/tderadio3/plugins/timecontrol/timecontrol-configuration.cpp
+++ b/tderadio3/plugins/timecontrol/timecontrol-configuration.cpp
@ -29,7 +29,7 @@ using std::sort;
 #include <tqpushbutton.h>

 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>

 #include "../../src/include/stationlist.h"
 #include "../../src/include/alarm.h"
--- a/tderadio3/plugins/timeshifter/timeshifter-configuration.cpp
+++ b/tderadio3/plugins/timeshifter/timeshifter-configuration.cpp
@ -29,7 +29,7 @@

 #include <tdefiledialog.h>
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>

 #include "../../src/include/utils.h"
 #include "../../src/include/gui_list_helper.h"
--- a/tderadio3/plugins/timeshifter/timeshifter.cpp
+++ b/tderadio3/plugins/timeshifter/timeshifter.cpp
@ -19,7 +19,7 @@
 #include <config.h>
 #endif

-#include <klocale.h>
+#include <tdelocale.h>
 #include <linux/soundcard.h>

 #include "../../src/include/utils.h"
--- a/tderadio3/plugins/v4lradio/v4lradio-configuration.cpp
+++ b/tderadio3/plugins/v4lradio/v4lradio-configuration.cpp
@ -31,7 +31,7 @@

 #include <tdefiledialog.h>
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktabwidget.h>

 #include "../../src/include/utils.h"
--- a/tderadio3/plugins/v4lradio/v4lradio.cpp
+++ b/tderadio3/plugins/v4lradio/v4lradio.cpp
@ -40,7 +40,7 @@
 #include <kiconloader.h>
 #include <kdialogbase.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>

 #include "../../src/include/aboutwidget.h"
 #include "../../src/include/utils.h"
--- a/tderadio3/src/aboutwidget.cpp
+++ b/tderadio3/src/aboutwidget.cpp
@ -29,12 +29,12 @@
 #include <tqtabbar.h>
 #include <tqimage.h>

-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <ktextbrowser.h>
 #include <tqtextedit.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kurllabel.h>

--- a/tderadio3/src/errorlog-interfaces.cpp
+++ b/tderadio3/src/errorlog-interfaces.cpp
@ -18,7 +18,7 @@
 #include "include/errorlog-interfaces.h"

 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdatetime.h>

 IErrorLog *staticLogger = NULL;
--- a/tderadio3/src/fileringbuffer.cpp
+++ b/tderadio3/src/fileringbuffer.cpp
@ -19,7 +19,7 @@

 #include <tqstring.h>
 #include <unistd.h>
-#include <klocale.h>
+#include <tdelocale.h>

 FileRingBuffer::FileRingBuffer(const TQString &filename, TQ_UINT64 max_size)
 {
--- a/tderadio3/src/frequencyradiostation.cpp
+++ b/tderadio3/src/frequencyradiostation.cpp
@ -18,8 +18,8 @@
 #include "include/frequencyradiostation.h"
 #include <typeinfo>
 #include "include/radiostation-config.h"
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>

 /////////////////////////////////////////////////////////////////////////////

--- a/tderadio3/src/include/plugins.h
+++ b/tderadio3/src/include/plugins.h
@ -24,7 +24,7 @@
 #include <config.h>
 #endif

-#include <kglobal.h>
+#include <tdeglobal.h>

 #include "errorlog-interfaces.h"
 #include <tqstring.h>
--- a/tderadio3/src/include/radiostation.h
+++ b/tderadio3/src/include/radiostation.h
@ -27,7 +27,7 @@
 #include <tqstringlist.h>
 #include <tqdict.h>

-#include <klocale.h>
+#include <tdelocale.h>

 /**
  *@author Martin Witte, Klas Kalass
--- a/tderadio3/src/include/utils.h
+++ b/tderadio3/src/include/utils.h
@ -25,7 +25,7 @@
 using namespace std;

 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqstring.h>
 #define __USE_ISOC99 1
--- a/tderadio3/src/main.cpp
+++ b/tderadio3/src/main.cpp
@ -17,7 +17,7 @@

 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>

 #include "include/tderadioversion.h"
 #include "include/tderadioapp.h"
--- a/tderadio3/src/multibuffer.cpp
+++ b/tderadio3/src/multibuffer.cpp
@ -15,7 +15,7 @@
 *                                                                         *
 ***************************************************************************/

-#include <klocale.h>
+#include <tdelocale.h>

 #include "include/multibuffer.h"

--- a/tderadio3/src/plugin_configuration_dialog.cpp
+++ b/tderadio3/src/plugin_configuration_dialog.cpp
@ -17,7 +17,7 @@

 #include "include/plugin_configuration_dialog.h"
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>

 PluginConfigurationDialog::PluginConfigurationDialog(
    int dialogFace, const TQString &caption,
--- a/tderadio3/src/pluginmanager.cpp
+++ b/tderadio3/src/pluginmanager.cpp
@ -23,7 +23,7 @@

 #include <kiconloader.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kprogress.h>

--- a/tderadio3/src/radiostation-config.cpp
+++ b/tderadio3/src/radiostation-config.cpp
@ -18,7 +18,7 @@
 #include <tqlabel.h>
 #include <tqspinbox.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>

 #include <math.h>

--- a/tderadio3/src/radiostation-listview.cpp
+++ b/tderadio3/src/radiostation-listview.cpp
@ -20,7 +20,7 @@
 #include "include/radiostation.h"
 #include "include/station-drag-object.h"

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 #include <tqimage.h>
 #include <tqpixmap.h>
--- a/tderadio3/src/standardscandialog.cpp
+++ b/tderadio3/src/standardscandialog.cpp
@ -22,7 +22,7 @@
 #include <tqlabel.h>
 #include <tqpushbutton.h>

-#include <klocale.h>
+#include <tdelocale.h>

 #include <math.h>

--- a/tderadio3/src/station-drag-object.cpp
+++ b/tderadio3/src/station-drag-object.cpp
@ -17,7 +17,7 @@

 #include "include/station-drag-object.h"
 #include "include/errorlog-interfaces.h"
-#include <klocale.h>
+#include <tdelocale.h>

 #define STATION_LIST_MIME_TYPE "multimedia/tderadio-stationids"

--- a/tderadio3/src/stationlist.cpp
+++ b/tderadio3/src/stationlist.cpp
@ -27,8 +27,8 @@
 #include <tqiodevice.h>
 #include <tqmessagebox.h>
 #include <tdeio/netaccess.h>
-#include <ktempfile.h>
-#include <klocale.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>

 //////////////////////////////////////////////////////////////////////////////

--- a/tderadio3/src/stationlistxmlhandler.cpp
+++ b/tderadio3/src/stationlistxmlhandler.cpp
@ -16,7 +16,7 @@
 ***************************************************************************/

 #include "include/stationlistxmlhandler.h"
-#include <klocale.h>
+#include <tdelocale.h>

 const char *TDERadioConfigElement         = "tderadiorc";

--- a/tderadio3/src/tderadioapp.cpp
+++ b/tderadio3/src/tderadioapp.cpp
@ -21,10 +21,10 @@


 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klibloader.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>

 // #include <kprogress.h>
--- a/tderadio3/src/widgetplugins.cpp
+++ b/tderadio3/src/widgetplugins.cpp
@ -25,7 +25,7 @@
 #include <twin.h>
 #include <tqwidget.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>

 WidgetPluginBase::WidgetPluginBase(const TQString &name, const TQString &description)
  : PluginBase(name, description),