diff options
Diffstat (limited to 'noatun')
56 files changed, 95 insertions, 95 deletions
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> |