summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:58:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:58:20 -0600
commit6915c95d7c4a42d19ebbec3c87c1e308b20ec272 (patch)
tree027fb6e879e17c2d65cbea9eab5c9da028618972
parent9d63b7d4600a5822f26793062dd2eca819bcfb1d (diff)
downloadtdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.tar.gz
tdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.zip
Rename additional header files to avoid conflicts with KDE4
-rw-r--r--arts/builder/createtool.cpp4
-rw-r--r--arts/builder/dirmanager.cpp4
-rw-r--r--arts/builder/execdlg.cpp2
-rw-r--r--arts/builder/interfacedlg.cpp2
-rw-r--r--arts/builder/main.cpp4
-rw-r--r--arts/builder/mwidget.cpp4
-rw-r--r--arts/builder/portposdlg.cpp2
-rw-r--r--arts/builder/propertypanel.cpp2
-rw-r--r--arts/builder/retrievedlg.cpp2
-rw-r--r--arts/gui/kde/dbtest.cpp2
-rw-r--r--arts/gui/kde/kpoti.cpp2
-rw-r--r--arts/gui/kde/kvolumefader_impl.cpp4
-rw-r--r--arts/modules/common/env_mixeritem_impl.cc4
-rw-r--r--arts/modules/effects/fivebandmonocomplexeq_impl.cc4
-rw-r--r--arts/modules/effects/freeverbguifactory_impl.cc4
-rw-r--r--arts/modules/effects/monostereoconversion_impl.cc4
-rw-r--r--arts/modules/effects/stereocompressorguifactory_impl.cc4
-rw-r--r--arts/modules/effects/synth_stereo_fir_equalizer_impl.cc4
-rw-r--r--arts/modules/mixers/littlestereomixerchannel_impl.cc2
-rw-r--r--arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc4
-rw-r--r--arts/modules/mixers/simplemixerchannelguifactory_impl.cc4
-rw-r--r--arts/tools/artsactions.cpp4
-rw-r--r--arts/tools/artscontrolapplet.cpp6
-rw-r--r--arts/tools/audiomanager.cpp2
-rw-r--r--arts/tools/choosebusdlg.cpp2
-rw-r--r--arts/tools/environmentview.cpp2
-rw-r--r--arts/tools/fftscopeview.cpp2
-rw-r--r--arts/tools/main.cpp2
-rw-r--r--arts/tools/main.h2
-rw-r--r--arts/tools/mediatypesview.cpp2
-rw-r--r--arts/tools/midiinstdlg.cpp2
-rw-r--r--arts/tools/midimanagerview.cpp2
-rw-r--r--arts/tools/midiportdlg.cpp2
-rw-r--r--arts/tools/statusview.cpp2
-rw-r--r--juk/advancedsearchdialog.cpp2
-rw-r--r--juk/artsplayer.cpp4
-rw-r--r--juk/cache.cpp4
-rw-r--r--juk/collectionlist.cpp4
-rw-r--r--juk/coverdialog.cpp2
-rw-r--r--juk/coverinfo.cpp2
-rw-r--r--juk/covermanager.cpp2
-rw-r--r--juk/deletedialog.cpp4
-rw-r--r--juk/directorylist.cpp2
-rw-r--r--juk/exampleoptions.cpp2
-rw-r--r--juk/filerenamer.cpp6
-rw-r--r--juk/filerenamerconfigdlg.cpp2
-rw-r--r--juk/filerenameroptions.cpp2
-rw-r--r--juk/gstreamerplayer.cpp2
-rw-r--r--juk/historyplaylist.cpp4
-rw-r--r--juk/juk.cpp2
-rw-r--r--juk/k3bexporter.cpp4
-rw-r--r--juk/keydialog.cpp2
-rw-r--r--juk/ktrm.cpp2
-rw-r--r--juk/mediafiles.cpp2
-rw-r--r--juk/musicbrainzquery.cpp2
-rw-r--r--juk/nowplaying.cpp2
-rw-r--r--juk/playermanager.cpp2
-rw-r--r--juk/playlist.cpp6
-rw-r--r--juk/playlist.h2
-rw-r--r--juk/playlistbox.cpp2
-rw-r--r--juk/playlistcollection.cpp2
-rw-r--r--juk/playlistcollection.h2
-rw-r--r--juk/searchwidget.cpp2
-rw-r--r--juk/slideraction.cpp2
-rw-r--r--juk/splashscreen.cpp2
-rw-r--r--juk/statuslabel.cpp2
-rw-r--r--juk/systemtray.cpp4
-rw-r--r--juk/tageditor.cpp4
-rw-r--r--juk/tagguesser.cpp2
-rw-r--r--juk/tagguesserconfigdlg.cpp2
-rw-r--r--juk/tagrenameroptions.cpp4
-rw-r--r--juk/tagtransactionmanager.cpp4
-rw-r--r--juk/trackpickerdialog.cpp2
-rw-r--r--juk/tracksequencemanager.cpp2
-rw-r--r--juk/treeviewitemplaylist.cpp4
-rw-r--r--juk/webimagefetcher.cpp2
-rw-r--r--juk/webimagefetcherdialog.cpp4
-rw-r--r--kaboodle/conf.cpp2
-rw-r--r--kaboodle/engine.cpp4
-rw-r--r--kaboodle/kaboodle_factory.cpp2
-rw-r--r--kaboodle/main.cpp2
-rw-r--r--kaboodle/player.cpp2
-rw-r--r--kaboodle/userinterface.cpp6
-rw-r--r--kaboodle/view.cpp2
-rw-r--r--kaudiocreator/encodefileimp.cpp2
-rw-r--r--kaudiocreator/encoder.cpp2
-rw-r--r--kaudiocreator/encoderconfigimp.cpp4
-rw-r--r--kaudiocreator/job.h2
-rw-r--r--kaudiocreator/jobqueimp.cpp4
-rw-r--r--kaudiocreator/kaudiocreator.cpp2
-rw-r--r--kaudiocreator/ripper.cpp4
-rw-r--r--kaudiocreator/tracksimp.cpp2
-rw-r--r--kaudiocreator/tracksimp.h2
-rw-r--r--kaudiocreator/wizard.ui.h2
-rw-r--r--kmix/colorwidget.ui2
-rw-r--r--kmix/dialogselectmaster.cpp2
-rw-r--r--kmix/dialogviewconfiguration.cpp2
-rw-r--r--kmix/kmix.cpp6
-rw-r--r--kmix/kmixapplet.cpp8
-rw-r--r--kmix/kmixctrl.cpp4
-rw-r--r--kmix/kmixdockwidget.cpp4
-rw-r--r--kmix/kmixerwidget.cpp4
-rw-r--r--kmix/kmixprefdlg.cpp2
-rw-r--r--kmix/kmixtoolbox.cpp2
-rw-r--r--kmix/ksmallslider.cpp2
-rw-r--r--kmix/main.cpp4
-rw-r--r--kmix/mdwenum.cpp2
-rw-r--r--kmix/mdwslider.cpp2
-rw-r--r--kmix/mdwswitch.cpp2
-rw-r--r--kmix/mixdevice.cpp2
-rw-r--r--kmix/mixdevicewidget.cpp2
-rw-r--r--kmix/mixer.cpp4
-rw-r--r--kmix/mixer_alsa9.cpp2
-rw-r--r--kmix/mixer_backend.cpp2
-rw-r--r--kmix/mixer_oss.cpp2
-rw-r--r--kmix/mixer_oss4.cpp2
-rw-r--r--kmix/mixertoolbox.cpp2
-rw-r--r--kmix/viewbase.cpp2
-rw-r--r--kmix/viewdockareapopup.cpp2
-rw-r--r--kmix/viewswitches.cpp2
-rw-r--r--krec/krecconfig_files.cpp2
-rw-r--r--krec/krecconfig_fileswidget.cpp2
-rw-r--r--krec/krecconfigure.cpp4
-rw-r--r--krec/krecexport_wave.cpp2
-rw-r--r--krec/krecfile.cpp6
-rw-r--r--krec/krecfileview.cpp2
-rw-r--r--krec/krecfileviewhelpers.cpp2
-rw-r--r--krec/krecfileviewhelpers.h2
-rw-r--r--krec/krecfilewidgets.cpp2
-rw-r--r--krec/krecnewproperties.cpp2
-rw-r--r--krec/krecord.cpp4
-rw-r--r--krec/main.cpp2
-rw-r--r--krec/mp3_export/krecexport_mp3.cpp6
-rw-r--r--krec/ogg_export/krecexport_ogg.cpp6
-rw-r--r--kscd/cddbdlg.cpp6
-rw-r--r--kscd/docking.cpp4
-rw-r--r--kscd/kcompactdisc.cpp4
-rw-r--r--kscd/kscd.cpp12
-rw-r--r--kscd/kscdmagic/main.cpp4
-rw-r--r--libkcddb/categories.cpp2
-rw-r--r--libkcddb/cddb.cpp2
-rw-r--r--libkcddb/cdinfodialogbase.ui.h2
-rw-r--r--libkcddb/cdinfoencodingwidget.cpp4
-rw-r--r--libkcddb/config.cpp2
-rw-r--r--libkcddb/genres.cpp2
-rw-r--r--libkcddb/kcmcddb/cddbconfigwidget.cpp4
-rw-r--r--libkcddb/kcmcddb/kcmcddb.cpp6
-rw-r--r--noatun/app/main.cpp2
-rw-r--r--noatun/library/app.cpp6
-rw-r--r--noatun/library/cmodule.cpp2
-rw-r--r--noatun/library/downloader.cpp2
-rw-r--r--noatun/library/effectview.cpp2
-rw-r--r--noatun/library/engine.cpp4
-rw-r--r--noatun/library/equalizer.cpp4
-rw-r--r--noatun/library/equalizerview.cpp2
-rw-r--r--noatun/library/ksaver.cpp4
-rw-r--r--noatun/library/noatunstdaction.cpp2
-rw-r--r--noatun/library/noatuntags/tags.cpp2
-rw-r--r--noatun/library/player.cpp2
-rw-r--r--noatun/library/playlistsaver.cpp2
-rw-r--r--noatun/library/pluginloader.cpp4
-rw-r--r--noatun/library/pluginmodule.cpp4
-rw-r--r--noatun/library/pref.cpp4
-rw-r--r--noatun/library/titleproxy.cpp2
-rw-r--r--noatun/library/vequalizer.cpp4
-rw-r--r--noatun/library/video.cpp2
-rw-r--r--noatun/modules/excellent/userinterface.cpp8
-rw-r--r--noatun/modules/htmlexport/htmlexport.cpp2
-rw-r--r--noatun/modules/htmlexport/htmlexport.h4
-rw-r--r--noatun/modules/infrared/infrared.cpp2
-rw-r--r--noatun/modules/infrared/irprefs.cpp2
-rw-r--r--noatun/modules/infrared/lirc.cpp4
-rw-r--r--noatun/modules/kaiman/pref.cpp4
-rw-r--r--noatun/modules/kaiman/style.cpp4
-rw-r--r--noatun/modules/kaiman/userinterface.cpp6
-rw-r--r--noatun/modules/keyz/keyz.cpp2
-rw-r--r--noatun/modules/kjofol-skin/kjbutton.cpp2
-rw-r--r--noatun/modules/kjofol-skin/kjfont.cpp2
-rw-r--r--noatun/modules/kjofol-skin/kjloader.cpp6
-rw-r--r--noatun/modules/kjofol-skin/kjprefs.cpp8
-rw-r--r--noatun/modules/kjofol-skin/kjsliders.cpp2
-rw-r--r--noatun/modules/kjofol-skin/kjtextdisplay.cpp2
-rw-r--r--noatun/modules/kjofol-skin/kjvis.cpp2
-rw-r--r--noatun/modules/marquis/marquis.cpp4
-rw-r--r--noatun/modules/metatag/edit.cpp2
-rw-r--r--noatun/modules/metatag/metatag.cpp4
-rw-r--r--noatun/modules/monoscope/monoscope.cpp2
-rw-r--r--noatun/modules/noatunui/userinterface.cpp4
-rw-r--r--noatun/modules/simple/propertiesdialog.ui.h2
-rw-r--r--noatun/modules/simple/userinterface.cpp8
-rw-r--r--noatun/modules/splitplaylist/find.cpp2
-rw-r--r--noatun/modules/splitplaylist/view.cpp6
-rw-r--r--noatun/modules/systray/cmodule.cpp4
-rw-r--r--noatun/modules/systray/systray.cpp6
-rw-r--r--noatun/modules/voiceprint/prefs.cpp4
-rw-r--r--noatun/modules/voiceprint/voiceprint.cpp2
-rw-r--r--noatun/modules/winskin/guiSpectrumAnalyser.cpp2
-rw-r--r--noatun/modules/winskin/plugin.cpp4
-rw-r--r--noatun/modules/winskin/waDigit.cpp2
-rw-r--r--noatun/modules/winskin/waInfo.cpp2
-rw-r--r--noatun/modules/winskin/waSkin.cpp4
-rw-r--r--noatun/modules/winskin/waSkinManager.cpp2
-rw-r--r--noatun/modules/winskin/winSkinConfig.cpp6
-rw-r--r--tdefile-plugins/au/tdefile_au.cpp2
-rw-r--r--tdefile-plugins/avi/tdefile_avi.cpp2
-rw-r--r--tdefile-plugins/flac/tdefile_flac.cpp2
-rw-r--r--tdefile-plugins/m3u/tdefile_m3u.cpp2
-rw-r--r--tdefile-plugins/mp3/tdefile_mp3.cpp2
-rw-r--r--tdefile-plugins/mpc/tdefile_mpc.cpp2
-rw-r--r--tdefile-plugins/mpeg/tdefile_mpeg.cpp2
-rw-r--r--tdefile-plugins/ogg/tdefile_ogg.cpp2
-rw-r--r--tdefile-plugins/sid/tdefile_sid.cpp2
-rw-r--r--tdefile-plugins/theora/tdefile_theora.cpp2
-rw-r--r--tdefile-plugins/wav/tdefile_wav.cpp2
-rw-r--r--tdeioslave/audiocd/audiocd.cpp2
-rw-r--r--tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp2
-rw-r--r--tdeioslave/audiocd/plugins/lame/encoderlame.cpp6
-rw-r--r--tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp4
-rw-r--r--tdemid/channel.cpp4
-rw-r--r--tdemid/channelcfgdlg.cpp2
-rw-r--r--tdemid/channelview.cpp2
-rw-r--r--tdemid/collectdlg.cpp4
-rw-r--r--tdemid/kdisptext.cpp6
-rw-r--r--tdemid/main.cpp2
-rw-r--r--tdemid/midicfgdlg.cpp6
-rw-r--r--tdemid/slman.cpp2
-rw-r--r--tdemid/tdemid_part.cpp2
-rw-r--r--tdemid/tdemidclient.cpp6
-rw-r--r--tdemid/tdemidframe.cpp6
-rw-r--r--tdemid/tdemidframe.h2
230 files changed, 352 insertions, 352 deletions
diff --git a/arts/builder/createtool.cpp b/arts/builder/createtool.cpp
index f52573a4..2913fdd3 100644
--- a/arts/builder/createtool.cpp
+++ b/arts/builder/createtool.cpp
@@ -27,8 +27,8 @@
//#include <arts/debug.h>
#include <tqpalette.h>
#include <tqpainter.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
MWidgetTool::MWidgetTool(ModuleWidget *mwidget)
{
diff --git a/arts/builder/dirmanager.cpp b/arts/builder/dirmanager.cpp
index 9c8ed639..f3907142 100644
--- a/arts/builder/dirmanager.cpp
+++ b/arts/builder/dirmanager.cpp
@@ -26,9 +26,9 @@
#include <tqfile.h>
#include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "dirmanager.h"
diff --git a/arts/builder/execdlg.cpp b/arts/builder/execdlg.cpp
index fc14f6b0..fcdce6b8 100644
--- a/arts/builder/execdlg.cpp
+++ b/arts/builder/execdlg.cpp
@@ -29,7 +29,7 @@
#include <kbuttonbox.h>
#include <tdefiledialog.h>
#include <kseparator.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <kstdguiitem.h>
diff --git a/arts/builder/interfacedlg.cpp b/arts/builder/interfacedlg.cpp
index b4d0ae6d..99b8072e 100644
--- a/arts/builder/interfacedlg.cpp
+++ b/arts/builder/interfacedlg.cpp
@@ -30,7 +30,7 @@
#include <tdeapplication.h>
#include <kiconloader.h>
#include <kseparator.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlineedit.h>
#include <stdio.h>
#include <arts/debug.h>
diff --git a/arts/builder/main.cpp b/arts/builder/main.cpp
index 0a60801a..b163f4a1 100644
--- a/arts/builder/main.cpp
+++ b/arts/builder/main.cpp
@@ -45,12 +45,12 @@
#include <kstdaction.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinputdialog.h>
#include <tdestdaccel.h>
#include <tdefiledialog.h>
#include <ksavefile.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeaboutdata.h>
#include <kstandarddirs.h>
#include <kartsserver.h>
diff --git a/arts/builder/mwidget.cpp b/arts/builder/mwidget.cpp
index 8b2aeed8..38a362e7 100644
--- a/arts/builder/mwidget.cpp
+++ b/arts/builder/mwidget.cpp
@@ -4,8 +4,8 @@
#include <arts/debug.h>
//#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqtimer.h>
#include <tqpainter.h>
diff --git a/arts/builder/portposdlg.cpp b/arts/builder/portposdlg.cpp
index e4ea94a2..922a9f16 100644
--- a/arts/builder/portposdlg.cpp
+++ b/arts/builder/portposdlg.cpp
@@ -25,7 +25,7 @@
#include <tqlabel.h>
#include <tqlistbox.h>
#include <kbuttonbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinputdialog.h>
#include <tqbuttongroup.h>
#include <tqradiobutton.h>
diff --git a/arts/builder/propertypanel.cpp b/arts/builder/propertypanel.cpp
index 702a088e..25809100 100644
--- a/arts/builder/propertypanel.cpp
+++ b/arts/builder/propertypanel.cpp
@@ -22,7 +22,7 @@
#include "module.h"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqlabel.h>
diff --git a/arts/builder/retrievedlg.cpp b/arts/builder/retrievedlg.cpp
index ca4b255b..c95d40ad 100644
--- a/arts/builder/retrievedlg.cpp
+++ b/arts/builder/retrievedlg.cpp
@@ -29,7 +29,7 @@
#include <tqlineedit.h>
#include <tdeapplication.h>
#include <kseparator.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstdguiitem.h>
#include <stdio.h>
#include <set>
diff --git a/arts/gui/kde/dbtest.cpp b/arts/gui/kde/dbtest.cpp
index 0cd781b1..e1933b17 100644
--- a/arts/gui/kde/dbtest.cpp
+++ b/arts/gui/kde/dbtest.cpp
@@ -2,7 +2,7 @@
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstdaction.h>
#include <tdeactioncollection.h>
#include <kdebug.h>
diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp
index c0a3b5d2..ae9c6728 100644
--- a/arts/gui/kde/kpoti.cpp
+++ b/arts/gui/kde/kpoti.cpp
@@ -34,7 +34,7 @@
#include <kpixmap.h>
#include <kpixmapeffect.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <tdeapplication.h>
diff --git a/arts/gui/kde/kvolumefader_impl.cpp b/arts/gui/kde/kvolumefader_impl.cpp
index 15fc8c8a..da6a5d39 100644
--- a/arts/gui/kde/kvolumefader_impl.cpp
+++ b/arts/gui/kde/kvolumefader_impl.cpp
@@ -25,8 +25,8 @@
#include <tqstyle.h>
#include <tqfont.h>
#include <tqfontmetrics.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <tdeaction.h>
#include <kinputdialog.h>
diff --git a/arts/modules/common/env_mixeritem_impl.cc b/arts/modules/common/env_mixeritem_impl.cc
index 6f4e0e48..6fee8b44 100644
--- a/arts/modules/common/env_mixeritem_impl.cc
+++ b/arts/modules/common/env_mixeritem_impl.cc
@@ -4,8 +4,8 @@
#include "connect.h"
#include "../runtime/sequenceutils.h"
#include <stdio.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <vector>
diff --git a/arts/modules/effects/fivebandmonocomplexeq_impl.cc b/arts/modules/effects/fivebandmonocomplexeq_impl.cc
index 148f1a0d..59d0ef44 100644
--- a/arts/modules/effects/fivebandmonocomplexeq_impl.cc
+++ b/arts/modules/effects/fivebandmonocomplexeq_impl.cc
@@ -26,8 +26,8 @@
#include <artsmoduleseffects.h>
#include <connect.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
namespace Arts {
diff --git a/arts/modules/effects/freeverbguifactory_impl.cc b/arts/modules/effects/freeverbguifactory_impl.cc
index c15a5bfd..4b5d4d34 100644
--- a/arts/modules/effects/freeverbguifactory_impl.cc
+++ b/arts/modules/effects/freeverbguifactory_impl.cc
@@ -24,8 +24,8 @@
#include "debug.h"
#include "connect.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
using namespace std;
using namespace Arts;
diff --git a/arts/modules/effects/monostereoconversion_impl.cc b/arts/modules/effects/monostereoconversion_impl.cc
index deee99fd..9bf1bbee 100644
--- a/arts/modules/effects/monostereoconversion_impl.cc
+++ b/arts/modules/effects/monostereoconversion_impl.cc
@@ -26,8 +26,8 @@
#include <artsmoduleseffects.h>
#include <connect.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
namespace Arts {
diff --git a/arts/modules/effects/stereocompressorguifactory_impl.cc b/arts/modules/effects/stereocompressorguifactory_impl.cc
index 3c05ab9f..0dd523e8 100644
--- a/arts/modules/effects/stereocompressorguifactory_impl.cc
+++ b/arts/modules/effects/stereocompressorguifactory_impl.cc
@@ -17,8 +17,8 @@
*/
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include "artsmoduleseffects.h"
#include "connect.h"
diff --git a/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc b/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc
index 364375c2..8f15a4dc 100644
--- a/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc
+++ b/arts/modules/effects/synth_stereo_fir_equalizer_impl.cc
@@ -31,8 +31,8 @@
#include <stdio.h>
#include <stdlib.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
using namespace std;
using namespace Arts;
diff --git a/arts/modules/mixers/littlestereomixerchannel_impl.cc b/arts/modules/mixers/littlestereomixerchannel_impl.cc
index 84aaef5f..3b14fa39 100644
--- a/arts/modules/mixers/littlestereomixerchannel_impl.cc
+++ b/arts/modules/mixers/littlestereomixerchannel_impl.cc
@@ -28,7 +28,7 @@
#include <debug.h>
#include "artsgui.h"
-#include <klocale.h>
+#include <tdelocale.h>
using namespace Arts;
diff --git a/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc b/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc
index 64b48ad7..ab35e4fc 100644
--- a/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc
+++ b/arts/modules/mixers/monosimplemixerchannelguifactory_impl.cc
@@ -2,8 +2,8 @@
#include "debug.h"
#include "connect.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
namespace Arts {
diff --git a/arts/modules/mixers/simplemixerchannelguifactory_impl.cc b/arts/modules/mixers/simplemixerchannelguifactory_impl.cc
index 370865bf..0a36470d 100644
--- a/arts/modules/mixers/simplemixerchannelguifactory_impl.cc
+++ b/arts/modules/mixers/simplemixerchannelguifactory_impl.cc
@@ -2,8 +2,8 @@
#include "debug.h"
#include "connect.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
namespace Arts {
class SimpleMixerChannelGuiFactory_impl : virtual public SimpleMixerChannelGuiFactory_skel {
diff --git a/arts/tools/artsactions.cpp b/arts/tools/artsactions.cpp
index f0dee6fd..d970ed6e 100644
--- a/arts/tools/artsactions.cpp
+++ b/arts/tools/artsactions.cpp
@@ -23,8 +23,8 @@
#include <tdeaction.h>
#include <tdeactioncollection.h>
#include <tdepopupmenu.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
//#include <kdebug.h>
#include <kartsserver.h>
diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp
index 285e08b0..2697ff69 100644
--- a/arts/tools/artscontrolapplet.cpp
+++ b/arts/tools/artscontrolapplet.cpp
@@ -15,11 +15,11 @@
* *
***************************************************************************/
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tqcursor.h>
#include <tqtimer.h>
diff --git a/arts/tools/audiomanager.cpp b/arts/tools/audiomanager.cpp
index 9bca14b1..542abec1 100644
--- a/arts/tools/audiomanager.cpp
+++ b/arts/tools/audiomanager.cpp
@@ -27,7 +27,7 @@
#include <tqtimer.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdelistview.h>
#include <kiconloader.h>
diff --git a/arts/tools/choosebusdlg.cpp b/arts/tools/choosebusdlg.cpp
index 0a4c5b89..24e233e4 100644
--- a/arts/tools/choosebusdlg.cpp
+++ b/arts/tools/choosebusdlg.cpp
@@ -31,7 +31,7 @@
#include <kbuttonbox.h>
#include <kseparator.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <kdebug.h>
#include <kstdguiitem.h>
diff --git a/arts/tools/environmentview.cpp b/arts/tools/environmentview.cpp
index 8c84e8d2..aca373e9 100644
--- a/arts/tools/environmentview.cpp
+++ b/arts/tools/environmentview.cpp
@@ -28,7 +28,7 @@
#include <tdelistbox.h>
#include <kartswidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <stdio.h>
#include <fstream>
diff --git a/arts/tools/fftscopeview.cpp b/arts/tools/fftscopeview.cpp
index c8124c0b..d998c41a 100644
--- a/arts/tools/fftscopeview.cpp
+++ b/arts/tools/fftscopeview.cpp
@@ -29,7 +29,7 @@
#include <tdepopupmenu.h>
#include <kartswidget.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include "artsactions.h"
diff --git a/arts/tools/main.cpp b/arts/tools/main.cpp
index 3f22e53a..b651c625 100644
--- a/arts/tools/main.cpp
+++ b/arts/tools/main.cpp
@@ -40,7 +40,7 @@
#include <tqpushbutton.h>
#include <tdeaction.h>
#include <kled.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <kartsserver.h>
diff --git a/arts/tools/main.h b/arts/tools/main.h
index a967e512..ef349216 100644
--- a/arts/tools/main.h
+++ b/arts/tools/main.h
@@ -30,7 +30,7 @@
#include <tdemainwindow.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstdaction.h>
#include <tqlayout.h>
#include <tqpushbutton.h>
diff --git a/arts/tools/mediatypesview.cpp b/arts/tools/mediatypesview.cpp
index 6091461d..493c36d1 100644
--- a/arts/tools/mediatypesview.cpp
+++ b/arts/tools/mediatypesview.cpp
@@ -23,7 +23,7 @@
#include <tqlayout.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kartsserver.h>
#include <map>
#include <kiconloader.h>
diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp
index 04859733..6d155b06 100644
--- a/arts/tools/midiinstdlg.cpp
+++ b/arts/tools/midiinstdlg.cpp
@@ -20,7 +20,7 @@
*/
#include "midiinstdlg.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tdeapplication.h>
diff --git a/arts/tools/midimanagerview.cpp b/arts/tools/midimanagerview.cpp
index 62d54da0..b32c09f2 100644
--- a/arts/tools/midimanagerview.cpp
+++ b/arts/tools/midimanagerview.cpp
@@ -33,7 +33,7 @@
#include <tqpainter.h>
#include <stdio.h>
#include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <soundserver.h>
#include "artsmidi.h"
diff --git a/arts/tools/midiportdlg.cpp b/arts/tools/midiportdlg.cpp
index b8b70bda..1273bf58 100644
--- a/arts/tools/midiportdlg.cpp
+++ b/arts/tools/midiportdlg.cpp
@@ -20,7 +20,7 @@
*/
#include "midiportdlg.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <tqlayout.h>
diff --git a/arts/tools/statusview.cpp b/arts/tools/statusview.cpp
index c29cf4ed..197d620d 100644
--- a/arts/tools/statusview.cpp
+++ b/arts/tools/statusview.cpp
@@ -22,7 +22,7 @@
*/
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqpushbutton.h>
#include <tqwidget.h>
#include <tqtimer.h>
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>
diff --git a/kaboodle/conf.cpp b/kaboodle/conf.cpp
index 2c66f5a8..db4aa5e5 100644
--- a/kaboodle/conf.cpp
+++ b/kaboodle/conf.cpp
@@ -24,7 +24,7 @@
// in this Software without prior written authorization from the author(s).
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqcheckbox.h>
#include <tqvbox.h>
diff --git a/kaboodle/engine.cpp b/kaboodle/engine.cpp
index 0b3c42f4..a53989d2 100644
--- a/kaboodle/engine.cpp
+++ b/kaboodle/engine.cpp
@@ -28,8 +28,8 @@ extern "C"
#include <tdeconfig.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kmimetype.h>
#include <kstandarddirs.h>
#include <kurl.h>
diff --git a/kaboodle/kaboodle_factory.cpp b/kaboodle/kaboodle_factory.cpp
index 818145d6..1517fa27 100644
--- a/kaboodle/kaboodle_factory.cpp
+++ b/kaboodle/kaboodle_factory.cpp
@@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
#include "kaboodle_factory.h"
#include "player.h"
diff --git a/kaboodle/main.cpp b/kaboodle/main.cpp
index 0a206cfc..d83fb8cf 100644
--- a/kaboodle/main.cpp
+++ b/kaboodle/main.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqapplication.h>
#include "kaboodle_factory.h"
diff --git a/kaboodle/player.cpp b/kaboodle/player.cpp
index cebab8cd..af53a91b 100644
--- a/kaboodle/player.cpp
+++ b/kaboodle/player.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdeaction.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
#include "engine.h"
diff --git a/kaboodle/userinterface.cpp b/kaboodle/userinterface.cpp
index 49303b66..08531166 100644
--- a/kaboodle/userinterface.cpp
+++ b/kaboodle/userinterface.cpp
@@ -26,10 +26,10 @@
#include <tdeconfig.h>
#include <kdialog.h>
#include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
-#include <klocale.h>
-#include <kmenubar.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
#include <kpropertiesdialog.h>
#include <kstatusbar.h>
#include <kstdaction.h>
diff --git a/kaboodle/view.cpp b/kaboodle/view.cpp
index 9a5823b5..2fe044d4 100644
--- a/kaboodle/view.cpp
+++ b/kaboodle/view.cpp
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kdebug.h>
#include <kdialog.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kvideowidget.h>
#include <tqdragobject.h>
#include <tqlabel.h>
diff --git a/kaudiocreator/encodefileimp.cpp b/kaudiocreator/encodefileimp.cpp
index 59f32405..75f79736 100644
--- a/kaudiocreator/encodefileimp.cpp
+++ b/kaudiocreator/encodefileimp.cpp
@@ -25,7 +25,7 @@
#include <tqlineedit.h>
#include <kurlrequester.h>
#include <tqcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
EncodeFileImp::EncodeFileImp(TQWidget* parent,
const char* name) : EncodeFile(parent, name), m_genres(KCDDB::Genres()) {
diff --git a/kaudiocreator/encoder.cpp b/kaudiocreator/encoder.cpp
index 9ef0f562..9cc729a6 100644
--- a/kaudiocreator/encoder.cpp
+++ b/kaudiocreator/encoder.cpp
@@ -27,7 +27,7 @@
#include <tqregexp.h>
#include <tqdir.h>
#include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kurl.h>
#include <kdebug.h>
#include <knotifyclient.h>
diff --git a/kaudiocreator/encoderconfigimp.cpp b/kaudiocreator/encoderconfigimp.cpp
index b02ca614..2865dce3 100644
--- a/kaudiocreator/encoderconfigimp.cpp
+++ b/kaudiocreator/encoderconfigimp.cpp
@@ -25,8 +25,8 @@
#include <tqpushbutton.h>
#include <tqlineedit.h>
#include <tdeconfigdialog.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
/**
diff --git a/kaudiocreator/job.h b/kaudiocreator/job.h
index bb65eed9..c314976e 100644
--- a/kaudiocreator/job.h
+++ b/kaudiocreator/job.h
@@ -22,7 +22,7 @@
#define JOB_H
#include <tqmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
/**
* The job class is what is passed around the system. All of the data about
diff --git a/kaudiocreator/jobqueimp.cpp b/kaudiocreator/jobqueimp.cpp
index 1083f738..5ea164e3 100644
--- a/kaudiocreator/jobqueimp.cpp
+++ b/kaudiocreator/jobqueimp.cpp
@@ -25,10 +25,10 @@
#include <tqlabel.h>
#include <tqpainter.h>
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kurl.h>
#include <tqfile.h>
#include <tqregexp.h>
diff --git a/kaudiocreator/kaudiocreator.cpp b/kaudiocreator/kaudiocreator.cpp
index b05af4b2..1c2cd02e 100644
--- a/kaudiocreator/kaudiocreator.cpp
+++ b/kaudiocreator/kaudiocreator.cpp
@@ -23,7 +23,7 @@
#include <tqvbox.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdepopupmenu.h>
#include <tdeaction.h>
#include <kstatusbar.h>
diff --git a/kaudiocreator/ripper.cpp b/kaudiocreator/ripper.cpp
index 2060278f..89db60f1 100644
--- a/kaudiocreator/ripper.cpp
+++ b/kaudiocreator/ripper.cpp
@@ -23,8 +23,8 @@
#include <tqfile.h>
#include <tqtimer.h>
-#include <ktempfile.h>
-#include <kmessagebox.h>
+#include <tdetempfile.h>
+#include <tdemessagebox.h>
#include <knotifyclient.h>
#include <kstandarddirs.h>
#include <tdeio/scheduler.h>
diff --git a/kaudiocreator/tracksimp.cpp b/kaudiocreator/tracksimp.cpp
index 8885243d..0d7ab5cd 100644
--- a/kaudiocreator/tracksimp.cpp
+++ b/kaudiocreator/tracksimp.cpp
@@ -29,7 +29,7 @@
#include <kinputdialog.h>
#include <tdelistview.h>
#include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kurl.h>
#include <tqfileinfo.h>
diff --git a/kaudiocreator/tracksimp.h b/kaudiocreator/tracksimp.h
index 26d3705e..72c33396 100644
--- a/kaudiocreator/tracksimp.h
+++ b/kaudiocreator/tracksimp.h
@@ -24,7 +24,7 @@
#include "tracks.h"
#include <kiconloader.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
// CDDB support via libkcddb
#include <libkcddb/client.h>
diff --git a/kaudiocreator/wizard.ui.h b/kaudiocreator/wizard.ui.h
index cbd6ca68..ce69c172 100644
--- a/kaudiocreator/wizard.ui.h
+++ b/kaudiocreator/wizard.ui.h
@@ -29,7 +29,7 @@
#include <tqstring.h>
#include <tqregexp.h>
#include <tqmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "job.h"
void fileWizard::homePressed()
diff --git a/kmix/colorwidget.ui b/kmix/colorwidget.ui
index 27739653..7058fe5a 100644
--- a/kmix/colorwidget.ui
+++ b/kmix/colorwidget.ui
@@ -269,7 +269,7 @@
<tabstop>mutedBack</tabstop>
</tabstops>
<includes>
- <include location="global" impldecl="in declaration">klocale.h</include>
+ <include location="global" impldecl="in declaration">tdelocale.h</include>
<include location="global" impldecl="in declaration">kseparator.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
diff --git a/kmix/dialogselectmaster.cpp b/kmix/dialogselectmaster.cpp
index 08c8f760..ec957d4b 100644
--- a/kmix/dialogselectmaster.cpp
+++ b/kmix/dialogselectmaster.cpp
@@ -31,7 +31,7 @@
#include <kcombobox.h>
#include <kdebug.h>
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "dialogselectmaster.h"
#include "mixdevice.h"
diff --git a/kmix/dialogviewconfiguration.cpp b/kmix/dialogviewconfiguration.cpp
index 09e88d23..d6deb523 100644
--- a/kmix/dialogviewconfiguration.cpp
+++ b/kmix/dialogviewconfiguration.cpp
@@ -26,7 +26,7 @@
#include <kdebug.h>
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "dialogviewconfiguration.h"
#include "mixdevicewidget.h"
diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp
index e4eefa31..f50e7baa 100644
--- a/kmix/kmix.cpp
+++ b/kmix/kmix.cpp
@@ -31,10 +31,10 @@
// include files for KDE
#include <kcombobox.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
-#include <kmenubar.h>
+#include <tdemessagebox.h>
+#include <tdemenubar.h>
#include <klineeditdlg.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <tdeaction.h>
#include <tdeapplication.h>
diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp
index 31f69c5a..23c3768f 100644
--- a/kmix/kmixapplet.cpp
+++ b/kmix/kmixapplet.cpp
@@ -43,13 +43,13 @@
#include <kcolorbutton.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kglobalaccel.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kiconloader.h>
#include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
// // KMix
diff --git a/kmix/kmixctrl.cpp b/kmix/kmixctrl.cpp
index f95274f5..9f6188c7 100644
--- a/kmix/kmixctrl.cpp
+++ b/kmix/kmixctrl.cpp
@@ -22,8 +22,8 @@
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <tdeconfig.h>
#include <kdebug.h>
diff --git a/kmix/kmixdockwidget.cpp b/kmix/kmixdockwidget.cpp
index 87027ec1..a185ef29 100644
--- a/kmix/kmixdockwidget.cpp
+++ b/kmix/kmixdockwidget.cpp
@@ -23,11 +23,11 @@
*/
#include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <kpanelapplet.h>
#include <tdepopupmenu.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kdialog.h>
#include <kaudioplayer.h>
#include <kiconloader.h>
diff --git a/kmix/kmixerwidget.cpp b/kmix/kmixerwidget.cpp
index fec74d5b..94965122 100644
--- a/kmix/kmixerwidget.cpp
+++ b/kmix/kmixerwidget.cpp
@@ -30,8 +30,8 @@
// KDE
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <ktabwidget.h>
// KMix
diff --git a/kmix/kmixprefdlg.cpp b/kmix/kmixprefdlg.cpp
index 876fafcb..5489eea2 100644
--- a/kmix/kmixprefdlg.cpp
+++ b/kmix/kmixprefdlg.cpp
@@ -27,7 +27,7 @@
#include <tqlabel.h>
#include <tqradiobutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
// For "kapp"
#include <tdeapplication.h>
diff --git a/kmix/kmixtoolbox.cpp b/kmix/kmixtoolbox.cpp
index 2a472d6d..7e0d57c4 100644
--- a/kmix/kmixtoolbox.cpp
+++ b/kmix/kmixtoolbox.cpp
@@ -26,7 +26,7 @@
//#include <kdebug.h>
#include <kglobalaccel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "mdwslider.h"
#include "mdwswitch.h"
diff --git a/kmix/ksmallslider.cpp b/kmix/ksmallslider.cpp
index 08bee03b..c976d3cb 100644
--- a/kmix/ksmallslider.cpp
+++ b/kmix/ksmallslider.cpp
@@ -27,7 +27,7 @@
#include <tqbrush.h>
#include <tqstyle.h>
-#include "kglobalsettings.h"
+#include "tdeglobalsettings.h"
#include "ksmallslider.h"
/*
diff --git a/kmix/main.cpp b/kmix/main.cpp
index 358b6ad7..16074aee 100644
--- a/kmix/main.cpp
+++ b/kmix/main.cpp
@@ -21,8 +21,8 @@
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include "KMixApp.h"
diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp
index eae521e2..708000f2 100644
--- a/kmix/mdwenum.cpp
+++ b/kmix/mdwenum.cpp
@@ -25,7 +25,7 @@
#include <tqobject.h>
#include <tqtooltip.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kcombobox.h>
#include <tdeaction.h>
diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp
index 87bad20a..042f3723 100644
--- a/kmix/mdwslider.cpp
+++ b/kmix/mdwslider.cpp
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kled.h>
#include <kiconloader.h>
#include <tdeconfig.h>
diff --git a/kmix/mdwswitch.cpp b/kmix/mdwswitch.cpp
index b002469e..94acf747 100644
--- a/kmix/mdwswitch.cpp
+++ b/kmix/mdwswitch.cpp
@@ -26,7 +26,7 @@
#include <tqslider.h>
#include <tqtooltip.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <tdeaction.h>
#include <tdepopupmenu.h>
diff --git a/kmix/mixdevice.cpp b/kmix/mixdevice.cpp
index 4b0649d0..243ae3d1 100644
--- a/kmix/mixdevice.cpp
+++ b/kmix/mixdevice.cpp
@@ -20,7 +20,7 @@
*/
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "mixdevice.h"
diff --git a/kmix/mixdevicewidget.cpp b/kmix/mixdevicewidget.cpp
index 6173fdf5..d6bf2ff1 100644
--- a/kmix/mixdevicewidget.cpp
+++ b/kmix/mixdevicewidget.cpp
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kled.h>
#include <kiconloader.h>
#include <tdeconfig.h>
diff --git a/kmix/mixer.cpp b/kmix/mixer.cpp
index fc5a06f6..ba3bfee8 100644
--- a/kmix/mixer.cpp
+++ b/kmix/mixer.cpp
@@ -22,9 +22,9 @@
#include <tqtimer.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <dcopobject.h>
diff --git a/kmix/mixer_alsa9.cpp b/kmix/mixer_alsa9.cpp
index 6c8c1783..e23e2b57 100644
--- a/kmix/mixer_alsa9.cpp
+++ b/kmix/mixer_alsa9.cpp
@@ -35,7 +35,7 @@ extern "C"
}
// KDE Headers
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
// Local Headers
diff --git a/kmix/mixer_backend.cpp b/kmix/mixer_backend.cpp
index 4f15a564..ffd6ced0 100644
--- a/kmix/mixer_backend.cpp
+++ b/kmix/mixer_backend.cpp
@@ -17,7 +17,7 @@
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "mixer_backend.h"
// for the "ERR_" declartions, #include mixer.h
diff --git a/kmix/mixer_oss.cpp b/kmix/mixer_oss.cpp
index 7fcfb38e..62ab0bcc 100644
--- a/kmix/mixer_oss.cpp
+++ b/kmix/mixer_oss.cpp
@@ -34,7 +34,7 @@
#endif
#include "mixer_oss.h"
-#include <klocale.h>
+#include <tdelocale.h>
/*
I am using a fixed MAX_MIXDEVS #define here.
diff --git a/kmix/mixer_oss4.cpp b/kmix/mixer_oss4.cpp
index 01b167aa..ffb2cddd 100644
--- a/kmix/mixer_oss4.cpp
+++ b/kmix/mixer_oss4.cpp
@@ -40,7 +40,7 @@
#endif
#include "mixer_oss4.h"
-#include <klocale.h>
+#include <tdelocale.h>
Mixer_Backend* OSS4_getMixer(int device)
{
diff --git a/kmix/mixertoolbox.cpp b/kmix/mixertoolbox.cpp
index 66e0241c..b474eca6 100644
--- a/kmix/mixertoolbox.cpp
+++ b/kmix/mixertoolbox.cpp
@@ -24,7 +24,7 @@
#include "tqstring.h"
//#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "mixdevice.h"
#include "mixer.h"
diff --git a/kmix/viewbase.cpp b/kmix/viewbase.cpp
index 948e8d7d..11bb06a8 100644
--- a/kmix/viewbase.cpp
+++ b/kmix/viewbase.cpp
@@ -28,7 +28,7 @@
// KDE
#include <tdeaction.h>
#include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
// KMix
diff --git a/kmix/viewdockareapopup.cpp b/kmix/viewdockareapopup.cpp
index 1d4ea37b..081aec18 100644
--- a/kmix/viewdockareapopup.cpp
+++ b/kmix/viewdockareapopup.cpp
@@ -33,7 +33,7 @@
#include <kdebug.h>
#include <tdeaction.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
// KMix
#include "mdwslider.h"
diff --git a/kmix/viewswitches.cpp b/kmix/viewswitches.cpp
index 2bb39a6d..06b346e5 100644
--- a/kmix/viewswitches.cpp
+++ b/kmix/viewswitches.cpp
@@ -25,7 +25,7 @@
#include <tqwidget.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "mdwswitch.h"
#include "mdwenum.h"
diff --git a/krec/krecconfig_files.cpp b/krec/krecconfig_files.cpp
index 9ad1f2fa..31df79aa 100644
--- a/krec/krecconfig_files.cpp
+++ b/krec/krecconfig_files.cpp
@@ -26,7 +26,7 @@
#include <tqlabel.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
typedef KGenericFactory<KRecConfigFiles, TQWidget> KRecConfigFilesFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_krec_files, KRecConfigFilesFactory( "krec" ) )
diff --git a/krec/krecconfig_fileswidget.cpp b/krec/krecconfig_fileswidget.cpp
index 8eb4dda4..42fcd11d 100644
--- a/krec/krecconfig_fileswidget.cpp
+++ b/krec/krecconfig_fileswidget.cpp
@@ -23,7 +23,7 @@
#include <tqlineedit.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
KRecConfigFilesWidget::KRecConfigFilesWidget( TQWidget* p, const char* n )
diff --git a/krec/krecconfigure.cpp b/krec/krecconfigure.cpp
index f08bf48c..5063c461 100644
--- a/krec/krecconfigure.cpp
+++ b/krec/krecconfigure.cpp
@@ -27,8 +27,8 @@
#include <tqlabel.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kpushbutton.h>
typedef KGenericFactory<KRecConfigGeneral, TQWidget> KRecConfigGeneralFactory;
diff --git a/krec/krecexport_wave.cpp b/krec/krecexport_wave.cpp
index 6224283e..47fb0470 100644
--- a/krec/krecexport_wave.cpp
+++ b/krec/krecexport_wave.cpp
@@ -17,7 +17,7 @@
#include "krecglobal.h"
#include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqfile.h>
#include <tqtimer.h>
#include <kgenericfactory.h>
diff --git a/krec/krecfile.cpp b/krec/krecfile.cpp
index cfd2ef6b..864b4c43 100644
--- a/krec/krecfile.cpp
+++ b/krec/krecfile.cpp
@@ -21,14 +21,14 @@
#include <kdebug.h>
#include <tdeapplication.h>
#include <ktempdir.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <ktar.h>
#include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ksimpleconfig.h>
#include <tqdir.h>
#include <tqfileinfo.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqtimer.h>
#include <tqdatastream.h>
diff --git a/krec/krecfileview.cpp b/krec/krecfileview.cpp
index a5a989d8..bdf62adb 100644
--- a/krec/krecfileview.cpp
+++ b/krec/krecfileview.cpp
@@ -20,7 +20,7 @@
#include "krecglobal.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqlabel.h>
#include <tqpainter.h>
diff --git a/krec/krecfileviewhelpers.cpp b/krec/krecfileviewhelpers.cpp
index 4472a3c6..2ca5b582 100644
--- a/krec/krecfileviewhelpers.cpp
+++ b/krec/krecfileviewhelpers.cpp
@@ -17,7 +17,7 @@
#include "krecglobal.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqlabel.h>
#include <tqpainter.h>
diff --git a/krec/krecfileviewhelpers.h b/krec/krecfileviewhelpers.h
index 85e0f48e..695b9105 100644
--- a/krec/krecfileviewhelpers.h
+++ b/krec/krecfileviewhelpers.h
@@ -18,7 +18,7 @@
#include <tqlabel.h>
#include <tqstring.h>
#include <tqpoint.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
class TQBoxLayout;
class AKLabel;
diff --git a/krec/krecfilewidgets.cpp b/krec/krecfilewidgets.cpp
index 69c7a5ca..c0b778de 100644
--- a/krec/krecfilewidgets.cpp
+++ b/krec/krecfilewidgets.cpp
@@ -18,7 +18,7 @@
#include "krecglobal.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqlabel.h>
#include <tqpainter.h>
diff --git a/krec/krecnewproperties.cpp b/krec/krecnewproperties.cpp
index fc713a1a..8f5f7385 100644
--- a/krec/krecnewproperties.cpp
+++ b/krec/krecnewproperties.cpp
@@ -31,7 +31,7 @@
#include <tqfont.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
KRecNewProperties::KRecNewProperties( TQWidget* p, const char* n )
: TQDialog( p,n, 0, TQt::WType_Dialog|TQt::WStyle_Customize|TQt::WStyle_DialogBorder )
diff --git a/krec/krecord.cpp b/krec/krecord.cpp
index 955c8b89..0e122979 100644
--- a/krec/krecord.cpp
+++ b/krec/krecord.cpp
@@ -26,8 +26,8 @@
#include <arts/kaudioplaystream.h>
#include <arts/kaudiorecordstream.h>
#include <tdefiledialog.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeapplication.h>
#include <tdeaction.h>
diff --git a/krec/main.cpp b/krec/main.cpp
index 75333177..b530078d 100644
--- a/krec/main.cpp
+++ b/krec/main.cpp
@@ -18,7 +18,7 @@
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "krecord.h"
diff --git a/krec/mp3_export/krecexport_mp3.cpp b/krec/mp3_export/krecexport_mp3.cpp
index 312a91e0..79d0f4ad 100644
--- a/krec/mp3_export/krecexport_mp3.cpp
+++ b/krec/mp3_export/krecexport_mp3.cpp
@@ -17,16 +17,16 @@
#include "krecglobal.h"
#include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqfile.h>
#include <tqtimer.h>
#include <kgenericfactory.h>
#include <stdlib.h>
#include <time.h>
#include <tqdatetime.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
// Error code definitions from lame.h
static const char *lame_error[] =
diff --git a/krec/ogg_export/krecexport_ogg.cpp b/krec/ogg_export/krecexport_ogg.cpp
index f8bc9799..32ff777a 100644
--- a/krec/ogg_export/krecexport_ogg.cpp
+++ b/krec/ogg_export/krecexport_ogg.cpp
@@ -21,7 +21,7 @@
#include "krecglobal.h"
#include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqfile.h>
#include <tqtimer.h>
#include <tdeconfig.h>
@@ -29,8 +29,8 @@
#include <time.h>
#include <tqdatetime.h>
#include <kgenericfactory.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
K_EXPORT_COMPONENT_FACTORY( libkrecexport_ogg, KGenericFactory<KRecExport_OGG> )
diff --git a/kscd/cddbdlg.cpp b/kscd/cddbdlg.cpp
index eec94a70..40a17cbf 100644
--- a/kscd/cddbdlg.cpp
+++ b/kscd/cddbdlg.cpp
@@ -12,13 +12,13 @@
#include <klineedit.h>
#include <knuminput.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeapplication.h>
#include <kdebug.h>
#include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <stdio.h>
#include <math.h>
diff --git a/kscd/docking.cpp b/kscd/docking.cpp
index 830e92ca..8d6cb859 100644
--- a/kscd/docking.cpp
+++ b/kscd/docking.cpp
@@ -30,8 +30,8 @@
#include <tdeaboutdata.h>
#include <tdeactioncollection.h>
#include <tdeapplication.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <tdepopupmenu.h>
#include <kpassivepopup.h>
diff --git a/kscd/kcompactdisc.cpp b/kscd/kcompactdisc.cpp
index 4e477055..debfc6e3 100644
--- a/kscd/kcompactdisc.cpp
+++ b/kscd/kcompactdisc.cpp
@@ -22,8 +22,8 @@
#include <dcopref.h>
#include <tqfile.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kprotocolmanager.h>
+#include <tdelocale.h>
+#include <tdeprotocolmanager.h>
#include <krun.h>
#include "kcompactdisc.h"
#include <netwm.h>
diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp
index ee0be3b5..dd3c0967 100644
--- a/kscd/kscd.cpp
+++ b/kscd/kscd.cpp
@@ -42,24 +42,24 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <kdialogbase.h>
-#include <kemailsettings.h>
-#include <kglobal.h>
+#include <tdeemailsettings.h>
+#include <tdeglobal.h>
#include <khelpmenu.h>
#include <kkeydialog.h>
#include <kiconloader.h>
#include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdepopupmenu.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
#include <krun.h>
#include <kstandarddirs.h>
#include <kstdaction.h>
#include <kstringhandler.h>
#include <kurl.h>
#include <kuniqueapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdecmoduleloader.h>
#include <tdeconfigdialog.h>
diff --git a/kscd/kscdmagic/main.cpp b/kscd/kscdmagic/main.cpp
index 9472ddf9..312b4b14 100644
--- a/kscd/kscdmagic/main.cpp
+++ b/kscd/kscdmagic/main.cpp
@@ -50,8 +50,8 @@
#include <getopt.h>
#endif
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <dcopclient.h>
diff --git a/libkcddb/categories.cpp b/libkcddb/categories.cpp
index 5b86a5f5..c334a332 100644
--- a/libkcddb/categories.cpp
+++ b/libkcddb/categories.cpp
@@ -7,7 +7,7 @@
//
#include <categories.h>
-#include <klocale.h>
+#include <tdelocale.h>
KCDDB::Categories::Categories()
{
diff --git a/libkcddb/cddb.cpp b/libkcddb/cddb.cpp
index e79f74a3..23b429ab 100644
--- a/libkcddb/cddb.cpp
+++ b/libkcddb/cddb.cpp
@@ -24,7 +24,7 @@
#include <kdebug.h>
#include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "cddb.h"
diff --git a/libkcddb/cdinfodialogbase.ui.h b/libkcddb/cdinfodialogbase.ui.h
index 93d3b2cc..f09702d1 100644
--- a/libkcddb/cdinfodialogbase.ui.h
+++ b/libkcddb/cdinfodialogbase.ui.h
@@ -10,7 +10,7 @@
#include <tqtextcodec.h>
#include <kdebug.h>
#include <kdialogbase.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kcharsets.h>
#include "cdinfoencodingwidget.h"
diff --git a/libkcddb/cdinfoencodingwidget.cpp b/libkcddb/cdinfoencodingwidget.cpp
index 18b08363..f2a7e578 100644
--- a/libkcddb/cdinfoencodingwidget.cpp
+++ b/libkcddb/cdinfoencodingwidget.cpp
@@ -21,8 +21,8 @@
#include <tqlistbox.h>
#include <tqlabel.h>
#include <tqtextcodec.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kcharsets.h>
#include "cdinfoencodingwidget.h"
diff --git a/libkcddb/config.cpp b/libkcddb/config.cpp
index 5c4a82f2..41be28cb 100644
--- a/libkcddb/config.cpp
+++ b/libkcddb/config.cpp
@@ -20,7 +20,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <kemailsettings.h>
+#include <tdeemailsettings.h>
#include <libkcddb/config.h>
diff --git a/libkcddb/genres.cpp b/libkcddb/genres.cpp
index 423e80fc..385b40d8 100644
--- a/libkcddb/genres.cpp
+++ b/libkcddb/genres.cpp
@@ -7,7 +7,7 @@
//
#include <genres.h>
-#include <klocale.h>
+#include <tdelocale.h>
KCDDB::Genres::Genres()
{
diff --git a/libkcddb/kcmcddb/cddbconfigwidget.cpp b/libkcddb/kcmcddb/cddbconfigwidget.cpp
index c6c6f7f3..0de1f7ba 100644
--- a/libkcddb/kcmcddb/cddbconfigwidget.cpp
+++ b/libkcddb/kcmcddb/cddbconfigwidget.cpp
@@ -29,9 +29,9 @@
#include <tqlineedit.h>
#include <tdefiledialog.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <keditlistbox.h>
#include <tqwidgetstack.h>
#include <kurlrequester.h>
diff --git a/libkcddb/kcmcddb/kcmcddb.cpp b/libkcddb/kcmcddb/kcmcddb.cpp
index 8ce6a6dd..cda14763 100644
--- a/libkcddb/kcmcddb/kcmcddb.cpp
+++ b/libkcddb/kcmcddb/kcmcddb.cpp
@@ -29,10 +29,10 @@
#include <tqbuttongroup.h>
#include <tdeconfig.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeconfigdialogmanager.h>
#include "cddbconfigwidget.h"
diff --git a/noatun/app/main.cpp b/noatun/app/main.cpp
index 20c18c18..d39b2735 100644
--- a/noatun/app/main.cpp
+++ b/noatun/app/main.cpp
@@ -3,7 +3,7 @@
//#include <dcopclient.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const char description[] = I18N_NOOP("The Fusion of Frequencies");
static const char version[] = NOATUN_VERSION;
diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp
index 29ea0496..1bd1fb6b 100644
--- a/noatun/library/app.cpp
+++ b/noatun/library/app.cpp
@@ -23,11 +23,11 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knotifyclient.h>
#include <tdepopupmenu.h>
#include <tqfile.h>
diff --git a/noatun/library/cmodule.cpp b/noatun/library/cmodule.cpp
index 1820e441..8e5f184a 100644
--- a/noatun/library/cmodule.cpp
+++ b/noatun/library/cmodule.cpp
@@ -8,7 +8,7 @@
#include <tqradiobutton.h>
#include <tqcheckbox.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdelistview.h>
#include <tqsplitter.h>
diff --git a/noatun/library/downloader.cpp b/noatun/library/downloader.cpp
index 75653940..21fb7926 100644
--- a/noatun/library/downloader.cpp
+++ b/noatun/library/downloader.cpp
@@ -4,7 +4,7 @@
#include <tqfile.h>
#include <tqtimer.h>
#include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
DownloadItem::DownloadItem()
{
diff --git a/noatun/library/effectview.cpp b/noatun/library/effectview.cpp
index e332a456..f312d8fb 100644
--- a/noatun/library/effectview.cpp
+++ b/noatun/library/effectview.cpp
@@ -29,7 +29,7 @@
#include <kcombobox.h>
#include <kdialog.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqdragobject.h>
#include <tqheader.h>
#include <tqhgroupbox.h>
diff --git a/noatun/library/engine.cpp b/noatun/library/engine.cpp
index 995e9771..dbb4d978 100644
--- a/noatun/library/engine.cpp
+++ b/noatun/library/engine.cpp
@@ -9,8 +9,8 @@
#include <string.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tdeconfig.h>
#include <kdebug.h>
diff --git a/noatun/library/equalizer.cpp b/noatun/library/equalizer.cpp
index 1c50370c..a59b9259 100644
--- a/noatun/library/equalizer.cpp
+++ b/noatun/library/equalizer.cpp
@@ -7,14 +7,14 @@
#include <player.h>
#include <soundserver.h>
#include <noatunarts.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqdom.h>
#include <tdeio/netaccess.h>
#include <kstandarddirs.h>
#include <tqtextstream.h>
#include <math.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "ksaver.h"
#define EQ napp->equalizer()
diff --git a/noatun/library/equalizerview.cpp b/noatun/library/equalizerview.cpp
index 69acf562..a7a1d453 100644
--- a/noatun/library/equalizerview.cpp
+++ b/noatun/library/equalizerview.cpp
@@ -9,7 +9,7 @@
#include <kdialog.h>
#include <kdebug.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqslider.h>
diff --git a/noatun/library/ksaver.cpp b/noatun/library/ksaver.cpp
index 72b6218e..bd65db6d 100644
--- a/noatun/library/ksaver.cpp
+++ b/noatun/library/ksaver.cpp
@@ -27,8 +27,8 @@
#include "config.h"
#endif
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
#include <tdeio/netaccess.h>
#include "ksaver.h"
diff --git a/noatun/library/noatunstdaction.cpp b/noatun/library/noatunstdaction.cpp
index 767a3cc9..212fdc31 100644
--- a/noatun/library/noatunstdaction.cpp
+++ b/noatun/library/noatunstdaction.cpp
@@ -6,7 +6,7 @@
#include <khelpmenu.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <kstdaction.h>
#include <tqcursor.h>
diff --git a/noatun/library/noatuntags/tags.cpp b/noatun/library/noatuntags/tags.cpp
index 9125ff45..3c1bb2ac 100644
--- a/noatun/library/noatuntags/tags.cpp
+++ b/noatun/library/noatuntags/tags.cpp
@@ -1,6 +1,6 @@
#include "tags.h"
#include "tagsgetter.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqslider.h>
#include <tqspinbox.h>
#include <tdeconfig.h>
diff --git a/noatun/library/player.cpp b/noatun/library/player.cpp
index 0b90952c..5ab2aeba 100644
--- a/noatun/library/player.cpp
+++ b/noatun/library/player.cpp
@@ -7,7 +7,7 @@
#include <klibloader.h>
#include <knotifyclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqfile.h>
enum ArtsPOS { posIdle=0, posPlaying, posPaused };
diff --git a/noatun/library/playlistsaver.cpp b/noatun/library/playlistsaver.cpp
index a187b235..6a49f43f 100644
--- a/noatun/library/playlistsaver.cpp
+++ b/noatun/library/playlistsaver.cpp
@@ -7,7 +7,7 @@
#include "ksaver.h"
#include <ksimpleconfig.h>
#include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqregexp.h>
#include <tqxml.h>
#include <kdebug.h>
diff --git a/noatun/library/pluginloader.cpp b/noatun/library/pluginloader.cpp
index 4ba9ce3d..2fecb898 100644
--- a/noatun/library/pluginloader.cpp
+++ b/noatun/library/pluginloader.cpp
@@ -1,10 +1,10 @@
#include <tqfile.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tqdir.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
#include <knotifyclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
#include <pluginloader.h>
#include <plugin.h>
diff --git a/noatun/library/pluginmodule.cpp b/noatun/library/pluginmodule.cpp
index 72f58c9b..d6b86e86 100644
--- a/noatun/library/pluginmodule.cpp
+++ b/noatun/library/pluginmodule.cpp
@@ -23,8 +23,8 @@
#include <kdebug.h>
#include <kdialog.h>
#include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqtabwidget.h>
#include <tqheader.h>
#include <tqlabel.h>
diff --git a/noatun/library/pref.cpp b/noatun/library/pref.cpp
index 2d30a413..9ed882c5 100644
--- a/noatun/library/pref.cpp
+++ b/noatun/library/pref.cpp
@@ -1,7 +1,7 @@
#include "pref.h"
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kdebug.h>
#include <tqlayout.h>
diff --git a/noatun/library/titleproxy.cpp b/noatun/library/titleproxy.cpp
index 438504eb..65006135 100644
--- a/noatun/library/titleproxy.cpp
+++ b/noatun/library/titleproxy.cpp
@@ -18,7 +18,7 @@ email : markey@web.de
#include "titleproxy.h"
#include <kdebug.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
#include <kmdcodec.h>
#include <tqstring.h>
diff --git a/noatun/library/vequalizer.cpp b/noatun/library/vequalizer.cpp
index f4aa60d6..1275df80 100644
--- a/noatun/library/vequalizer.cpp
+++ b/noatun/library/vequalizer.cpp
@@ -50,11 +50,11 @@
#include <artsflow.h>
#include <soundserver.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tdeio/netaccess.h>
#include <kstandarddirs.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqdom.h>
#include <tqtextstream.h>
diff --git a/noatun/library/video.cpp b/noatun/library/video.cpp
index 2588a811..db6886b3 100644
--- a/noatun/library/video.cpp
+++ b/noatun/library/video.cpp
@@ -10,7 +10,7 @@
#include <tqpopupmenu.h>
#include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "globalvideo.h"
diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp
index 612807ab..12e7169b 100644
--- a/noatun/modules/excellent/userinterface.cpp
+++ b/noatun/modules/excellent/userinterface.cpp
@@ -39,11 +39,11 @@
#include <kbuttonbox.h>
#include <tdeconfig.h>
#include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
-#include <klocale.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
#include <kpixmapeffect.h>
#include <tdepopupmenu.h>
#include <kstatusbar.h>
diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp
index 60792eea..77e832df 100644
--- a/noatun/modules/htmlexport/htmlexport.cpp
+++ b/noatun/modules/htmlexport/htmlexport.cpp
@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqregexp.h>
#include <tqtextcodec.h>
#include <tdeaction.h>
diff --git a/noatun/modules/htmlexport/htmlexport.h b/noatun/modules/htmlexport/htmlexport.h
index d9acd313..c5928ed7 100644
--- a/noatun/modules/htmlexport/htmlexport.h
+++ b/noatun/modules/htmlexport/htmlexport.h
@@ -13,10 +13,10 @@
#include <tqtooltip.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kcolorbutton.h>
#include <tdeio/netaccess.h>
#include <tdeconfig.h>
diff --git a/noatun/modules/infrared/infrared.cpp b/noatun/modules/infrared/infrared.cpp
index 1bfe0aae..bd8a65bd 100644
--- a/noatun/modules/infrared/infrared.cpp
+++ b/noatun/modules/infrared/infrared.cpp
@@ -5,7 +5,7 @@
#include <noatun/player.h>
#include <noatun/app.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqtimer.h>
#include "infrared.h"
diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp
index c3c2c89d..06a1ade4 100644
--- a/noatun/modules/infrared/irprefs.cpp
+++ b/noatun/modules/infrared/irprefs.cpp
@@ -5,7 +5,7 @@
#include <noatun/app.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <tdelistview.h>
#include <kcombobox.h>
diff --git a/noatun/modules/infrared/lirc.cpp b/noatun/modules/infrared/lirc.cpp
index 7278b0ec..2487278b 100644
--- a/noatun/modules/infrared/lirc.cpp
+++ b/noatun/modules/infrared/lirc.cpp
@@ -7,8 +7,8 @@
#include <tqsocket.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "lirc.h"
diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp
index 08af1b28..5e2193c7 100644
--- a/noatun/modules/kaiman/pref.cpp
+++ b/noatun/modules/kaiman/pref.cpp
@@ -16,13 +16,13 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqlabel.h>
#include <tdelistbox.h>
#include <tqdir.h>
#include <tqfileinfo.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <kstandarddirs.h>
#include <tdeconfig.h>
diff --git a/noatun/modules/kaiman/style.cpp b/noatun/modules/kaiman/style.cpp
index 903660dd..2c318154 100644
--- a/noatun/modules/kaiman/style.cpp
+++ b/noatun/modules/kaiman/style.cpp
@@ -20,13 +20,13 @@
#include <tdeapplication.h>
#include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqfile.h>
#include <tqtextstream.h>
#include <tqpainter.h>
#include <tqdropsite.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurldrag.h>
#include <tqtimer.h>
diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp
index 36a41281..9f502178 100644
--- a/noatun/modules/kaiman/userinterface.cpp
+++ b/noatun/modules/kaiman/userinterface.cpp
@@ -42,12 +42,12 @@
#include <kdebug.h>
#include <tdeapplication.h>
#include <twin.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <tdepopupmenu.h>
#include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeio/netaccess.h>
#include <kurldrag.h>
diff --git a/noatun/modules/keyz/keyz.cpp b/noatun/modules/keyz/keyz.cpp
index 3a3bb547..420ccd01 100644
--- a/noatun/modules/keyz/keyz.cpp
+++ b/noatun/modules/keyz/keyz.cpp
@@ -7,7 +7,7 @@
#include <kglobalaccel.h>
#include <kkeydialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqclipboard.h>
#include "keyz.h"
diff --git a/noatun/modules/kjofol-skin/kjbutton.cpp b/noatun/modules/kjofol-skin/kjbutton.cpp
index d027217c..306a82fc 100644
--- a/noatun/modules/kjofol-skin/kjbutton.cpp
+++ b/noatun/modules/kjofol-skin/kjbutton.cpp
@@ -18,7 +18,7 @@
#include <tqcursor.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpixmap.h>
#include <kpixmapeffect.h>
#include <kurl.h>
diff --git a/noatun/modules/kjofol-skin/kjfont.cpp b/noatun/modules/kjofol-skin/kjfont.cpp
index 7d5a967f..f48010b6 100644
--- a/noatun/modules/kjofol-skin/kjfont.cpp
+++ b/noatun/modules/kjofol-skin/kjfont.cpp
@@ -14,7 +14,7 @@
#include "kjprefs.h"
#include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tqimage.h>
#include <tqpainter.h>
diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp
index 67bf516c..9db30363 100644
--- a/noatun/modules/kjofol-skin/kjloader.cpp
+++ b/noatun/modules/kjofol-skin/kjloader.cpp
@@ -58,9 +58,9 @@
#include <khelpmenu.h>
#include <kstdaction.h>
#include <tdepopupmenu.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <knotifyclient.h>
#include <kpixmapeffect.h>
diff --git a/noatun/modules/kjofol-skin/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp
index 20ff7750..cb341ea3 100644
--- a/noatun/modules/kjofol-skin/kjprefs.cpp
+++ b/noatun/modules/kjofol-skin/kjprefs.cpp
@@ -31,15 +31,15 @@
#include <knuminput.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeio/job.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kmimemagic.h>
#include <knotifyclient.h>
#include <kprocess.h>
#include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdefontcombo.h>
#include <kcolorcombo.h>
diff --git a/noatun/modules/kjofol-skin/kjsliders.cpp b/noatun/modules/kjofol-skin/kjsliders.cpp
index eaba2e76..d570249e 100644
--- a/noatun/modules/kjofol-skin/kjsliders.cpp
+++ b/noatun/modules/kjofol-skin/kjsliders.cpp
@@ -15,7 +15,7 @@
#include "helpers.cpp"
// kde includes
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
// arts-includes, needed for pitch
diff --git a/noatun/modules/kjofol-skin/kjtextdisplay.cpp b/noatun/modules/kjofol-skin/kjtextdisplay.cpp
index 7bacbb13..e75613d2 100644
--- a/noatun/modules/kjofol-skin/kjtextdisplay.cpp
+++ b/noatun/modules/kjofol-skin/kjtextdisplay.cpp
@@ -14,7 +14,7 @@
#include "kjprefs.h"
// kde includes
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kpixmap.h>
#include <kurl.h>
diff --git a/noatun/modules/kjofol-skin/kjvis.cpp b/noatun/modules/kjofol-skin/kjvis.cpp
index 527fb673..a7873fe1 100644
--- a/noatun/modules/kjofol-skin/kjvis.cpp
+++ b/noatun/modules/kjofol-skin/kjvis.cpp
@@ -18,7 +18,7 @@
//kde includes
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <kpixmapeffect.h>
#include <kpixmap.h>
diff --git a/noatun/modules/marquis/marquis.cpp b/noatun/modules/marquis/marquis.cpp
index f1f46ae8..f7a6e5ff 100644
--- a/noatun/modules/marquis/marquis.cpp
+++ b/noatun/modules/marquis/marquis.cpp
@@ -29,8 +29,8 @@
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <noatun/pluginloader.h>
#include "marquis.h"
#include <noatun/player.h>
diff --git a/noatun/modules/metatag/edit.cpp b/noatun/modules/metatag/edit.cpp
index c354e96e..e520320c 100644
--- a/noatun/modules/metatag/edit.cpp
+++ b/noatun/modules/metatag/edit.cpp
@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <klineedit.h>
#include <tqlabel.h>
diff --git a/noatun/modules/metatag/metatag.cpp b/noatun/modules/metatag/metatag.cpp
index c6fc8f92..801ddf0f 100644
--- a/noatun/modules/metatag/metatag.cpp
+++ b/noatun/modules/metatag/metatag.cpp
@@ -12,9 +12,9 @@
#include <tqlayout.h>
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <klineedit.h>
#include <tdeconfig.h>
#include <tdeaction.h>
diff --git a/noatun/modules/monoscope/monoscope.cpp b/noatun/modules/monoscope/monoscope.cpp
index a66cbbde..7ab51333 100644
--- a/noatun/modules/monoscope/monoscope.cpp
+++ b/noatun/modules/monoscope/monoscope.cpp
@@ -5,7 +5,7 @@
#include <tqpainter.h>
#include <tdeactionclasses.h>
#include <noatun/stdaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
extern "C"
{
diff --git a/noatun/modules/noatunui/userinterface.cpp b/noatun/modules/noatunui/userinterface.cpp
index 07d3ec7b..1919fade 100644
--- a/noatun/modules/noatunui/userinterface.cpp
+++ b/noatun/modules/noatunui/userinterface.cpp
@@ -21,8 +21,8 @@
#include <tdepopupmenu.h>
#include <kstatusbar.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kurldrag.h>
#include <tdefiledialog.h>
diff --git a/noatun/modules/simple/propertiesdialog.ui.h b/noatun/modules/simple/propertiesdialog.ui.h
index 5a3953c8..bae647f6 100644
--- a/noatun/modules/simple/propertiesdialog.ui.h
+++ b/noatun/modules/simple/propertiesdialog.ui.h
@@ -8,7 +8,7 @@
version 2.1 of the License, or (at your option) any later version.
*/
-#include <klocale.h>
+#include <tdelocale.h>
void PropertiesDialog::setPlayObject( PlaylistItem pi, Arts::PlayObject po )
{
diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp
index ebac7ce7..c600338d 100644
--- a/noatun/modules/simple/userinterface.cpp
+++ b/noatun/modules/simple/userinterface.cpp
@@ -18,12 +18,12 @@
#include <noatun/stdaction.h>
#include <tdeconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurldrag.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <tdepopupmenu.h>
#include <kstatusbar.h>
#include <kstdaction.h>
diff --git a/noatun/modules/splitplaylist/find.cpp b/noatun/modules/splitplaylist/find.cpp
index 5d378a79..0a97131c 100644
--- a/noatun/modules/splitplaylist/find.cpp
+++ b/noatun/modules/splitplaylist/find.cpp
@@ -3,7 +3,7 @@
#include <kcombobox.h>
#include <tqpushbutton.h>
#include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
Finder::Finder(TQWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), Close | User1, User1, false, KGuiItem(i18n("&Find"),"find"))
{
diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp
index 8c34e254..b7257505 100644
--- a/noatun/modules/splitplaylist/view.cpp
+++ b/noatun/modules/splitplaylist/view.cpp
@@ -24,14 +24,14 @@
#include <tdefileitem.h>
#include <tdeio/job.h>
#include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmenubar.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
#include <kstdaction.h>
#include <kedittoolbar.h>
#include <kurldrag.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <noatun/app.h>
#include <noatun/player.h>
diff --git a/noatun/modules/systray/cmodule.cpp b/noatun/modules/systray/cmodule.cpp
index c0e04fd3..0ed5e232 100644
--- a/noatun/modules/systray/cmodule.cpp
+++ b/noatun/modules/systray/cmodule.cpp
@@ -28,8 +28,8 @@
#include "yhconfigwidget.h"
#include <kdebug.h>
-//#include <kglobal.h>
-#include <klocale.h>
+//#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tqbuttongroup.h>
#include <tqcheckbox.h>
#include <tqcombobox.h>
diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp
index 3ef8841c..7f7cf7dc 100644
--- a/noatun/modules/systray/systray.cpp
+++ b/noatun/modules/systray/systray.cpp
@@ -41,9 +41,9 @@
#include <tdeaction.h>
#include <tdeconfig.h>
#include <tqfile.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpassivepopup.h>
#include <kpixmapeffect.h>
#include <kstdaction.h>
@@ -61,7 +61,7 @@
#include <kstandarddirs.h>
#include <netwm.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
// TODO: Maybe make this value configurable?
const int COVER_MAXW = 128;
diff --git a/noatun/modules/voiceprint/prefs.cpp b/noatun/modules/voiceprint/prefs.cpp
index e80de081..c716a312 100644
--- a/noatun/modules/voiceprint/prefs.cpp
+++ b/noatun/modules/voiceprint/prefs.cpp
@@ -1,8 +1,8 @@
#include "prefs.h"
#include "voiceprint.h"
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <kcolorbutton.h>
diff --git a/noatun/modules/voiceprint/voiceprint.cpp b/noatun/modules/voiceprint/voiceprint.cpp
index 0cfcb264..c0b1c859 100644
--- a/noatun/modules/voiceprint/voiceprint.cpp
+++ b/noatun/modules/voiceprint/voiceprint.cpp
@@ -4,7 +4,7 @@
#include <math.h>
#include <tqpainter.h>
#include "prefs.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <stdio.h>
extern "C"
diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.cpp b/noatun/modules/winskin/guiSpectrumAnalyser.cpp
index 0d2978ee..ee01777a 100644
--- a/noatun/modules/winskin/guiSpectrumAnalyser.cpp
+++ b/noatun/modules/winskin/guiSpectrumAnalyser.cpp
@@ -11,7 +11,7 @@
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqcolor.h>
#include <tqpopupmenu.h>
#include <tqpainter.h>
diff --git a/noatun/modules/winskin/plugin.cpp b/noatun/modules/winskin/plugin.cpp
index 8890c515..8be9cc77 100644
--- a/noatun/modules/winskin/plugin.cpp
+++ b/noatun/modules/winskin/plugin.cpp
@@ -1,5 +1,5 @@
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include "winSkinConfig.h"
#include "waSkin.h"
diff --git a/noatun/modules/winskin/waDigit.cpp b/noatun/modules/winskin/waDigit.cpp
index 75a89b7e..8e53c45f 100644
--- a/noatun/modules/winskin/waDigit.cpp
+++ b/noatun/modules/winskin/waDigit.cpp
@@ -16,7 +16,7 @@
#include "waSkinModel.h"
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
WaDigit::WaDigit() : WaWidget(_WA_MAPPING_DIGITS)
{
diff --git a/noatun/modules/winskin/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp
index b17c308d..25c088e3 100644
--- a/noatun/modules/winskin/waInfo.cpp
+++ b/noatun/modules/winskin/waInfo.cpp
@@ -18,7 +18,7 @@
#include <stdlib.h>
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "waInfo.h"
#include "waSkinModel.h"
diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp
index 845773b0..41770cbd 100644
--- a/noatun/modules/winskin/waSkin.cpp
+++ b/noatun/modules/winskin/waSkin.cpp
@@ -13,8 +13,8 @@
#include <tdeconfig.h>
#include <tqstringlist.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <khelpmenu.h>
#include <tdepopupmenu.h>
diff --git a/noatun/modules/winskin/waSkinManager.cpp b/noatun/modules/winskin/waSkinManager.cpp
index 8230feba..3363292c 100644
--- a/noatun/modules/winskin/waSkinManager.cpp
+++ b/noatun/modules/winskin/waSkinManager.cpp
@@ -1,4 +1,4 @@
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tqfileinfo.h>
#include <tqregexp.h>
#include <kstandarddirs.h>
diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp
index 667cf81f..c7dad1ae 100644
--- a/noatun/modules/winskin/winSkinConfig.cpp
+++ b/noatun/modules/winskin/winSkinConfig.cpp
@@ -1,18 +1,18 @@
#include <noatun/pref.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqpushbutton.h>
#include <tqlayout.h>
#include <tqlabel.h>
#include <tqpixmap.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <tqslider.h>
#include <tqframe.h>
#include <tqstringlist.h>
#include <tdefile.h>
#include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kurlrequester.h>
#include <kurlrequesterdlg.h>
diff --git a/tdefile-plugins/au/tdefile_au.cpp b/tdefile-plugins/au/tdefile_au.cpp
index 0b0b86f6..296a91d7 100644
--- a/tdefile-plugins/au/tdefile_au.cpp
+++ b/tdefile-plugins/au/tdefile_au.cpp
@@ -21,7 +21,7 @@
#include "tdefile_au.h"
#include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgenericfactory.h>
#include <kstringvalidator.h>
#include <kdebug.h>
diff --git a/tdefile-plugins/avi/tdefile_avi.cpp b/tdefile-plugins/avi/tdefile_avi.cpp
index b1c832bd..03866369 100644
--- a/tdefile-plugins/avi/tdefile_avi.cpp
+++ b/tdefile-plugins/avi/tdefile_avi.cpp
@@ -22,7 +22,7 @@
#include "tdefile_avi.h"
#include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgenericfactory.h>
#include <kstringvalidator.h>
#include <kdebug.h>
diff --git a/tdefile-plugins/flac/tdefile_flac.cpp b/tdefile-plugins/flac/tdefile_flac.cpp
index b7030998..85d52068 100644
--- a/tdefile-plugins/flac/tdefile_flac.cpp
+++ b/tdefile-plugins/flac/tdefile_flac.cpp
@@ -33,7 +33,7 @@
#include <kdebug.h>
#include <kurl.h>
#include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgenericfactory.h>
#include <ksavefile.h>
diff --git a/tdefile-plugins/m3u/tdefile_m3u.cpp b/tdefile-plugins/m3u/tdefile_m3u.cpp
index a25234e8..7e0aad18 100644
--- a/tdefile-plugins/m3u/tdefile_m3u.cpp
+++ b/tdefile-plugins/m3u/tdefile_m3u.cpp
@@ -23,7 +23,7 @@
#include <kdebug.h>
#include <kurl.h>
#include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgenericfactory.h>
#include <tqcstring.h>
diff --git a/tdefile-plugins/mp3/tdefile_mp3.cpp b/tdefile-plugins/mp3/tdefile_mp3.cpp
index ccabd079..2d0e0022 100644
--- a/tdefile-plugins/mp3/tdefile_mp3.cpp
+++ b/tdefile-plugins/mp3/tdefile_mp3.cpp
@@ -23,7 +23,7 @@
#include "tdefile_mp3.h"
#include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgenericfactory.h>
#include <kstringvalidator.h>
#include <kdebug.h>
diff --git a/tdefile-plugins/mpc/tdefile_mpc.cpp b/tdefile-plugins/mpc/tdefile_mpc.cpp
index bc4828fd..9a6a3d42 100644
--- a/tdefile-plugins/mpc/tdefile_mpc.cpp
+++ b/tdefile-plugins/mpc/tdefile_mpc.cpp
@@ -33,7 +33,7 @@
#include <kdebug.h>
#include <kurl.h>
#include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgenericfactory.h>
#include <ksavefile.h>
diff --git a/tdefile-plugins/mpeg/tdefile_mpeg.cpp b/tdefile-plugins/mpeg/tdefile_mpeg.cpp
index fd015422..f32c1576 100644
--- a/tdefile-plugins/mpeg/tdefile_mpeg.cpp
+++ b/tdefile-plugins/mpeg/tdefile_mpeg.cpp
@@ -25,7 +25,7 @@
#include "tdefile_mpeg.h"
#include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgenericfactory.h>
#include <kstringvalidator.h>
#include <kdebug.h>
diff --git a/tdefile-plugins/ogg/tdefile_ogg.cpp b/tdefile-plugins/ogg/tdefile_ogg.cpp
index b141acb1..bf1cbf94 100644
--- a/tdefile-plugins/ogg/tdefile_ogg.cpp
+++ b/tdefile-plugins/ogg/tdefile_ogg.cpp
@@ -31,7 +31,7 @@
#include <kdebug.h>
#include <kurl.h>
#include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgenericfactory.h>
#include <ksavefile.h>
diff --git a/tdefile-plugins/sid/tdefile_sid.cpp b/tdefile-plugins/sid/tdefile_sid.cpp
index 543d5b87..b0d61459 100644
--- a/tdefile-plugins/sid/tdefile_sid.cpp
+++ b/tdefile-plugins/sid/tdefile_sid.cpp
@@ -18,7 +18,7 @@
#include "tdefile_sid.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgenericfactory.h>
#include <kstringvalidator.h>
#include <kdebug.h>
diff --git a/tdefile-plugins/theora/tdefile_theora.cpp b/tdefile-plugins/theora/tdefile_theora.cpp
index 20e4e337..5c8fadb2 100644
--- a/tdefile-plugins/theora/tdefile_theora.cpp
+++ b/tdefile-plugins/theora/tdefile_theora.cpp
@@ -23,7 +23,7 @@
#include "tdefile_theora.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgenericfactory.h>
#include "theora/theora.h"
diff --git a/tdefile-plugins/wav/tdefile_wav.cpp b/tdefile-plugins/wav/tdefile_wav.cpp
index 1c1f61ad..d0057b42 100644
--- a/tdefile-plugins/wav/tdefile_wav.cpp
+++ b/tdefile-plugins/wav/tdefile_wav.cpp
@@ -21,7 +21,7 @@
#include "tdefile_wav.h"
#include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgenericfactory.h>
#include <kstringvalidator.h>
#include <kdebug.h>
diff --git a/tdeioslave/audiocd/audiocd.cpp b/tdeioslave/audiocd/audiocd.cpp
index 2366847b..5d1e54a8 100644
--- a/tdeioslave/audiocd/audiocd.cpp
+++ b/tdeioslave/audiocd/audiocd.cpp
@@ -49,7 +49,7 @@ extern "C"
#include <tdecmdlineargs.h>
#include <kdebug.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqregexp.h>
// CDDB
diff --git a/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp b/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
index bd1e721f..2287b668 100644
--- a/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
+++ b/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
@@ -18,7 +18,7 @@
#include <tdeconfig.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqcheckbox.h>
#include <tqcombobox.h>
diff --git a/tdeioslave/audiocd/plugins/lame/encoderlame.cpp b/tdeioslave/audiocd/plugins/lame/encoderlame.cpp
index 509e1c39..0e2ddef3 100644
--- a/tdeioslave/audiocd/plugins/lame/encoderlame.cpp
+++ b/tdeioslave/audiocd/plugins/lame/encoderlame.cpp
@@ -27,11 +27,11 @@
#include <kprocess.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <tqfileinfo.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kstandarddirs.h>
#include "collectingprocess.h"
diff --git a/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp b/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp
index f1a5bad5..5507b6f2 100644
--- a/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp
+++ b/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp
@@ -35,8 +35,8 @@
#include <knuminput.h>
#include <tqgroupbox.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
extern "C"
{
diff --git a/tdemid/channel.cpp b/tdemid/channel.cpp
index c97ea5c9..6b8e23cf 100644
--- a/tdemid/channel.cpp
+++ b/tdemid/channel.cpp
@@ -28,10 +28,10 @@
#include <tqpainter.h>
#include <tqcombobox.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kinstance.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include "tdemidbutton.h"
diff --git a/tdemid/channelcfgdlg.cpp b/tdemid/channelcfgdlg.cpp
index 7dee1dbb..e55aaa58 100644
--- a/tdemid/channelcfgdlg.cpp
+++ b/tdemid/channelcfgdlg.cpp
@@ -4,7 +4,7 @@
#include <kdialogbase.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "channelview.h"
#include "channelcfgdlg.h"
diff --git a/tdemid/channelview.cpp b/tdemid/channelview.cpp
index b2108e41..50a88f24 100644
--- a/tdemid/channelview.cpp
+++ b/tdemid/channelview.cpp
@@ -23,7 +23,7 @@
***************************************************************************/
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "channelview.h"
#include "channel3d.h"
diff --git a/tdemid/collectdlg.cpp b/tdemid/collectdlg.cpp
index 8cbe6624..4df74df7 100644
--- a/tdemid/collectdlg.cpp
+++ b/tdemid/collectdlg.cpp
@@ -27,9 +27,9 @@
#include <tdeapplication.h>
#include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kurl.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
diff --git a/tdemid/kdisptext.cpp b/tdemid/kdisptext.cpp
index 3152a277..d701ccb4 100644
--- a/tdemid/kdisptext.cpp
+++ b/tdemid/kdisptext.cpp
@@ -29,10 +29,10 @@
#include <tqtextcodec.h>
#include <tdeconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "version.h"
diff --git a/tdemid/main.cpp b/tdemid/main.cpp
index 10460e04..78fdaf94 100644
--- a/tdemid/main.cpp
+++ b/tdemid/main.cpp
@@ -29,7 +29,7 @@
#include <tqtextcodec.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeio/job.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
diff --git a/tdemid/midicfgdlg.cpp b/tdemid/midicfgdlg.cpp
index c6741f87..446f7e03 100644
--- a/tdemid/midicfgdlg.cpp
+++ b/tdemid/midicfgdlg.cpp
@@ -28,13 +28,13 @@
#include <tdeapplication.h>
#include <tdefiledialog.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <libtdemid/deviceman.h>
#include "midicfgdlg.h"
#include "version.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
MidiConfigDialog::MidiConfigDialog(DeviceManager *dm,
diff --git a/tdemid/slman.cpp b/tdemid/slman.cpp
index 39b10ca2..ca441850 100644
--- a/tdemid/slman.cpp
+++ b/tdemid/slman.cpp
@@ -26,7 +26,7 @@
#include <stdio.h>
#include <string.h>
#include "version.h"
-#include <klocale.h>
+#include <tdelocale.h>
SLManager::SLManager()
{
diff --git a/tdemid/tdemid_part.cpp b/tdemid/tdemid_part.cpp
index bcfe054c..13a977e8 100644
--- a/tdemid/tdemid_part.cpp
+++ b/tdemid/tdemid_part.cpp
@@ -2,7 +2,7 @@
#include <kinstance.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutdata.h>
#include <tdeaction.h>
#include <tqiconset.h>
diff --git a/tdemid/tdemidclient.cpp b/tdemid/tdemidclient.cpp
index 958c38c6..fa59e749 100644
--- a/tdemid/tdemidclient.cpp
+++ b/tdemid/tdemidclient.cpp
@@ -40,9 +40,9 @@
#include <tdeapplication.h>
#include <kcharsets.h>
#include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kurl.h>
#include <tdeaction.h>
diff --git a/tdemid/tdemidframe.cpp b/tdemid/tdemidframe.cpp
index feeb0ab8..870a1db1 100644
--- a/tdemid/tdemidframe.cpp
+++ b/tdemid/tdemidframe.cpp
@@ -37,10 +37,10 @@
#include <tdecmdlineargs.h>
#include <tdefiledialog.h>
#include <tdefontdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdetoolbar.h>
#include <kurl.h>
#include <kdebug.h>
diff --git a/tdemid/tdemidframe.h b/tdemid/tdemidframe.h
index 2ce5226e..fe8c5aef 100644
--- a/tdemid/tdemidframe.h
+++ b/tdemid/tdemidframe.h
@@ -25,7 +25,7 @@
#define _KMIDFRAME_H
#include <tdemainwindow.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <libtdemid/midiout.h>
#include <libtdemid/player.h>
#include <libtdemid/track.h>