diff options
49 files changed, 81 insertions, 81 deletions
diff --git a/kaffeine/src/input/audiobrowser/googlefetcher.cpp b/kaffeine/src/input/audiobrowser/googlefetcher.cpp index fafd8d6..781c501 100644 --- a/kaffeine/src/input/audiobrowser/googlefetcher.cpp +++ b/kaffeine/src/input/audiobrowser/googlefetcher.cpp @@ -27,7 +27,7 @@ #include <tdehtml_part.h> -#include <klocale.h> +#include <tdelocale.h> #include <kinputdialog.h> #include <kurl.h> #include <tdeio/netaccess.h> diff --git a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp index b3bf475..40e5804 100644 --- a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp +++ b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp @@ -20,9 +20,9 @@ #include <tdeapplication.h> #include <tdeio/netaccess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kcombobox.h> #include <tqhbox.h> diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp index 8a15d70..c3e42db 100644 --- a/kaffeine/src/input/audiobrowser/playlist.cpp +++ b/kaffeine/src/input/audiobrowser/playlist.cpp @@ -21,14 +21,14 @@ #include <krandomsequence.h> #include <tdeapplication.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kmimetype.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeio/netaccess.h> #include <tdeio/job.h> #include <kprogress.h> diff --git a/kaffeine/src/input/audiobrowser/playlist.h b/kaffeine/src/input/audiobrowser/playlist.h index 63aab68..4d6df08 100644 --- a/kaffeine/src/input/audiobrowser/playlist.h +++ b/kaffeine/src/input/audiobrowser/playlist.h @@ -23,7 +23,7 @@ #define PLAYLIST_H #include <kdialogbase.h> -#include <kdiroperator.h> +#include <tdediroperator.h> #include <tdefileiconview.h> #include <tdeaction.h> #include <kstdaction.h> diff --git a/kaffeine/src/input/audiobrowser/urllistview.cpp b/kaffeine/src/input/audiobrowser/urllistview.cpp index a5d19bb..73dda50 100644 --- a/kaffeine/src/input/audiobrowser/urllistview.cpp +++ b/kaffeine/src/input/audiobrowser/urllistview.cpp @@ -18,13 +18,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <kurl.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdefiledialog.h> #include <tdepopupmenu.h> diff --git a/kaffeine/src/input/disc/cddb.cpp b/kaffeine/src/input/disc/cddb.cpp index b61bfca..ccd8007 100644 --- a/kaffeine/src/input/disc/cddb.cpp +++ b/kaffeine/src/input/disc/cddb.cpp @@ -33,7 +33,7 @@ #include <kdebug.h> #include <ksock.h> #include <kextsock.h> -#include <klocale.h> +#include <tdelocale.h> #include <kinputdialog.h> #include "cddb.h" diff --git a/kaffeine/src/input/disc/disc.cpp b/kaffeine/src/input/disc/disc.cpp index 97bbfbc..5a340cb 100644 --- a/kaffeine/src/input/disc/disc.cpp +++ b/kaffeine/src/input/disc/disc.cpp @@ -28,9 +28,9 @@ #include <tqpopupmenu.h> #include <tqapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeaction.h> #include <kstdaction.h> #include <kdebug.h> diff --git a/kaffeine/src/input/disc/paranoia.cpp b/kaffeine/src/input/disc/paranoia.cpp index 1145129..1e3722f 100644 --- a/kaffeine/src/input/disc/paranoia.cpp +++ b/kaffeine/src/input/disc/paranoia.cpp @@ -36,8 +36,8 @@ #include <tqcombobox.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kdebug.h> #include <ktrader.h> #include <kpushbutton.h> diff --git a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp index 47b956d..ad671dd 100644 --- a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp +++ b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp @@ -22,7 +22,7 @@ #include <tqcheckbox.h> #include <tdeparts/genericfactory.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kpushbutton.h> diff --git a/kaffeine/src/input/dvb/audioeditor.cpp b/kaffeine/src/input/dvb/audioeditor.cpp index c9bb391..d6dab15 100644 --- a/kaffeine/src/input/dvb/audioeditor.cpp +++ b/kaffeine/src/input/dvb/audioeditor.cpp @@ -24,8 +24,8 @@ #include <tqlineedit.h> #include <tqcheckbox.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include "audioeditor.h" diff --git a/kaffeine/src/input/dvb/broadcasteditor.cpp b/kaffeine/src/input/dvb/broadcasteditor.cpp index 2dc350e..9e2db76 100644 --- a/kaffeine/src/input/dvb/broadcasteditor.cpp +++ b/kaffeine/src/input/dvb/broadcasteditor.cpp @@ -23,7 +23,7 @@ #include <kpushbutton.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include "broadcasteditor.h" diff --git a/kaffeine/src/input/dvb/channeleditor.cpp b/kaffeine/src/input/dvb/channeleditor.cpp index e87e171..18658ae 100644 --- a/kaffeine/src/input/dvb/channeleditor.cpp +++ b/kaffeine/src/input/dvb/channeleditor.cpp @@ -27,8 +27,8 @@ #include <tqlineedit.h> #include <tqpushbutton.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "channeleditor.h" #include "audioeditor.h" diff --git a/kaffeine/src/input/dvb/crontimer.cpp b/kaffeine/src/input/dvb/crontimer.cpp index b32d7c4..91a0abf 100644 --- a/kaffeine/src/input/dvb/crontimer.cpp +++ b/kaffeine/src/input/dvb/crontimer.cpp @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kpushbutton.h> diff --git a/kaffeine/src/input/dvb/dvbconfig.cpp b/kaffeine/src/input/dvb/dvbconfig.cpp index 0489d13..9e15e36 100644 --- a/kaffeine/src/input/dvb/dvbconfig.cpp +++ b/kaffeine/src/input/dvb/dvbconfig.cpp @@ -29,9 +29,9 @@ #include <tqregexp.h> #include <tqradiobutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> #include <ktar.h> #include <kstandarddirs.h> diff --git a/kaffeine/src/input/dvb/dvbevents.cpp b/kaffeine/src/input/dvb/dvbevents.cpp index 8db5006..df14b43 100644 --- a/kaffeine/src/input/dvb/dvbevents.cpp +++ b/kaffeine/src/input/dvb/dvbevents.cpp @@ -26,7 +26,7 @@ #include <tqdatetime.h> #include <tqfile.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <ktrader.h> #include <tdeparts/componentfactory.h> diff --git a/kaffeine/src/input/dvb/dvbpanel.cpp b/kaffeine/src/input/dvb/dvbpanel.cpp index dedce60..d6a6727 100644 --- a/kaffeine/src/input/dvb/dvbpanel.cpp +++ b/kaffeine/src/input/dvb/dvbpanel.cpp @@ -33,8 +33,8 @@ #include <tqmap.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kinputdialog.h> #include <kicondialog.h> diff --git a/kaffeine/src/input/dvb/dvbstream.cpp b/kaffeine/src/input/dvb/dvbstream.cpp index 62f45d6..d4149a8 100644 --- a/kaffeine/src/input/dvb/dvbstream.cpp +++ b/kaffeine/src/input/dvb/dvbstream.cpp @@ -41,9 +41,9 @@ #include <tqdir.h> #include <tqprogressdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "dvbstream.h" #include "dvbevents.h" diff --git a/kaffeine/src/input/dvb/kevents.cpp b/kaffeine/src/input/dvb/kevents.cpp index 7d0b704..adc8170 100644 --- a/kaffeine/src/input/dvb/kevents.cpp +++ b/kaffeine/src/input/dvb/kevents.cpp @@ -27,7 +27,7 @@ #include <tqcheckbox.h> #include <tqtooltip.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include "kevents.h" diff --git a/kaffeine/src/input/dvb/krecord.cpp b/kaffeine/src/input/dvb/krecord.cpp index c2b000e..587f701 100644 --- a/kaffeine/src/input/dvb/krecord.cpp +++ b/kaffeine/src/input/dvb/krecord.cpp @@ -24,9 +24,9 @@ #include <tqdir.h> #include <tqframe.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "krecord.h" diff --git a/kaffeine/src/input/dvb/ktimereditor.cpp b/kaffeine/src/input/dvb/ktimereditor.cpp index 1db3825..6cb365e 100644 --- a/kaffeine/src/input/dvb/ktimereditor.cpp +++ b/kaffeine/src/input/dvb/ktimereditor.cpp @@ -21,9 +21,9 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "ktimereditor.h" diff --git a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp index ea00f76..af83da8 100644 --- a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp +++ b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp @@ -26,7 +26,7 @@ #include <tqdatetime.h> #include <tqfile.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include "kaffeinedvbevents.h" diff --git a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp index 3c49848..a00b9a5 100644 --- a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp +++ b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp @@ -29,7 +29,7 @@ #include <time.h> #include <iconv.h> -#include <klocale.h> +#include <tdelocale.h> #include "kaffeinedvbsection.h" diff --git a/kaffeine/src/input/dvb/scandialog.cpp b/kaffeine/src/input/dvb/scandialog.cpp index 44a2abb..31de9ee 100644 --- a/kaffeine/src/input/dvb/scandialog.cpp +++ b/kaffeine/src/input/dvb/scandialog.cpp @@ -31,9 +31,9 @@ #include <tqapplication.h> #include <tqaccel.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "scandialog.h" #include "channeleditor.h" diff --git a/kaffeine/src/input/dvb/sender.cpp b/kaffeine/src/input/dvb/sender.cpp index f829f1a..5f1ed6e 100644 --- a/kaffeine/src/input/dvb/sender.cpp +++ b/kaffeine/src/input/dvb/sender.cpp @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include "sender.h" diff --git a/kaffeine/src/input/dvb/subeditor.cpp b/kaffeine/src/input/dvb/subeditor.cpp index 3995ee3..34815f4 100644 --- a/kaffeine/src/input/dvb/subeditor.cpp +++ b/kaffeine/src/input/dvb/subeditor.cpp @@ -24,8 +24,8 @@ #include <tqlineedit.h> #include <tqcheckbox.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include "subeditor.h" diff --git a/kaffeine/src/input/dvb/ts2rtp.cpp b/kaffeine/src/input/dvb/ts2rtp.cpp index c216da0..c505ae2 100644 --- a/kaffeine/src/input/dvb/ts2rtp.cpp +++ b/kaffeine/src/input/dvb/ts2rtp.cpp @@ -23,8 +23,8 @@ #include <sys/time.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include "ts2rtp.h" #include "gdvb.h" diff --git a/kaffeine/src/input/dvbclient/cddump.cpp b/kaffeine/src/input/dvbclient/cddump.cpp index 1225768..210c72b 100644 --- a/kaffeine/src/input/dvbclient/cddump.cpp +++ b/kaffeine/src/input/dvbclient/cddump.cpp @@ -21,9 +21,9 @@ #include <fcntl.h> #include <unistd.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "cddump.h" diff --git a/kaffeine/src/input/dvbclient/cdlisten.cpp b/kaffeine/src/input/dvbclient/cdlisten.cpp index 2493d11..96fed0e 100644 --- a/kaffeine/src/input/dvbclient/cdlisten.cpp +++ b/kaffeine/src/input/dvbclient/cdlisten.cpp @@ -20,8 +20,8 @@ #include <unistd.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include "cdlisten.h" diff --git a/kaffeine/src/input/dvbclient/cdwidget.cpp b/kaffeine/src/input/dvbclient/cdwidget.cpp index f3d905f..9046601 100644 --- a/kaffeine/src/input/dvbclient/cdwidget.cpp +++ b/kaffeine/src/input/dvbclient/cdwidget.cpp @@ -23,7 +23,7 @@ #include <tqdir.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include "cdwidget.h" diff --git a/kaffeine/src/inputmanager.cpp b/kaffeine/src/inputmanager.cpp index 56e0d74..34cc50a 100644 --- a/kaffeine/src/inputmanager.cpp +++ b/kaffeine/src/inputmanager.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <kurldrag.h> #include <kkeydialog.h> -#include <klocale.h> +#include <tdelocale.h> #include "tdemultitabbar.h" #include "kaffeine.h" diff --git a/kaffeine/src/instwizard.cpp b/kaffeine/src/instwizard.cpp index af17236..0acf9d8 100644 --- a/kaffeine/src/instwizard.cpp +++ b/kaffeine/src/instwizard.cpp @@ -22,10 +22,10 @@ #include <config.h> #endif -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kprocess.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <ktextbrowser.h> #include <kservice.h> diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp index d7b101d..ca4b946 100644 --- a/kaffeine/src/kaffeine.cpp +++ b/kaffeine/src/kaffeine.cpp @@ -37,15 +37,15 @@ #include <kstdaction.h> #include <klibloader.h> #include <tdeparts/componentfactory.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstatusbar.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <kcombobox.h> #include <tdepopupmenu.h> #include <ktabbar.h> #include <twin.h> #include <ktrader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kprocess.h> #include <kstandarddirs.h> diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp index 82112ce..cee06e4 100644 --- a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp +++ b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp @@ -25,7 +25,7 @@ #include <tdeparts/genericfactory.h> #include <tdeaction.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kxmlguifactory.h> #include <tdetoolbar.h> diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp index 9f47172..3b0a294 100644 --- a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp +++ b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp @@ -21,9 +21,9 @@ #include <kcombobox.h> #include <klineedit.h> #include <kseparator.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqlabel.h> diff --git a/kaffeine/src/player-parts/gstreamer-part/timer.cpp b/kaffeine/src/player-parts/gstreamer-part/timer.cpp index 0002fa2..04be9b7 100644 --- a/kaffeine/src/player-parts/gstreamer-part/timer.cpp +++ b/kaffeine/src/player-parts/gstreamer-part/timer.cpp @@ -25,7 +25,7 @@ #include <config.h> #endif -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqslider.h> diff --git a/kaffeine/src/player-parts/gstreamer-part/video.cpp b/kaffeine/src/player-parts/gstreamer-part/video.cpp index f43e0fc..ecca253 100644 --- a/kaffeine/src/player-parts/gstreamer-part/video.cpp +++ b/kaffeine/src/player-parts/gstreamer-part/video.cpp @@ -31,7 +31,7 @@ #include <kstatusbar.h> #include <tdetoolbar.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <kdebug.h> #include <gst/interfaces/xoverlay.h> diff --git a/kaffeine/src/player-parts/gstreamer-part/videosettings.cpp b/kaffeine/src/player-parts/gstreamer-part/videosettings.cpp index 2d0244a..f3b047b 100644 --- a/kaffeine/src/player-parts/gstreamer-part/videosettings.cpp +++ b/kaffeine/src/player-parts/gstreamer-part/videosettings.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <klocale.h> +#include <tdelocale.h> #include <tqslider.h> #include <tqlayout.h> diff --git a/kaffeine/src/player-parts/xine-part/deinterlacequality.cpp b/kaffeine/src/player-parts/xine-part/deinterlacequality.cpp index c8d253c..8674424 100644 --- a/kaffeine/src/player-parts/xine-part/deinterlacequality.cpp +++ b/kaffeine/src/player-parts/xine-part/deinterlacequality.cpp @@ -19,7 +19,7 @@ */ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <tqcheckbox.h> diff --git a/kaffeine/src/player-parts/xine-part/equalizer.cpp b/kaffeine/src/player-parts/xine-part/equalizer.cpp index 5a23ecf..319f537 100644 --- a/kaffeine/src/player-parts/xine-part/equalizer.cpp +++ b/kaffeine/src/player-parts/xine-part/equalizer.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqlayout.h> diff --git a/kaffeine/src/player-parts/xine-part/filterdialog.cpp b/kaffeine/src/player-parts/xine-part/filterdialog.cpp index 9741c21..ebee0ff 100644 --- a/kaffeine/src/player-parts/xine-part/filterdialog.cpp +++ b/kaffeine/src/player-parts/xine-part/filterdialog.cpp @@ -18,10 +18,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kpushbutton.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kcombobox.h> diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp index 45ca32c..49f76cf 100644 --- a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp +++ b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp @@ -43,7 +43,7 @@ #ifndef USE_TQT_ONLY #include "kxinewidget.moc" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #endif diff --git a/kaffeine/src/player-parts/xine-part/postfilter.cpp b/kaffeine/src/player-parts/xine-part/postfilter.cpp index 4ed3eb6..1605b28 100644 --- a/kaffeine/src/player-parts/xine-part/postfilter.cpp +++ b/kaffeine/src/player-parts/xine-part/postfilter.cpp @@ -21,7 +21,7 @@ #include <kpushbutton.h> #include <kseparator.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqlayout.h> diff --git a/kaffeine/src/player-parts/xine-part/screenshotpreview.cpp b/kaffeine/src/player-parts/xine-part/screenshotpreview.cpp index 9c14482..dadb91b 100644 --- a/kaffeine/src/player-parts/xine-part/screenshotpreview.cpp +++ b/kaffeine/src/player-parts/xine-part/screenshotpreview.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tqpainter.h> #include <tqwidget.h> diff --git a/kaffeine/src/player-parts/xine-part/videosettings.cpp b/kaffeine/src/player-parts/xine-part/videosettings.cpp index c64f627..93c706f 100644 --- a/kaffeine/src/player-parts/xine-part/videosettings.cpp +++ b/kaffeine/src/player-parts/xine-part/videosettings.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <klocale.h> +#include <tdelocale.h> #include <tqslider.h> #include <tqlayout.h> diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp index eb24868..4887ba1 100644 --- a/kaffeine/src/player-parts/xine-part/xine_part.cpp +++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp @@ -26,7 +26,7 @@ #include <tdeaction.h> #include <kstdaction.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kinputdialog.h> #include <kxmlguifactory.h> #include <tdepopupmenu.h> diff --git a/kaffeine/src/player-parts/xine-part/xineconfig.cpp b/kaffeine/src/player-parts/xine-part/xineconfig.cpp index 0ddc375..3ec7229 100644 --- a/kaffeine/src/player-parts/xine-part/xineconfig.cpp +++ b/kaffeine/src/player-parts/xine-part/xineconfig.cpp @@ -18,13 +18,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <klineedit.h> #include <kcombobox.h> #include <kpushbutton.h> #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kseparator.h> diff --git a/kaffeine/src/pref.cpp b/kaffeine/src/pref.cpp index 3907b44..ba03eaf 100644 --- a/kaffeine/src/pref.cpp +++ b/kaffeine/src/pref.cpp @@ -26,12 +26,12 @@ #include "pref.h" #include "pref.moc" -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kpushbutton.h> #include <tdefiledialog.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqlabel.h> diff --git a/kaffeine/src/startwindow.cpp b/kaffeine/src/startwindow.cpp index 327dd0c..37095f5 100644 --- a/kaffeine/src/startwindow.cpp +++ b/kaffeine/src/startwindow.cpp @@ -24,9 +24,9 @@ #endif #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqlabel.h> diff --git a/kaffeine/src/systemtray.cpp b/kaffeine/src/systemtray.cpp index 2057ff3..ceb69b9 100644 --- a/kaffeine/src/systemtray.cpp +++ b/kaffeine/src/systemtray.cpp @@ -22,10 +22,10 @@ #include <config.h> #endif -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <tdeaction.h> |