Rename additional header files to avoid conflicts with KDE4

46 files changed, 53 insertions, 53 deletions

diff --git a/tderadio3/convert-presets/convert-presets.cpp b/tderadio3/convert-presets/convert-presets.cpp
index 770bdbc..c6ee08c 100644
--- 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>
diff --git a/tderadio3/plugins/alsa-sound/alsa-sound-configuration.cpp b/tderadio3/plugins/alsa-sound/alsa-sound-configuration.cpp
index de67faf..9a29e43 100644
--- 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"
diff --git a/tderadio3/plugins/alsa-sound/alsa-sound.cpp b/tderadio3/plugins/alsa-sound/alsa-sound.cpp
index 15cb98f..b37bdda 100644
--- 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>
diff --git a/tderadio3/plugins/gui-docking-menu/docking-configuration.cpp b/tderadio3/plugins/gui-docking-menu/docking-configuration.cpp
index daff887..dd1a18c 100644
--- 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;
 
diff --git a/tderadio3/plugins/gui-error-log/errorlog.cpp b/tderadio3/plugins/gui-error-log/errorlog.cpp
index 1ee9a3f..1a243e0 100644
--- 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
diff --git a/tderadio3/plugins/gui-quickbar/quickbar.cpp b/tderadio3/plugins/gui-quickbar/quickbar.cpp
index d4f5f54..d8bba88 100644
--- 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>
 
diff --git a/tderadio3/plugins/gui-standard-display/displaycfg.cpp b/tderadio3/plugins/gui-standard-display/displaycfg.cpp
index d08dde4..e2a37ac 100644
--- 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>
 
diff --git a/tderadio3/plugins/gui-standard-display/radioview.cpp b/tderadio3/plugins/gui-standard-display/radioview.cpp
index 2c7c08e..ae5fb88 100644
--- 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>
diff --git a/tderadio3/plugins/gui-standard-display/radioview_frequencyseeker.cpp b/tderadio3/plugins/gui-standard-display/radioview_frequencyseeker.cpp
index e334e45..2534dbe 100644
--- 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"
 
diff --git a/tderadio3/plugins/gui-standard-display/radioview_volume.cpp b/tderadio3/plugins/gui-standard-display/radioview_volume.cpp
index 921a6ed..683ef82 100644
--- 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"
diff --git a/tderadio3/plugins/lirc/lirc-configuration.cpp b/tderadio3/plugins/lirc/lirc-configuration.cpp
index 6fd87af..470b2ff 100644
--- 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>
diff --git a/tderadio3/plugins/oss-sound/oss-sound.cpp b/tderadio3/plugins/oss-sound/oss-sound.cpp
index a6579e8..00801c0 100644
--- 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>
diff --git a/tderadio3/plugins/radio/radio-configuration.cpp b/tderadio3/plugins/radio/radio-configuration.cpp
index 9f23413..a08d458 100644
--- 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),
diff --git a/tderadio3/plugins/recording/encoder.cpp b/tderadio3/plugins/recording/encoder.cpp
index c1e27c3..b1c054f 100644
--- 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,
diff --git a/tderadio3/plugins/recording/encoder_mp3.cpp b/tderadio3/plugins/recording/encoder_mp3.cpp
index 2ec1e1d..456850f 100644
--- 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,
diff --git a/tderadio3/plugins/recording/encoder_ogg.cpp b/tderadio3/plugins/recording/encoder_ogg.cpp
index fa61ab1..ca093b9 100644
--- 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,
diff --git a/tderadio3/plugins/recording/encoder_pcm.cpp b/tderadio3/plugins/recording/encoder_pcm.cpp
index 1143bc3..24a8ab6 100644
--- 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,
diff --git a/tderadio3/plugins/recording/recording-datamonitor.cpp b/tderadio3/plugins/recording/recording-datamonitor.cpp
index f2bbe8e..cd8b7e1 100644
--- 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
diff --git a/tderadio3/plugins/recording/recording-monitor.cpp b/tderadio3/plugins/recording/recording-monitor.cpp
index 0e0bd62..ee1514b 100644
--- 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>
 
diff --git a/tderadio3/plugins/soundserver/soundserver.cpp b/tderadio3/plugins/soundserver/soundserver.cpp
index a864ca3..305e4c2 100644
--- 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>
 
 
 ///////////////////////////////////////////////////////////////////////
diff --git a/tderadio3/plugins/streaming/streaming-configuration.cpp b/tderadio3/plugins/streaming/streaming-configuration.cpp
index fbfdbd8..ab57bea 100644
--- 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"
diff --git a/tderadio3/plugins/streaming/streaming.cpp b/tderadio3/plugins/streaming/streaming.cpp
index 0f90f0f..fcbc0cb 100644
--- 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"
diff --git a/tderadio3/plugins/timecontrol/timecontrol-configuration.cpp b/tderadio3/plugins/timecontrol/timecontrol-configuration.cpp
index 24c3a04..db3a760 100644
--- 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"
diff --git a/tderadio3/plugins/timeshifter/timeshifter-configuration.cpp b/tderadio3/plugins/timeshifter/timeshifter-configuration.cpp
index 559c1ae..1974ae7 100644
--- 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"
diff --git a/tderadio3/plugins/timeshifter/timeshifter.cpp b/tderadio3/plugins/timeshifter/timeshifter.cpp
index a46175c..146e530 100644
--- 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"
diff --git a/tderadio3/plugins/v4lradio/v4lradio-configuration.cpp b/tderadio3/plugins/v4lradio/v4lradio-configuration.cpp
index a6adfb6..ea71f9f 100644
--- 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"
diff --git a/tderadio3/plugins/v4lradio/v4lradio.cpp b/tderadio3/plugins/v4lradio/v4lradio.cpp
index 8fa4c81..64d794f 100644
--- 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"
diff --git a/tderadio3/src/aboutwidget.cpp b/tderadio3/src/aboutwidget.cpp
index 728840e..83e0ba4 100644
--- 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>
 
diff --git a/tderadio3/src/errorlog-interfaces.cpp b/tderadio3/src/errorlog-interfaces.cpp
index ec18402..e71304c 100644
--- 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;
diff --git a/tderadio3/src/fileringbuffer.cpp b/tderadio3/src/fileringbuffer.cpp
index a31e007..5cca0c7 100644
--- 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)
 {
diff --git a/tderadio3/src/frequencyradiostation.cpp b/tderadio3/src/frequencyradiostation.cpp
index 602caec..38cddd7 100644
--- 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>
 
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/tderadio3/src/include/plugins.h b/tderadio3/src/include/plugins.h
index 426ff99..c39b65e 100644
--- 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>
diff --git a/tderadio3/src/include/radiostation.h b/tderadio3/src/include/radiostation.h
index 8098d3d..68d0325 100644
--- 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
diff --git a/tderadio3/src/include/utils.h b/tderadio3/src/include/utils.h
index a50304e..c446c82 100644
--- 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
diff --git a/tderadio3/src/main.cpp b/tderadio3/src/main.cpp
index f79fe88..68c041f 100644
--- 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"
diff --git a/tderadio3/src/multibuffer.cpp b/tderadio3/src/multibuffer.cpp
index 07eb74b..8f82b2f 100644
--- a/tderadio3/src/multibuffer.cpp
+++ b/tderadio3/src/multibuffer.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "include/multibuffer.h"
 
diff --git a/tderadio3/src/plugin_configuration_dialog.cpp b/tderadio3/src/plugin_configuration_dialog.cpp
index b02fc81..f202d84 100644
--- 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,
diff --git a/tderadio3/src/pluginmanager.cpp b/tderadio3/src/pluginmanager.cpp
index 6ba7113..b4eedf3 100644
--- 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>
 
diff --git a/tderadio3/src/radiostation-config.cpp b/tderadio3/src/radiostation-config.cpp
index 677d798..52a692e 100644
--- 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>
 
diff --git a/tderadio3/src/radiostation-listview.cpp b/tderadio3/src/radiostation-listview.cpp
index ce67ba9..4c7fe64 100644
--- 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>
diff --git a/tderadio3/src/standardscandialog.cpp b/tderadio3/src/standardscandialog.cpp
index b738618..32f1138 100644
--- 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>
 
diff --git a/tderadio3/src/station-drag-object.cpp b/tderadio3/src/station-drag-object.cpp
index f383362..29f082c 100644
--- 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"
 
diff --git a/tderadio3/src/stationlist.cpp b/tderadio3/src/stationlist.cpp
index 2478e4e..d86a98a 100644
--- 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>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/tderadio3/src/stationlistxmlhandler.cpp b/tderadio3/src/stationlistxmlhandler.cpp
index 816494b..68bcc69 100644
--- 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";
 
diff --git a/tderadio3/src/tderadioapp.cpp b/tderadio3/src/tderadioapp.cpp
index 0fc4012..f484c37 100644
--- 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>
diff --git a/tderadio3/src/widgetplugins.cpp b/tderadio3/src/widgetplugins.cpp
index 4df2c67..462030e 100644
--- 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),