diff options
753 files changed, 1323 insertions, 1323 deletions
diff --git a/doc/ksplashml/index.docbook b/doc/ksplashml/index.docbook index 3dc98adc..bdd73cea 100644 --- a/doc/ksplashml/index.docbook +++ b/doc/ksplashml/index.docbook @@ -1088,8 +1088,8 @@ appropriate plugin.</para> #include <kdebug.h> #include <kdialogbase.h> #include <kgenericfactory.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <ksplash/objkstheme.h> #include <kstandarddirs.h> diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp index b0d3cb4f..d7a09c54 100644 --- a/drkonqi/backtrace.cpp +++ b/drkonqi/backtrace.cpp @@ -31,9 +31,9 @@ #include <kprocess.h> #include <kdebug.h> #include <kstandarddirs.h> -#include <kmessagebox.h> -#include <klocale.h> -#include <ktempfile.h> +#include <tdemessagebox.h> +#include <tdelocale.h> +#include <tdetempfile.h> #include "krashconf.h" #include "backtrace.h" diff --git a/drkonqi/debugger.cpp b/drkonqi/debugger.cpp index 71b6f3a4..aab0e794 100644 --- a/drkonqi/debugger.cpp +++ b/drkonqi/debugger.cpp @@ -30,15 +30,15 @@ #include <tqlabel.h> #include <kdialog.h> -#include <klocale.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kpushbutton.h> #include <kstdguiitem.h> #include <ktextbrowser.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include "backtrace.h" #include "krashconf.h" diff --git a/drkonqi/drbugreport.cpp b/drkonqi/drbugreport.cpp index 924f83e2..0d59396d 100644 --- a/drkonqi/drbugreport.cpp +++ b/drkonqi/drbugreport.cpp @@ -28,8 +28,8 @@ #include <tqmultilineedit.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include "drbugreport.moc" #include "drbugreport.h" diff --git a/drkonqi/krashconf.cpp b/drkonqi/krashconf.cpp index 6fcfbaee..884d66bc 100644 --- a/drkonqi/krashconf.cpp +++ b/drkonqi/krashconf.cpp @@ -26,12 +26,12 @@ *****************************************************************/ #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kstartupinfo.h> +#include <tdestartupinfo.h> #include <dcopclient.h> #include <kmacroexpander.h> diff --git a/drkonqi/main.cpp b/drkonqi/main.cpp index feb6c4ba..ae53f43f 100644 --- a/drkonqi/main.cpp +++ b/drkonqi/main.cpp @@ -33,7 +33,7 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> #include "krashconf.h" diff --git a/drkonqi/toplevel.cpp b/drkonqi/toplevel.cpp index 95f29136..3368f6dc 100644 --- a/drkonqi/toplevel.cpp +++ b/drkonqi/toplevel.cpp @@ -31,11 +31,11 @@ #include "netwm.h" -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kbugreport.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <tdeapplication.h> #include <dcopclient.h> diff --git a/kappfinder/common.cpp b/kappfinder/common.cpp index 9fb00f9d..51d30dee 100644 --- a/kappfinder/common.cpp +++ b/kappfinder/common.cpp @@ -21,7 +21,7 @@ #include <kdebug.h> #include <kdesktopfile.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <tqdir.h> diff --git a/kappfinder/main.cpp b/kappfinder/main.cpp index bcd83d13..813e8a19 100644 --- a/kappfinder/main.cpp +++ b/kappfinder/main.cpp @@ -20,7 +20,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include "toplevel.h" diff --git a/kappfinder/main_install.cpp b/kappfinder/main_install.cpp index 0195172f..c5617954 100644 --- a/kappfinder/main_install.cpp +++ b/kappfinder/main_install.cpp @@ -20,9 +20,9 @@ */ #include <tdecmdlineargs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tqstringlist.h> diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp index 16b8cdbd..25bbec9e 100644 --- a/kappfinder/toplevel.cpp +++ b/kappfinder/toplevel.cpp @@ -24,16 +24,16 @@ #include <kbuttonbox.h> #include <kdebug.h> #include <kdesktopfile.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprogress.h> #include <kservice.h> #include <kservicegroup.h> #include <kstandarddirs.h> #include <kstdguiitem.h> -#include <kstartupinfo.h> +#include <tdestartupinfo.h> #include <tqaccel.h> #include <tqlabel.h> diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp index c78309fb..9cba61cc 100644 --- a/kate/app/kateapp.cpp +++ b/kate/app/kateapp.cpp @@ -37,10 +37,10 @@ #include <ktip.h> #include <kdebug.h> #include <klibloader.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <ksimpleconfig.h> -#include <kstartupinfo.h> +#include <tdestartupinfo.h> #include <tqfile.h> #include <tqtimer.h> diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp index 1d0ce7af..76809241 100644 --- a/kate/app/kateconfigdialog.cpp +++ b/kate/app/kateconfigdialog.cpp @@ -48,12 +48,12 @@ #include <kdebug.h> #include <kdialogbase.h> #include <kglobalaccel.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <kkeydialog.h> #include <tdelistbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include <kstdaction.h> #include <kstandarddirs.h> diff --git a/kate/app/kateconfigplugindialogpage.cpp b/kate/app/kateconfigplugindialogpage.cpp index 8e12e2d8..90d7262e 100644 --- a/kate/app/kateconfigplugindialogpage.cpp +++ b/kate/app/kateconfigplugindialogpage.cpp @@ -27,7 +27,7 @@ #include <tqstringlist.h> #include <tqhbox.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqpushbutton.h> #include <tqtooltip.h> #include <kiconloader.h> diff --git a/kate/app/kateconsole.cpp b/kate/app/kateconsole.cpp index 26627181..cb49ef16 100644 --- a/kate/app/kateconsole.cpp +++ b/kate/app/kateconsole.cpp @@ -35,9 +35,9 @@ #include <kurl.h> #include <klibloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> KateConsole::KateConsole (KateMainWindow *mw, KateMDI::ToolView* parent) : TQVBox (parent) diff --git a/kate/app/katedocmanager.cpp b/kate/app/katedocmanager.cpp index 178e63d0..6cca9efe 100644 --- a/kate/app/katedocmanager.cpp +++ b/kate/app/katedocmanager.cpp @@ -32,12 +32,12 @@ #include <tdeparts/factory.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeconfig.h> #include <klibloader.h> #include <kmdcodec.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kencodingfiledialog.h> #include <tdeio/job.h> #include <twin.h> diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp index f24a0cf9..e0057fb2 100644 --- a/kate/app/kateexternaltools.cpp +++ b/kate/app/kateexternaltools.cpp @@ -34,9 +34,9 @@ #include <kate/document.h> #include <tdelistbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kmimetypechooser.h> #include <tdeconfig.h> #include <krun.h> diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp index e91a8df4..24062336 100644 --- a/kate/app/katefilelist.cpp +++ b/kate/app/katefilelist.cpp @@ -40,8 +40,8 @@ #include <kiconloader.h> #include <tdeconfig.h> -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <kpassivepopup.h> #include <kdebug.h> #include <tdeapplication.h> diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp index 9747a9da..06cd0c3c 100644 --- a/kate/app/katefileselector.cpp +++ b/kate/app/katefileselector.cpp @@ -52,12 +52,12 @@ #include <kurlcombobox.h> #include <kurlcompletion.h> #include <kprotocolinfo.h> -#include <kdiroperator.h> +#include <tdediroperator.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcombobox.h> #include <tdeaction.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdetoolbarbutton.h> #include <tqtoolbar.h> #include <tdepopupmenu.h> diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp index aa69f341..b180fd51 100644 --- a/kate/app/kategrepdialog.cpp +++ b/kate/app/kategrepdialog.cpp @@ -37,9 +37,9 @@ #include <tdefiledialog.h> #include <kprocess.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kpushbutton.h> #include <kurlrequester.h> #include <kurlcompletion.h> diff --git a/kate/app/katemailfilesdialog.cpp b/kate/app/katemailfilesdialog.cpp index b402ca58..858caa5f 100644 --- a/kate/app/katemailfilesdialog.cpp +++ b/kate/app/katemailfilesdialog.cpp @@ -22,7 +22,7 @@ #include "katedocmanager.h" #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <tqevent.h> diff --git a/kate/app/katemain.cpp b/kate/app/katemain.cpp index 38e14f30..33c049ce 100644 --- a/kate/app/katemain.cpp +++ b/kate/app/katemain.cpp @@ -20,13 +20,13 @@ #include "kateapp.h" #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kinstance.h> -#include <kstartupinfo.h> +#include <tdestartupinfo.h> #include <dcopclient.h> #include <dcopref.h> #include <kdebug.h> diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp index 7584e09d..cf62e77f 100644 --- a/kate/app/katemainwindow.cpp +++ b/kate/app/katemainwindow.cpp @@ -50,17 +50,17 @@ #include <tdecmdlineargs.h> #include <kdebug.h> #include <kdialogbase.h> -#include <kdiroperator.h> +#include <tdediroperator.h> #include <kdockwidget.h> #include <kedittoolbar.h> #include <tdefiledialog.h> #include <kglobalaccel.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <kkeydialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kmimetype.h> #include <kopenwith.h> #include <tdepopupmenu.h> @@ -75,7 +75,7 @@ #include <khelpmenu.h> #include <tdemultitabbar.h> #include <ktip.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <kstringhandler.h> #include <tqlayout.h> #include <tqptrvector.h> diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp index 1b85215c..a6c657e2 100644 --- a/kate/app/katemdi.cpp +++ b/kate/app/katemdi.cpp @@ -25,14 +25,14 @@ #include <tdeaction.h> #include <kdebug.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kiconloader.h> #include <tdepopupmenu.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqvbox.h> #include <tqhbox.h> diff --git a/kate/app/katemwmodonhddialog.cpp b/kate/app/katemwmodonhddialog.cpp index 3abf1275..ab141847 100644 --- a/kate/app/katemwmodonhddialog.cpp +++ b/kate/app/katemwmodonhddialog.cpp @@ -26,11 +26,11 @@ #include <kiconloader.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprocio.h> #include <krun.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kpushbutton.h> #include <tqlabel.h> diff --git a/kate/app/katepluginmanager.cpp b/kate/app/katepluginmanager.cpp index 8f6fae52..455866a0 100644 --- a/kate/app/katepluginmanager.cpp +++ b/kate/app/katepluginmanager.cpp @@ -28,7 +28,7 @@ #include <tdeconfig.h> #include <tqstringlist.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tqfile.h> diff --git a/kate/app/katesavemodifieddialog.cpp b/kate/app/katesavemodifieddialog.cpp index f4eb73e3..a89fe57f 100644 --- a/kate/app/katesavemodifieddialog.cpp +++ b/kate/app/katesavemodifieddialog.cpp @@ -19,7 +19,7 @@ #include "katesavemodifieddialog.h" #include "katesavemodifieddialog.moc" -#include <klocale.h> +#include <tdelocale.h> #include <tqlistview.h> #include <tdelistview.h> #include <kguiitem.h> @@ -29,7 +29,7 @@ #include <tqlabel.h> #include <tqpushbutton.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <kencodingfiledialog.h> #include <tdetexteditor/encodinginterface.h> diff --git a/kate/app/katesession.cpp b/kate/app/katesession.cpp index d55af0c9..ed6ee3f9 100644 --- a/kate/app/katesession.cpp +++ b/kate/app/katesession.cpp @@ -24,13 +24,13 @@ #include "katedocmanager.h" #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kdirwatch.h> #include <tdelistview.h> #include <kinputdialog.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kmdcodec.h> #include <kstdguiitem.h> #include <kpushbutton.h> diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp index 6b3549fd..ca361232 100644 --- a/kate/app/kateviewmanager.cpp +++ b/kate/app/kateviewmanager.cpp @@ -31,18 +31,18 @@ #include <tdeaction.h> #include <tdecmdlineargs.h> #include <kdebug.h> -#include <kdiroperator.h> +#include <tdediroperator.h> #include <kdockwidget.h> #include <kencodingfiledialog.h> #include <kiconloader.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdetoolbar.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <ksimpleconfig.h> #include <kstdaction.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdestdaccel.h> #include <tdetexteditor/encodinginterface.h> diff --git a/kate/app/kateviewspace.cpp b/kate/app/kateviewspace.cpp index 5bbd544d..ebc7a3b9 100644 --- a/kate/app/kateviewspace.cpp +++ b/kate/app/kateviewspace.cpp @@ -28,7 +28,7 @@ #include "katesession.h" #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksqueezedtextlabel.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp index 22e0fc87..de9309f5 100644 --- a/kate/app/kateviewspacecontainer.cpp +++ b/kate/app/kateviewspacecontainer.cpp @@ -32,18 +32,18 @@ #include <tdeaction.h> #include <tdecmdlineargs.h> #include <kdebug.h> -#include <kdiroperator.h> +#include <tdediroperator.h> #include <kdockwidget.h> #include <kencodingfiledialog.h> #include <kiconloader.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdetoolbar.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <ksimpleconfig.h> #include <kstdaction.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstringhandler.h> #include <tdetexteditor/encodinginterface.h> diff --git a/kate/app/kbookmarkhandler.cpp b/kate/app/kbookmarkhandler.cpp index 2ff3c7e6..8dbf8461 100644 --- a/kate/app/kbookmarkhandler.cpp +++ b/kate/app/kbookmarkhandler.cpp @@ -28,7 +28,7 @@ #include <tdepopupmenu.h> #include <ksavefile.h> #include <kstandarddirs.h> -#include <kdiroperator.h> +#include <tdediroperator.h> #include <tdeaction.h> #include "kbookmarkhandler.h" diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp index ce548669..75d49483 100644 --- a/kate/app/kwritemain.cpp +++ b/kate/app/kwritemain.cpp @@ -38,24 +38,24 @@ #include <dcopclient.h> #include <kurldrag.h> #include <kencodingfiledialog.h> -#include <kdiroperator.h> +#include <tdediroperator.h> #include <kiconloader.h> #include <tdeaboutdata.h> #include <kstatusbar.h> #include <kstdaction.h> #include <tdeaction.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <tdeconfig.h> #include <tdecmdlineargs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kkeydialog.h> #include <kedittoolbar.h> #include <tdeparts/event.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <tqdropsite.h> #include <tqdragobject.h> diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp index 161f4c31..5a820680 100644 --- a/kcontrol/access/kaccess.cpp +++ b/kcontrol/access/kaccess.cpp @@ -8,15 +8,15 @@ #include <tqlabel.h> #include <kdialogbase.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kcombobox.h> #include <kiconloader.h> #include <kdebug.h> #include <kaudioplayer.h> #include <knotifyclient.h> #include <tdeconfig.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <netwm.h> #include <tdeshortcut.h> #include <kkeynative.h> diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp index 1332f60c..d2428783 100644 --- a/kcontrol/arts/arts.cpp +++ b/kcontrol/arts/arts.cpp @@ -42,7 +42,7 @@ #include <kdebug.h> #include <kdialog.h> #include <klineedit.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <krichtextlabel.h> #include <ksimpleconfig.h> diff --git a/kcontrol/arts/krichtextlabel.cpp b/kcontrol/arts/krichtextlabel.cpp index 6543b369..c2fb6e91 100644 --- a/kcontrol/arts/krichtextlabel.cpp +++ b/kcontrol/arts/krichtextlabel.cpp @@ -22,7 +22,7 @@ #include <tqstylesheet.h> #include <tqsimplerichtext.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> static TQString qrichtextify( const TQString& text ) { diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp index bfe3eff2..69783679 100644 --- a/kcontrol/background/bgadvanced.cpp +++ b/kcontrol/background/bgadvanced.cpp @@ -34,8 +34,8 @@ #include <tdeconfig.h> #include <kcolorbutton.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kpixmap.h> #include <kstandarddirs.h> #include <twin.h> diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp index ff200149..d8d6efaa 100644 --- a/kcontrol/background/bgdialog.cpp +++ b/kcontrol/background/bgdialog.cpp @@ -44,10 +44,10 @@ #include <kdebug.h> #include <tdefiledialog.h> #include <tdefilemetainfo.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kimageio.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpixmap.h> #include <kstandarddirs.h> #include <kstringhandler.h> diff --git a/kcontrol/background/bgmonitor.cpp b/kcontrol/background/bgmonitor.cpp index f78a7b61..b9283360 100644 --- a/kcontrol/background/bgmonitor.cpp +++ b/kcontrol/background/bgmonitor.cpp @@ -23,7 +23,7 @@ */ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpixmap.h> #include <kstandarddirs.h> #include <kurldrag.h> diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp index 4f7a6be2..08cb3055 100644 --- a/kcontrol/background/bgrender.cpp +++ b/kcontrol/background/bgrender.cpp @@ -27,7 +27,7 @@ #include <kimageeffect.h> #include <kprocess.h> #include <kpixmapio.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kcursor.h> #include <kmimetype.h> #include <tdefilemetainfo.h> diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp index cb6cf956..d36d7f14 100644 --- a/kcontrol/background/bgsettings.cpp +++ b/kcontrol/background/bgsettings.cpp @@ -23,7 +23,7 @@ #include <dcopclient.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> #include <krandomsequence.h> diff --git a/kcontrol/background/bgwallpaper.cpp b/kcontrol/background/bgwallpaper.cpp index 1edf37a8..460c9c56 100644 --- a/kcontrol/background/bgwallpaper.cpp +++ b/kcontrol/background/bgwallpaper.cpp @@ -29,7 +29,7 @@ #include <tdefiledialog.h> #include <kimageio.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kurldrag.h> diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp index 5878f4a6..5022ab42 100644 --- a/kcontrol/bell/bell.cpp +++ b/kcontrol/bell/bell.cpp @@ -29,7 +29,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <knotifyclient.h> #include <knuminput.h> diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp index f4603164..d469b1ff 100644 --- a/kcontrol/clock/dtime.cpp +++ b/kcontrol/clock/dtime.cpp @@ -33,9 +33,9 @@ #include <tqregexp.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdialog.h> #include <tdeconfig.h> diff --git a/kcontrol/clock/tzone.cpp b/kcontrol/clock/tzone.cpp index 4af720b0..518c6663 100644 --- a/kcontrol/clock/tzone.cpp +++ b/kcontrol/clock/tzone.cpp @@ -29,8 +29,8 @@ #include <tqfile.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdialog.h> #include <tdeio/netaccess.h> @@ -39,7 +39,7 @@ #include "tzone.moc" #if defined(USE_SOLARIS) -#include <ktempfile.h> +#include <tdetempfile.h> #include <kstandarddirs.h> #include <sys/param.h> #include <sys/types.h> diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp index 1572f4b7..45e3932d 100644 --- a/kcontrol/colors/colorscm.cpp +++ b/kcontrol/colors/colorscm.cpp @@ -26,11 +26,11 @@ #include <kcursor.h> #include <tdefiledialog.h> #include <kgenericfactory.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kinputdialog.h> #include <tdeio/netaccess.h> #include <kipc.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <kstandarddirs.h> #include <tdeaboutdata.h> diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp index 684e9d6d..b08ef613 100644 --- a/kcontrol/colors/widgetcanvas.cpp +++ b/kcontrol/colors/widgetcanvas.cpp @@ -15,9 +15,9 @@ #include <kcolordrag.h> #include <kpixmapeffect.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpixmap.h> #include "widgetcanvas.h" @@ -280,7 +280,7 @@ void WidgetCanvas::drawSampleWidgets() TDEConfig * c = new TDEConfig("kcmfonts"); - // Keep in sync with kglobalsettings. + // Keep in sync with tdeglobalsettings. TQFont windowFontGuess(TDEGlobalSettings::generalFont().family(), 12, TQFont::SansSerif, true); windowFontGuess.setPixelSize(12); diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp index b650cff2..9de1a1a7 100644 --- a/kcontrol/componentchooser/componentchooser.cpp +++ b/kcontrol/componentchooser/componentchooser.cpp @@ -28,10 +28,10 @@ #include <dcopclient.h> #include <tdeapplication.h> -#include <kemailsettings.h> +#include <tdeemailsettings.h> #include <kipc.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kopenwith.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> diff --git a/kcontrol/componentchooser/kcm_componentchooser.cpp b/kcontrol/componentchooser/kcm_componentchooser.cpp index c1c5728e..30750bdd 100644 --- a/kcontrol/componentchooser/kcm_componentchooser.cpp +++ b/kcontrol/componentchooser/kcm_componentchooser.cpp @@ -16,7 +16,7 @@ #include <tqlayout.h> #include <tdeaboutdata.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "kcm_componentchooser.h" #include "kcm_componentchooser.moc" diff --git a/kcontrol/crypto/certexport.cpp b/kcontrol/crypto/certexport.cpp index 4a6bda89..034d6989 100644 --- a/kcontrol/crypto/certexport.cpp +++ b/kcontrol/crypto/certexport.cpp @@ -31,9 +31,9 @@ #include <tqvbuttongroup.h> #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <ksslall.h> diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp index 8e97a7c4..70344e16 100644 --- a/kcontrol/crypto/crypto.cpp +++ b/kcontrol/crypto/crypto.cpp @@ -56,11 +56,11 @@ #include <kdialog.h> #include <tdefiledialog.h> #include <kgenericfactory.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmdcodec.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kpassdlg.h> #include <kprocess.h> #include <kpushbutton.h> diff --git a/kcontrol/crypto/kdatetimedlg.cpp b/kcontrol/crypto/kdatetimedlg.cpp index 872ffc30..f7cd9d1c 100644 --- a/kcontrol/crypto/kdatetimedlg.cpp +++ b/kcontrol/crypto/kdatetimedlg.cpp @@ -25,7 +25,7 @@ #include "kdatetimedlg.h" #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kdatepicker.h> #include <kpushbutton.h> diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp index 931c0eb0..e2e043f7 100644 --- a/kcontrol/css/kcmcss.cpp +++ b/kcontrol/css/kcmcss.cpp @@ -11,7 +11,7 @@ #include <kdialogbase.h> #include <tdefontdialog.h> #include <kgenericfactory.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstandarddirs.h> #include <kurlrequester.h> diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp index 11d494bb..fd503d2c 100644 --- a/kcontrol/displayconfig/displayconfig.cpp +++ b/kcontrol/displayconfig/displayconfig.cpp @@ -34,10 +34,10 @@ #include <kcombobox.h> #include <kdebug.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> #include <kinputdialog.h> #include <kurlrequester.h> diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp index 1f130f46..4bb73aa6 100644 --- a/kcontrol/dnssd/kcmdnssd.cpp +++ b/kcontrol/dnssd/kcmdnssd.cpp @@ -32,15 +32,15 @@ #include <tqcursor.h> #include <tqbuttongroup.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeparts/genericfactory.h> #include <kprocess.h> #include <klineedit.h> #include <kpassdlg.h> #include <ksimpleconfig.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "kcmdnssd.h" #include <dnssd/settings.h> diff --git a/kcontrol/ebrowsing/filteropts.cpp b/kcontrol/ebrowsing/filteropts.cpp index d2f0f66f..80916f06 100644 --- a/kcontrol/ebrowsing/filteropts.cpp +++ b/kcontrol/ebrowsing/filteropts.cpp @@ -25,7 +25,7 @@ #include <tqlabel.h> #include <dcopclient.h> -#include <klocale.h> +#include <tdelocale.h> #include "filteropts.h" diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp index 121037bd..d9930224 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp @@ -28,15 +28,15 @@ #include <tqwhatsthis.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <dcopref.h> #include <tdeapplication.h> #include <kcombobox.h> #include <tdeconfig.h> #include <kiconloader.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kservice.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp index e0acab4e..f6227b90 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp @@ -21,10 +21,10 @@ #include <unistd.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <kinstance.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "ikwsopts.h" #include "kuriikwsfiltereng.h" diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp index c42a6be0..78f84780 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp @@ -22,9 +22,9 @@ #include <unistd.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kinstance.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "ikwsopts.h" #include "kuriikwsfiltereng.h" diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp index 543c3963..a1f6ca61 100644 --- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp @@ -22,12 +22,12 @@ #include <tqwhatsthis.h> #include <tdeapplication.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kcharsets.h> #include <klineedit.h> #include <kcombobox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "searchproviderdlg_ui.h" #include "searchproviderdlg.h" diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp index 19c46e23..fa3afe74 100644 --- a/kcontrol/energy/energy.cpp +++ b/kcontrol/energy/energy.cpp @@ -31,7 +31,7 @@ #include <kcursor.h> #include <kdialog.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <krun.h> #include <kstandarddirs.h> diff --git a/kcontrol/filetypes/filegroupdetails.cpp b/kcontrol/filetypes/filegroupdetails.cpp index eb57f50a..7000a97e 100644 --- a/kcontrol/filetypes/filegroupdetails.cpp +++ b/kcontrol/filetypes/filegroupdetails.cpp @@ -22,7 +22,7 @@ #include <tqradiobutton.h> #include <tqwhatsthis.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> FileGroupDetails::FileGroupDetails(TQWidget *parent, const char *name ) : TQWidget( parent, name ) diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp index 92a4f47a..c4f3ce7b 100644 --- a/kcontrol/filetypes/filetypedetails.cpp +++ b/kcontrol/filetypes/filetypedetails.cpp @@ -10,7 +10,7 @@ #include <kicondialog.h> #include <klineedit.h> #include <kinputdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include "kservicelistwidget.h" #include "filetypedetails.h" diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp index f4011f3b..58bbbbd0 100644 --- a/kcontrol/filetypes/filetypesview.cpp +++ b/kcontrol/filetypes/filetypesview.cpp @@ -15,7 +15,7 @@ #include <kipc.h> #include <klineedit.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include "newtypedlg.h" diff --git a/kcontrol/filetypes/kservicelistwidget.cpp b/kcontrol/filetypes/kservicelistwidget.cpp index e8193f27..d0463d7a 100644 --- a/kcontrol/filetypes/kservicelistwidget.cpp +++ b/kcontrol/filetypes/kservicelistwidget.cpp @@ -26,8 +26,8 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <knotifyclient.h> #include <kopenwith.h> diff --git a/kcontrol/filetypes/kserviceselectdlg.cpp b/kcontrol/filetypes/kserviceselectdlg.cpp index b0cf1e3b..f8c4f0dd 100644 --- a/kcontrol/filetypes/kserviceselectdlg.cpp +++ b/kcontrol/filetypes/kserviceselectdlg.cpp @@ -20,7 +20,7 @@ #include "kserviceselectdlg.moc" #include "kservicelistwidget.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqvbox.h> #include <tqlabel.h> diff --git a/kcontrol/filetypes/newtypedlg.cpp b/kcontrol/filetypes/newtypedlg.cpp index ee0e3eab..dbb37344 100644 --- a/kcontrol/filetypes/newtypedlg.cpp +++ b/kcontrol/filetypes/newtypedlg.cpp @@ -4,7 +4,7 @@ #include <tqwhatsthis.h> #include <tqcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include "newtypedlg.h" diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp index 3f202c02..2489b80c 100644 --- a/kcontrol/fonts/fonts.cpp +++ b/kcontrol/fonts/fonts.cpp @@ -26,7 +26,7 @@ #include <tdeapplication.h> #include <kgenericfactory.h> #include <kipc.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <knuminput.h> #include <kprocio.h> #include <ksimpleconfig.h> @@ -522,7 +522,7 @@ TDEFonts::TDEFonts(TQWidget *parent, const char *name, const TQStringList &) TQValueList<TQFont> defaultFontList; - // Keep in sync with tdelibs/tdecore/kglobalsettings.cpp + // Keep in sync with tdelibs/tdecore/tdeglobalsettings.cpp TQFont f0("Sans Serif", 10); TQFont f1("Monospace", 10); diff --git a/kcontrol/fonts/kxftconfig.cpp b/kcontrol/fonts/kxftconfig.cpp index 124d33d2..459c7b88 100644 --- a/kcontrol/fonts/kxftconfig.cpp +++ b/kcontrol/fonts/kxftconfig.cpp @@ -26,7 +26,7 @@ #include <tqregexp.h> #include <tqfile.h> #include <tqpaintdevice.h> -#include <klocale.h> +#include <tdelocale.h> #include <klargefile.h> #include <tqdir.h> #include <tqsettings.h> diff --git a/kcontrol/hwmanager/deviceiconview.cpp b/kcontrol/hwmanager/deviceiconview.cpp index 0255c01c..cea27b16 100644 --- a/kcontrol/hwmanager/deviceiconview.cpp +++ b/kcontrol/hwmanager/deviceiconview.cpp @@ -21,11 +21,11 @@ #include <tqheader.h> #include <tqcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kservicegroup.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> diff --git a/kcontrol/hwmanager/devicepropsdlg.cpp b/kcontrol/hwmanager/devicepropsdlg.cpp index 2eb1dfa3..5483b2d2 100644 --- a/kcontrol/hwmanager/devicepropsdlg.cpp +++ b/kcontrol/hwmanager/devicepropsdlg.cpp @@ -34,11 +34,11 @@ #include <kbuttonbox.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <klineedit.h> #include <kstdguiitem.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "devicepropsdlg.h" diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp index bc3970e9..4ccb8ce8 100644 --- a/kcontrol/hwmanager/hwmanager.cpp +++ b/kcontrol/hwmanager/hwmanager.cpp @@ -32,10 +32,10 @@ #include <kcombobox.h> #include <kdebug.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> #include <kinputdialog.h> #include <kurlrequester.h> diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp index 4a72e29f..b7c51c28 100644 --- a/kcontrol/iccconfig/iccconfig.cpp +++ b/kcontrol/iccconfig/iccconfig.cpp @@ -32,10 +32,10 @@ #include <kcombobox.h> #include <kdebug.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> #include <kinputdialog.h> #include <kurlrequester.h> diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp index f98aa270..56df77a5 100644 --- a/kcontrol/icons/icons.cpp +++ b/kcontrol/icons/icons.cpp @@ -25,9 +25,9 @@ #include <kiconeffect.h> #include <kiconloader.h> #include <kipc.h> -#include <klocale.h> +#include <tdelocale.h> #include <kseparator.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <dcopclient.h> #include "icons.h" diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp index 078224dc..fe0a59ee 100644 --- a/kcontrol/icons/iconthemes.cpp +++ b/kcontrol/icons/iconthemes.cpp @@ -30,14 +30,14 @@ #include <tdeapplication.h> #include <kstandarddirs.h> #include <kservice.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #undef Unsorted #include <kipc.h> #include <tdelistview.h> #include <kurlrequesterdlg.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprogress.h> #include <kiconloader.h> diff --git a/kcontrol/info/info.cpp b/kcontrol/info/info.cpp index 666b914a..2d79f4f5 100644 --- a/kcontrol/info/info.cpp +++ b/kcontrol/info/info.cpp @@ -31,7 +31,7 @@ #include <tqwhatsthis.h> #include <tqlayout.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <kdialog.h> diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp index d6cd750e..76d68d67 100644 --- a/kcontrol/info/memory.cpp +++ b/kcontrol/info/memory.cpp @@ -29,7 +29,7 @@ #include <tqdrawutil.h> #include <tqtooltip.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdialog.h> #include <kseparator.h> diff --git a/kcontrol/info/opengl.cpp b/kcontrol/info/opengl.cpp index 061e368e..a38aee93 100644 --- a/kcontrol/info/opengl.cpp +++ b/kcontrol/info/opengl.cpp @@ -29,8 +29,8 @@ #include <tqfile.h> #include <tqstring.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <X11/Xlib.h> diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp index bb8e7ca0..24b43d82 100644 --- a/kcontrol/input/core/themepage.cpp +++ b/kcontrol/input/core/themepage.cpp @@ -19,14 +19,14 @@ * Boston, MA 02110-1301, USA. */ -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kurl.h> #include <kprocess.h> #include <tdeio/job.h> #include <tdeio/netaccess.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdelistview.h> #include <kdialog.h> diff --git a/kcontrol/input/logitechmouse.cpp b/kcontrol/input/logitechmouse.cpp index 39b8948a..0e2f6f1d 100644 --- a/kcontrol/input/logitechmouse.cpp +++ b/kcontrol/input/logitechmouse.cpp @@ -31,8 +31,8 @@ #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <config.h> diff --git a/kcontrol/input/main.cpp b/kcontrol/input/main.cpp index 38bded50..254f2ee5 100644 --- a/kcontrol/input/main.cpp +++ b/kcontrol/input/main.cpp @@ -25,8 +25,8 @@ # include <config.h> #endif -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <dcopref.h> #include <tqfile.h> diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp index 33409a42..49b67c98 100644 --- a/kcontrol/input/mouse.cpp +++ b/kcontrol/input/mouse.cpp @@ -56,7 +56,7 @@ #include <tqtabwidget.h> #include <tqradiobutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <tdeconfig.h> #include <kstandarddirs.h> diff --git a/kcontrol/input/mouse.h b/kcontrol/input/mouse.h index 853a4e73..01f6c107 100644 --- a/kcontrol/input/mouse.h +++ b/kcontrol/input/mouse.h @@ -40,7 +40,7 @@ #include <tdeapplication.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <knuminput.h> #include <config.h> diff --git a/kcontrol/input/xcursor/previewwidget.cpp b/kcontrol/input/xcursor/previewwidget.cpp index 326178a7..2f0ea6ed 100644 --- a/kcontrol/input/xcursor/previewwidget.cpp +++ b/kcontrol/input/xcursor/previewwidget.cpp @@ -16,7 +16,7 @@ * Boston, MA 02110-1301, USA. */ -#include <kglobal.h> +#include <tdeglobal.h> #include <tqwidget.h> #include <tqpainter.h> @@ -24,7 +24,7 @@ #include <tqstring.h> #include <tqcursor.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <X11/Xlib.h> #include <X11/Xutil.h> diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp index 72a25ce9..d84d470b 100644 --- a/kcontrol/input/xcursor/themepage.cpp +++ b/kcontrol/input/xcursor/themepage.cpp @@ -20,14 +20,14 @@ # include <config.h> #endif -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kstandarddirs.h> #include <tdelistview.h> #include <ksimpleconfig.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kurlrequesterdlg.h> #include <tdeio/job.h> #include <tdeio/netaccess.h> diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp index 719c5abf..b64d5a4d 100644 --- a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp +++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp @@ -36,10 +36,10 @@ #include <kdebug.h> #include <kdialog.h> #include <kgenericfactory.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tdeio/job.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprotocolinfo.h> #include <kstandarddirs.h> diff --git a/kcontrol/joystick/caldialog.cpp b/kcontrol/joystick/caldialog.cpp index 978919ca..877befb6 100644 --- a/kcontrol/joystick/caldialog.cpp +++ b/kcontrol/joystick/caldialog.cpp @@ -27,8 +27,8 @@ #include <tqapplication.h> #include <tqvbox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> //-------------------------------------------------------------- diff --git a/kcontrol/joystick/joydevice.cpp b/kcontrol/joystick/joydevice.cpp index 6453bdf6..3c4aeac3 100644 --- a/kcontrol/joystick/joydevice.cpp +++ b/kcontrol/joystick/joydevice.cpp @@ -21,7 +21,7 @@ #include "joydevice.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <sys/types.h> diff --git a/kcontrol/joystick/joystick.cpp b/kcontrol/joystick/joystick.cpp index 85316944..009795db 100644 --- a/kcontrol/joystick/joystick.cpp +++ b/kcontrol/joystick/joystick.cpp @@ -21,8 +21,8 @@ #include <tdeaboutdata.h> #include <kgenericfactory.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "joystick.h" #include "joywidget.h" diff --git a/kcontrol/joystick/joywidget.cpp b/kcontrol/joystick/joywidget.cpp index d6533aef..8e1ff558 100644 --- a/kcontrol/joystick/joywidget.cpp +++ b/kcontrol/joystick/joywidget.cpp @@ -34,9 +34,9 @@ #include <tqfontmetrics.h> #include <tqpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kiconloader.h> //-------------------------------------------------------------- diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp index fbce1e3e..d6a0e06d 100644 --- a/kcontrol/kcontrol/aboutwidget.cpp +++ b/kcontrol/kcontrol/aboutwidget.cpp @@ -24,12 +24,12 @@ #include <tqfile.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kpixmap.h> #include <kpixmapeffect.h> #include <kcursor.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdehtml_part.h> #include <tdeapplication.h> #include <kiconloader.h> diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp index 9ecd5339..dd1835e9 100644 --- a/kcontrol/kcontrol/dockcontainer.cpp +++ b/kcontrol/kcontrol/dockcontainer.cpp @@ -26,8 +26,8 @@ #include <tqpushbutton.h> #include <tdeapplication.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kdebug.h> #include <kdialog.h> #include <kiconloader.h> diff --git a/kcontrol/kcontrol/helpwidget.cpp b/kcontrol/kcontrol/helpwidget.cpp index 93c96722..0e8cc484 100644 --- a/kcontrol/kcontrol/helpwidget.cpp +++ b/kcontrol/kcontrol/helpwidget.cpp @@ -19,7 +19,7 @@ #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kprocess.h> #include <tdeapplication.h> diff --git a/kcontrol/kcontrol/kcrootonly.cpp b/kcontrol/kcontrol/kcrootonly.cpp index e99cfa79..13d1cf32 100644 --- a/kcontrol/kcontrol/kcrootonly.cpp +++ b/kcontrol/kcontrol/kcrootonly.cpp @@ -19,7 +19,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include "kcrootonly.h" diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp index d9557517..17b8ae8e 100644 --- a/kcontrol/kcontrol/main.cpp +++ b/kcontrol/kcontrol/main.cpp @@ -37,7 +37,7 @@ #include <tdecmdlineargs.h> #include <dcopclient.h> #include <tdeaboutdata.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/kcontrol/kcontrol/moduleiconview.cpp b/kcontrol/kcontrol/moduleiconview.cpp index 76402e18..45be8a1a 100644 --- a/kcontrol/kcontrol/moduleiconview.cpp +++ b/kcontrol/kcontrol/moduleiconview.cpp @@ -21,7 +21,7 @@ #include <tqheader.h> #include <tqcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kservicegroup.h> #include <kiconloader.h> diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp index f899eb4c..f203e6b5 100644 --- a/kcontrol/kcontrol/modulemenu.cpp +++ b/kcontrol/kcontrol/modulemenu.cpp @@ -27,8 +27,8 @@ that is intentional :-] #include <tqpoint.h> #include <tqcursor.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kiconloader.h> #include <kservicegroup.h> diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp index c4f7b2a8..30294902 100644 --- a/kcontrol/kcontrol/modules.cpp +++ b/kcontrol/kcontrol/modules.cpp @@ -29,7 +29,7 @@ #include <kservicegroup.h> #include <kprocess.h> #include <qxembed.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp index df69395e..501d6934 100644 --- a/kcontrol/kcontrol/moduletreeview.cpp +++ b/kcontrol/kcontrol/moduletreeview.cpp @@ -23,7 +23,7 @@ #include <tqpainter.h> #include <tqbitmap.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kservicegroup.h> #include <kdebug.h> diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp index a5b25d20..7aa2383b 100644 --- a/kcontrol/kcontrol/proxywidget.cpp +++ b/kcontrol/kcontrol/proxywidget.cpp @@ -21,7 +21,7 @@ #include <kpushbutton.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdecmodule.h> #include <kseparator.h> diff --git a/kcontrol/kcontrol/searchwidget.cpp b/kcontrol/kcontrol/searchwidget.cpp index e53c899d..995d162e 100644 --- a/kcontrol/kcontrol/searchwidget.cpp +++ b/kcontrol/kcontrol/searchwidget.cpp @@ -25,7 +25,7 @@ #include <klineedit.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdelistbox.h> #include "searchwidget.h" diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp index ff49603d..a93122a2 100644 --- a/kcontrol/kcontrol/toplevel.cpp +++ b/kcontrol/kcontrol/toplevel.cpp @@ -23,7 +23,7 @@ #include <tdeconfig.h> #include <kbugreport.h> #include <tdeaboutapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kinstance.h> #include <tdeaction.h> #include <twin.h> diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp index 66c7207a..425d5882 100644 --- a/kcontrol/kded/kcmkded.cpp +++ b/kcontrol/kded/kcmkded.cpp @@ -35,7 +35,7 @@ #include <kdialog.h> #include <kgenericfactory.h> #include <tdelistview.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kservice.h> #include <kstandarddirs.h> diff --git a/kcontrol/keys/commandShortcuts.cpp b/kcontrol/keys/commandShortcuts.cpp index 0ab7f120..4ae379a5 100644 --- a/kcontrol/keys/commandShortcuts.cpp +++ b/kcontrol/keys/commandShortcuts.cpp @@ -29,11 +29,11 @@ #include <kactivelabel.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdialog.h> #include <khotkeys.h> #include <kkeybutton.h> -#include <klocale.h> +#include <tdelocale.h> static bool treeFilled = false; CommandShortcutsModule::CommandShortcutsModule( TQWidget *parent, const char *name ) diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp index 74f9d544..9785d22d 100644 --- a/kcontrol/keys/keyconfig.cpp +++ b/kcontrol/keys/keyconfig.cpp @@ -19,10 +19,10 @@ #include <tqregexp.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <ksimpleconfig.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kseparator.h> #include <dcopclient.h> #include <tdeapplication.h> diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp index 736a937b..c9aa1481 100644 --- a/kcontrol/keys/main.cpp +++ b/kcontrol/keys/main.cpp @@ -24,7 +24,7 @@ #include <tqlayout.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include "commandShortcuts.h" diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp index ce39b0bf..39dfb701 100644 --- a/kcontrol/keys/modifiers.cpp +++ b/kcontrol/keys/modifiers.cpp @@ -12,8 +12,8 @@ #include <kdialog.h> #include <kkeynative.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #define XK_MISCELLANY #define XK_XKB_KEYS diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp index d81fe74c..e7f599dd 100644 --- a/kcontrol/keys/shortcuts.cpp +++ b/kcontrol/keys/shortcuts.cpp @@ -36,8 +36,8 @@ #include <kipc.h> #include <kkeynative.h> #include <kinputdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeshortcutlist.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> diff --git a/kcontrol/keys/treeview.cpp b/kcontrol/keys/treeview.cpp index 361c1cfb..36d0e3bf 100644 --- a/kcontrol/keys/treeview.cpp +++ b/kcontrol/keys/treeview.cpp @@ -26,7 +26,7 @@ #include <tqcursor.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kservicegroup.h> diff --git a/kcontrol/kicker/advancedDialog.cpp b/kcontrol/kicker/advancedDialog.cpp index a56625e4..f2ba1568 100644 --- a/kcontrol/kicker/advancedDialog.cpp +++ b/kcontrol/kicker/advancedDialog.cpp @@ -25,7 +25,7 @@ #include <tqslider.h> #include <kcolorbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include "advancedDialog.h" #include "advancedOptions.h" diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp index 85f582ca..c2f48855 100644 --- a/kcontrol/kicker/applettab_impl.cpp +++ b/kcontrol/kicker/applettab_impl.cpp @@ -28,8 +28,8 @@ #include <tqfileinfo.h> #include <tdeconfig.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdialog.h> #include <kstandarddirs.h> #include <tdelistview.h> diff --git a/kcontrol/kicker/extensionInfo.cpp b/kcontrol/kicker/extensionInfo.cpp index 037159d9..a773e063 100644 --- a/kcontrol/kicker/extensionInfo.cpp +++ b/kcontrol/kicker/extensionInfo.cpp @@ -20,7 +20,7 @@ #include <kdebug.h> #include <kdesktopfile.h> -#include <klocale.h> +#include <tdelocale.h> #include "extensionInfo.h" diff --git a/kcontrol/kicker/hidingconfig.cpp b/kcontrol/kicker/hidingconfig.cpp index 81002447..e1e71dc8 100644 --- a/kcontrol/kicker/hidingconfig.cpp +++ b/kcontrol/kicker/hidingconfig.cpp @@ -18,7 +18,7 @@ #include <tqlayout.h> #include <tqtimer.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "hidingtab_impl.h" diff --git a/kcontrol/kicker/hidingtab_impl.cpp b/kcontrol/kicker/hidingtab_impl.cpp index 3bde445b..8c340bd5 100644 --- a/kcontrol/kicker/hidingtab_impl.cpp +++ b/kcontrol/kicker/hidingtab_impl.cpp @@ -23,7 +23,7 @@ #include <kcombobox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include "main.h" diff --git a/kcontrol/kicker/lookandfeelconfig.cpp b/kcontrol/kicker/lookandfeelconfig.cpp index 49c0cf56..af451421 100644 --- a/kcontrol/kicker/lookandfeelconfig.cpp +++ b/kcontrol/kicker/lookandfeelconfig.cpp @@ -18,7 +18,7 @@ #include <tqlayout.h> #include <tqtimer.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "lookandfeeltab_impl.h" diff --git a/kcontrol/kicker/lookandfeeltab_impl.cpp b/kcontrol/kicker/lookandfeeltab_impl.cpp index 73367d24..674b1cd0 100644 --- a/kcontrol/kicker/lookandfeeltab_impl.cpp +++ b/kcontrol/kicker/lookandfeeltab_impl.cpp @@ -29,8 +29,8 @@ #include <kiconeffect.h> #include <kimageio.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kickerSettings.h> diff --git a/kcontrol/kicker/menuconfig.cpp b/kcontrol/kicker/menuconfig.cpp index b477cd76..26624ff9 100644 --- a/kcontrol/kicker/menuconfig.cpp +++ b/kcontrol/kicker/menuconfig.cpp @@ -18,7 +18,7 @@ #include <tqlayout.h> #include <tqtimer.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "kickerSettings.h" diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp index e3fc24ec..2c259829 100644 --- a/kcontrol/kicker/menutab_impl.cpp +++ b/kcontrol/kicker/menutab_impl.cpp @@ -32,8 +32,8 @@ #include <kdesktopfile.h> #include <kiconloader.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <knuminput.h> #include <kstandarddirs.h> #include <tdefontrequester.h> diff --git a/kcontrol/kicker/positionconfig.cpp b/kcontrol/kicker/positionconfig.cpp index 4eafcf67..a65a3234 100644 --- a/kcontrol/kicker/positionconfig.cpp +++ b/kcontrol/kicker/positionconfig.cpp @@ -18,7 +18,7 @@ #include <tqlayout.h> #include <tqtimer.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "positiontab_impl.h" diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp index ba392bcb..63cdb35a 100644 --- a/kcontrol/kicker/positiontab_impl.cpp +++ b/kcontrol/kicker/positiontab_impl.cpp @@ -29,7 +29,7 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kpanelextension.h> #include <kpixmap.h> diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp index 23f0748a..a8f1e28c 100644 --- a/kcontrol/konq/behaviour.cpp +++ b/kcontrol/konq/behaviour.cpp @@ -31,7 +31,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <tdeio/uiserver_stub.h> -#include <klocale.h> +#include <tdelocale.h> #include <konq_defaults.h> #include <kstandarddirs.h> #include <kurlrequester.h> diff --git a/kcontrol/konq/browser.cpp b/kcontrol/konq/browser.cpp index 96f370d7..dc6c20b7 100644 --- a/kcontrol/konq/browser.cpp +++ b/kcontrol/konq/browser.cpp @@ -20,7 +20,7 @@ #include <tqtabwidget.h> #include <tqfile.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <fixx11h.h> #include <tdecmoduleloader.h> diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp index 5c41bace..973d9404 100644 --- a/kcontrol/konq/desktop.cpp +++ b/kcontrol/konq/desktop.cpp @@ -25,9 +25,9 @@ #include <tqslider.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <dcopclient.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <klineedit.h> #include <knuminput.h> diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp index 2825de22..d9920e8a 100644 --- a/kcontrol/konq/desktopbehavior_impl.cpp +++ b/kcontrol/konq/desktopbehavior_impl.cpp @@ -32,8 +32,8 @@ #include <tqwhatsthis.h> #include <tdelistview.h> #include <kservice.h> -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <kmimetype.h> #include <ktrader.h> #include <tdeapplication.h> diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp index edba20dc..9a325966 100644 --- a/kcontrol/konq/fontopts.cpp +++ b/kcontrol/konq/fontopts.cpp @@ -32,7 +32,7 @@ #include <kdebug.h> #include <tdefontcombo.h> #include <tdefontdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <konq_defaults.h> // include default values directly from konqueror #include "fontopts.h" diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp index 90ac4bef..107270ec 100644 --- a/kcontrol/konq/previews.cpp +++ b/kcontrol/konq/previews.cpp @@ -29,9 +29,9 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kprotocolinfo.h> diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp index c1bfa5a4..216c7518 100644 --- a/kcontrol/konq/rootopts.cpp +++ b/kcontrol/konq/rootopts.cpp @@ -27,12 +27,12 @@ #include <kcustommenueditor.h> #include <kdebug.h> #include <tdefileitem.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kipc.h> #include <tdelistview.h> #include <tdeio/job.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kmimetype.h> #include <kstandarddirs.h> #include <ktrader.h> diff --git a/kcontrol/konqhtml/advancedTabDialog.cpp b/kcontrol/konqhtml/advancedTabDialog.cpp index ba6e1b45..f8ca88c4 100644 --- a/kcontrol/konqhtml/advancedTabDialog.cpp +++ b/kcontrol/konqhtml/advancedTabDialog.cpp @@ -27,7 +27,7 @@ #include <tdeapplication.h> #include <dcopclient.h> #include <kcolorbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include "advancedTabDialog.h" diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp index ad584f7e..30272c3f 100644 --- a/kcontrol/konqhtml/appearance.cpp +++ b/kcontrol/konqhtml/appearance.cpp @@ -13,9 +13,9 @@ #include <kdebug.h> #include <kdialog.h> #include <tdefontcombo.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdehtmldefaults.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #if defined Q_WS_X11 && !defined K_WS_QTONLY diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp index 87daeea6..fcddac79 100644 --- a/kcontrol/konqhtml/domainlistview.cpp +++ b/kcontrol/konqhtml/domainlistview.cpp @@ -25,8 +25,8 @@ #include <tdeconfig.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "domainlistview.h" #include "policies.h" diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp index 232a3169..3ae9091a 100644 --- a/kcontrol/konqhtml/filteropts.cpp +++ b/kcontrol/konqhtml/filteropts.cpp @@ -17,8 +17,8 @@ */ #include <tdeconfig.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeaboutdata.h> #include <tdefiledialog.h> #include <dcopclient.h> diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp index 2fe6eb96..0fb7f602 100644 --- a/kcontrol/konqhtml/htmlopts.cpp +++ b/kcontrol/konqhtml/htmlopts.cpp @@ -15,8 +15,8 @@ #include "advancedTabDialog.h" #include <konq_defaults.h> // include default values directly from konqueror -#include <kglobalsettings.h> // get default for DEFAULT_CHANGECURSOR -#include <klocale.h> +#include <tdeglobalsettings.h> // get default for DEFAULT_CHANGECURSOR +#include <tdelocale.h> #include <kdialog.h> #include <knuminput.h> #include <kseparator.h> diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp index f5cc93f1..e2191059 100644 --- a/kcontrol/konqhtml/javaopts.cpp +++ b/kcontrol/konqhtml/javaopts.cpp @@ -16,7 +16,7 @@ #include <kurlrequester.h> #include <kdebug.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdehtml_settings.h> #include <knuminput.h> diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp index adb00bd9..da5af132 100644 --- a/kcontrol/konqhtml/jsopts.cpp +++ b/kcontrol/konqhtml/jsopts.cpp @@ -26,7 +26,7 @@ #include "htmlopts.h" #include "policydlg.h" -#include <klocale.h> +#include <tdelocale.h> #include "jsopts.h" diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp index bdaa506c..1debc0ac 100644 --- a/kcontrol/konqhtml/jspolicies.cpp +++ b/kcontrol/konqhtml/jspolicies.cpp @@ -27,7 +27,7 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "jspolicies.h" diff --git a/kcontrol/konqhtml/khttpoptdlg.cpp b/kcontrol/konqhtml/khttpoptdlg.cpp index 6e79a59e..7272e6e9 100644 --- a/kcontrol/konqhtml/khttpoptdlg.cpp +++ b/kcontrol/konqhtml/khttpoptdlg.cpp @@ -3,8 +3,8 @@ #include <tqlayout.h> //CT -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include "khttpoptdlg.h" diff --git a/kcontrol/konqhtml/nsconfigwidget.ui b/kcontrol/konqhtml/nsconfigwidget.ui index b784048e..f3525430 100644 --- a/kcontrol/konqhtml/nsconfigwidget.ui +++ b/kcontrol/konqhtml/nsconfigwidget.ui @@ -256,7 +256,7 @@ </vbox> </widget> <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">kurlrequester.h</include> <include location="global" impldecl="in declaration">tdelistbox.h</include> <include location="local" impldecl="in implementation">kdialog.h</include> diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp index d30a6726..f8e1ad10 100644 --- a/kcontrol/konqhtml/pluginopts.cpp +++ b/kcontrol/konqhtml/pluginopts.cpp @@ -20,8 +20,8 @@ #include <tdefiledialog.h> #include <kiconloader.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprocio.h> #include <kstandarddirs.h> #include <kurlrequester.h> diff --git a/kcontrol/konqhtml/policydlg.cpp b/kcontrol/konqhtml/policydlg.cpp index 4f1529ed..d38524e6 100644 --- a/kcontrol/konqhtml/policydlg.cpp +++ b/kcontrol/konqhtml/policydlg.cpp @@ -7,9 +7,9 @@ #include <tqwhatsthis.h> #include <tqcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kbuttonbox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqpushbutton.h> diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp index 97eeb6d4..cdda274b 100644 --- a/kcontrol/konsole/kcmkonsole.cpp +++ b/kcontrol/konsole/kcmkonsole.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <tdefontdialog.h> #include <kgenericfactory.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "schemaeditor.h" #include "sessioneditor.h" diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp index 0594e7d9..66b07e59 100644 --- a/kcontrol/konsole/schemaeditor.cpp +++ b/kcontrol/konsole/schemaeditor.cpp @@ -34,11 +34,11 @@ //#include <errno.h> #include <tqslider.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> #include <kinputdialog.h> #include <tqtoolbutton.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <ksharedpixmap.h> #include <kimageeffect.h> #include <tqimage.h> diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp index d0f4f822..86c9dd82 100644 --- a/kcontrol/konsole/sessioneditor.cpp +++ b/kcontrol/konsole/sessioneditor.cpp @@ -23,11 +23,11 @@ #include <kdebug.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> #include <kinputdialog.h> #include <kicondialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kurlrequester.h> #include <klineedit.h> #include <kiconloader.h> diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp index 565e0e47..1f5d9a99 100644 --- a/kcontrol/krdb/krdb.cpp +++ b/kcontrol/krdb/krdb.cpp @@ -32,12 +32,12 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstandarddirs.h> #include <kprocio.h> #include <ksavefile.h> -#include <ktempfile.h> -#include <klocale.h> +#include <tdetempfile.h> +#include <tdelocale.h> #include <tdestyle.h> #include "krdb.h" diff --git a/kcontrol/kthememanager/knewthemedlg.cpp b/kcontrol/kthememanager/knewthemedlg.cpp index 8ba59b68..ee18c31c 100644 --- a/kcontrol/kthememanager/knewthemedlg.cpp +++ b/kcontrol/kthememanager/knewthemedlg.cpp @@ -22,7 +22,7 @@ #include <tqlineedit.h> #include <tqtextedit.h> -#include <klocale.h> +#include <tdelocale.h> KNewThemeDlg::KNewThemeDlg( TQWidget * parent, const char * name ) : KDialogBase(parent, name, true, i18n("New Theme"), Ok|Cancel, Ok) diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp index 87d17806..974ad88b 100644 --- a/kcontrol/kthememanager/ktheme.cpp +++ b/kcontrol/kthememanager/ktheme.cpp @@ -31,12 +31,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include <tdeconfig.h> #include <kdatastream.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tdeio/job.h> #include <tdeio/netaccess.h> #include <kipc.h> -#include <klocale.h> +#include <tdelocale.h> #include <kservice.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp index bcd73f18..aa04d8e5 100644 --- a/kcontrol/kthememanager/kthememanager.cpp +++ b/kcontrol/kthememanager/kthememanager.cpp @@ -27,13 +27,13 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kdialog.h> -#include <kemailsettings.h> +#include <tdeemailsettings.h> #include <tdefiledialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kservicegroup.h> #include <kstandarddirs.h> #include <kurldrag.h> diff --git a/kcontrol/locale/klocalesample.cpp b/kcontrol/locale/klocalesample.cpp index 91c978a6..9903965e 100644 --- a/kcontrol/locale/klocalesample.cpp +++ b/kcontrol/locale/klocalesample.cpp @@ -31,7 +31,7 @@ #include <stdio.h> -#include <klocale.h> +#include <tdelocale.h> #include "klocalesample.h" #include "klocalesample.moc" diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp index 66b95e50..6cb8e9a8 100644 --- a/kcontrol/locale/localeother.cpp +++ b/kcontrol/locale/localeother.cpp @@ -27,7 +27,7 @@ #include <tqprinter.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp index e74330c3..a7a85e72 100644 --- a/kcontrol/locale/toplevel.cpp +++ b/kcontrol/locale/toplevel.cpp @@ -32,7 +32,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <kservice.h> diff --git a/kcontrol/nics/nic.cpp b/kcontrol/nics/nic.cpp index 53e9ef3d..26a270a0 100644 --- a/kcontrol/nics/nic.cpp +++ b/kcontrol/nics/nic.cpp @@ -33,7 +33,7 @@ #include <tdeaboutdata.h> #include <kdialog.h> #include <kgenericfactory.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tqlayout.h> #include <tqlistview.h> diff --git a/kcontrol/performance/kcmperformance.cpp b/kcontrol/performance/kcmperformance.cpp index 3795cc39..93c5019a 100644 --- a/kcontrol/performance/kcmperformance.cpp +++ b/kcontrol/performance/kcmperformance.cpp @@ -19,7 +19,7 @@ #include <tqlayout.h> #include <tqtabwidget.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include "kcmperformance.h" diff --git a/kcontrol/performance/konqueror.cpp b/kcontrol/performance/konqueror.cpp index 46dd7077..8cd82699 100644 --- a/kcontrol/performance/konqueror.cpp +++ b/kcontrol/performance/konqueror.cpp @@ -25,7 +25,7 @@ #include <tqspinbox.h> #include <tqlabel.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> namespace KCMPerformance { diff --git a/kcontrol/performance/system.cpp b/kcontrol/performance/system.cpp index 57d50ee1..3e9c1605 100644 --- a/kcontrol/performance/system.cpp +++ b/kcontrol/performance/system.cpp @@ -22,7 +22,7 @@ #include <tqwhatsthis.h> #include <tqcheckbox.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> namespace KCMPerformance { diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp index 4336b605..c52c1b5c 100644 --- a/kcontrol/privacy/kprivacymanager.cpp +++ b/kcontrol/privacy/kprivacymanager.cpp @@ -24,7 +24,7 @@ #include <tdeconfig.h> #include <ksimpleconfig.h> #include <kprocess.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeapplication.h> #include <kdebug.h> #include <tderecentdocument.h> diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp index 52dac192..535aa21c 100644 --- a/kcontrol/privacy/privacy.cpp +++ b/kcontrol/privacy/privacy.cpp @@ -29,10 +29,10 @@ #include <tdeaboutdata.h> #include <tdeconfig.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <ktextedit.h> #include "privacy.h" diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp index 1d7ffcc4..5ed71aa6 100644 --- a/kcontrol/randr/configdialog.cpp +++ b/kcontrol/randr/configdialog.cpp @@ -27,7 +27,7 @@ #include <assert.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <twinmodule.h> #include <kregexpeditorinterface.h> diff --git a/kcontrol/randr/ktimerdialog.cpp b/kcontrol/randr/ktimerdialog.cpp index baada1f1..1aa0f58d 100644 --- a/kcontrol/randr/ktimerdialog.cpp +++ b/kcontrol/randr/ktimerdialog.cpp @@ -29,7 +29,7 @@ #include <twin.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "ktimerdialog.h" diff --git a/kcontrol/randr/main.cpp b/kcontrol/randr/main.cpp index 4cd5967f..af2e8b27 100644 --- a/kcontrol/randr/main.cpp +++ b/kcontrol/randr/main.cpp @@ -19,10 +19,10 @@ #include <stdlib.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "tderandrapp.h" diff --git a/kcontrol/randr/tderandrmodule.cpp b/kcontrol/randr/tderandrmodule.cpp index 9da8a569..11263bbf 100644 --- a/kcontrol/randr/tderandrmodule.cpp +++ b/kcontrol/randr/tderandrmodule.cpp @@ -33,8 +33,8 @@ #include <kdebug.h> #include <kdialog.h> #include <kgenericfactory.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "tderandrmodule.h" #include "tderandrmodule.moc" diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp index 247f669c..e4372d77 100644 --- a/kcontrol/randr/tderandrtray.cpp +++ b/kcontrol/randr/tderandrtray.cpp @@ -26,12 +26,12 @@ #include <kdebug.h> #include <khelpmenu.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kstdaction.h> #include <kstdguiitem.h> -#include <kglobal.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <cstdlib> diff --git a/kcontrol/samba/kcmsambaimports.cpp b/kcontrol/samba/kcmsambaimports.cpp index caa78560..c25867fa 100644 --- a/kcontrol/samba/kcmsambaimports.cpp +++ b/kcontrol/samba/kcmsambaimports.cpp @@ -26,7 +26,7 @@ #include <tqlayout.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <stdio.h> diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp index b6bceb31..c25a0111 100644 --- a/kcontrol/samba/kcmsambalog.cpp +++ b/kcontrol/samba/kcmsambalog.cpp @@ -25,9 +25,9 @@ #include <tqlayout.h> #include <tqwhatsthis.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include "kcmsambalog.h" #include "kcmsambalog.moc" diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp index b4b32611..3b77dbc9 100644 --- a/kcontrol/samba/kcmsambastatistics.cpp +++ b/kcontrol/samba/kcmsambastatistics.cpp @@ -32,8 +32,8 @@ #include <tqpushbutton.h> #include <tqregexp.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <kdialog.h> diff --git a/kcontrol/samba/ksmbstatus.cpp b/kcontrol/samba/ksmbstatus.cpp index cd5457de..abd423d1 100644 --- a/kcontrol/samba/ksmbstatus.cpp +++ b/kcontrol/samba/ksmbstatus.cpp @@ -24,7 +24,7 @@ #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include "ksmbstatus.h" diff --git a/kcontrol/screensaver/advanceddialog.cpp b/kcontrol/screensaver/advanceddialog.cpp index 507255ee..7a28178d 100644 --- a/kcontrol/screensaver/advanceddialog.cpp +++ b/kcontrol/screensaver/advanceddialog.cpp @@ -1,4 +1,4 @@ -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tqcombobox.h> #include <kdebug.h> diff --git a/kcontrol/screensaver/saverconfig.cpp b/kcontrol/screensaver/saverconfig.cpp index 4c6e3a36..75ee227f 100644 --- a/kcontrol/screensaver/saverconfig.cpp +++ b/kcontrol/screensaver/saverconfig.cpp @@ -1,5 +1,5 @@ #include <kdesktopfile.h> -#include <klocale.h> +#include <tdelocale.h> #include "saverconfig.h" diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp index 8c57cb73..f0891db1 100644 --- a/kcontrol/smartcard/smartcard.cpp +++ b/kcontrol/smartcard/smartcard.cpp @@ -35,10 +35,10 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> #include "smartcard.h" diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index 1b247739..f6925a0b 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/kcontrol/style/kcmstyle.cpp @@ -43,14 +43,14 @@ #include <dcopclient.h> #include <tdeapplication.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kdebug.h> #include <kipc.h> #include <tdeaboutdata.h> #include <kdialog.h> #include <klibloader.h> #include <tdelistview.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <ksimpleconfig.h> #include <tdestyle.h> #include <kstandarddirs.h> diff --git a/kcontrol/style/keramik/keramitdeconf.cpp b/kcontrol/style/keramik/keramitdeconf.cpp index 74284287..6b73662d 100644 --- a/kcontrol/style/keramik/keramitdeconf.cpp +++ b/kcontrol/style/keramik/keramitdeconf.cpp @@ -25,8 +25,8 @@ DEALINGS IN THE SOFTWARE. #include <tqlayout.h> #include <tqsettings.h> #include <kdialog.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "keramitdeconf.h" diff --git a/kcontrol/style/main.cpp b/kcontrol/style/main.cpp index 334229f4..7748e9ea 100644 --- a/kcontrol/style/main.cpp +++ b/kcontrol/style/main.cpp @@ -1,5 +1,5 @@ -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include "kcmstyle.h" diff --git a/kcontrol/style/menupreview.cpp b/kcontrol/style/menupreview.cpp index ecb26816..9b5edb67 100644 --- a/kcontrol/style/menupreview.cpp +++ b/kcontrol/style/menupreview.cpp @@ -24,7 +24,7 @@ #include <kpixmap.h> #include <kpixmapeffect.h> -#include <klocale.h> +#include <tdelocale.h> #include <kimageeffect.h> #include <kiconloader.h> diff --git a/kcontrol/style/styleconfdialog.cpp b/kcontrol/style/styleconfdialog.cpp index 1623a3a2..8cb426b3 100644 --- a/kcontrol/style/styleconfdialog.cpp +++ b/kcontrol/style/styleconfdialog.cpp @@ -19,7 +19,7 @@ */ #include "styleconfdialog.h" -#include <klocale.h> +#include <tdelocale.h> StyleConfigDialog::StyleConfigDialog(TQWidget* parent, TQString styleName): KDialogBase(parent, "StyleConfigDialog", diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp index fb2c0716..9f939324 100644 --- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp @@ -42,7 +42,7 @@ #include <tqsettings.h> #include <tdeaboutdata.h> #include <kgenericfactory.h> -#include <kdiroperator.h> +#include <tdediroperator.h> #include <kprinter.h> #include "Misc.h" #include "KFileFontIconView.h" @@ -52,7 +52,7 @@ #include <tdetoolbarbutton.h> #include <tdestdaccel.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdecmdlineargs.h> #include <tdeapplication.h> #include <tdeio/job.h> diff --git a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp index 55143369..e393e238 100644 --- a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp +++ b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp @@ -40,10 +40,10 @@ #include <tqpixmap.h> #include <tdeapplication.h> #include <tdefileitem.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kicontheme.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdebug.h> #include <kurldrag.h> diff --git a/kcontrol/tdefontinst/kcmfontinst/PrintDialog.cpp b/kcontrol/tdefontinst/kcmfontinst/PrintDialog.cpp index afd9fa20..7e64e059 100644 --- a/kcontrol/tdefontinst/kcmfontinst/PrintDialog.cpp +++ b/kcontrol/tdefontinst/kcmfontinst/PrintDialog.cpp @@ -30,7 +30,7 @@ #include <tqlayout.h> #include <tqframe.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> namespace KFI { diff --git a/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp b/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp index e555dc7f..4840b721 100644 --- a/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp +++ b/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp @@ -33,9 +33,9 @@ #include <tqcheckbox.h> #include <tqvbox.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeio/job.h> #include <tdeio/netaccess.h> diff --git a/kcontrol/tdefontinst/lib/FcEngine.cpp b/kcontrol/tdefontinst/lib/FcEngine.cpp index 8ac8f4fb..ab89689d 100644 --- a/kcontrol/tdefontinst/lib/FcEngine.cpp +++ b/kcontrol/tdefontinst/lib/FcEngine.cpp @@ -5,7 +5,7 @@ #include <tqtextstream.h> #include <kurl.h> #include <tdeconfig.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeio/netaccess.h> #include <math.h> #include "FcEngine.h" diff --git a/kcontrol/tdefontinst/lib/KfiConstants.h b/kcontrol/tdefontinst/lib/KfiConstants.h index d7f5ef03..5e863353 100644 --- a/kcontrol/tdefontinst/lib/KfiConstants.h +++ b/kcontrol/tdefontinst/lib/KfiConstants.h @@ -1,7 +1,7 @@ #ifndef __KFI_CONSTANTS_H__ #define __KFI_CONSTANTS_H__ -#include <klocale.h> +#include <tdelocale.h> #define KFI_CATALOGUE "tdefontinst" diff --git a/kcontrol/tdefontinst/tdefontinst/FontEngine.cpp b/kcontrol/tdefontinst/tdefontinst/FontEngine.cpp index 4fe823c2..0cb0fa77 100644 --- a/kcontrol/tdefontinst/tdefontinst/FontEngine.cpp +++ b/kcontrol/tdefontinst/tdefontinst/FontEngine.cpp @@ -29,7 +29,7 @@ #include "FontEngine.h" #include "Misc.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <ctype.h> #include <string.h> #include <stdlib.h> diff --git a/kcontrol/tdefontinst/tdefontinst/XConfig.cpp b/kcontrol/tdefontinst/tdefontinst/XConfig.cpp index 7572e389..bb6e49d5 100644 --- a/kcontrol/tdefontinst/tdefontinst/XConfig.cpp +++ b/kcontrol/tdefontinst/tdefontinst/XConfig.cpp @@ -35,7 +35,7 @@ #include <string.h> #include <tqdir.h> #include <tqregexp.h> -#include <klocale.h> +#include <tdelocale.h> #include <sys/types.h> #include <signal.h> diff --git a/kcontrol/tdefontinst/tdeio/KioFonts.cpp b/kcontrol/tdefontinst/tdeio/KioFonts.cpp index f42d50c0..949b0d4c 100644 --- a/kcontrol/tdefontinst/tdeio/KioFonts.cpp +++ b/kcontrol/tdefontinst/tdeio/KioFonts.cpp @@ -51,14 +51,14 @@ #include <tdeio/connection.h> #include <tqtextstream.h> #include <kmimetype.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <tqdir.h> #include <tqdatastream.h> #include <tqregexp.h> #include <kinstance.h> #include <klargefile.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdesu/su.h> #include <kprocess.h> #include <kdebug.h> diff --git a/kcontrol/tdefontinst/tdeio/KioFonts.h b/kcontrol/tdefontinst/tdeio/KioFonts.h index ec8c69c4..4f3c465d 100644 --- a/kcontrol/tdefontinst/tdeio/KioFonts.h +++ b/kcontrol/tdefontinst/tdeio/KioFonts.h @@ -33,7 +33,7 @@ #include <time.h> #include <tdeio/slavebase.h> #include <kurl.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqstring.h> #include <tqcstring.h> #include <tqmap.h> diff --git a/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp b/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp index aaf85e94..a053393f 100644 --- a/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp +++ b/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp @@ -32,8 +32,8 @@ #include <tqbitmap.h> #include <tqpainter.h> #include <kiconloader.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <kurl.h> extern "C" diff --git a/kcontrol/tdefontinst/viewpart/FontPreview.cpp b/kcontrol/tdefontinst/viewpart/FontPreview.cpp index 151dfc88..41367d58 100644 --- a/kcontrol/tdefontinst/viewpart/FontPreview.cpp +++ b/kcontrol/tdefontinst/viewpart/FontPreview.cpp @@ -28,7 +28,7 @@ #include "FontPreview.h" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqpainter.h> #include <tqimage.h> #include <stdlib.h> diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp index d04d1b3d..2f289649 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp @@ -31,7 +31,7 @@ #include "Misc.h" #include "KfiConstants.h" #include "KfiPrint.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqpushbutton.h> #include <tqframe.h> @@ -46,7 +46,7 @@ #include <tqtimer.h> #include <tdeio/netaccess.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <knuminput.h> #include <kstdaction.h> #include <tdeaction.h> diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp index 45aeffe8..df1fa92d 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp @@ -31,8 +31,8 @@ #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <klibloader.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdefiledialog.h> #include <tdeconfig.h> diff --git a/kcontrol/tdeio/cache.cpp b/kcontrol/tdeio/cache.cpp index 990770a2..42c0fc28 100644 --- a/kcontrol/tdeio/cache.cpp +++ b/kcontrol/tdeio/cache.cpp @@ -28,7 +28,7 @@ #include <tqradiobutton.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> #include <knuminput.h> diff --git a/kcontrol/tdeio/fakeuaprovider.cpp b/kcontrol/tdeio/fakeuaprovider.cpp index e13c680b..b48d1973 100644 --- a/kcontrol/tdeio/fakeuaprovider.cpp +++ b/kcontrol/tdeio/fakeuaprovider.cpp @@ -21,7 +21,7 @@ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include "fakeuaprovider.h" diff --git a/kcontrol/tdeio/kcookiesmain.cpp b/kcontrol/tdeio/kcookiesmain.cpp index 24aff4fe..417eb9e4 100644 --- a/kcontrol/tdeio/kcookiesmain.cpp +++ b/kcontrol/tdeio/kcookiesmain.cpp @@ -6,9 +6,9 @@ #include <tqlayout.h> #include <tqtabwidget.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <dcopref.h> diff --git a/kcontrol/tdeio/kcookiesmanagement.cpp b/kcontrol/tdeio/kcookiesmanagement.cpp index 0fc8e994..1a9314d9 100644 --- a/kcontrol/tdeio/kcookiesmanagement.cpp +++ b/kcontrol/tdeio/kcookiesmanagement.cpp @@ -31,13 +31,13 @@ #include <kidna.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <kiconloader.h> #include <klineedit.h> #include <tdelistview.h> #include <tdelistviewsearchline.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <dcopref.h> #include "kcookiesmain.h" diff --git a/kcontrol/tdeio/kcookiespolicies.cpp b/kcontrol/tdeio/kcookiespolicies.cpp index 7e9b39f6..a39773cf 100644 --- a/kcontrol/tdeio/kcookiespolicies.cpp +++ b/kcontrol/tdeio/kcookiespolicies.cpp @@ -34,10 +34,10 @@ #include <kiconloader.h> #include <kidna.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdelistview.h> #include <tdelistviewsearchline.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <dcopref.h> diff --git a/kcontrol/tdeio/kenvvarproxydlg.cpp b/kcontrol/tdeio/kenvvarproxydlg.cpp index 22accb4e..e8d1c0e4 100644 --- a/kcontrol/tdeio/kenvvarproxydlg.cpp +++ b/kcontrol/tdeio/kenvvarproxydlg.cpp @@ -28,9 +28,9 @@ #include <tqpushbutton.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "envvarproxy_ui.h" #include "kenvvarproxydlg.h" diff --git a/kcontrol/tdeio/kmanualproxydlg.cpp b/kcontrol/tdeio/kmanualproxydlg.cpp index 9a3bf46c..6c1786af 100644 --- a/kcontrol/tdeio/kmanualproxydlg.cpp +++ b/kcontrol/tdeio/kmanualproxydlg.cpp @@ -27,13 +27,13 @@ #include <tqpushbutton.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <tdelistbox.h> #include <klineedit.h> #include <kicontheme.h> #include <kurifilter.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include <kinputdialog.h> #include <tdeio/ioslave_defaults.h> diff --git a/kcontrol/tdeio/kproxydlg.cpp b/kcontrol/tdeio/kproxydlg.cpp index a165f957..7bd082ed 100644 --- a/kcontrol/tdeio/kproxydlg.cpp +++ b/kcontrol/tdeio/kproxydlg.cpp @@ -28,9 +28,9 @@ #include <tqradiobutton.h> #include <tqtabwidget.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "ksaveioconfig.h" #include "kenvvarproxydlg.h" diff --git a/kcontrol/tdeio/kproxydlgbase.h b/kcontrol/tdeio/kproxydlgbase.h index 06ffa875..8454f2f3 100644 --- a/kcontrol/tdeio/kproxydlgbase.h +++ b/kcontrol/tdeio/kproxydlgbase.h @@ -27,7 +27,7 @@ #include <tqstringlist.h> #include <kdialogbase.h> -#include <kprotocolmanager.h> +#include <tdeprotocolmanager.h> class KProxyData { diff --git a/kcontrol/tdeio/ksaveioconfig.cpp b/kcontrol/tdeio/ksaveioconfig.cpp index 84518415..8ab676ad 100644 --- a/kcontrol/tdeio/ksaveioconfig.cpp +++ b/kcontrol/tdeio/ksaveioconfig.cpp @@ -19,8 +19,8 @@ #include <dcopref.h> #include <tdeconfig.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstaticdeleter.h> #include <tdeio/ioslave_defaults.h> diff --git a/kcontrol/tdeio/ksaveioconfig.h b/kcontrol/tdeio/ksaveioconfig.h index f14e98e2..6bfe9e1f 100644 --- a/kcontrol/tdeio/ksaveioconfig.h +++ b/kcontrol/tdeio/ksaveioconfig.h @@ -20,7 +20,7 @@ #ifndef KSAVEIO_CONFIG_H_ #define KSAVEIO_CONFIG_H_ -#include <kprotocolmanager.h> +#include <tdeprotocolmanager.h> class TQWidget; class KSaveIOConfigPrivate; diff --git a/kcontrol/tdeio/main.cpp b/kcontrol/tdeio/main.cpp index 3fe2fd8a..87862439 100644 --- a/kcontrol/tdeio/main.cpp +++ b/kcontrol/tdeio/main.cpp @@ -26,7 +26,7 @@ #include <tqtabwidget.h> #include <tdecmoduleloader.h> -#include <klocale.h> +#include <tdelocale.h> #include "kcookiesmain.h" #include "netpref.h" diff --git a/kcontrol/tdeio/main.h b/kcontrol/tdeio/main.h index a208b942..23451b2b 100644 --- a/kcontrol/tdeio/main.h +++ b/kcontrol/tdeio/main.h @@ -22,7 +22,7 @@ #define MYMAIN_H #include <tdecmodule.h> -#include <kglobal.h> +#include <tdeglobal.h> class TQTabWidget; diff --git a/kcontrol/tdeio/netpref.cpp b/kcontrol/tdeio/netpref.cpp index ea3de857..acde5635 100644 --- a/kcontrol/tdeio/netpref.cpp +++ b/kcontrol/tdeio/netpref.cpp @@ -5,7 +5,7 @@ #include <tdeio/ioslave_defaults.h> #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <tdeconfig.h> diff --git a/kcontrol/tdeio/policydlg.cpp b/kcontrol/tdeio/policydlg.cpp index 44862f51..c45dd837 100644 --- a/kcontrol/tdeio/policydlg.cpp +++ b/kcontrol/tdeio/policydlg.cpp @@ -24,7 +24,7 @@ #include <klineedit.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include "policydlg.h" #include "policydlg_ui.h" diff --git a/kcontrol/tdeio/smbrodlg.cpp b/kcontrol/tdeio/smbrodlg.cpp index 617c27b9..ccb070e3 100644 --- a/kcontrol/tdeio/smbrodlg.cpp +++ b/kcontrol/tdeio/smbrodlg.cpp @@ -22,9 +22,9 @@ #include <tqlabel.h> #include <tqtextcodec.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kcharsets.h> #include <kcombobox.h> #include <kdialog.h> diff --git a/kcontrol/tdeio/socks.cpp b/kcontrol/tdeio/socks.cpp index bf0e6410..91d8cfd5 100644 --- a/kcontrol/tdeio/socks.cpp +++ b/kcontrol/tdeio/socks.cpp @@ -27,7 +27,7 @@ #include <tdefiledialog.h> #include <tdelistview.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <ksocks.h> #include <tdeapplication.h> diff --git a/kcontrol/tdeio/uagentproviderdlg.cpp b/kcontrol/tdeio/uagentproviderdlg.cpp index 9e945948..5e5cbd23 100644 --- a/kcontrol/tdeio/uagentproviderdlg.cpp +++ b/kcontrol/tdeio/uagentproviderdlg.cpp @@ -23,7 +23,7 @@ #include <tqpushbutton.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcombobox.h> #include <klineedit.h> #include <kurllabel.h> diff --git a/kcontrol/tdeio/useragentdlg.cpp b/kcontrol/tdeio/useragentdlg.cpp index c325d2bc..7b1f4b3d 100644 --- a/kcontrol/tdeio/useragentdlg.cpp +++ b/kcontrol/tdeio/useragentdlg.cpp @@ -33,9 +33,9 @@ #include <kdebug.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdelistview.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <ksimpleconfig.h> #include <tdeio/http_slave_defaults.h> diff --git a/kcontrol/tdm/background.cpp b/kcontrol/tdm/background.cpp index 4078bd39..139ae90b 100644 --- a/kcontrol/tdm/background.cpp +++ b/kcontrol/tdm/background.cpp @@ -28,7 +28,7 @@ #include <tqwhatsthis.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> #include "../background/bgsettings.h" #include "../background/bgdialog.h" diff --git a/kcontrol/tdm/main.cpp b/kcontrol/tdm/main.cpp index 43671c0e..4a2c8e3e 100644 --- a/kcontrol/tdm/main.cpp +++ b/kcontrol/tdm/main.cpp @@ -28,7 +28,7 @@ #include <tdeaboutdata.h> #include <kgenericfactory.h> #include <kimageio.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kurldrag.h> #include "tdm-appear.h" diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp index 3457a230..91d65ccd 100644 --- a/kcontrol/tdm/tdm-appear.cpp +++ b/kcontrol/tdm/tdm-appear.cpp @@ -35,11 +35,11 @@ #include <tqcheckbox.h> #include <tqstyle.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <kimageio.h> #include <kcombobox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <tdeio/netaccess.h> #include <kiconloader.h> diff --git a/kcontrol/tdm/tdm-conv.cpp b/kcontrol/tdm/tdm-conv.cpp index 105630f4..06a1b044 100644 --- a/kcontrol/tdm/tdm-conv.cpp +++ b/kcontrol/tdm/tdm-conv.cpp @@ -33,7 +33,7 @@ #include <kdialog.h> #include <ksimpleconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include "tdm-conv.h" diff --git a/kcontrol/tdm/tdm-font.cpp b/kcontrol/tdm/tdm-font.cpp index c0e31718..65dbea17 100644 --- a/kcontrol/tdm/tdm-font.cpp +++ b/kcontrol/tdm/tdm-font.cpp @@ -32,7 +32,7 @@ #include <kdialog.h> #include <ksimpleconfig.h> #include <tdefontrequester.h> -#include <klocale.h> +#include <tdelocale.h> #include "tdm-font.h" diff --git a/kcontrol/tdm/tdm-shut.cpp b/kcontrol/tdm/tdm-shut.cpp index 434b55ae..80f96e13 100644 --- a/kcontrol/tdm/tdm-shut.cpp +++ b/kcontrol/tdm/tdm-shut.cpp @@ -30,7 +30,7 @@ #include <ksimpleconfig.h> #include <karrowbutton.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <kurlrequester.h> diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp index 65d57a89..d39d4048 100644 --- a/kcontrol/tdm/tdm-users.cpp +++ b/kcontrol/tdm/tdm-users.cpp @@ -33,9 +33,9 @@ #include <kimageio.h> #include <kimagefilepreview.h> #include <tdeio/netaccess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kurldrag.h> #include "tdm-users.h" diff --git a/kcontrol/usbview/usbdevices.cpp b/kcontrol/usbview/usbdevices.cpp index 466fd9a9..ac7f1ce9 100644 --- a/kcontrol/usbview/usbdevices.cpp +++ b/kcontrol/usbview/usbdevices.cpp @@ -19,8 +19,8 @@ #include <tqdir.h> #include <tqregexp.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "usbdb.h" #include "usbdevices.h" diff --git a/kcontrol/view1394/view1394.cpp b/kcontrol/view1394/view1394.cpp index 09214adb..74bba77f 100644 --- a/kcontrol/view1394/view1394.cpp +++ b/kcontrol/view1394/view1394.cpp @@ -24,8 +24,8 @@ #include <tqtextstream.h> #include <kdialog.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include "view1394.h" diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp index 7e43d9e9..d32adc1b 100644 --- a/kcontrol/xinerama/kcmxinerama.cpp +++ b/kcontrol/xinerama/kcmxinerama.cpp @@ -25,10 +25,10 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kdialog.h> -#include <kglobal.h> -#include <kglobalsettings.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <twin.h> #include <tqcheckbox.h> diff --git a/kdcop/kdcop.cpp b/kdcop/kdcop.cpp index 102eb4be..436a4a59 100644 --- a/kdcop/kdcop.cpp +++ b/kdcop/kdcop.cpp @@ -4,7 +4,7 @@ * Licensed under the Artistic License. */ #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp index 12bb5f0c..6cf24579 100644 --- a/kdcop/kdcopwindow.cpp +++ b/kdcop/kdcopwindow.cpp @@ -9,14 +9,14 @@ #include "kdcoplistview.h" #include <dcopclient.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdatastream.h> #include <kstdaction.h> #include <tdeaction.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <klineedit.h> #include <keditlistbox.h> diff --git a/kdebugdialog/kabstractdebugdialog.cpp b/kdebugdialog/kabstractdebugdialog.cpp index e8d8bdd8..9d01e668 100644 --- a/kdebugdialog/kabstractdebugdialog.cpp +++ b/kdebugdialog/kabstractdebugdialog.cpp @@ -22,7 +22,7 @@ #include <kpushbutton.h> #include <tqlayout.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstdguiitem.h> KAbstractDebugDialog::KAbstractDebugDialog( TQWidget *parent, const char *name, bool modal ) diff --git a/kdebugdialog/kdebugdialog.cpp b/kdebugdialog/kdebugdialog.cpp index 6d2e17f5..fc80bd48 100644 --- a/kdebugdialog/kdebugdialog.cpp +++ b/kdebugdialog/kdebugdialog.cpp @@ -30,8 +30,8 @@ #include <tqcheckbox.h> #include <tqpushbutton.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdialog.h> #include <tdeconfig.h> #include <kseparator.h> diff --git a/kdebugdialog/main.cpp b/kdebugdialog/main.cpp index 9690955e..b70d7d0e 100644 --- a/kdebugdialog/main.cpp +++ b/kdebugdialog/main.cpp @@ -23,7 +23,7 @@ #include <tdeaboutdata.h> #include <kstandarddirs.h> #include <tqtextstream.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kuniqueapplication.h> #include <tdeconfig.h> diff --git a/kdebugdialog/tdelistdebugdialog.cpp b/kdebugdialog/tdelistdebugdialog.cpp index 65007e7f..d447b374 100644 --- a/kdebugdialog/tdelistdebugdialog.cpp +++ b/kdebugdialog/tdelistdebugdialog.cpp @@ -25,7 +25,7 @@ #include <tqlayout.h> #include <tqscrollview.h> #include <tqvbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqpushbutton.h> #include <klineedit.h> #include <dcopclient.h> diff --git a/kdepasswd/kcm/chfacedlg.cpp b/kdepasswd/kcm/chfacedlg.cpp index a63de1af..0a3dbfb7 100644 --- a/kdepasswd/kcm/chfacedlg.cpp +++ b/kdepasswd/kcm/chfacedlg.cpp @@ -35,12 +35,12 @@ #include <tqcheckbox.h> #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> #include <kiconview.h> #include <kimagefilepreview.h> #include <kimageio.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <konq_operations.h> #include <kurl.h> diff --git a/kdepasswd/kcm/kcm_useraccount.kcfg b/kdepasswd/kcm/kcm_useraccount.kcfg index b741d418..549afdb1 100644 --- a/kdepasswd/kcm/kcm_useraccount.kcfg +++ b/kdepasswd/kcm/kcm_useraccount.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <include>kglobal.h</include> + <include>tdeglobal.h</include> <include>kstandarddirs.h</include> <kcfgfile name="tdm/tdmrc"/> <group name="X-*-Greeter"> diff --git a/kdepasswd/kcm/main.cpp b/kdepasswd/kcm/main.cpp index f65a5fef..18ecbb44 100644 --- a/kdepasswd/kcm/main.cpp +++ b/kdepasswd/kcm/main.cpp @@ -32,7 +32,7 @@ #include <kpushbutton.h> #include <kguiitem.h> -#include <kemailsettings.h> +#include <tdeemailsettings.h> #include <kpassdlg.h> #include <kuser.h> #include <kdialog.h> @@ -40,7 +40,7 @@ #include <kstandarddirs.h> #include <tdeaboutdata.h> #include <kgenericfactory.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <tdeio/netaccess.h> #include <kurl.h> diff --git a/kdepasswd/kdepasswd.cpp b/kdepasswd/kdepasswd.cpp index 1f108e2c..6f1c38aa 100644 --- a/kdepasswd/kdepasswd.cpp +++ b/kdepasswd/kdepasswd.cpp @@ -9,10 +9,10 @@ #include <config.h> #include <kuniqueapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kuser.h> #include <kdebug.h> diff --git a/kdepasswd/passwddlg.cpp b/kdepasswd/passwddlg.cpp index 83319503..7aee3fe5 100644 --- a/kdepasswd/passwddlg.cpp +++ b/kdepasswd/passwddlg.cpp @@ -6,8 +6,8 @@ * Copyright (C) 2000 Geert Jansen <jansen@kde.org> */ -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "passwd.h" #include "passwddlg.h" diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc index 75721c68..45ae1e8e 100644 --- a/kdesktop/desktop.cc +++ b/kdesktop/desktop.cc @@ -48,17 +48,17 @@ #include <kimageio.h> #include <kinputdialog.h> #include <kipc.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/netaccess.h> #include <kprocess.h> #include <tdesycoca.h> -#include <ktempfile.h> -#include <kmessagebox.h> +#include <tdetempfile.h> +#include <tdemessagebox.h> #include <kglobalaccel.h> #include <twinmodule.h> #include <krun.h> #include <twin.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdepopupmenu.h> #include <tdeapplication.h> #include <kdirlister.h> diff --git a/kdesktop/init.cc b/kdesktop/init.cc index be6f0c5d..6bf87f33 100644 --- a/kdesktop/init.cc +++ b/kdesktop/init.cc @@ -21,11 +21,11 @@ #include <tdeio/netaccess.h> #include <kstandarddirs.h> #include <kdesktopfile.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeapplication.h> #include <kprocess.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kdebug.h> #include <kdesktopsettings.h> diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc index 68897eb9..e00fbada 100644 --- a/kdesktop/kdiconview.cc +++ b/kdesktop/kdiconview.cc @@ -29,9 +29,9 @@ #include <kdebug.h> #include <kdesktopfile.h> #include <kdirlister.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kpropertiesdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <konqbookmarkmanager.h> #include <konq_defaults.h> #include <konq_drag.h> diff --git a/kdesktop/kdiconview.h b/kdesktop/kdiconview.h index f74b6795..bc24308f 100644 --- a/kdesktop/kdiconview.h +++ b/kdesktop/kdiconview.h @@ -26,7 +26,7 @@ #include <tdeaction.h> #include <tdefileitem.h> #include <kdirnotify.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <dcopclient.h> diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc index 38435d0b..02f07313 100644 --- a/kdesktop/krootwm.cc +++ b/kdesktop/krootwm.cc @@ -40,7 +40,7 @@ #include <kcmultidialog.h> #include <kbookmarkmenu.h> #include <konqbookmarkmanager.h> -#include <klocale.h> +#include <tdelocale.h> #include <knewmenu.h> #include <dcopclient.h> #include <dcopref.h> @@ -48,8 +48,8 @@ #include <kdebug.h> #include <twindowlistmenu.h> #include <twin.h> -#include <kmenubar.h> -#include <kmessagebox.h> +#include <tdemenubar.h> +#include <tdemessagebox.h> #include <kuser.h> #include <tqfile.h> diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp index 885f1ce5..1e2499ea 100644 --- a/kdesktop/kwebdesktop/kwebdesktop.cpp +++ b/kdesktop/kwebdesktop/kwebdesktop.cpp @@ -24,7 +24,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> #include <kurifilter.h> diff --git a/kdesktop/kxdglauncher.cpp b/kdesktop/kxdglauncher.cpp index a6e45da3..6ee3a03f 100644 --- a/kdesktop/kxdglauncher.cpp +++ b/kdesktop/kxdglauncher.cpp @@ -24,12 +24,12 @@ #include <tqtextcodec.h> #include <krun.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kinputdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfig.h> #include <stdlib.h> diff --git a/kdesktop/lock/autologout.cc b/kdesktop/lock/autologout.cc index 41a1946e..07a68c50 100644 --- a/kdesktop/lock/autologout.cc +++ b/kdesktop/lock/autologout.cc @@ -8,13 +8,13 @@ #include "autologout.h" #include <tdeapplication.h> -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <tdeconfig.h> #include <kiconloader.h> #include <kdebug.h> #include <dcopref.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdialog.h> #include <tqlayout.h> diff --git a/kdesktop/lock/infodlg.cc b/kdesktop/lock/infodlg.cc index c241a1ac..97e2ea2a 100644 --- a/kdesktop/lock/infodlg.cc +++ b/kdesktop/lock/infodlg.cc @@ -11,11 +11,11 @@ #include <dmctl.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kseparator.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeconfig.h> #include <kiconloader.h> #include <tdesu/defaults.h> @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kuser.h> #include <dcopref.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqlayout.h> #include <tqpushbutton.h> diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc index e8e0f901..a3fe9828 100644 --- a/kdesktop/lock/lockdlg.cc +++ b/kdesktop/lock/lockdlg.cc @@ -16,11 +16,11 @@ #include <dmctl.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kseparator.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeconfig.h> #include <kiconloader.h> #include <tdesu/defaults.h> @@ -28,7 +28,7 @@ #include <kdebug.h> #include <kuser.h> #include <dcopref.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqlayout.h> #include <tqpushbutton.h> diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index 604b93a8..f4b6278f 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -40,9 +40,9 @@ #include <tdeapplication.h> #include <kservicegroup.h> #include <kdebug.h> -#include <kmessagebox.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <klibloader.h> #include <kpushbutton.h> #include <kstdguiitem.h> diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc index 1d7475a9..377080d2 100644 --- a/kdesktop/lock/main.cc +++ b/kdesktop/lock/main.cc @@ -24,10 +24,10 @@ #include "kdesktopsettings.h" #include <tdecmdlineargs.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <dcopref.h> #include <ksimpleconfig.h> diff --git a/kdesktop/lock/querydlg.cc b/kdesktop/lock/querydlg.cc index f1f1d517..a278fcb8 100644 --- a/kdesktop/lock/querydlg.cc +++ b/kdesktop/lock/querydlg.cc @@ -11,11 +11,11 @@ #include <dmctl.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kseparator.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeconfig.h> #include <kiconloader.h> #include <tdesu/defaults.h> @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kuser.h> #include <dcopref.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqlayout.h> #include <tqpushbutton.h> diff --git a/kdesktop/lock/sakdlg.cc b/kdesktop/lock/sakdlg.cc index 7a77feb0..5fca73e2 100644 --- a/kdesktop/lock/sakdlg.cc +++ b/kdesktop/lock/sakdlg.cc @@ -11,11 +11,11 @@ #include <dmctl.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kseparator.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeconfig.h> #include <kiconloader.h> #include <tdesu/defaults.h> @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kuser.h> #include <dcopref.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdialog.h> #include <tqlayout.h> diff --git a/kdesktop/lock/securedlg.cc b/kdesktop/lock/securedlg.cc index 57e76ed1..d19df99a 100644 --- a/kdesktop/lock/securedlg.cc +++ b/kdesktop/lock/securedlg.cc @@ -11,11 +11,11 @@ #include <dmctl.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kseparator.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeconfig.h> #include <kiconloader.h> #include <tdesu/defaults.h> @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kuser.h> #include <dcopref.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdialog.h> #include <tqlayout.h> diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cc index 24d950ab..a8c98cf3 100644 --- a/kdesktop/lockeng.cc +++ b/kdesktop/lockeng.cc @@ -15,7 +15,7 @@ #include <tdeapplication.h> #include <kservicegroup.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqfile.h> #include <tqtimer.h> #include <dcopclient.h> diff --git a/kdesktop/main.cc b/kdesktop/main.cc index 93b8d42c..0cff7342 100644 --- a/kdesktop/main.cc +++ b/kdesktop/main.cc @@ -19,15 +19,15 @@ #include <config.h> #include <kuniqueapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <kopenwith.h> #include <kcrash.h> #include <kdebug.h> -#include <kglobalsettings.h> -#include <kglobal.h> +#include <tdeglobalsettings.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kmanagerselection.h> diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp index 971b855e..86e24139 100644 --- a/kdesktop/minicli.cpp +++ b/kdesktop/minicli.cpp @@ -48,8 +48,8 @@ #include <tqstylesheet.h> #include <dcopclient.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <kcombobox.h> #include <klineedit.h> diff --git a/kdesktop/startupid.h b/kdesktop/startupid.h index 4c0027bf..893d0b8d 100644 --- a/kdesktop/startupid.h +++ b/kdesktop/startupid.h @@ -27,7 +27,7 @@ #include <tqstring.h> #include <tqtimer.h> #include <tqmap.h> -#include <kstartupinfo.h> +#include <tdestartupinfo.h> class TQStyle; diff --git a/kdesktop/tdefileividesktop.cpp b/kdesktop/tdefileividesktop.cpp index 04e8db16..7d20e4d8 100644 --- a/kdesktop/tdefileividesktop.cpp +++ b/kdesktop/tdefileividesktop.cpp @@ -31,7 +31,7 @@ #include <kwordwrap.h> #include <kiconview.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kshadowengine.h> #include "kdesktopshadowsettings.h" diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp index 37226a37..19dd197e 100644 --- a/kdialog/kdialog.cpp +++ b/kdialog/kdialog.cpp @@ -29,7 +29,7 @@ #include <tqdatastream.h> #include <tqregexp.h> #include <tqtimer.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include <kdebug.h> //#include <ktopwidget.h> @@ -40,7 +40,7 @@ #include "widgets.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqdialog.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> diff --git a/kdialog/tdelistboxdialog.cpp b/kdialog/tdelistboxdialog.cpp index f3fc6242..f961a7d4 100644 --- a/kdialog/tdelistboxdialog.cpp +++ b/kdialog/tdelistboxdialog.cpp @@ -24,7 +24,7 @@ #include "tdelistboxdialog.h" #include "tdelistboxdialog.moc" -#include "klocale.h" +#include "tdelocale.h" TDEListBoxDialog::TDEListBoxDialog(TQString text, TQWidget *parent) : KDialogBase( parent, 0, true, TQString::null, Ok|Cancel, Ok, true ) diff --git a/kdialog/widgets.cpp b/kdialog/widgets.cpp index ecd7551a..fb90bbb2 100644 --- a/kdialog/widgets.cpp +++ b/kdialog/widgets.cpp @@ -18,8 +18,8 @@ // -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "widgets.h" #include "tdelistboxdialog.h" diff --git a/kfind/kdatecombo.cpp b/kfind/kdatecombo.cpp index d27ea7a3..869753c5 100644 --- a/kfind/kdatecombo.cpp +++ b/kfind/kdatecombo.cpp @@ -6,8 +6,8 @@ #include <tqtimer.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdatepicker.h> #include <kdatetbl.h> #include <kdebug.h> diff --git a/kfind/kfind.cpp b/kfind/kfind.cpp index 8908b26c..b1afe1b0 100644 --- a/kfind/kfind.cpp +++ b/kfind/kfind.cpp @@ -31,7 +31,7 @@ #include <kdialog.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kseparator.h> #include <tqlineedit.h> #include <tqcheckbox.h> diff --git a/kfind/kfinddlg.cpp b/kfind/kfinddlg.cpp index b426050a..76fa6301 100644 --- a/kfind/kfinddlg.cpp +++ b/kfind/kfinddlg.cpp @@ -7,11 +7,11 @@ #include <tqlayout.h> #include <tqpushbutton.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kguiitem.h> #include <kstatusbar.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tdeaboutapplication.h> #include <kstandarddirs.h> diff --git a/kfind/kfindpart.cpp b/kfind/kfindpart.cpp index 3f71bdfb..54de01e9 100644 --- a/kfind/kfindpart.cpp +++ b/kfind/kfindpart.cpp @@ -23,7 +23,7 @@ #include <tdeparts/genericfactory.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqdir.h> #include <kinstance.h> diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp index 83e98aff..c2df7aa6 100644 --- a/kfind/kftabdlg.cpp +++ b/kfind/kftabdlg.cpp @@ -17,11 +17,11 @@ #include <tqapplication.h> #include <kcalendarsystem.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kcombobox.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> #include <kregexpeditorinterface.h> #include <tdeparts/componentfactory.h> diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp index f06b1a2a..7364aeb7 100644 --- a/kfind/kfwin.cpp +++ b/kfind/kfwin.cpp @@ -22,15 +22,15 @@ #include <tqdragobject.h> #include <tdefiledialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <krun.h> #include <kprocess.h> #include <kpropertiesdialog.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kmimetype.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdepopupmenu.h> #include <tdeio/netaccess.h> #include <kurldrag.h> diff --git a/kfind/kquery.cpp b/kfind/kquery.cpp index 514e6f91..1e3617c7 100644 --- a/kfind/kquery.cpp +++ b/kfind/kquery.cpp @@ -5,8 +5,8 @@ #include <tdefileitem.h> #include <tdefilemetainfo.h> #include <tdeapplication.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kzip.h> diff --git a/kfind/main.cpp b/kfind/main.cpp index 88aa6049..e0e8bc49 100644 --- a/kfind/main.cpp +++ b/kfind/main.cpp @@ -2,7 +2,7 @@ #include <tqfile.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> #include <kopenwith.h> diff --git a/khelpcenter/docmetainfo.cpp b/khelpcenter/docmetainfo.cpp index be4af6ba..8e254d90 100644 --- a/khelpcenter/docmetainfo.cpp +++ b/khelpcenter/docmetainfo.cpp @@ -2,7 +2,7 @@ #include <kdebug.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include "htmlsearch.h" diff --git a/khelpcenter/fontdialog.cpp b/khelpcenter/fontdialog.cpp index e9f5e378..1f0cc8f6 100644 --- a/khelpcenter/fontdialog.cpp +++ b/khelpcenter/fontdialog.cpp @@ -25,7 +25,7 @@ #include <tdeconfig.h> #include <tdefontcombo.h> #include <tdehtmldefaults.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <tqgroupbox.h> diff --git a/khelpcenter/formatter.cpp b/khelpcenter/formatter.cpp index a59fc534..7188ec21 100644 --- a/khelpcenter/formatter.cpp +++ b/khelpcenter/formatter.cpp @@ -20,8 +20,8 @@ #include "formatter.h" -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kdebug.h> #include <tdeconfig.h> #include <kstandarddirs.h> diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp index d4e171b0..0d25dbf7 100644 --- a/khelpcenter/glossary.cpp +++ b/khelpcenter/glossary.cpp @@ -24,7 +24,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdemainwindow.h> #include <kprocess.h> #include <kstandarddirs.h> diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp index 70ba4960..5fd0f464 100644 --- a/khelpcenter/htmlsearch/htmlsearch.cpp +++ b/khelpcenter/htmlsearch/htmlsearch.cpp @@ -6,7 +6,7 @@ #include <kdebug.h> #include <kstandarddirs.h> #include <kprocess.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> diff --git a/khelpcenter/htmlsearch/index.cpp b/khelpcenter/htmlsearch/index.cpp index b4dc9380..680f9f4a 100644 --- a/khelpcenter/htmlsearch/index.cpp +++ b/khelpcenter/htmlsearch/index.cpp @@ -1,7 +1,7 @@ #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeapplication.h> #include "htmlsearch.h" diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp index a011a2bc..3db9c989 100644 --- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp +++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp @@ -20,7 +20,7 @@ #include <tqlayout.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurllabel.h> #include <tdeapplication.h> #include <tqcheckbox.h> diff --git a/khelpcenter/htmlsearch/progressdialog.cpp b/khelpcenter/htmlsearch/progressdialog.cpp index e7eafedb..33a78312 100644 --- a/khelpcenter/htmlsearch/progressdialog.cpp +++ b/khelpcenter/htmlsearch/progressdialog.cpp @@ -2,7 +2,7 @@ #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprogress.h> #include <kstandarddirs.h> diff --git a/khelpcenter/htmlsearchconfig.cpp b/khelpcenter/htmlsearchconfig.cpp index 85ce883b..a9eef3b4 100644 --- a/khelpcenter/htmlsearchconfig.cpp +++ b/khelpcenter/htmlsearchconfig.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurllabel.h> #include <tdeapplication.h> #include <tdefiledialog.h> diff --git a/khelpcenter/infotree.cpp b/khelpcenter/infotree.cpp index ebde1342..c0c5a9d9 100644 --- a/khelpcenter/infotree.cpp +++ b/khelpcenter/infotree.cpp @@ -28,7 +28,7 @@ #include <kdebug.h> #include <kiconloader.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kurl.h> diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp index 10c94dc4..df8f1b36 100644 --- a/khelpcenter/kcmhelpcenter.cpp +++ b/khelpcenter/kcmhelpcenter.cpp @@ -28,17 +28,17 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeaboutdata.h> #include <kdialog.h> #include <kstandarddirs.h> #include <kprocess.h> #include <tdeapplication.h> #include <dcopclient.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kurlrequester.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdelistview.h> #include <klineedit.h> #include <tqlayout.h> diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp index 3eb04a63..9c605687 100644 --- a/khelpcenter/khc_indexbuilder.cpp +++ b/khelpcenter/khc_indexbuilder.cpp @@ -24,7 +24,7 @@ #include "version.h" #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <kuniqueapplication.h> #include <kdebug.h> diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp index 743a7d20..e05671ef 100644 --- a/khelpcenter/navigator.cpp +++ b/khelpcenter/navigator.cpp @@ -41,11 +41,11 @@ #include <tdeapplication.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdelistview.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include <kprocio.h> #include <kcharsets.h> diff --git a/khelpcenter/scrollkeepertreebuilder.cpp b/khelpcenter/scrollkeepertreebuilder.cpp index 377e6691..87a6861e 100644 --- a/khelpcenter/scrollkeepertreebuilder.cpp +++ b/khelpcenter/scrollkeepertreebuilder.cpp @@ -26,8 +26,8 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kprocio.h> #include <tqdom.h> diff --git a/khelpcenter/searchengine.cpp b/khelpcenter/searchengine.cpp index 76061edc..56b6e635 100644 --- a/khelpcenter/searchengine.cpp +++ b/khelpcenter/searchengine.cpp @@ -6,8 +6,8 @@ #include <kdebug.h> #include <kstandarddirs.h> #include <kprocess.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "docmetainfo.h" #include "formatter.h" diff --git a/khelpcenter/searchhandler.cpp b/khelpcenter/searchhandler.cpp index 06ca584f..54a0a9a3 100644 --- a/khelpcenter/searchhandler.cpp +++ b/khelpcenter/searchhandler.cpp @@ -27,8 +27,8 @@ #include <kdesktopfile.h> #include <kprocess.h> #include <kdebug.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <stdlib.h> diff --git a/khelpcenter/searchwidget.cpp b/khelpcenter/searchwidget.cpp index c8f706b5..5040a7d8 100644 --- a/khelpcenter/searchwidget.cpp +++ b/khelpcenter/searchwidget.cpp @@ -30,7 +30,7 @@ #include <ksimpleconfig.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kiconloader.h> diff --git a/khelpcenter/testmetainfo.cpp b/khelpcenter/testmetainfo.cpp index d70e2d16..2f77ff76 100644 --- a/khelpcenter/testmetainfo.cpp +++ b/khelpcenter/testmetainfo.cpp @@ -3,7 +3,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include "docmetainfo.h" diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp index a3554e25..3c29e039 100644 --- a/khelpcenter/view.cpp +++ b/khelpcenter/view.cpp @@ -11,7 +11,7 @@ #include <kdebug.h> #include <tdehtml_settings.h> #include <tdehtmlview.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kstandarddirs.h> diff --git a/khotkeys/app/app.cpp b/khotkeys/app/app.cpp index 0d0fd339..27e78d90 100644 --- a/khotkeys/app/app.cpp +++ b/khotkeys/app/app.cpp @@ -18,7 +18,7 @@ #include <tdecmdlineargs.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <stdio.h> #include <stdlib.h> diff --git a/khotkeys/app/kded.cpp b/khotkeys/app/kded.cpp index 743e0fb0..afbd2bce 100644 --- a/khotkeys/app/kded.cpp +++ b/khotkeys/app/kded.cpp @@ -18,7 +18,7 @@ #include <tdecmdlineargs.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <stdio.h> diff --git a/khotkeys/arts/soundrecorder_arts.cpp b/khotkeys/arts/soundrecorder_arts.cpp index 0faf7100..0fdc48ab 100644 --- a/khotkeys/arts/soundrecorder_arts.cpp +++ b/khotkeys/arts/soundrecorder_arts.cpp @@ -31,7 +31,7 @@ #include <arts/kartsdispatcher.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqtimer.h> diff --git a/khotkeys/kcontrol/action_group_tab.cpp b/khotkeys/kcontrol/action_group_tab.cpp index 8a297b93..1bdeffd7 100644 --- a/khotkeys/kcontrol/action_group_tab.cpp +++ b/khotkeys/kcontrol/action_group_tab.cpp @@ -19,8 +19,8 @@ #include <tqlineedit.h> #include <tqcheckbox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <ktextedit.h> #include <actions.h> diff --git a/khotkeys/kcontrol/action_list_widget.cpp b/khotkeys/kcontrol/action_list_widget.cpp index 33dc8054..79744a09 100644 --- a/khotkeys/kcontrol/action_list_widget.cpp +++ b/khotkeys/kcontrol/action_list_widget.cpp @@ -22,7 +22,7 @@ #include <tqheader.h> #include <tqlineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <khlistview.h> diff --git a/khotkeys/kcontrol/actions_listview_widget.cpp b/khotkeys/kcontrol/actions_listview_widget.cpp index 5048289d..e528005e 100644 --- a/khotkeys/kcontrol/actions_listview_widget.cpp +++ b/khotkeys/kcontrol/actions_listview_widget.cpp @@ -18,7 +18,7 @@ #include <tqheader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqdragobject.h> diff --git a/khotkeys/kcontrol/condition_list_widget.cpp b/khotkeys/kcontrol/condition_list_widget.cpp index 86ff8f47..ba3be5e7 100644 --- a/khotkeys/kcontrol/condition_list_widget.cpp +++ b/khotkeys/kcontrol/condition_list_widget.cpp @@ -23,8 +23,8 @@ #include <tqpopupmenu.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <khlistview.h> diff --git a/khotkeys/kcontrol/dcop_widget.cpp b/khotkeys/kcontrol/dcop_widget.cpp index a410109f..bee14986 100644 --- a/khotkeys/kcontrol/dcop_widget.cpp +++ b/khotkeys/kcontrol/dcop_widget.cpp @@ -20,8 +20,8 @@ #include <tqpushbutton.h> #include <krun.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <actions.h> diff --git a/khotkeys/kcontrol/general_tab.cpp b/khotkeys/kcontrol/general_tab.cpp index 1190780d..1cd98d46 100644 --- a/khotkeys/kcontrol/general_tab.cpp +++ b/khotkeys/kcontrol/general_tab.cpp @@ -20,7 +20,7 @@ #include <tqcheckbox.h> #include <tqcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <ktextedit.h> diff --git a/khotkeys/kcontrol/gesturerecordpage.cpp b/khotkeys/kcontrol/gesturerecordpage.cpp index af2fb8cd..e9e768bb 100644 --- a/khotkeys/kcontrol/gesturerecordpage.cpp +++ b/khotkeys/kcontrol/gesturerecordpage.cpp @@ -13,8 +13,8 @@ #include <tqlabel.h> #include <tqpushbutton.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "gesturerecordpage.h" #include "gesturerecorder.h" diff --git a/khotkeys/kcontrol/gestures_settings_tab.cpp b/khotkeys/kcontrol/gestures_settings_tab.cpp index 2b5a8ff4..8585fedb 100644 --- a/khotkeys/kcontrol/gestures_settings_tab.cpp +++ b/khotkeys/kcontrol/gestures_settings_tab.cpp @@ -16,7 +16,7 @@ #include "gestures_settings_tab.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqcombobox.h> #include <knuminput.h> #include <tqcheckbox.h> diff --git a/khotkeys/kcontrol/info_tab.cpp b/khotkeys/kcontrol/info_tab.cpp index 7a2e0c91..feba07dd 100644 --- a/khotkeys/kcontrol/info_tab.cpp +++ b/khotkeys/kcontrol/info_tab.cpp @@ -19,7 +19,7 @@ #include <tqpushbutton.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> namespace KHotKeys { diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp index 5d6e1aad..5f9e4d5f 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.cpp +++ b/khotkeys/kcontrol/kcmkhotkeys.cpp @@ -24,14 +24,14 @@ #include <tdecmodule.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <dcopclient.h> #include <kdebug.h> -#include <kmessagebox.h> -#include <kglobal.h> +#include <tdemessagebox.h> +#include <tdeglobal.h> #include <ksimpleconfig.h> #include <tdefiledialog.h> #include <dcopref.h> diff --git a/khotkeys/kcontrol/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp index 9095cff2..08b8a3c2 100644 --- a/khotkeys/kcontrol/menuedit.cpp +++ b/khotkeys/kcontrol/menuedit.cpp @@ -18,8 +18,8 @@ #include "menuedit.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeaccel.h> #include <tdeapplication.h> #include <dcopclient.h> diff --git a/khotkeys/kcontrol/tab_widget.cpp b/khotkeys/kcontrol/tab_widget.cpp index 24354351..d3ca4afb 100644 --- a/khotkeys/kcontrol/tab_widget.cpp +++ b/khotkeys/kcontrol/tab_widget.cpp @@ -18,7 +18,7 @@ #include <typeinfo> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <actions.h> diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp index 683aad32..d4f7ff9d 100644 --- a/khotkeys/kcontrol/triggers_tab.cpp +++ b/khotkeys/kcontrol/triggers_tab.cpp @@ -25,7 +25,7 @@ #include <tqheader.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdeshortcut.h> #include <tdeconfig.h> diff --git a/khotkeys/kcontrol/voice_settings_tab.cpp b/khotkeys/kcontrol/voice_settings_tab.cpp index 277e2f67..1d97d69a 100644 --- a/khotkeys/kcontrol/voice_settings_tab.cpp +++ b/khotkeys/kcontrol/voice_settings_tab.cpp @@ -10,7 +10,7 @@ #include "voice_settings_tab.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqcombobox.h> #include <knuminput.h> #include <tqcheckbox.h> diff --git a/khotkeys/kcontrol/voicerecorder.cpp b/khotkeys/kcontrol/voicerecorder.cpp index 50d1fa2f..fc231a82 100644 --- a/khotkeys/kcontrol/voicerecorder.cpp +++ b/khotkeys/kcontrol/voicerecorder.cpp @@ -18,11 +18,11 @@ #include "khotkeysglobal.h" #include <kpushbutton.h> #include <klineedit.h> -#include <klocale.h> -#include <ktempfile.h> +#include <tdelocale.h> +#include <tdetempfile.h> #include <tqlabel.h> #include <tqpainter.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <klibloader.h> #include <kstandarddirs.h> diff --git a/khotkeys/kcontrol/voicerecordpage.cpp b/khotkeys/kcontrol/voicerecordpage.cpp index fec07e22..1c7f8c93 100644 --- a/khotkeys/kcontrol/voicerecordpage.cpp +++ b/khotkeys/kcontrol/voicerecordpage.cpp @@ -14,8 +14,8 @@ #include <klineedit.h> #include <kstandarddirs.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "voicerecordpage.h" #include "voicerecorder.h" diff --git a/khotkeys/kcontrol/windowdef_list_widget.cpp b/khotkeys/kcontrol/windowdef_list_widget.cpp index 471aab74..dc16d780 100644 --- a/khotkeys/kcontrol/windowdef_list_widget.cpp +++ b/khotkeys/kcontrol/windowdef_list_widget.cpp @@ -23,7 +23,7 @@ #include <tqpopupmenu.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <khlistview.h> diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp index e95734b7..3174b1dc 100644 --- a/khotkeys/shared/actions.cpp +++ b/khotkeys/shared/actions.cpp @@ -20,12 +20,12 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kurifilter.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <tdeapplication.h> #include <dcopclient.h> #include <kdesktopfile.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaccel.h> #include <kservice.h> #include <kprocess.h> diff --git a/khotkeys/shared/conditions.cpp b/khotkeys/shared/conditions.cpp index 6120ca87..b09284b4 100644 --- a/khotkeys/shared/conditions.cpp +++ b/khotkeys/shared/conditions.cpp @@ -22,7 +22,7 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <assert.h> #include <X11/Xlib.h> diff --git a/khotkeys/shared/khotkeysglobal.h b/khotkeys/shared/khotkeysglobal.h index 92dba09b..c97ef1de 100644 --- a/khotkeys/shared/khotkeysglobal.h +++ b/khotkeys/shared/khotkeysglobal.h @@ -20,7 +20,7 @@ #include <tqstring.h> -#include <klocale.h> +#include <tdelocale.h> class TDEConfig; class TQObject; diff --git a/khotkeys/shared/settings.cpp b/khotkeys/shared/settings.cpp index 43f9ad7c..76adac6b 100644 --- a/khotkeys/shared/settings.cpp +++ b/khotkeys/shared/settings.cpp @@ -18,10 +18,10 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaccel.h> -#include <kglobal.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdemessagebox.h> #include "triggers.h" #include "conditions.h" diff --git a/khotkeys/shared/soundrecorder.cpp b/khotkeys/shared/soundrecorder.cpp index 266bbc7c..b5759542 100644 --- a/khotkeys/shared/soundrecorder.cpp +++ b/khotkeys/shared/soundrecorder.cpp @@ -26,7 +26,7 @@ #include "soundrecorder.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqtimer.h> #include <klibloader.h> diff --git a/khotkeys/shared/triggers.cpp b/khotkeys/shared/triggers.cpp index 1f883827..115bc668 100644 --- a/khotkeys/shared/triggers.cpp +++ b/khotkeys/shared/triggers.cpp @@ -20,7 +20,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <twinmodule.h> -#include <klocale.h> +#include <tdelocale.h> #include <netwm_def.h> #include <tdeaccel.h> diff --git a/khotkeys/shared/windows.cpp b/khotkeys/shared/windows.cpp index b27fa3a0..077bf7b1 100644 --- a/khotkeys/shared/windows.cpp +++ b/khotkeys/shared/windows.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <twinmodule.h> #include <twin.h> -#include <klocale.h> +#include <tdelocale.h> #include "khotkeysglobal.h" diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index e4248958..be8dfed7 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -44,12 +44,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kstandarddirs.h> #include <tdeapplication.h> #include <kprocess.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kstringhandler.h> #include <tdefiledialog.h> #include <tdefontrequester.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeconfigdialogmanager.h> #include <kcalendarsystem.h> #include <kicontheme.h> diff --git a/kicker/applets/clock/datepicker.cpp b/kicker/applets/clock/datepicker.cpp index 7823df53..d6165306 100644 --- a/kicker/applets/clock/datepicker.cpp +++ b/kicker/applets/clock/datepicker.cpp @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kdatepicker.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <twin.h> #include <netwm.h> diff --git a/kicker/applets/clock/init.cpp b/kicker/applets/clock/init.cpp index 096b0224..55ee382f 100644 --- a/kicker/applets/clock/init.cpp +++ b/kicker/applets/clock/init.cpp @@ -44,12 +44,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kstandarddirs.h> #include <tdeapplication.h> #include <kprocess.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kstringhandler.h> #include <tdefiledialog.h> #include <tdefontrequester.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeconfigdialogmanager.h> #include <kcalendarsystem.h> #include <kicontheme.h> diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp index 3a313fbe..aa9126b8 100644 --- a/kicker/applets/clock/zone.cpp +++ b/kicker/applets/clock/zone.cpp @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kdebug.h> #include <kstandarddirs.h> #include <kstringhandler.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqfile.h> #include <tqtooltip.h> diff --git a/kicker/applets/launcher/CMakeLists.txt b/kicker/applets/launcher/CMakeLists.txt index bf511165..0cb4c36e 100644 --- a/kicker/applets/launcher/CMakeLists.txt +++ b/kicker/applets/launcher/CMakeLists.txt @@ -44,7 +44,7 @@ tde_add_kpart( launcher_panelapplet AUTOMOC -Wl,--start-group kicker_core-static kicker_buttons-static kicker_ui-static -Wl,--end-group - kickermain-shared tdeutils-shared kabc-shared + kickermain-shared tdeutils-shared tdeabc-shared DEPENDENCIES libkicker-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kicker/applets/launcher/configdlg.cpp b/kicker/applets/launcher/configdlg.cpp index 94bb9c89..d542d259 100644 --- a/kicker/applets/launcher/configdlg.cpp +++ b/kicker/applets/launcher/configdlg.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "prefs.h" diff --git a/kicker/applets/launcher/quickaddappsmenu.cpp b/kicker/applets/launcher/quickaddappsmenu.cpp index 5b1ff44c..cdbc94dd 100644 --- a/kicker/applets/launcher/quickaddappsmenu.cpp +++ b/kicker/applets/launcher/quickaddappsmenu.cpp @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kstandarddirs.h> #include <kdesktopfile.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdesycocaentry.h> #include <kservice.h> #include <kservicegroup.h> diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp index d44dc053..19377c1b 100644 --- a/kicker/applets/launcher/quickbutton.cpp +++ b/kicker/applets/launcher/quickbutton.cpp @@ -31,11 +31,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeactionclasses.h> #include <kickertip.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdesktopfile.h> #include <krun.h> #include <kiconeffect.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kcursor.h> #include <tdeapplication.h> #include <kipc.h> diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp index 3d623962..1ee251b3 100644 --- a/kicker/applets/launcher/quicklauncher.cpp +++ b/kicker/applets/launcher/quicklauncher.cpp @@ -34,9 +34,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeaboutapplication.h> #include <tdeaboutdata.h> #include <kdialogbase.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <knuminput.h> #include <tdeconfig.h> #include <kstandarddirs.h> diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp index b7b74c43..8547b1b4 100644 --- a/kicker/applets/lockout/lockout.cpp +++ b/kicker/applets/lockout/lockout.cpp @@ -35,8 +35,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <dcopclient.h> #include <tdeapplication.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kiconloader.h> #include <krun.h> #include <kdebug.h> diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp index af1113f1..c3b964ce 100644 --- a/kicker/applets/media/mediaapplet.cpp +++ b/kicker/applets/media/mediaapplet.cpp @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <tdeaboutdata.h> diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp index c85b5017..ce61cfbd 100644 --- a/kicker/applets/media/mediumbutton.cpp +++ b/kicker/applets/media/mediumbutton.cpp @@ -27,12 +27,12 @@ #include <tqstyle.h> #include <tqtooltip.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kmimetype.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdesktopfile.h> #include <krun.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kcursor.h> #include <tdeapplication.h> #include <kipc.h> diff --git a/kicker/applets/media/preferencesdialog.cpp b/kicker/applets/media/preferencesdialog.cpp index 8fbd958f..3f1d2789 100644 --- a/kicker/applets/media/preferencesdialog.cpp +++ b/kicker/applets/media/preferencesdialog.cpp @@ -19,7 +19,7 @@ #include "preferencesdialog.h" -#include <klocale.h> +#include <tdelocale.h> #include <kmimetype.h> #include <tqvbox.h> #include <tqwhatsthis.h> diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp index 006722c7..f95e4e4c 100644 --- a/kicker/applets/menu/menuapplet.cpp +++ b/kicker/applets/menu/menuapplet.cpp @@ -33,8 +33,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <twin.h> #include <twinmodule.h> diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp index 50d9c6d3..ac0fa134 100644 --- a/kicker/applets/minipager/pagerapplet.cpp +++ b/kicker/applets/minipager/pagerapplet.cpp @@ -29,12 +29,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqbuttongroup.h> #include <dcopref.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <twin.h> #include <twinmodule.h> #include <tdeapplication.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <kprocess.h> #include <tdepopupmenu.h> diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp index c805a46a..1da45a35 100644 --- a/kicker/applets/naughty/NaughtyApplet.cpp +++ b/kicker/applets/naughty/NaughtyApplet.cpp @@ -27,13 +27,13 @@ #include <tqlayout.h> #include <kiconloader.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <tdeaboutapplication.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqpushbutton.h> extern "C" diff --git a/kicker/applets/naughty/NaughtyConfigDialog.cpp b/kicker/applets/naughty/NaughtyConfigDialog.cpp index 493c7817..9218155a 100644 --- a/kicker/applets/naughty/NaughtyConfigDialog.cpp +++ b/kicker/applets/naughty/NaughtyConfigDialog.cpp @@ -20,7 +20,7 @@ #include <keditlistbox.h> #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqvbox.h> #include "NaughtyConfigDialog.h" diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.cpp b/kicker/applets/naughty/NaughtyProcessMonitor.cpp index b14012a7..c71ba6e2 100644 --- a/kicker/applets/naughty/NaughtyProcessMonitor.cpp +++ b/kicker/applets/naughty/NaughtyProcessMonitor.cpp @@ -42,7 +42,7 @@ #include <tqmap.h> #include <tqdatetime.h> -#include <klocale.h> +#include <tdelocale.h> #include "NaughtyProcessMonitor.h" diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp index edeb7c2f..c5d3e972 100644 --- a/kicker/applets/run/runapplet.cpp +++ b/kicker/applets/run/runapplet.cpp @@ -28,14 +28,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqhbox.h> #include <tdeapplication.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kcombobox.h> #include <kurifilter.h> #include <kdialog.h> #include <krun.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "runapplet.h" #include "runapplet.moc" diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp index 699a5151..1ac34cfe 100644 --- a/kicker/applets/swallow/swallow.cpp +++ b/kicker/applets/swallow/swallow.cpp @@ -27,8 +27,8 @@ #include <tdecmdlineargs.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <kshell.h> #include <twin.h> diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index 20386c14..707f4b74 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -37,10 +37,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <dcopclient.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <krun.h> #include <twinmodule.h> #include <kdialogbase.h> diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp index f46e0040..5673cb56 100644 --- a/kicker/applets/taskbar/taskbarapplet.cpp +++ b/kicker/applets/taskbar/taskbarapplet.cpp @@ -25,8 +25,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqpalette.h> #include <tdeapplication.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include "global.h" diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp index 04fa2073..f431b8ae 100644 --- a/kicker/applets/trash/trashapplet.cpp +++ b/kicker/applets/trash/trashapplet.cpp @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <tdeaboutdata.h> diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp index 526048c5..85c0eef6 100644 --- a/kicker/applets/trash/trashbutton.cpp +++ b/kicker/applets/trash/trashbutton.cpp @@ -22,7 +22,7 @@ #include <tqpopupmenu.h> #include <tqtooltip.h> -#include <klocale.h> +#include <tdelocale.h> #include <krun.h> #include <tdepopupmenu.h> diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp index 97a4b4fa..44699110 100644 --- a/kicker/extensions/dockbar/dockbarextension.cpp +++ b/kicker/extensions/dockbar/dockbarextension.cpp @@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ #undef Bool // For enable-final -#include <klocale.h> +#include <tdelocale.h> #include <twinmodule.h> #include <kdebug.h> #include <tdeconfig.h> @@ -30,10 +30,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kshell.h> #include <twin.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include <dcopclient.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "dockbarextension.h" #include "dockbarextension.moc" diff --git a/kicker/extensions/dockbar/dockcontainer.cpp b/kicker/extensions/dockbar/dockcontainer.cpp index 71419922..7814a108 100644 --- a/kicker/extensions/dockbar/dockcontainer.cpp +++ b/kicker/extensions/dockbar/dockcontainer.cpp @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <twin.h> #include <tqvalidator.h> #include <kinputdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kdebug.h> diff --git a/kicker/extensions/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp index d5f53e2f..1b58d87c 100644 --- a/kicker/extensions/kasbar/kasaboutdlg.cpp +++ b/kicker/extensions/kasbar/kasaboutdlg.cpp @@ -60,9 +60,9 @@ #include <tqtextstream.h> #include <tdeversion.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <ktextbrowser.h> diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp index e3314ec7..ebb2422d 100644 --- a/kicker/extensions/kasbar/kasbarapp.cpp +++ b/kicker/extensions/kasbar/kasbarapp.cpp @@ -57,8 +57,8 @@ #include <kdebug.h> #include <dcopclient.h> #include <twin.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "kasitem.h" #include "kastasker.h" diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp index 5c8e5525..5d870dae 100644 --- a/kicker/extensions/kasbar/kasbarextension.cpp +++ b/kicker/extensions/kasbar/kasbarextension.cpp @@ -56,12 +56,12 @@ #include <dcopclient.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "kastasker.h" #include "kasprefsdlg.h" diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp index b1d4d2c9..249e7c05 100644 --- a/kicker/extensions/kasbar/kasclockitem.cpp +++ b/kicker/extensions/kasbar/kasclockitem.cpp @@ -6,12 +6,12 @@ #include <tqtimer.h> #include <kdatepicker.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <twin.h> #include <kiconloader.h> #include <kpixmap.h> #include <kpixmapeffect.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdepopupmenu.h> diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp index 6fa500cd..b50f6e9f 100644 --- a/kicker/extensions/kasbar/kasgroupitem.cpp +++ b/kicker/extensions/kasbar/kasgroupitem.cpp @@ -57,13 +57,13 @@ #include <tqwmatrix.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <twin.h> #include <kiconloader.h> #include <kpixmap.h> #include <kpixmapeffect.h> #include <tdepopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <taskmanager.h> #include <taskrmbmenu.h> diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp index 866f6eb5..2523ef18 100644 --- a/kicker/extensions/kasbar/kasitem.cpp +++ b/kicker/extensions/kasbar/kasitem.cpp @@ -58,10 +58,10 @@ #include <tqtimer.h> #include <kdebug.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include "kasitem.h" diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp index 5a62349c..95cdfb81 100644 --- a/kicker/extensions/kasbar/kasloaditem.cpp +++ b/kicker/extensions/kasbar/kasloaditem.cpp @@ -13,12 +13,12 @@ #include <tqtimer.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <twin.h> #include <kiconloader.h> #include <kpixmap.h> #include <kpixmapeffect.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdepopupmenu.h> diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp index 9a5e75dd..978b6ae4 100644 --- a/kicker/extensions/kasbar/kasprefsdlg.cpp +++ b/kicker/extensions/kasbar/kasprefsdlg.cpp @@ -65,9 +65,9 @@ #include <kcolorbutton.h> #include <tdeconfig.h> #include <kdialogbase.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include "kastasker.h" diff --git a/kicker/extensions/kasbar/kasstartupitem.cpp b/kicker/extensions/kasbar/kasstartupitem.cpp index 67cdd168..2f008d0c 100644 --- a/kicker/extensions/kasbar/kasstartupitem.cpp +++ b/kicker/extensions/kasbar/kasstartupitem.cpp @@ -57,12 +57,12 @@ #include <tqtimer.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <twin.h> #include <kiconloader.h> #include <kpixmap.h> #include <kpixmapeffect.h> -#include <klocale.h> +#include <tdelocale.h> #include <taskmanager.h> #include "kaspopup.h" diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp index a62b5958..0d908fa5 100644 --- a/kicker/extensions/kasbar/kastasker.cpp +++ b/kicker/extensions/kasbar/kastasker.cpp @@ -57,7 +57,7 @@ #include <tdeactionclasses.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kiconloader.h> diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp index ceb847e9..f9fb2364 100644 --- a/kicker/extensions/kasbar/kastaskitem.cpp +++ b/kicker/extensions/kasbar/kastaskitem.cpp @@ -67,10 +67,10 @@ #include <kdebug.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpassivepopup.h> #include <tdepopupmenu.h> #include <kprocess.h> diff --git a/kicker/extensions/kasbar/kastastdepopup.cpp b/kicker/extensions/kasbar/kastastdepopup.cpp index 74c8631a..292b6d86 100644 --- a/kicker/extensions/kasbar/kastastdepopup.cpp +++ b/kicker/extensions/kasbar/kastastdepopup.cpp @@ -55,7 +55,7 @@ #include <tqapplication.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kpixmapeffect.h> #include <taskmanager.h> diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp index 1bbb7d99..1a4f6924 100644 --- a/kicker/extensions/sidebar/sidebarextension.cpp +++ b/kicker/extensions/sidebar/sidebarextension.cpp @@ -17,9 +17,9 @@ #include "sidebarextension.h" #include "sidebarextension.moc" #include <kdebug.h> -#include <kmessagebox.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeparts/part.h> #include <tdeparts/componentfactory.h> #include <tqlayout.h> diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp index 531a383a..4606b27f 100644 --- a/kicker/extensions/taskbar/taskbarextension.cpp +++ b/kicker/extensions/taskbar/taskbarextension.cpp @@ -28,8 +28,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <dcopclient.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <krootpixmap.h> #include <kstandarddirs.h> diff --git a/kicker/kicker/CMakeLists.txt b/kicker/kicker/CMakeLists.txt index ce4befca..db2f54c9 100644 --- a/kicker/kicker/CMakeLists.txt +++ b/kicker/kicker/CMakeLists.txt @@ -54,5 +54,5 @@ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy tde_add_tdeinit_executable( kicker SOURCES dummy.cpp EMBED kicker_core-static - LINK kicker_buttons-static kicker_ui-static kickermain-shared kabc-shared tdeutils-shared + LINK kicker_buttons-static kicker_ui-static kickermain-shared tdeabc-shared tdeutils-shared ) diff --git a/kicker/kicker/buttons/bookmarksbutton.cpp b/kicker/kicker/buttons/bookmarksbutton.cpp index 8b4559c5..1dd44f7a 100644 --- a/kicker/kicker/buttons/bookmarksbutton.cpp +++ b/kicker/kicker/buttons/bookmarksbutton.cpp @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kbookmark.h> #include <kbookmarkmenu.h> #include <konqbookmarkmanager.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include "bookmarksbutton.h" diff --git a/kicker/kicker/buttons/browserbutton.cpp b/kicker/kicker/buttons/browserbutton.cpp index 36d65027..71f2d050 100644 --- a/kicker/kicker/buttons/browserbutton.cpp +++ b/kicker/kicker/buttons/browserbutton.cpp @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqdragobject.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <konq_operations.h> #include <tdefileitem.h> diff --git a/kicker/kicker/buttons/desktopbutton.cpp b/kicker/kicker/buttons/desktopbutton.cpp index dc6063c2..fe70954f 100644 --- a/kicker/kicker/buttons/desktopbutton.cpp +++ b/kicker/kicker/buttons/desktopbutton.cpp @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqtooltip.h> #include <tqdragobject.h> -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <konq_operations.h> #include <tdefileitem.h> diff --git a/kicker/kicker/buttons/kbutton.cpp b/kicker/kicker/buttons/kbutton.cpp index d45648f9..2f84badb 100644 --- a/kicker/kicker/buttons/kbutton.cpp +++ b/kicker/kicker/buttons/kbutton.cpp @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqtooltip.h> #include <tqstyle.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kdebug.h> diff --git a/kicker/kicker/buttons/knewbutton.cpp b/kicker/kicker/buttons/knewbutton.cpp index ea5c76c1..ee5fa9c1 100644 --- a/kicker/kicker/buttons/knewbutton.cpp +++ b/kicker/kicker/buttons/knewbutton.cpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqcursor.h> #include <tqeffects_p.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kstandarddirs.h> #include <kiconloader.h> diff --git a/kicker/kicker/buttons/nonkdeappbutton.cpp b/kicker/kicker/buttons/nonkdeappbutton.cpp index b0028763..b2e90065 100644 --- a/kicker/kicker/buttons/nonkdeappbutton.cpp +++ b/kicker/kicker/buttons/nonkdeappbutton.cpp @@ -27,11 +27,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeconfig.h> #include <kdesktopfile.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <krun.h> #include <kprocess.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kiconeffect.h> #include <kdebug.h> diff --git a/kicker/kicker/buttons/servicebutton.cpp b/kicker/kicker/buttons/servicebutton.cpp index 99f8368c..716a750e 100644 --- a/kicker/kicker/buttons/servicebutton.cpp +++ b/kicker/kicker/buttons/servicebutton.cpp @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqtooltip.h> #include <kdesktopfile.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconeffect.h> #include <kicontheme.h> #include <kpropertiesdialog.h> diff --git a/kicker/kicker/buttons/servicemenubutton.cpp b/kicker/kicker/buttons/servicemenubutton.cpp index a15ba1cf..b8473e5a 100644 --- a/kicker/kicker/buttons/servicemenubutton.cpp +++ b/kicker/kicker/buttons/servicemenubutton.cpp @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeconfig.h> #include <kservicegroup.h> -#include <klocale.h> +#include <tdelocale.h> #include "service_mnu.h" diff --git a/kicker/kicker/buttons/urlbutton.cpp b/kicker/kicker/buttons/urlbutton.cpp index ac9934b3..13ff9532 100644 --- a/kicker/kicker/buttons/urlbutton.cpp +++ b/kicker/kicker/buttons/urlbutton.cpp @@ -28,13 +28,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdefileitem.h> #include <konq_operations.h> #include <kicontheme.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconeffect.h> #include <kpropertiesdialog.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <krun.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> diff --git a/kicker/kicker/buttons/windowlistbutton.cpp b/kicker/kicker/buttons/windowlistbutton.cpp index 78991116..f1c72904 100644 --- a/kicker/kicker/buttons/windowlistbutton.cpp +++ b/kicker/kicker/buttons/windowlistbutton.cpp @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqtooltip.h> #include <twindowlistmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include "windowlistbutton.h" #include "windowlistbutton.moc" diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp index a98d2d04..1806fedb 100644 --- a/kicker/kicker/core/applethandle.cpp +++ b/kicker/kicker/core/applethandle.cpp @@ -33,8 +33,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kpushbutton.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "global.h" #include "container_applet.h" diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp index cbfc2ef2..d710a1ad 100644 --- a/kicker/kicker/core/container_applet.cpp +++ b/kicker/kicker/core/container_applet.cpp @@ -34,9 +34,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kpanelapplet.h> #include <tdepopupmenu.h> #include <kprocess.h> diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp index 1efafe80..e3131b2e 100644 --- a/kicker/kicker/core/container_base.cpp +++ b/kicker/kicker/core/container_base.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqpopupmenu.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp index d501c0aa..178d83ba 100644 --- a/kicker/kicker/core/container_button.cpp +++ b/kicker/kicker/core/container_button.cpp @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdemultipledrag.h> #include <kpanelapplet.h> #include <kurldrag.h> diff --git a/kicker/kicker/core/container_button.h b/kicker/kicker/core/container_button.h index 79d75e59..9ef4a228 100644 --- a/kicker/kicker/core/container_button.h +++ b/kicker/kicker/core/container_button.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __container_button_h__ #define __container_button_h__ -#include <klocale.h> +#include <tdelocale.h> #include <kservice.h> #include <kurl.h> diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 597fd56c..6e9bfbfe 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -41,12 +41,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeconfig.h> #include <kdebug.h> #include <kdesktopfile.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kicker.h> #include <kstandarddirs.h> #include <twin.h> -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <tdeapplication.h> #include <netwm.h> #include <fixx11h.h> diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp index 6939531e..b34847db 100644 --- a/kicker/kicker/core/containerarea.cpp +++ b/kicker/kicker/core/containerarea.cpp @@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqwmatrix.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kurl.h> #include <kdebug.h> @@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kprocess.h> #include <krootpixmap.h> #include <kpixmap.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/netaccess.h> #include <kservice.h> #include <kurldrag.h> diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp index 68d0aafa..c12778fb 100644 --- a/kicker/kicker/core/containerarealayout.cpp +++ b/kicker/kicker/core/containerarealayout.cpp @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqapplication.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "containerarea.h" #include "containerarealayout.h" diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp index 7bff1019..927a84f7 100644 --- a/kicker/kicker/core/extensionmanager.cpp +++ b/kicker/kicker/core/extensionmanager.cpp @@ -29,11 +29,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeaboutdata.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeio/netaccess.h> -#include <klocale.h> -#include <kmenubar.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemenubar.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <twinmodule.h> #include <dcopref.h> diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp index 2678b210..904fcbb2 100644 --- a/kicker/kicker/core/kicker.cpp +++ b/kicker/kicker/core/kicker.cpp @@ -35,12 +35,12 @@ #include <kcrash.h> #include <kdebug.h> #include <kdirwatch.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kglobalaccel.h> #include <kiconloader.h> #include <kimageio.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <twin.h> #include <twinmodule.h> diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp index 6815ddd3..437f597d 100644 --- a/kicker/kicker/core/main.cpp +++ b/kicker/kicker/core/main.cpp @@ -22,11 +22,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ #include <config.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <kdebug.h> #include <tdeaboutdata.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <dcopclient.h> #include <dcopref.h> diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp index fa4ca15d..cf91da25 100644 --- a/kicker/kicker/core/panelextension.cpp +++ b/kicker/kicker/core/panelextension.cpp @@ -30,8 +30,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kdebug.h> #include <khelpmenu.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdepopupmenu.h> #include <kiconloader.h> #include <tdeconfig.h> diff --git a/kicker/kicker/core/pluginmanager.cpp b/kicker/kicker/core/pluginmanager.cpp index 76719291..a8b79877 100644 --- a/kicker/kicker/core/pluginmanager.cpp +++ b/kicker/kicker/core/pluginmanager.cpp @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeapplication.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <klibloader.h> #include <kpanelapplet.h> #include <kpanelextension.h> diff --git a/kicker/kicker/kicker-3.4-reverseLayout.cpp b/kicker/kicker/kicker-3.4-reverseLayout.cpp index 48d82b85..6112d4b3 100644 --- a/kicker/kicker/kicker-3.4-reverseLayout.cpp +++ b/kicker/kicker/kicker-3.4-reverseLayout.cpp @@ -6,10 +6,10 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kprocess.h> -#include <ktempfile.h> +#include <tdetempfile.h> struct AppletInfo { diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp index 9c1d718c..e707b9e3 100644 --- a/kicker/kicker/ui/addapplet.cpp +++ b/kicker/kicker/ui/addapplet.cpp @@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kiconloader.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kpushbutton.h> #include <kstandarddirs.h> #include <kstdguiitem.h> diff --git a/kicker/kicker/ui/addapplet.h b/kicker/kicker/ui/addapplet.h index 224c6e1c..bc2763f0 100644 --- a/kicker/kicker/ui/addapplet.h +++ b/kicker/kicker/ui/addapplet.h @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqpixmap.h> #include <tqvaluelist.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialogbase.h> #include "appletinfo.h" diff --git a/kicker/kicker/ui/addappletvisualfeedback.cpp b/kicker/kicker/ui/addappletvisualfeedback.cpp index e5fa5672..587a0f2d 100644 --- a/kicker/kicker/ui/addappletvisualfeedback.cpp +++ b/kicker/kicker/ui/addappletvisualfeedback.cpp @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqtimer.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include "global.h" diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp index ca5958ad..a037909b 100644 --- a/kicker/kicker/ui/appletop_mnu.cpp +++ b/kicker/kicker/ui/appletop_mnu.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 <kiconloader.h> #include <kpanelapplet.h> #include <kstdguiitem.h> diff --git a/kicker/kicker/ui/appletwidget.h b/kicker/kicker/ui/appletwidget.h index 6323f538..d0bb9e88 100644 --- a/kicker/kicker/ui/appletwidget.h +++ b/kicker/kicker/ui/appletwidget.h @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqpoint.h> #include <tqvaluelist.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialogbase.h> #include "appletinfo.h" diff --git a/kicker/kicker/ui/browser_dlg.cpp b/kicker/kicker/ui/browser_dlg.cpp index 66b8aa47..0e98054d 100644 --- a/kicker/kicker/ui/browser_dlg.cpp +++ b/kicker/kicker/ui/browser_dlg.cpp @@ -25,12 +25,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqlayout.h> #include <tqvbox.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kicondialog.h> #include <tdefiledialog.h> #include <klineedit.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "browser_dlg.h" #include "browser_dlg.moc" diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp index 0722c6ae..2a25830e 100644 --- a/kicker/kicker/ui/browser_mnu.cpp +++ b/kicker/kicker/ui/browser_mnu.cpp @@ -29,12 +29,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kdesktopfile.h> #include <kdirwatch.h> #include <tdefileitem.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <tdeconfig.h> #include <kiconloader.h> #include <tdeio/global.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmimetype.h> #include <konq_operations.h> #include <kprocess.h> diff --git a/kicker/kicker/ui/dirdrop_mnu.cpp b/kicker/kicker/ui/dirdrop_mnu.cpp index cd814f42..464bf1c0 100644 --- a/kicker/kicker/ui/dirdrop_mnu.cpp +++ b/kicker/kicker/ui/dirdrop_mnu.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 <kiconloader.h> #include "dirdrop_mnu.h" diff --git a/kicker/kicker/ui/exe_dlg.cpp b/kicker/kicker/ui/exe_dlg.cpp index ab502e86..24c42c92 100644 --- a/kicker/kicker/ui/exe_dlg.cpp +++ b/kicker/kicker/ui/exe_dlg.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqfileinfo.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tqcheckbox.h> @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqvbox.h> #include <kicondialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kmimetype.h> #include <kstandarddirs.h> #include <kurlcompletion.h> diff --git a/kicker/kicker/ui/extensionop_mnu.cpp b/kicker/kicker/ui/extensionop_mnu.cpp index a30434a4..2d4c597d 100644 --- a/kicker/kicker/ui/extensionop_mnu.cpp +++ b/kicker/kicker/ui/extensionop_mnu.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 <kiconloader.h> #include <kpanelextension.h> #include <kstdguiitem.h> diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp index c9930099..04666659 100644 --- a/kicker/kicker/ui/hidebutton.cpp +++ b/kicker/kicker/ui/hidebutton.cpp @@ -24,7 +24,7 @@ #include <tdeapplication.h> #include <kcursor.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconeffect.h> #include <kiconloader.h> #include <kicontheme.h> diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp index 547e051c..729a7b86 100644 --- a/kicker/kicker/ui/itemview.cpp +++ b/kicker/kicker/ui/itemview.cpp @@ -52,11 +52,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kbookmarkmenu.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kcombobox.h> #include <twin.h> diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index 83262c89..8ab0d3a0 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -42,12 +42,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kbookmarkmenu.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <tdetoolbarbutton.h> #include <twin.h> diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index cd600750..dfee118e 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -50,12 +50,12 @@ #include <kbookmarkmenu.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kcombobox.h> #include <twin.h> diff --git a/kicker/kicker/ui/k_new_mnu.h b/kicker/kicker/ui/k_new_mnu.h index f48e5652..95545324 100644 --- a/kicker/kicker/ui/k_new_mnu.h +++ b/kicker/kicker/ui/k_new_mnu.h @@ -34,8 +34,8 @@ #include <tqvbox.h> #include <tqregexp.h> -#include <kabc/addressbook.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/addressbook.h> +#include <tdeabc/stdaddressbook.h> #include "../interfaces/kickoff-search-plugin.h" // #include "kmenubase.h" diff --git a/kicker/kicker/ui/quickbrowser_mnu.cpp b/kicker/kicker/ui/quickbrowser_mnu.cpp index c2436599..9efc1ab5 100644 --- a/kicker/kicker/ui/quickbrowser_mnu.cpp +++ b/kicker/kicker/ui/quickbrowser_mnu.cpp @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqdir.h> #include <tdeapplication.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kurl.h> diff --git a/kicker/kicker/ui/recentapps.cpp b/kicker/kicker/ui/recentapps.cpp index 411a0596..ef2f5c6a 100644 --- a/kicker/kicker/ui/recentapps.cpp +++ b/kicker/kicker/ui/recentapps.cpp @@ -29,8 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <dcopclient.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "kickerSettings.h" diff --git a/kicker/kicker/ui/removeapplet_mnu.cpp b/kicker/kicker/ui/removeapplet_mnu.cpp index 2e0543da..a7bc609a 100644 --- a/kicker/kicker/ui/removeapplet_mnu.cpp +++ b/kicker/kicker/ui/removeapplet_mnu.cpp @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include "pluginmanager.h" #include "containerarea.h" diff --git a/kicker/kicker/ui/removebutton_mnu.cpp b/kicker/kicker/ui/removebutton_mnu.cpp index 8f02abd6..819eff53 100644 --- a/kicker/kicker/ui/removebutton_mnu.cpp +++ b/kicker/kicker/ui/removebutton_mnu.cpp @@ -23,8 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqregexp.h> #include <kiconloader.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kdebug.h> #include "panelbutton.h" diff --git a/kicker/kicker/ui/removecontainer_mnu.cpp b/kicker/kicker/ui/removecontainer_mnu.cpp index 9d6d19ea..1b30506c 100644 --- a/kicker/kicker/ui/removecontainer_mnu.cpp +++ b/kicker/kicker/ui/removecontainer_mnu.cpp @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include "removecontainer_mnu.h" #include "removecontainer_mnu.moc" diff --git a/kicker/kicker/ui/removeextension_mnu.cpp b/kicker/kicker/ui/removeextension_mnu.cpp index 9d5d80d2..829dfab5 100644 --- a/kicker/kicker/ui/removeextension_mnu.cpp +++ b/kicker/kicker/ui/removeextension_mnu.cpp @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include "kicker.h" #include "extensionmanager.h" diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index b0503e74..6e3d7bed 100644 --- a/kicker/kicker/ui/service_mnu.cpp +++ b/kicker/kicker/ui/service_mnu.cpp @@ -33,9 +33,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kstandarddirs.h> #include <kdebug.h> #include <kdesktopfile.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmimetype.h> #include <kprocess.h> #include <krun.h> diff --git a/kicker/libkicker/kickerSettings.kcfg b/kicker/libkicker/kickerSettings.kcfg index 129b51d9..9d3b90f5 100644 --- a/kicker/libkicker/kickerSettings.kcfg +++ b/kicker/libkicker/kickerSettings.kcfg @@ -5,7 +5,7 @@ http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > <include>tdeapplication.h</include> -<include>klocale.h</include> +<include>tdelocale.h</include> <kcfgfile arg="true" /> <group name="General"> diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp index f7a83297..9f05d1f9 100644 --- a/kicker/libkicker/panelbutton.cpp +++ b/kicker/libkicker/panelbutton.cpp @@ -37,14 +37,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kcursor.h> #include <kdialog.h> #include <kdirwatch.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <kicontheme.h> #include <kiconeffect.h> #include <kipc.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "global.h" diff --git a/kicker/libkicker/panner.cpp b/kicker/libkicker/panner.cpp index 2027f19d..ec06b30c 100644 --- a/kicker/libkicker/panner.cpp +++ b/kicker/libkicker/panner.cpp @@ -27,8 +27,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqpainter.h> #include <tqstyle.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include "simplebutton.h" diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp index cd4f833e..67c90b81 100644 --- a/kicker/libkicker/simplebutton.cpp +++ b/kicker/libkicker/simplebutton.cpp @@ -26,7 +26,7 @@ #include <tdeapplication.h> #include <kcursor.h> #include <kdialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconeffect.h> #include <kicontheme.h> #include <kipc.h> diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp index 73a25738..854f4ce3 100644 --- a/kicker/menuext/kate/katesessionmenu.cpp +++ b/kicker/menuext/kate/katesessionmenu.cpp @@ -23,12 +23,12 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kinputdialog.h> #include <klibloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> diff --git a/kicker/menuext/konq-profiles/konqy_menu.cpp b/kicker/menuext/konq-profiles/konqy_menu.cpp index ec003328..321d9ac5 100644 --- a/kicker/menuext/konq-profiles/konqy_menu.cpp +++ b/kicker/menuext/konq-profiles/konqy_menu.cpp @@ -23,8 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "konqy_menu.h" #include <kiconloader.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeapplication.h> #include <krun.h> #include <kstandarddirs.h> diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp index a99ca24e..c9439c8d 100644 --- a/kicker/menuext/konsole/konsole_mnu.cpp +++ b/kicker/menuext/konsole/konsole_mnu.cpp @@ -31,10 +31,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqfileinfo.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tdeio/global.h> -#include <klocale.h> +#include <tdelocale.h> #include <krun.h> #include <kshell.h> #include <ksimpleconfig.h> diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp index 420a17c3..0860cc12 100644 --- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp +++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp @@ -17,7 +17,7 @@ #include <tqfile.h> #include <tdeaction.h> -#include <klocale.h> +#include <tdelocale.h> KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr, diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp index 400baba8..d41ca66a 100644 --- a/kicker/menuext/prefmenu/prefmenu.cpp +++ b/kicker/menuext/prefmenu/prefmenu.cpp @@ -25,9 +25,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqtimer.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kservice.h> #include <kservicegroup.h> #include <kstandarddirs.h> diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp index 566543f4..19adfa86 100644 --- a/kicker/menuext/recentdocs/recentdocsmenu.cpp +++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp @@ -25,12 +25,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqstring.h> #include <tqstringlist.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kmimetype.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdesktopfile.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeapplication.h> #include <kurldrag.h> #include <tderecentdocument.h> diff --git a/kicker/menuext/remote/remotemenu.cpp b/kicker/menuext/remote/remotemenu.cpp index f6b9a8a1..aeaff8e9 100644 --- a/kicker/menuext/remote/remotemenu.cpp +++ b/kicker/menuext/remote/remotemenu.cpp @@ -20,7 +20,7 @@ #include "remotemenu.h" #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <krun.h> #include <kiconloader.h> diff --git a/kicker/menuext/tdeprint/print_mnu.cpp b/kicker/menuext/tdeprint/print_mnu.cpp index a50a293f..a4dbe3df 100644 --- a/kicker/menuext/tdeprint/print_mnu.cpp +++ b/kicker/menuext/tdeprint/print_mnu.cpp @@ -23,8 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "print_mnu.h" #include <kiconloader.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeapplication.h> #include <krun.h> #include <tdeprint/kmmanager.h> diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc index 761eebd5..fa8fcb38 100644 --- a/kicker/menuext/tom/tom.cc +++ b/kicker/menuext/tom/tom.cc @@ -37,11 +37,11 @@ using namespace std; #include <tdeapplication.h> #include <kcombobox.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kiconeffect.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kmimetype.h> #include <kpixmap.h> #include <tderecentdocument.h> diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp index c5569057..ac2f969d 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/kicker/proxy/appletproxy.cpp @@ -29,13 +29,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <qxembed.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <klibloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdecmdlineargs.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kpanelapplet.h> #include <tdeaboutdata.h> #include <tqfileinfo.h> diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp index 9003e2a7..c210e7b9 100644 --- a/kicker/proxy/extensiondebugger.cpp +++ b/kicker/proxy/extensiondebugger.cpp @@ -26,9 +26,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqpushbutton.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <klibloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdecmdlineargs.h> #include <kdebug.h> diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index ac99d628..13c40e67 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -28,9 +28,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <qxembed.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <klibloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdecmdlineargs.h> #include <kdebug.h> diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp index ab2b77ff..8f1f4a6a 100644 --- a/kicker/taskbar/taskbar.cpp +++ b/kicker/taskbar/taskbar.cpp @@ -35,10 +35,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <dcopclient.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kglobalaccel.h> #include <kimageeffect.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include "kickerSettings.h" diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp index fce2256d..166175f6 100644 --- a/kicker/taskbar/taskcontainer.cpp +++ b/kicker/taskbar/taskcontainer.cpp @@ -38,8 +38,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeapplication.h> #include <kdebug.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <kiconeffect.h> #include <kiconloader.h> #include <kimageeffect.h> diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp index f7434e3b..1be54ca8 100644 --- a/kicker/taskmanager/tasklmbmenu.cpp +++ b/kicker/taskmanager/tasklmbmenu.cpp @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. //#include <tqstyle.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include "global.h" diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp index 777142b4..33df1ddd 100644 --- a/kicker/taskmanager/taskmanager.cpp +++ b/kicker/taskmanager/taskmanager.cpp @@ -28,9 +28,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> // #include <kpixmapio.h> #include <kstaticdeleter.h> #include <twinmodule.h> diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h index f35e10f6..2753218c 100644 --- a/kicker/taskmanager/taskmanager.h +++ b/kicker/taskmanager/taskmanager.h @@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqvaluevector.h> #include <ksharedptr.h> -#include <kstartupinfo.h> +#include <tdestartupinfo.h> #include <twin.h> #include <config.h> diff --git a/kicker/taskmanager/taskrmbmenu.cpp b/kicker/taskmanager/taskrmbmenu.cpp index fb4c9ae8..c910c5f9 100644 --- a/kicker/taskmanager/taskrmbmenu.cpp +++ b/kicker/taskmanager/taskrmbmenu.cpp @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <assert.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include "taskmanager.h" diff --git a/klipper/applet.cpp b/klipper/applet.cpp index 804f0a2e..aaaf9523 100644 --- a/klipper/applet.cpp +++ b/klipper/applet.cpp @@ -21,8 +21,8 @@ #include "applet.h" #include <tdeaboutapplication.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <dcopclient.h> #include <tdeconfig.h> diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp index 1a4c66e1..46737720 100644 --- a/klipper/configdialog.cpp +++ b/klipper/configdialog.cpp @@ -27,7 +27,7 @@ #include <assert.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <twinmodule.h> #include <kregexpeditorinterface.h> diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp index 1fa378f7..41eabdbd 100644 --- a/klipper/klipperpopup.cpp +++ b/klipper/klipperpopup.cpp @@ -19,17 +19,17 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <khelpmenu.h> #include <kiconloader.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaction.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <twin.h> #include <tdeapplication.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kdebug.h> #include "klipperpopup.h" diff --git a/klipper/main.cpp b/klipper/main.cpp index e32b37cf..0cdc73af 100644 --- a/klipper/main.cpp +++ b/klipper/main.cpp @@ -21,7 +21,7 @@ #include <stdio.h> #include <stdlib.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <twin.h> #include <tdeaboutdata.h> diff --git a/klipper/popupproxy.cpp b/klipper/popupproxy.cpp index d5c57269..4811e8f9 100644 --- a/klipper/popupproxy.cpp +++ b/klipper/popupproxy.cpp @@ -23,7 +23,7 @@ #include <tqimage.h> #include <kstringhandler.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "historyitem.h" diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp index 1112fa06..b30d551c 100644 --- a/klipper/toplevel.cpp +++ b/klipper/toplevel.cpp @@ -35,11 +35,11 @@ #include <tdeaction.h> #include <tdeapplication.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kipc.h> #include <kkeydialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <ksavefile.h> #include <kstandarddirs.h> #include <ksimpleconfig.h> @@ -48,7 +48,7 @@ #include <kurldrag.h> #include <twin.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <dcopclient.h> #include <kiconloader.h> #include <khelpmenu.h> diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp index a7ccb305..684e08c2 100644 --- a/klipper/urlgrabber.cpp +++ b/klipper/urlgrabber.cpp @@ -25,7 +25,7 @@ #include <tdeconfig.h> #include <kdialogbase.h> #include <ktextedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kservice.h> #include <kiconloader.h> diff --git a/kmenuedit/basictab.cpp b/kmenuedit/basictab.cpp index 45c6a1c2..8f439663 100644 --- a/kmenuedit/basictab.cpp +++ b/kmenuedit/basictab.cpp @@ -26,13 +26,13 @@ #include <tqhbox.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdialog.h> #include <kkeybutton.h> #include <klineedit.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kicondialog.h> #include <kdesktopfile.h> #include <kurlrequester.h> diff --git a/kmenuedit/kcontrol_main.cpp b/kmenuedit/kcontrol_main.cpp index fb50c8ff..2ec45ca6 100644 --- a/kmenuedit/kcontrol_main.cpp +++ b/kmenuedit/kcontrol_main.cpp @@ -22,7 +22,7 @@ #include <unistd.h> #include <kuniqueapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> #include <kstandarddirs.h> diff --git a/kmenuedit/kmenuedit.cpp b/kmenuedit/kmenuedit.cpp index fc86e6d3..9e3b8209 100644 --- a/kmenuedit/kmenuedit.cpp +++ b/kmenuedit/kmenuedit.cpp @@ -25,9 +25,9 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kedittoolbar.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kservice.h> #include <kstdaction.h> #include <tdestdaccel.h> diff --git a/kmenuedit/main.cpp b/kmenuedit/main.cpp index 15b1e9d4..b78a71ef 100644 --- a/kmenuedit/main.cpp +++ b/kmenuedit/main.cpp @@ -21,7 +21,7 @@ #include <unistd.h> #include <kuniqueapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> diff --git a/kmenuedit/menufile.cpp b/kmenuedit/menufile.cpp index 38f02ddc..1109d6b7 100644 --- a/kmenuedit/menufile.cpp +++ b/kmenuedit/menufile.cpp @@ -21,8 +21,8 @@ #include <tqregexp.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include "menufile.h" diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp index 2fb6371b..eac0f399 100644 --- a/kmenuedit/treeview.cpp +++ b/kmenuedit/treeview.cpp @@ -33,16 +33,16 @@ #include <tqregexp.h> #include <tqstringlist.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kinputdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include <kdebug.h> #include <kiconloader.h> #include <kdesktopfile.h> #include <tdeaction.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include <kservice.h> #include <kservicegroup.h> diff --git a/knetattach/knetattach.ui b/knetattach/knetattach.ui index dd7f5d64..781643ff 100644 --- a/knetattach/knetattach.ui +++ b/knetattach/knetattach.ui @@ -407,10 +407,10 @@ </tabstops> <includes> <include location="global" impldecl="in implementation">tdeio/netaccess.h</include> - <include location="global" impldecl="in implementation">kmessagebox.h</include> + <include location="global" impldecl="in implementation">tdemessagebox.h</include> <include location="global" impldecl="in implementation">kiconloader.h</include> - <include location="global" impldecl="in implementation">klocale.h</include> - <include location="global" impldecl="in implementation">kglobalsettings.h</include> + <include location="global" impldecl="in implementation">tdelocale.h</include> + <include location="global" impldecl="in implementation">tdeglobalsettings.h</include> <include location="global" impldecl="in implementation">ksimpleconfig.h</include> <include location="global" impldecl="in implementation">tdeapplication.h</include> <include location="global" impldecl="in implementation">kstandarddirs.h</include> diff --git a/knetattach/main.cpp b/knetattach/main.cpp index 5c40741f..b2cb63d0 100644 --- a/knetattach/main.cpp +++ b/knetattach/main.cpp @@ -20,8 +20,8 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "knetattach.h" diff --git a/konqueror/KonqMainWindowIface.cc b/konqueror/KonqMainWindowIface.cc index ade50e94..a18301a2 100644 --- a/konqueror/KonqMainWindowIface.cc +++ b/konqueror/KonqMainWindowIface.cc @@ -28,7 +28,7 @@ #include <kdcopactionproxy.h> #include <kdcoppropertyproxy.h> #include <kdebug.h> -#include <kstartupinfo.h> +#include <tdestartupinfo.h> #include <twin.h> KonqMainWindowIface::KonqMainWindowIface( KonqMainWindow * mainWindow ) diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc index f10c0ecb..92176b0e 100644 --- a/konqueror/about/konq_aboutpage.cc +++ b/konqueror/about/konq_aboutpage.cc @@ -5,8 +5,8 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <ksavefile.h> #include <kstandarddirs.h> #include <tdeaction.h> diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc index 37e7a150..c0f0c5c6 100644 --- a/konqueror/client/kfmclient.cc +++ b/konqueror/client/kfmclient.cc @@ -28,13 +28,13 @@ #include <tdeio/job.h> #include <tdecmdlineargs.h> #include <kpropertiesdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <ktrader.h> #include <kprocess.h> #include <kstandarddirs.h> #include <kopenwith.h> #include <kurlrequesterdlg.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> #include <kdebug.h> #include <dcopclient.h> diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc index 1e495efe..a7bb5a81 100644 --- a/konqueror/iconview/konq_iconview.cc +++ b/konqueror/iconview/konq_iconview.cc @@ -31,16 +31,16 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kdirlister.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kinputdialog.h> #include <konq_settings.h> #include <kpropertiesdialog.h> #include <kstdaction.h> #include <tdeparts/factory.h> #include <ktrader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kivdirectoryoverlay.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstaticdeleter.h> #include <tqregexp.h> diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp index d191718f..197d5ab9 100644 --- a/konqueror/keditbookmarks/actionsimpl.cpp +++ b/konqueror/keditbookmarks/actionsimpl.cpp @@ -36,7 +36,7 @@ #include <tqpopupmenu.h> #include <tqpainter.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> #include <dcopref.h> #include <kdebug.h> @@ -47,12 +47,12 @@ #include <kedittoolbar.h> #include <tdefiledialog.h> #include <kkeydialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kinputdialog.h> #include <krun.h> #include <kdatastream.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kstandarddirs.h> #include <tdeparts/part.h> diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp index c84ce50d..95ae0707 100644 --- a/konqueror/keditbookmarks/bookmarkinfo.cpp +++ b/konqueror/keditbookmarks/bookmarkinfo.cpp @@ -29,7 +29,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeapplication.h> @@ -40,7 +40,7 @@ #include <kkeydialog.h> #include <kedittoolbar.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <klineedit.h> #include <tdefiledialog.h> diff --git a/konqueror/keditbookmarks/commands.cpp b/konqueror/keditbookmarks/commands.cpp index 2ad58a68..4cfb95a7 100644 --- a/konqueror/keditbookmarks/commands.cpp +++ b/konqueror/keditbookmarks/commands.cpp @@ -30,7 +30,7 @@ #include <tqvaluevector.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kbookmarkdrag.h> #include <kbookmarkmanager.h> diff --git a/konqueror/keditbookmarks/dcop.cpp b/konqueror/keditbookmarks/dcop.cpp index 5b788689..570445ca 100644 --- a/konqueror/keditbookmarks/dcop.cpp +++ b/konqueror/keditbookmarks/dcop.cpp @@ -30,7 +30,7 @@ #include <tqpopupmenu.h> #include <tqpainter.h> -#include <klocale.h> +#include <tdelocale.h> #include <kbookmarkmanager.h> #include <dcopclient.h> #include <kdebug.h> diff --git a/konqueror/keditbookmarks/exporters.cpp b/konqueror/keditbookmarks/exporters.cpp index 78480256..68188388 100644 --- a/konqueror/keditbookmarks/exporters.cpp +++ b/konqueror/keditbookmarks/exporters.cpp @@ -21,7 +21,7 @@ #include "exporters.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tqfile.h> diff --git a/konqueror/keditbookmarks/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp index 19bdb39d..f4e2183e 100644 --- a/konqueror/keditbookmarks/favicons.cpp +++ b/konqueror/keditbookmarks/favicons.cpp @@ -26,7 +26,7 @@ #include "updater.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> FavIconsItrHolder *FavIconsItrHolder::s_self = 0; diff --git a/konqueror/keditbookmarks/importers.cpp b/konqueror/keditbookmarks/importers.cpp index bbaf6b95..ec0d5e24 100644 --- a/konqueror/keditbookmarks/importers.cpp +++ b/konqueror/keditbookmarks/importers.cpp @@ -27,9 +27,9 @@ #include <tqregexp.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> #include <kbookmarkmanager.h> diff --git a/konqueror/keditbookmarks/importers.h b/konqueror/keditbookmarks/importers.h index eee00823..0550e46f 100644 --- a/konqueror/keditbookmarks/importers.h +++ b/konqueror/keditbookmarks/importers.h @@ -23,7 +23,7 @@ #define __importers_h #include "commands.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/job.h> #include <kcommand.h> diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp index e3373795..92eb1c48 100644 --- a/konqueror/keditbookmarks/listview.cpp +++ b/konqueror/keditbookmarks/listview.cpp @@ -35,7 +35,7 @@ #include <tqheader.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> #include <kdebug.h> #include <tdeapplication.h> @@ -45,7 +45,7 @@ #include <kedittoolbar.h> #include <tdefiledialog.h> #include <kkeydialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <klineedit.h> #include <krun.h> #include <tdelistviewsearchline.h> diff --git a/konqueror/keditbookmarks/listview.h b/konqueror/keditbookmarks/listview.h index 13bf2a15..f693c608 100644 --- a/konqueror/keditbookmarks/listview.h +++ b/konqueror/keditbookmarks/listview.h @@ -26,7 +26,7 @@ #include <tqmap.h> #include <tqvaluevector.h> -#include <klocale.h> +#include <tdelocale.h> #include <kbookmark.h> #include <tdelistview.h> #include <kiconloader.h> diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp index 8f6b3695..d64f6bce 100644 --- a/konqueror/keditbookmarks/main.cpp +++ b/konqueror/keditbookmarks/main.cpp @@ -26,7 +26,7 @@ #include <dcopclient.h> #include <dcopref.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstandarddirs.h> @@ -34,7 +34,7 @@ #include <tdeaboutdata.h> #include <kuniqueapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <twin.h> #include <kbookmarkmanager.h> diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp index 737fdd4f..9402e49a 100644 --- a/konqueror/keditbookmarks/toplevel.cpp +++ b/konqueror/keditbookmarks/toplevel.cpp @@ -37,7 +37,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeapplication.h> @@ -47,7 +47,7 @@ #include <dcopref.h> #include <kedittoolbar.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <klineedit.h> #include <tdefiledialog.h> diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp index 8c8a662f..08210222 100644 --- a/konqueror/keditbookmarks/updater.cpp +++ b/konqueror/keditbookmarks/updater.cpp @@ -27,7 +27,7 @@ #include "toplevel.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdeio/job.h> diff --git a/konqueror/konq_extensionmanager.cc b/konqueror/konq_extensionmanager.cc index d7b36c37..0bda1db9 100644 --- a/konqueror/konq_extensionmanager.cc +++ b/konqueror/konq_extensionmanager.cc @@ -19,7 +19,7 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/componentfactory.h> #include <tdeparts/plugin.h> #include <kplugininfo.h> diff --git a/konqueror/konq_factory.cc b/konqueror/konq_factory.cc index f6535c97..9921b712 100644 --- a/konqueror/konq_factory.cc +++ b/konqueror/konq_factory.cc @@ -27,8 +27,8 @@ #include <konq_mainwindow.h> #include <kdebug.h> #include <tdeaboutdata.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqwidget.h> #include <tqfile.h> diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cc index 05eb3be1..0acf39b4 100644 --- a/konqueror/konq_frame.cc +++ b/konqueror/konq_frame.cc @@ -29,10 +29,10 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <kprogress.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksqueezedtextlabel.h> #include <networkstatusindicator.h> diff --git a/konqueror/konq_guiclients.cc b/konqueror/konq_guiclients.cc index 738e7533..31647b0c 100644 --- a/konqueror/konq_guiclients.cc +++ b/konqueror/konq_guiclients.cc @@ -18,8 +18,8 @@ */ #include <kdebug.h> -#include <klocale.h> -#include <kmenubar.h> +#include <tdelocale.h> +#include <tdemenubar.h> #include "konq_view.h" #include "konq_settingsxt.h" #include "konq_frame.h" diff --git a/konqueror/konq_main.cc b/konqueror/konq_main.cc index ad3706a3..ee1fc71d 100644 --- a/konqueror/konq_main.cc +++ b/konqueror/konq_main.cc @@ -25,8 +25,8 @@ #include "konq_settingsxt.h" #include "KonquerorIface.h" -#include <ktempfile.h> -#include <klocale.h> +#include <tdetempfile.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kdebug.h> #include <tdecmdlineargs.h> diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc index 67a90767..a3cda915 100644 --- a/konqueror/konq_mainwindow.cc +++ b/konqueror/konq_mainwindow.cc @@ -75,8 +75,8 @@ #include <kdebug.h> #include <kedittoolbar.h> #include <kkeydialog.h> -#include <kmenubar.h> -#include <kmessagebox.h> +#include <tdemenubar.h> +#include <tdemessagebox.h> #include <knewmenu.h> #include <konq_defaults.h> #include <konq_dirpart.h> @@ -89,13 +89,13 @@ #include <kstdaction.h> #include <kstandarddirs.h> #include <tdesycoca.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kurlrequesterdlg.h> #include <kurlrequester.h> #include <kuserprofile.h> #include <twin.h> #include <tdefiledialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdepopupmenu.h> #include <kprocess.h> diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h index ad31c436..3e9c71ac 100644 --- a/konqueror/konq_mainwindow.h +++ b/konqueror/konq_mainwindow.h @@ -34,7 +34,7 @@ #include <kbookmarkmanager.h> #include <kcompletion.h> #include <kurlcompletion.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <dcopobject.h> #include <kxmlguifactory.h> #include <kxmlguiclient.h> diff --git a/konqueror/konq_misc.cc b/konqueror/konq_misc.cc index 690dd6d1..b76f44ad 100644 --- a/konqueror/konq_misc.cc +++ b/konqueror/konq_misc.cc @@ -24,14 +24,14 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kurifilter.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <twin.h> #include <kprotocolinfo.h> #include <kurldrag.h> -#include <kstartupinfo.h> +#include <tdestartupinfo.h> #include "konq_misc.h" #include "konq_mainwindow.h" diff --git a/konqueror/konq_profiledlg.cc b/konqueror/konq_profiledlg.cc index 9226c9e1..5f8626f8 100644 --- a/konqueror/konq_profiledlg.cc +++ b/konqueror/konq_profiledlg.cc @@ -33,7 +33,7 @@ #include <kstdguiitem.h> #include <tdeio/global.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include <kseparator.h> #include <kpushbutton.h> diff --git a/konqueror/konq_run.cc b/konqueror/konq_run.cc index f5e10897..64bb3203 100644 --- a/konqueror/konq_run.cc +++ b/konqueror/konq_run.cc @@ -22,8 +22,8 @@ #include "konq_run.h" #include "konq_view.h" #include <kuserprofile.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <konq_historymgr.h> diff --git a/konqueror/konq_tabs.cc b/konqueror/konq_tabs.cc index be7df5a0..1bf5115c 100644 --- a/konqueror/konq_tabs.cc +++ b/konqueror/konq_tabs.cc @@ -30,7 +30,7 @@ #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurldrag.h> #include <kstringhandler.h> diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc index aec59ef0..fff2d04b 100644 --- a/konqueror/konq_view.cc +++ b/konqueror/konq_view.cc @@ -46,8 +46,8 @@ #include <tqobjectlist.h> #include <config.h> #include <tqucomextra_p.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <fixx11h.h> diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc index 148d7db1..635d0b1a 100644 --- a/konqueror/konq_viewmgr.cc +++ b/konqueror/konq_viewmgr.cc @@ -33,11 +33,11 @@ #include <kstandarddirs.h> #include <kdebug.h> #include <tdeapplication.h> -#include <kglobalsettings.h> -#include <ktempfile.h> +#include <tdeglobalsettings.h> +#include <tdetempfile.h> #include <dcopclient.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <assert.h> #include <tdepopupmenu.h> diff --git a/konqueror/kttsplugin/tdehtmlkttsd.cpp b/konqueror/kttsplugin/tdehtmlkttsd.cpp index af2eae5d..49d20666 100644 --- a/konqueror/kttsplugin/tdehtmlkttsd.cpp +++ b/konqueror/kttsplugin/tdehtmlkttsd.cpp @@ -23,7 +23,7 @@ #include <kgenericfactory.h> #include <kiconloader.h> #include <tqmessagebox.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqstring.h> #include <tqtimer.h> #include <kspeech.h> diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc index 056fbe75..5f4a0f63 100644 --- a/konqueror/listview/konq_infolistviewitem.cc +++ b/konqueror/listview/konq_infolistviewitem.cc @@ -21,7 +21,7 @@ #include <konq_settings.h> #include <tdefilemetainfo.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <assert.h> #include <stdio.h> #include <tqpainter.h> diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc index ef77cc1b..fab79890 100644 --- a/konqueror/listview/konq_infolistviewwidget.cc +++ b/konqueror/listview/konq_infolistviewwidget.cc @@ -21,7 +21,7 @@ #include "konq_infolistviewitem.h" #include "konq_listview.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdefilemetainfo.h> #include <kdebug.h> #include <tdeaction.h> diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc index 3d1090e1..7d0a8d62 100644 --- a/konqueror/listview/konq_listview.cc +++ b/konqueror/listview/konq_listview.cc @@ -28,7 +28,7 @@ #include <kdebug.h> #include <kdirlister.h> #include <kinputdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <konq_drag.h> #include <kpropertiesdialog.h> #include <kstdaction.h> diff --git a/konqueror/listview/konq_listview.h b/konqueror/listview/konq_listview.h index 5b175e13..f7592d73 100644 --- a/konqueror/listview/konq_listview.h +++ b/konqueror/listview/konq_listview.h @@ -21,7 +21,7 @@ #define __konq_listview_h__ #include <tdeparts/browserextension.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <konq_operations.h> #include <tdeparts/factory.h> #include <konq_dirpart.h> diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cc index 0077c6da..12952fb2 100644 --- a/konqueror/listview/konq_listviewitems.cc +++ b/konqueror/listview/konq_listviewitems.cc @@ -20,7 +20,7 @@ #include "konq_listview.h" #include <konq_settings.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <assert.h> #include <stdio.h> #include <tqpainter.h> diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc index 67336206..c885aef4 100644 --- a/konqueror/listview/konq_listviewwidget.cc +++ b/konqueror/listview/konq_listviewwidget.cc @@ -27,11 +27,11 @@ #include <kdebug.h> #include <kdirlister.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprotocolinfo.h> #include <tdeaction.h> #include <kurldrag.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include <kiconeffect.h> diff --git a/konqueror/listview/konq_textviewitem.cc b/konqueror/listview/konq_textviewitem.cc index ac63cd44..3919d6c8 100644 --- a/konqueror/listview/konq_textviewitem.cc +++ b/konqueror/listview/konq_textviewitem.cc @@ -22,7 +22,7 @@ #include <assert.h> #include <stdio.h> -#include <kglobal.h> +#include <tdeglobal.h> int KonqTextViewItem::compare( TQListViewItem *item, int col, bool ascending ) const { diff --git a/konqueror/listview/konq_textviewitem.h b/konqueror/listview/konq_textviewitem.h index cbeda173..506c1b59 100644 --- a/konqueror/listview/konq_textviewitem.h +++ b/konqueror/listview/konq_textviewitem.h @@ -23,7 +23,7 @@ #include <tqlistview.h> #include <tqstring.h> #include <tdeio/global.h> -#include <klocale.h> +#include <tdelocale.h> #include "konq_listviewitems.h" #include "konq_textviewwidget.h" diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp index 846fae1b..8889861b 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp @@ -26,14 +26,14 @@ #include <kdebug.h> #include <tdeaction.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kcharsets.h> #include <tdepopupmenu.h> #include <dcopclient.h> #include <kgenericfactory.h> -#include <kprotocolmanager.h> +#include <tdeprotocolmanager.h> #include <kprotocolinfo.h> #include <tdeio/slaveconfig.h> #include <konq_dirpart.h> diff --git a/konqueror/shellcmdplugin/kshellcmddialog.cpp b/konqueror/shellcmdplugin/kshellcmddialog.cpp index eefa5733..b4ea0cb5 100644 --- a/konqueror/shellcmdplugin/kshellcmddialog.cpp +++ b/konqueror/shellcmdplugin/kshellcmddialog.cpp @@ -21,7 +21,7 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstdguiitem.h> #include <kpushbutton.h> diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp index 3f93fead..e5e8dabe 100644 --- a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp +++ b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp @@ -27,9 +27,9 @@ #include <tqsocketnotifier.h> #include <kinputdialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdesu/process.h> -#include <klocale.h> +#include <tdelocale.h> KShellCommandExecutor::KShellCommandExecutor(const TQString& command, TQWidget* parent) :TQTextView(parent) diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp index d4b3041a..5c96fea8 100644 --- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp +++ b/konqueror/shellcmdplugin/kshellcmdplugin.cpp @@ -18,7 +18,7 @@ #include "kshellcmdplugin.h" #include <kinputdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <konq_dirpart.h> #include <kprocess.h> #include <tdeapplication.h> diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp index 91eb43bf..bfff3c8e 100644 --- a/konqueror/sidebar/konqsidebar.cpp +++ b/konqueror/sidebar/konqsidebar.cpp @@ -78,7 +78,7 @@ void KonqSidebar::customEvent(TQCustomEvent* ev) // It's usually safe to leave the factory code alone.. with the // notable exception of the TDEAboutData data #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <kinstance.h> TDEInstance* KonqSidebarFactory::s_instance = 0L; diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index a775f516..62a26cba 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -27,13 +27,13 @@ #include <tqstringlist.h> #include <tqucomextra_p.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> #include <kdebug.h> #include <kiconloader.h> #include <kicondialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kinputdialog.h> #include <konq_events.h> #include <tdefileitem.h> diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp index b190790d..675642c3 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp @@ -26,7 +26,7 @@ #include <kbookmarkdrag.h> #include <kiconloader.h> #include <klineedit.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <dcopclient.h> #include <dcopref.h> diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp index 637c428d..15c162d7 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp @@ -23,7 +23,7 @@ #include <konq_operations.h> #include <konq_drag.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kuserprofile.h> #include <tqapplication.h> #include <tqclipboard.h> diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp index 61e5eb43..4f6ee068 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kprotocolinfo.h> #include <kdesktopfile.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include <kdirlister.h> #include "konqsidebariface_p.h" diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp index a6c092e0..6d5ac509 100644 --- a/konqueror/sidebar/trees/history_module/history_module.cpp +++ b/konqueror/sidebar/trees/history_module/history_module.cpp @@ -26,7 +26,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <krun.h> #include <kstaticdeleter.h> diff --git a/konqueror/sidebar/trees/history_module/history_module.h b/konqueror/sidebar/trees/history_module/history_module.h index 5c114a16..93309745 100644 --- a/konqueror/sidebar/trees/history_module/history_module.h +++ b/konqueror/sidebar/trees/history_module/history_module.h @@ -24,8 +24,8 @@ #include <tqdict.h> #include <tqpixmap.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <konq_sidebartreemodule.h> #include "history_item.h" diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp index 5614122c..eb1621ae 100644 --- a/konqueror/sidebar/trees/history_module/history_settings.cpp +++ b/konqueror/sidebar/trees/history_module/history_settings.cpp @@ -1,7 +1,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <dcopclient.h> #include "history_settings.h" diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp index 52005e2b..70e42e11 100644 --- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp +++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp @@ -33,10 +33,10 @@ #include <kdialog.h> #include <tdefontdialog.h> #include <kgenericfactory.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <knuminput.h> #include "history_dlg.h" diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp index e690c600..1e8f4d79 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.cpp +++ b/konqueror/sidebar/trees/konq_sidebartree.cpp @@ -35,7 +35,7 @@ #include <kdebug.h> #include <kdesktopfile.h> #include <kdirnotify_stub.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <kinputdialog.h> #include <tdeio/netaccess.h> diff --git a/konqueror/sidebar/trees/konqsidebar_tree.h b/konqueror/sidebar/trees/konqsidebar_tree.h index 5a198eec..bdc58ad0 100644 --- a/konqueror/sidebar/trees/konqsidebar_tree.h +++ b/konqueror/sidebar/trees/konqsidebar_tree.h @@ -9,7 +9,7 @@ #include <kdialogbase.h> #include <tqcombobox.h> #include <tqstringlist.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlineedit.h> class KonqSidebarTree; class TQVBox; diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp index da5a5c9b..44a94f02 100644 --- a/konqueror/sidebar/web_module/web_module.cpp +++ b/konqueror/sidebar/web_module/web_module.cpp @@ -25,8 +25,8 @@ #include <dom/html_inline.h> #include <kdebug.h> #include <kdialog.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <konq_pixmapprovider.h> #include <tdeparts/browserextension.h> #include <kstandarddirs.h> diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h index 494f1050..938677d8 100644 --- a/konqueror/sidebar/web_module/web_module.h +++ b/konqueror/sidebar/web_module/web_module.h @@ -22,7 +22,7 @@ #include <assert.h> #include <tdehtml_part.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <konqsidebarplugin.h> #include <tdepopupmenu.h> #include <tqobject.h> diff --git a/konsole/konsole/TEHistory.h b/konsole/konsole/TEHistory.h index dd5ba7a6..ff16433b 100644 --- a/konsole/konsole/TEHistory.h +++ b/konsole/konsole/TEHistory.h @@ -25,7 +25,7 @@ #include <tqptrvector.h> #include <tqbitarray.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include "TECommon.h" diff --git a/konsole/konsole/TEPty.cpp b/konsole/konsole/TEPty.cpp index 53aca227..1efcd214 100644 --- a/konsole/konsole/TEPty.cpp +++ b/konsole/konsole/TEPty.cpp @@ -81,7 +81,7 @@ #include <termios.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kpty.h> diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp index 8aae214f..42695052 100644 --- a/konsole/konsole/TEWidget.cpp +++ b/konsole/konsole/TEWidget.cpp @@ -76,9 +76,9 @@ #include <krun.h> #include <kcursor.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <knotifyclient.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeshortcut.h> #include <kurldrag.h> #include <tdeio/netaccess.h> diff --git a/konsole/konsole/TEmuVt102.cpp b/konsole/konsole/TEmuVt102.cpp index 76772ab7..907e19b3 100644 --- a/konsole/konsole/TEmuVt102.cpp +++ b/konsole/konsole/TEmuVt102.cpp @@ -32,8 +32,8 @@ #undef HAVE_XKB #endif -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "TEmuVt102.h" #include "TEWidget.h" diff --git a/konsole/konsole/keytrans.cpp b/konsole/konsole/keytrans.cpp index 3a4168e8..3712bb0d 100644 --- a/konsole/konsole/keytrans.cpp +++ b/konsole/konsole/keytrans.cpp @@ -31,7 +31,7 @@ #include <tqintdict.h> #include <tqfile.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <stdio.h> #include <stddef.h> diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index 3e3fde7f..25d9d65b 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -101,8 +101,8 @@ Time to start a requirement list. #include <kkeydialog.h> #include <kstandarddirs.h> #include <tqpainter.h> -#include <kmenubar.h> -#include <kmessagebox.h> +#include <tdemenubar.h> +#include <tdemessagebox.h> #include <krootpixmap.h> #include <krun.h> #include <kstdaction.h> @@ -110,7 +110,7 @@ Time to start a requirement list. #include <kdebug.h> #include <kipc.h> #include <dcopclient.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <knotifydialog.h> #undef B0 #include <kprinter.h> @@ -121,7 +121,7 @@ Time to start a requirement list. #include <kshell.h> #include <tqlabel.h> #include <tdepopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <sys/wait.h> #include <sys/stat.h> #include <signal.h> diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp index 64fe3a7b..5263418b 100644 --- a/konsole/konsole/konsole_part.cpp +++ b/konsole/konsole/konsole_part.cpp @@ -31,11 +31,11 @@ #include <kcharsets.h> #include <kdebug.h> #include <tdefontdialog.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 <krun.h> #include <kstdaction.h> #include <tqlabel.h> diff --git a/konsole/konsole/kwrited.cpp b/konsole/konsole/kwrited.cpp index df771670..9eef5795 100644 --- a/konsole/konsole/kwrited.cpp +++ b/konsole/konsole/kwrited.cpp @@ -37,13 +37,13 @@ // KDE #include <kuniqueapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <kdebug.h> #include <kcrash.h> #include <kpty.h> #include <kuser.h> -#include <kglobal.h> +#include <tdeglobal.h> // kwrited #include "kwrited.h" diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp index a0fdd6f3..a4419660 100644 --- a/konsole/konsole/main.cpp +++ b/konsole/konsole/main.cpp @@ -32,15 +32,15 @@ #include <dcopclient.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <kimageio.h> #include <kdebug.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeio/netaccess.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <config.h> diff --git a/konsole/konsole/printsettings.cpp b/konsole/konsole/printsettings.cpp index 8daa6c40..93b5279e 100644 --- a/konsole/konsole/printsettings.cpp +++ b/konsole/konsole/printsettings.cpp @@ -20,7 +20,7 @@ #include "printsettings.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqcheckbox.h> #include <tqlayout.h> diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp index 7e1084b6..8778a1ee 100644 --- a/konsole/konsole/schema.cpp +++ b/konsole/konsole/schema.cpp @@ -56,7 +56,7 @@ #include <tqdir.h> #include <tqdatetime.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/konsole/konsole/session.cpp b/konsole/konsole/session.cpp index 3637dcf0..17692f51 100644 --- a/konsole/konsole/session.cpp +++ b/konsole/konsole/session.cpp @@ -23,9 +23,9 @@ #include <kdebug.h> #include <dcopclient.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <knotifyclient.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocio.h> #include <krun.h> #include <kshell.h> diff --git a/konsole/konsole/zmodem_dialog.cpp b/konsole/konsole/zmodem_dialog.cpp index 421501c4..b4f16dd4 100644 --- a/konsole/konsole/zmodem_dialog.cpp +++ b/konsole/konsole/zmodem_dialog.cpp @@ -20,7 +20,7 @@ #include <tqtextedit.h> -#include <klocale.h> +#include <tdelocale.h> ZModemDialog::ZModemDialog(TQWidget *parent, bool modal, const TQString &caption) : KDialogBase(parent, "zmodem_progress", modal, caption, diff --git a/kpager/config.cpp b/kpager/config.cpp index 06524051..0c022d4b 100644 --- a/kpager/config.cpp +++ b/kpager/config.cpp @@ -30,7 +30,7 @@ #include <tqlayout.h> #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kseparator.h> #include <tdeapplication.h> diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp index bfe6bc39..74ead587 100644 --- a/kpager/desktop.cpp +++ b/kpager/desktop.cpp @@ -29,11 +29,11 @@ #include <dcopclient.h> #include <kdatastream.h> #include <tdeapplication.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <twinmodule.h> #include <twin.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <ksharedpixmap.h> #include <kpixmapio.h> diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp index 7c134fe7..3bceac2f 100644 --- a/kpager/kpager.cpp +++ b/kpager/kpager.cpp @@ -43,13 +43,13 @@ #include <tqtimer.h> #include <tdeapplication.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeaction.h> #include <kstdaction.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <twin.h> #include <twinmodule.h> #include <netwm.h> diff --git a/kpager/main.cpp b/kpager/main.cpp index 47f4d1d1..4a6ab2bc 100644 --- a/kpager/main.cpp +++ b/kpager/main.cpp @@ -22,7 +22,7 @@ ***************************************************************************/ #include <kuniqueapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> #include <tqcolor.h> diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp index 61be286c..36276eca 100644 --- a/kpersonalizer/kcountrypage.cpp +++ b/kpersonalizer/kcountrypage.cpp @@ -21,7 +21,7 @@ #include <tdeapplication.h> #include <ksimpleconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstandarddirs.h> #include <kiconloader.h> diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp index f2445e5b..9b5da3fd 100644 --- a/kpersonalizer/keyecandypage.cpp +++ b/kpersonalizer/keyecandypage.cpp @@ -25,18 +25,18 @@ #include <tqfont.h> #include <ksimpleconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> #include <kipc.h> #include <tdeapplication.h> #include <tdelistview.h> #include <krun.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include <ktrader.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <stdlib.h> diff --git a/kpersonalizer/kfindlanguage.cpp b/kpersonalizer/kfindlanguage.cpp index 83d1c161..150c67b2 100644 --- a/kpersonalizer/kfindlanguage.cpp +++ b/kpersonalizer/kfindlanguage.cpp @@ -22,9 +22,9 @@ #include <tqmap.h> #include <ksimpleconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include "kfindlanguage.h" diff --git a/kpersonalizer/kospage.cpp b/kpersonalizer/kospage.cpp index ab97a3ff..017b95fe 100644 --- a/kpersonalizer/kospage.cpp +++ b/kpersonalizer/kospage.cpp @@ -24,7 +24,7 @@ #include <ksimpleconfig.h> #include <kstandarddirs.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> #include <kipc.h> #include <krun.h> diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp index f06a84b1..c3611baf 100644 --- a/kpersonalizer/kpersonalizer.cpp +++ b/kpersonalizer/kpersonalizer.cpp @@ -26,14 +26,14 @@ #include <tqcursor.h> #include <ksimpleconfig.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdelistview.h> #include <krun.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfig.h> #include <stdlib.h> diff --git a/kpersonalizer/krefinepage.cpp b/kpersonalizer/krefinepage.cpp index 19b9e0a1..56896769 100644 --- a/kpersonalizer/krefinepage.cpp +++ b/kpersonalizer/krefinepage.cpp @@ -20,7 +20,7 @@ #include <krun.h> #include <tdeconfig.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include "krefinepage.h" #include "kpersonalizer.h" diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/kstylepage.cpp index de2643bb..296131ee 100644 --- a/kpersonalizer/kstylepage.cpp +++ b/kpersonalizer/kstylepage.cpp @@ -28,10 +28,10 @@ #include <tdeconfig.h> #include <kstandarddirs.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <kdesktopfile.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdelistview.h> #include <kipc.h> #include <ksimpleconfig.h> diff --git a/kpersonalizer/main.cpp b/kpersonalizer/main.cpp index 79449a01..e03c1903 100644 --- a/kpersonalizer/main.cpp +++ b/kpersonalizer/main.cpp @@ -17,9 +17,9 @@ #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "kpersonalizer.h" #include "kfindlanguage.h" diff --git a/kreadconfig/kreadconfig.cpp b/kreadconfig/kreadconfig.cpp index db5171b5..08e3dd43 100644 --- a/kreadconfig/kreadconfig.cpp +++ b/kreadconfig/kreadconfig.cpp @@ -25,10 +25,10 @@ * fi */ #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <stdio.h> diff --git a/kreadconfig/kwriteconfig.cpp b/kreadconfig/kwriteconfig.cpp index 259c0782..5d705641 100644 --- a/kreadconfig/kwriteconfig.cpp +++ b/kreadconfig/kwriteconfig.cpp @@ -7,10 +7,10 @@ * */ #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <stdio.h> diff --git a/krootbacking/main.cpp b/krootbacking/main.cpp index f94de001..5691d736 100644 --- a/krootbacking/main.cpp +++ b/krootbacking/main.cpp @@ -27,7 +27,7 @@ #include <tdeapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "krootbacking.h" diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp index 91d45d03..1004c439 100644 --- a/ksmserver/main.cpp +++ b/ksmserver/main.cpp @@ -20,8 +20,8 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include "server.h" diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp index 5e2d6b41..9b49ac43 100644 --- a/ksmserver/server.cpp +++ b/ksmserver/server.cpp @@ -66,14 +66,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqtimer.h> #include <tqregexp.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kstandarddirs.h> #include <unistd.h> #include <tdeapplication.h> #include <kstaticdeleter.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kprocess.h> #include <dcopclient.h> #include <dcopref.h> diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp index 0e740daf..87b9836b 100644 --- a/ksmserver/shutdown.cpp +++ b/ksmserver/shutdown.cpp @@ -66,14 +66,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqtimer.h> #include <tqregexp.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kstandarddirs.h> #include <unistd.h> #include <tdeapplication.h> #include <kstaticdeleter.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kprocess.h> #include <dcopclient.h> #include <dcopref.h> @@ -288,7 +288,7 @@ void KSMServer::shutdown( TDEApplication::ShutdownConfirm confirm, shutdownInternal( confirm, sdtype, sdmode ); } -#include <kmessagebox.h> +#include <tdemessagebox.h> void KSMServer::logoutTimed( int sdtype, int sdmode, TQString bootOption ) { diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp index 4dc8038c..c71bd094 100644 --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp @@ -37,7 +37,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> #include <tqregexp.h> #include <tqeventloop.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <kdebug.h> @@ -45,7 +45,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> #include <kstdguiitem.h> #include <kguiitem.h> #include <kiconloader.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <twin.h> #include <kuser.h> #include <kpixmap.h> diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp index 3df79fc1..b1ed9992 100644 --- a/ksmserver/startup.cpp +++ b/ksmserver/startup.cpp @@ -65,14 +65,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqguardedptr.h> #include <tqtimer.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kstandarddirs.h> #include <unistd.h> #include <tdeapplication.h> #include <kstaticdeleter.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kprocess.h> #include <dcopclient.h> #include <dcopref.h> diff --git a/ksmserver/startupdlg.cpp b/ksmserver/startupdlg.cpp index 585d437a..812ebc5c 100644 --- a/ksmserver/startupdlg.cpp +++ b/ksmserver/startupdlg.cpp @@ -28,7 +28,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> #include <tqregexp.h> #include <tqeventloop.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <kdebug.h> @@ -36,7 +36,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> #include <kstdguiitem.h> #include <kguiitem.h> #include <kiconloader.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <twin.h> #include <kuser.h> #include <kpixmap.h> diff --git a/ksplashml/kcmksplash/installer.cpp b/ksplashml/kcmksplash/installer.cpp index 0cb2b333..d04fbc4f 100644 --- a/ksplashml/kcmksplash/installer.cpp +++ b/ksplashml/kcmksplash/installer.cpp @@ -21,9 +21,9 @@ #include <kdebug.h> #include <tdefiledialog.h> -#include <kglobalsettings.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <kpushbutton.h> #include <kstandarddirs.h> diff --git a/ksplashml/main.cpp b/ksplashml/main.cpp index 3c364dcf..790e0e5d 100644 --- a/ksplashml/main.cpp +++ b/ksplashml/main.cpp @@ -22,7 +22,7 @@ #include <tdecmdlineargs.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> #include "wndmain.h" diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp index 064b404b..bd56f968 100644 --- a/ksplashml/themeengine/default/themelegacy.cpp +++ b/ksplashml/themeengine/default/themelegacy.cpp @@ -13,8 +13,8 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kgenericfactory.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kprogress.h> diff --git a/ksplashml/themeengine/objkstheme.cpp b/ksplashml/themeengine/objkstheme.cpp index 450bef75..89a9601b 100644 --- a/ksplashml/themeengine/objkstheme.cpp +++ b/ksplashml/themeengine/objkstheme.cpp @@ -13,8 +13,8 @@ #include <tdecmdlineargs.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tqcolor.h> diff --git a/ksplashml/themeengine/redmond/previewredmond.cpp b/ksplashml/themeengine/redmond/previewredmond.cpp index 3bfb8020..7a31a44b 100644 --- a/ksplashml/themeengine/redmond/previewredmond.cpp +++ b/ksplashml/themeengine/redmond/previewredmond.cpp @@ -10,7 +10,7 @@ * * ***************************************************************************/ -#include <klocale.h> +#include <tdelocale.h> #include <tqpainter.h> #include <tqpixmap.h> diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp index 38f54b8f..b0e81ba7 100644 --- a/ksplashml/themeengine/redmond/themeredmond.cpp +++ b/ksplashml/themeengine/redmond/themeredmond.cpp @@ -19,12 +19,12 @@ #include <kdialogbase.h> #include <tdefontcombo.h> #include <kgenericfactory.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kuser.h> -#include <kemailsettings.h> +#include <tdeemailsettings.h> #include <tqcheckbox.h> #include <tqdesktopwidget.h> diff --git a/ksplashml/themeengine/standard/themestandard.cpp b/ksplashml/themeengine/standard/themestandard.cpp index ee7fefb0..ce0fd124 100644 --- a/ksplashml/themeengine/standard/themestandard.cpp +++ b/ksplashml/themeengine/standard/themestandard.cpp @@ -12,9 +12,9 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kdialogbase.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdeconfig.h> diff --git a/ksplashml/themeengine/standard/wndicon.cpp b/ksplashml/themeengine/standard/wndicon.cpp index 9ddf7e6a..030456f4 100644 --- a/ksplashml/themeengine/standard/wndicon.cpp +++ b/ksplashml/themeengine/standard/wndicon.cpp @@ -18,7 +18,7 @@ #include <kcursor.h> #include <kdebug.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <twin.h> #include <tqdesktopwidget.h> diff --git a/ksplashml/themeengine/standard/wndstatus.cpp b/ksplashml/themeengine/standard/wndstatus.cpp index a89a8301..b3a2e69f 100644 --- a/ksplashml/themeengine/standard/wndstatus.cpp +++ b/ksplashml/themeengine/standard/wndstatus.cpp @@ -13,7 +13,7 @@ #include <tdeapplication.h> #include <kcursor.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <kprogress.h> #include <twin.h> diff --git a/ksplashml/themeengine/themeengine.cpp b/ksplashml/themeengine/themeengine.cpp index 45f8bbbc..9a7d3aba 100644 --- a/ksplashml/themeengine/themeengine.cpp +++ b/ksplashml/themeengine/themeengine.cpp @@ -17,7 +17,7 @@ #include <tdecmdlineargs.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <twin.h> #include <tqevent.h> diff --git a/ksplashml/themeengine/unified/themeunified.cpp b/ksplashml/themeengine/unified/themeunified.cpp index 9d3d2c3e..0a2eb634 100644 --- a/ksplashml/themeengine/unified/themeunified.cpp +++ b/ksplashml/themeengine/unified/themeunified.cpp @@ -13,8 +13,8 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kgenericfactory.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kprogress.h> diff --git a/ksplashml/wndmain.cpp b/ksplashml/wndmain.cpp index a3d8647a..c37c6e21 100644 --- a/ksplashml/wndmain.cpp +++ b/ksplashml/wndmain.cpp @@ -17,8 +17,8 @@ #include <kdebug.h> #include <kiconloader.h> #include <klibloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <ktrader.h> #include <twin.h> diff --git a/kstart/kstart.cpp b/kstart/kstart.cpp index 6e5bd277..bcbc6d84 100644 --- a/kstart/kstart.cpp +++ b/kstart/kstart.cpp @@ -18,13 +18,13 @@ #include <kdebug.h> #include <kprocess.h> -#include <klocale.h> +#include <tdelocale.h> #include <twin.h> #include <twinmodule.h> #include <tdeapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <kstartupinfo.h> +#include <tdestartupinfo.h> #include <kxmessages.h> #include <netwm.h> diff --git a/ksysguard/gui/KSGAppletSettings.cc b/ksysguard/gui/KSGAppletSettings.cc index 2e77eba5..01b2e0b1 100644 --- a/ksysguard/gui/KSGAppletSettings.cc +++ b/ksysguard/gui/KSGAppletSettings.cc @@ -23,7 +23,7 @@ #include <tqspinbox.h> #include <tdeaccelmanager.h> -#include <klocale.h> +#include <tdelocale.h> #include "KSGAppletSettings.h" diff --git a/ksysguard/gui/KSysGuardApplet.cc b/ksysguard/gui/KSysGuardApplet.cc index 0da48768..ae31d4a6 100644 --- a/ksysguard/gui/KSysGuardApplet.cc +++ b/ksysguard/gui/KSysGuardApplet.cc @@ -31,8 +31,8 @@ #include <tqtooltip.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <ksavefile.h> #include <kstandarddirs.h> #include <tdepopupmenu.h> diff --git a/ksysguard/gui/SensorBrowser.cc b/ksysguard/gui/SensorBrowser.cc index b0c898e1..801091d9 100644 --- a/ksysguard/gui/SensorBrowser.cc +++ b/ksysguard/gui/SensorBrowser.cc @@ -27,8 +27,8 @@ #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <ksgrd/SensorManager.h> #include "SensorBrowser.h" diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.cc b/ksysguard/gui/SensorDisplayLib/DancingBars.cc index 3917fc86..5b09addc 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBars.cc +++ b/ksysguard/gui/SensorDisplayLib/DancingBars.cc @@ -30,7 +30,7 @@ #include <tqtooltip.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <knumvalidator.h> #include <ksgrd/SensorManager.h> #include <ksgrd/StyleEngine.h> diff --git a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc index a4a97ee4..ee03f9e9 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc +++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc @@ -26,7 +26,7 @@ #include <klineedit.h> #include <kinputdialog.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <tqcheckbox.h> diff --git a/ksysguard/gui/SensorDisplayLib/DummyDisplay.cc b/ksysguard/gui/SensorDisplayLib/DummyDisplay.cc index 42267af4..13696c50 100644 --- a/ksysguard/gui/SensorDisplayLib/DummyDisplay.cc +++ b/ksysguard/gui/SensorDisplayLib/DummyDisplay.cc @@ -21,7 +21,7 @@ */ -#include <klocale.h> +#include <tdelocale.h> #include <ksgrd/SensorManager.h> #include <tqwhatsthis.h> diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc index 220df65b..22894afe 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc @@ -26,8 +26,8 @@ #include <tqtooltip.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <ksgrd/SensorManager.h> #include <ksgrd/StyleEngine.h> diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc index 3ba91aa9..ef53bab7 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc @@ -26,7 +26,7 @@ #include <kcolordialog.h> #include <klineedit.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <tqcheckbox.h> diff --git a/ksysguard/gui/SensorDisplayLib/ListView.cc b/ksysguard/gui/SensorDisplayLib/ListView.cc index d1182617..5b748e9c 100644 --- a/ksysguard/gui/SensorDisplayLib/ListView.cc +++ b/ksysguard/gui/SensorDisplayLib/ListView.cc @@ -30,9 +30,9 @@ #include <kcolorbutton.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <ksgrd/SensorManager.h> #include <ksgrd/StyleEngine.h> diff --git a/ksysguard/gui/SensorDisplayLib/ListViewSettings.cc b/ksysguard/gui/SensorDisplayLib/ListViewSettings.cc index 81a9b2d4..e8e8ca33 100644 --- a/ksysguard/gui/SensorDisplayLib/ListViewSettings.cc +++ b/ksysguard/gui/SensorDisplayLib/ListViewSettings.cc @@ -20,7 +20,7 @@ #include "ListViewSettings.h" #include "ListViewSettingsWidget.h" -#include <klocale.h> +#include <tdelocale.h> ListViewSettings::ListViewSettings( TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, i18n( "List View Settings" ), diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cc b/ksysguard/gui/SensorDisplayLib/LogFile.cc index a1ec685e..a8b22569 100644 --- a/ksysguard/gui/SensorDisplayLib/LogFile.cc +++ b/ksysguard/gui/SensorDisplayLib/LogFile.cc @@ -29,7 +29,7 @@ #include <tdefontdialog.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcolorbutton.h> #include <ksgrd/StyleEngine.h> diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cc b/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cc index 436c8540..90336988 100644 --- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cc +++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cc @@ -20,7 +20,7 @@ #include "MultiMeterSettings.h" #include "MultiMeterSettingsWidget.h" -#include <klocale.h> +#include <tdelocale.h> MultiMeterSettings::MultiMeterSettings( TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, i18n( "Multimeter Settings" ), diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cc b/ksysguard/gui/SensorDisplayLib/ProcessController.cc index 3f2bcd10..8daaeacf 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessController.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessController.cc @@ -27,8 +27,8 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdialogbase.h> #include <tdelistviewsearchline.h> diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cc index d151486e..c8ced256 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cc @@ -41,9 +41,9 @@ #include <tqpopupmenu.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "ProcessController.h" #include "ProcessList.h" diff --git a/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc b/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc index dfd53588..e226314d 100644 --- a/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc +++ b/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc @@ -22,7 +22,7 @@ */ -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include "ReniceDlg.moc" diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc index 7e05c9fd..4dfff795 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc +++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc @@ -31,8 +31,8 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <krun.h> #include <kservice.h> diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc b/ksysguard/gui/SensorDisplayLib/SensorLogger.cc index e0483f29..88083fca 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc +++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.cc @@ -20,7 +20,7 @@ #include <tdeapplication.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksgrd/SensorManager.h> #include <ksgrd/StyleEngine.h> diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc index a6f686db..422c6a83 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc +++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc @@ -22,7 +22,7 @@ #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> SensorLoggerDlg::SensorLoggerDlg( TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, i18n( "Sensor Logger" ), diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cc b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cc index 2935242f..e029d914 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cc +++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cc @@ -20,7 +20,7 @@ #include "SensorLoggerSettings.h" #include "SensorLoggerSettingsWidget.h" -#include <klocale.h> +#include <tdelocale.h> SensorLoggerSettings::SensorLoggerSettings( TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, i18n( "Sensor Logger Settings" ), diff --git a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc index 3d4d9c6f..bcb0b821 100644 --- a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc +++ b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc @@ -28,7 +28,7 @@ #include <tqpixmap.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <ksgrd/StyleEngine.h> diff --git a/ksysguard/gui/WorkSheet.cc b/ksysguard/gui/WorkSheet.cc index 386b0950..d465a998 100644 --- a/ksysguard/gui/WorkSheet.cc +++ b/ksysguard/gui/WorkSheet.cc @@ -28,8 +28,8 @@ #include <tqlayout.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> #include <SensorManager.h> diff --git a/ksysguard/gui/WorkSheetSettings.cc b/ksysguard/gui/WorkSheetSettings.cc index 4174aa40..703be57d 100644 --- a/ksysguard/gui/WorkSheetSettings.cc +++ b/ksysguard/gui/WorkSheetSettings.cc @@ -24,7 +24,7 @@ #include <tdeaccelmanager.h> #include <klineedit.h> #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqgroupbox.h> #include <tqlabel.h> diff --git a/ksysguard/gui/Workspace.cc b/ksysguard/gui/Workspace.cc index 9cb0e56e..c5e62224 100644 --- a/ksysguard/gui/Workspace.cc +++ b/ksysguard/gui/Workspace.cc @@ -28,8 +28,8 @@ #include <kdebug.h> #include <tdefiledialog.h> #include <tdeio/netaccess.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <tdeaccelmanager.h> diff --git a/ksysguard/gui/ksgrd/HostConnector.cc b/ksysguard/gui/ksgrd/HostConnector.cc index 146e1b3e..b6e85b79 100644 --- a/ksysguard/gui/ksgrd/HostConnector.cc +++ b/ksysguard/gui/ksgrd/HostConnector.cc @@ -21,7 +21,7 @@ #include <tdeapplication.h> #include <tdeaccelmanager.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqbuttongroup.h> #include <tqlabel.h> diff --git a/ksysguard/gui/ksgrd/SensorAgent.cc b/ksysguard/gui/ksgrd/SensorAgent.cc index 5fcb14a9..7f961598 100644 --- a/ksysguard/gui/ksgrd/SensorAgent.cc +++ b/ksysguard/gui/ksgrd/SensorAgent.cc @@ -21,7 +21,7 @@ #include <stdlib.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpassdlg.h> #include "SensorClient.h" diff --git a/ksysguard/gui/ksgrd/SensorManager.cc b/ksysguard/gui/ksgrd/SensorManager.cc index c22197fa..7794d9c1 100644 --- a/ksysguard/gui/ksgrd/SensorManager.cc +++ b/ksysguard/gui/ksgrd/SensorManager.cc @@ -29,7 +29,7 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "HostConnector.h" #include "SensorShellAgent.h" diff --git a/ksysguard/gui/ksgrd/SensorSocketAgent.cc b/ksysguard/gui/ksgrd/SensorSocketAgent.cc index 6289e440..30c0cc7e 100644 --- a/ksysguard/gui/ksgrd/SensorSocketAgent.cc +++ b/ksysguard/gui/ksgrd/SensorSocketAgent.cc @@ -21,7 +21,7 @@ #include <stdlib.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpassdlg.h> #include "SensorClient.h" diff --git a/ksysguard/gui/ksgrd/StyleEngine.cc b/ksysguard/gui/ksgrd/StyleEngine.cc index 3d4bb6c8..ce3e3bd6 100644 --- a/ksysguard/gui/ksgrd/StyleEngine.cc +++ b/ksysguard/gui/ksgrd/StyleEngine.cc @@ -26,7 +26,7 @@ #include <tqspinbox.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include "StyleSettings.h" diff --git a/ksysguard/gui/ksgrd/StyleSettings.cc b/ksysguard/gui/ksgrd/StyleSettings.cc index 9c04ae05..b84d3e40 100644 --- a/ksysguard/gui/ksgrd/StyleSettings.cc +++ b/ksysguard/gui/ksgrd/StyleSettings.cc @@ -33,7 +33,7 @@ #include <tdeaccelmanager.h> #include <kcolorbutton.h> #include <kcolordialog.h> -#include <klocale.h> +#include <tdelocale.h> #include "StyleSettings.h" diff --git a/ksysguard/gui/ksgrd/TimerSettings.cc b/ksysguard/gui/ksgrd/TimerSettings.cc index 9384cb05..43e73ab9 100644 --- a/ksysguard/gui/ksgrd/TimerSettings.cc +++ b/ksysguard/gui/ksgrd/TimerSettings.cc @@ -22,7 +22,7 @@ */ #include <tdeaccelmanager.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqcheckbox.h> #include <tqlabel.h> diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cc index 4b5b688d..0e8f810e 100644 --- a/ksysguard/gui/ksysguard.cc +++ b/ksysguard/gui/ksysguard.cc @@ -40,10 +40,10 @@ #include <tdecmdlineargs.h> #include <kdebug.h> #include <kedittoolbar.h> -#include <kglobal.h> -#include <kglobalsettings.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <ksgrd/SensorAgent.h> #include <ksgrd/SensorManager.h> #include <ksgrd/StyleEngine.h> diff --git a/ksystraycmd/ksystraycmd.cpp b/ksystraycmd/ksystraycmd.cpp index 4da74576..020cd7ee 100644 --- a/ksystraycmd/ksystraycmd.cpp +++ b/ksystraycmd/ksystraycmd.cpp @@ -5,9 +5,9 @@ #include <kdebug.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kprocess.h> #include <twinmodule.h> diff --git a/ksystraycmd/main.cpp b/ksystraycmd/main.cpp index 169a6b2f..e322f2cf 100644 --- a/ksystraycmd/main.cpp +++ b/ksystraycmd/main.cpp @@ -4,7 +4,7 @@ #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> #include "ksystraycmd.h" diff --git a/ktip/ktipwindow.cpp b/ktip/ktipwindow.cpp index 8ca130fc..64524d75 100644 --- a/ktip/ktipwindow.cpp +++ b/ktip/ktipwindow.cpp @@ -22,7 +22,7 @@ #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <ktip.h> #include <kuniqueapplication.h> diff --git a/kxkb/kcmlayout.cpp b/kxkb/kcmlayout.cpp index fb323ad2..2c601856 100644 --- a/kxkb/kcmlayout.cpp +++ b/kxkb/kcmlayout.cpp @@ -15,9 +15,9 @@ #include <tqspinbox.h> #include <kkeydialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kdebug.h> #include <tdeapplication.h> diff --git a/kxkb/kcmmisc.cpp b/kxkb/kcmmisc.cpp index 56d517b6..9436d730 100644 --- a/kxkb/kcmmisc.cpp +++ b/kxkb/kcmmisc.cpp @@ -37,11 +37,11 @@ #include <tqvbuttongroup.h> #include <tqradiobutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <knuminput.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kprocess.h> #include <kdialog.h> diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp index eae45523..2db4fb60 100644 --- a/kxkb/kxkb.cpp +++ b/kxkb/kxkb.cpp @@ -34,13 +34,13 @@ DESCRIPTION #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kglobalaccel.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> #include <twinmodule.h> #include <twin.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kstandarddirs.h> #include <kipc.h> #include <tdeaction.h> diff --git a/kxkb/kxkbtraywindow.cpp b/kxkb/kxkbtraywindow.cpp index dae4f709..ec91df67 100644 --- a/kxkb/kxkbtraywindow.cpp +++ b/kxkb/kxkbtraywindow.cpp @@ -12,7 +12,7 @@ #include <tqtooltip.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconeffect.h> #include <kiconloader.h> #include <tdepopupmenu.h> diff --git a/kxkb/pixmap.cpp b/kxkb/pixmap.cpp index 25c9f6d7..8752c258 100644 --- a/kxkb/pixmap.cpp +++ b/kxkb/pixmap.cpp @@ -6,7 +6,7 @@ #include <tqdict.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "pixmap.h" diff --git a/kxkb/rules.cpp b/kxkb/rules.cpp index 28d8f687..20f81760 100644 --- a/kxkb/rules.cpp +++ b/kxkb/rules.cpp @@ -6,8 +6,8 @@ #include <tqdir.h> #include <kstandarddirs.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <config.h> diff --git a/l10n/README b/l10n/README index 68a3d73a..9b53989c 100644 --- a/l10n/README +++ b/l10n/README @@ -225,7 +225,7 @@ between the entry name and the value. * AddressCountryPosition These fields define the formatting of postal addresses. For detailled information on these fields' format, please refer to - tdelibs/kabc/README.AddressFormat + tdelibs/tdeabc/README.AddressFormat Hans Petter Bieker <bieker@kde.org> Lukas Tinkl <lukas@kde.org> diff --git a/libkonq/kivdirectoryoverlay.cc b/libkonq/kivdirectoryoverlay.cc index 405032ec..c15c41d8 100644 --- a/libkonq/kivdirectoryoverlay.cc +++ b/libkonq/kivdirectoryoverlay.cc @@ -30,7 +30,7 @@ #include <kstandarddirs.h> #include <kiconloader.h> #include <konq_settings.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "kivdirectoryoverlay.h" diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cc index e27277ac..d4cae95a 100644 --- a/libkonq/knewmenu.cc +++ b/libkonq/knewmenu.cc @@ -24,8 +24,8 @@ #include <kdirwatch.h> #include <kinstance.h> #include <kinputdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kprotocolinfo.h> #include <tdepopupmenu.h> diff --git a/libkonq/konq_bgnddlg.cc b/libkonq/konq_bgnddlg.cc index 77905b0c..60f3aa63 100644 --- a/libkonq/konq_bgnddlg.cc +++ b/libkonq/konq_bgnddlg.cc @@ -27,7 +27,7 @@ #include <kcombobox.h> #include <kdebug.h> #include <kimagefilepreview.h> -#include <klocale.h> +#include <tdelocale.h> //#include <tderecentdocument.h> #include <kstandarddirs.h> #include <kurlrequester.h> diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cc index 0ada0251..0e88a992 100644 --- a/libkonq/konq_dirpart.cc +++ b/libkonq/konq_dirpart.cc @@ -29,14 +29,14 @@ #include <kdebug.h> #include <kdirlister.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <konq_drag.h> #include <tdeparts/browserextension.h> #include <kurldrag.h> #include <kuserprofile.h> #include <kurifilter.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tqapplication.h> #include <tqclipboard.h> diff --git a/libkonq/konq_faviconmgr.cc b/libkonq/konq_faviconmgr.cc index 5baf83a0..c5c828ec 100644 --- a/libkonq/konq_faviconmgr.cc +++ b/libkonq/konq_faviconmgr.cc @@ -20,7 +20,7 @@ #include <dcopclient.h> #include <tdeapplication.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kmimetype.h> #include "konq_faviconmgr.moc" diff --git a/libkonq/konq_filetip.cc b/libkonq/konq_filetip.cc index 78d2c0e2..8ad1e0d6 100644 --- a/libkonq/konq_filetip.cc +++ b/libkonq/konq_filetip.cc @@ -22,7 +22,7 @@ #include <konq_filetip.h> #include <tdefileitem.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstandarddirs.h> #include <tdeapplication.h> diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc index a0a4dfd4..18997a71 100644 --- a/libkonq/konq_iconviewwidget.cc +++ b/libkonq/konq_iconviewwidget.cc @@ -39,7 +39,7 @@ #include <tdefileivi.h> #include <konq_settings.h> #include <konq_drag.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kpropertiesdialog.h> #include <kipc.h> #include <kicontheme.h> @@ -51,7 +51,7 @@ #include <assert.h> #include <unistd.h> -#include <klocale.h> +#include <tdelocale.h> struct KonqIconViewWidgetPrivate diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc index 3e58bde5..cd9a6117 100644 --- a/libkonq/konq_operations.cc +++ b/libkonq/konq_operations.cc @@ -21,8 +21,8 @@ #include <kautomount.h> #include <kinputdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <knotifyclient.h> #include <krun.h> #include <kshell.h> @@ -44,7 +44,7 @@ #include <tdefileitem.h> #include <kdesktopfile.h> #include <kurldrag.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kimageio.h> #include <tdeio/job.h> #include <tdeio/jobclasses.h> diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc index 97b2eb99..fe962f3c 100644 --- a/libkonq/konq_popupmenu.cc +++ b/libkonq/konq_popupmenu.cc @@ -21,7 +21,7 @@ #include <tqdir.h> #include <tqeventloop.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kbookmarkmanager.h> #include <kdebug.h> @@ -29,7 +29,7 @@ #include <kprotocolinfo.h> #include <kiconloader.h> #include <kinputdialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstandarddirs.h> #include <kxmlguifactory.h> #include <kxmlguibuilder.h> diff --git a/libkonq/konq_settings.cc b/libkonq/konq_settings.cc index aef17475..41460e8a 100644 --- a/libkonq/konq_settings.cc +++ b/libkonq/konq_settings.cc @@ -19,8 +19,8 @@ #include "konq_settings.h" #include "konq_defaults.h" -#include "kglobalsettings.h" -#include <kglobal.h> +#include "tdeglobalsettings.h" +#include <tdeglobal.h> #include <kservicetype.h> #include <kdesktopfile.h> #include <kdebug.h> diff --git a/libkonq/konq_undo.cc b/libkonq/konq_undo.cc index c81313aa..a6072e80 100644 --- a/libkonq/konq_undo.cc +++ b/libkonq/konq_undo.cc @@ -32,8 +32,8 @@ #include <tdeapplication.h> #include <kdatastream.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <tdeconfig.h> #include <kipc.h> diff --git a/nsplugins/kcm_nsplugins.cpp b/nsplugins/kcm_nsplugins.cpp index 84284ae5..037798cb 100644 --- a/nsplugins/kcm_nsplugins.cpp +++ b/nsplugins/kcm_nsplugins.cpp @@ -23,7 +23,7 @@ #include <tqregexp.h> #include <tqlayout.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdefiledialog.h> #include <kurlrequester.h> diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp index 65a7e48a..8c9e6fe2 100644 --- a/nsplugins/nspluginloader.cpp +++ b/nsplugins/nspluginloader.cpp @@ -30,8 +30,8 @@ #include <tdeapplication.h> #include <kprocess.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdeconfig.h> #include <dcopclient.h> diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp index f7404b34..99cbc780 100644 --- a/nsplugins/plugin_part.cpp +++ b/nsplugins/plugin_part.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <tdefiledialog.h> #include <tdeio/netaccess.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/browserinterface.h> #include <tdeparts/browserextension.h> diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp index f8731a6c..0b6855c4 100644 --- a/nsplugins/pluginscan.cpp +++ b/nsplugins/pluginscan.cpp @@ -42,7 +42,7 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <klibloader.h> #include <tdeconfig.h> @@ -52,7 +52,7 @@ #include <kmimetype.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include "sdk/npupp.h" #include <X11/Intrinsic.h> diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp index 00f98921..d6327be3 100644 --- a/nsplugins/viewer/nsplugin.cpp +++ b/nsplugins/viewer/nsplugin.cpp @@ -46,14 +46,14 @@ #include <dcopclient.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeio/netaccess.h> #include <klibloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> -#include <kprotocolmanager.h> +#include <tdeprotocolmanager.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kurl.h> #include <X11/Intrinsic.h> diff --git a/nsplugins/viewer/qxteventloop.cpp b/nsplugins/viewer/qxteventloop.cpp index 2c79bc6e..1f112ba0 100644 --- a/nsplugins/viewer/qxteventloop.cpp +++ b/nsplugins/viewer/qxteventloop.cpp @@ -41,7 +41,7 @@ #include <tqapplication.h> #include <tqwidgetintdict.h> -#include <kglobal.h> +#include <tdeglobal.h> // resolve the conflict between X11's FocusIn and TQEvent::FocusIn const int XFocusOut = FocusOut; diff --git a/nsplugins/viewer/viewer.cpp b/nsplugins/viewer/viewer.cpp index 682a1199..a7469b4f 100644 --- a/nsplugins/viewer/viewer.cpp +++ b/nsplugins/viewer/viewer.cpp @@ -31,9 +31,9 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqptrlist.h> #include <tqsocketnotifier.h> #include <stdlib.h> diff --git a/tdeinit/displayconfig.cpp b/tdeinit/displayconfig.cpp index bc19cbd8..db0ae5b9 100644 --- a/tdeinit/displayconfig.cpp +++ b/tdeinit/displayconfig.cpp @@ -27,7 +27,7 @@ #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeconfig.h> diff --git a/tdeinit/phase1.cpp b/tdeinit/phase1.cpp index 14767248..054df883 100644 --- a/tdeinit/phase1.cpp +++ b/tdeinit/phase1.cpp @@ -27,7 +27,7 @@ #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeconfig.h> diff --git a/tdeioslave/cgi/cgi.cpp b/tdeioslave/cgi/cgi.cpp index b17ab620..4f54d666 100644 --- a/tdeioslave/cgi/cgi.cpp +++ b/tdeioslave/cgi/cgi.cpp @@ -26,7 +26,7 @@ #include <kprocess.h> #include <kstandarddirs.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include "cgi.h" diff --git a/tdeioslave/cgi/kcmcgi/kcmcgi.cpp b/tdeioslave/cgi/kcmcgi/kcmcgi.cpp index f20c5d73..592371cb 100644 --- a/tdeioslave/cgi/kcmcgi/kcmcgi.cpp +++ b/tdeioslave/cgi/kcmcgi/kcmcgi.cpp @@ -17,8 +17,8 @@ */ #include <tdeconfig.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeaboutdata.h> #include <tdefiledialog.h> diff --git a/tdeioslave/finger/tdeio_finger.cpp b/tdeioslave/finger/tdeio_finger.cpp index ba029491..643a699f 100644 --- a/tdeioslave/finger/tdeio_finger.cpp +++ b/tdeioslave/finger/tdeio_finger.cpp @@ -29,9 +29,9 @@ #include <kdebug.h> #include <kinstance.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include "tdeio_finger.h" diff --git a/tdeioslave/fish/fish.cpp b/tdeioslave/fish/fish.cpp index 6ef20451..98c11a71 100644 --- a/tdeioslave/fish/fish.cpp +++ b/tdeioslave/fish/fish.cpp @@ -62,11 +62,11 @@ #endif #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kinstance.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kremoteencoding.h> #include <kurl.h> #include <ksock.h> diff --git a/tdeioslave/floppy/tdeio_floppy.cpp b/tdeioslave/floppy/tdeio_floppy.cpp index 0e576e47..c67af0b3 100644 --- a/tdeioslave/floppy/tdeio_floppy.cpp +++ b/tdeioslave/floppy/tdeio_floppy.cpp @@ -45,7 +45,7 @@ #include <kinstance.h> #include <kdebug.h> #include <tdeio/global.h> -#include <klocale.h> +#include <tdelocale.h> using namespace TDEIO; diff --git a/tdeioslave/home/kdedmodule/homedirnotifymodule.cpp b/tdeioslave/home/kdedmodule/homedirnotifymodule.cpp index 19bcff98..ac4e79f6 100644 --- a/tdeioslave/home/kdedmodule/homedirnotifymodule.cpp +++ b/tdeioslave/home/kdedmodule/homedirnotifymodule.cpp @@ -19,8 +19,8 @@ #include "homedirnotifymodule.h" #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> HomeDirNotifyModule::HomeDirNotifyModule(const TQCString &obj) : KDEDModule(obj) diff --git a/tdeioslave/home/tdeio_home.cpp b/tdeioslave/home/tdeio_home.cpp index 8ab6bff9..109252f4 100644 --- a/tdeioslave/home/tdeio_home.cpp +++ b/tdeioslave/home/tdeio_home.cpp @@ -20,11 +20,11 @@ #include <stdlib.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <dcopclient.h> #include <tdecmdlineargs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "tdeio_home.h" diff --git a/tdeioslave/info/info.cc b/tdeioslave/info/info.cc index 4d973bc5..6ef78adc 100644 --- a/tdeioslave/info/info.cc +++ b/tdeioslave/info/info.cc @@ -12,7 +12,7 @@ #include <kstandarddirs.h> #include <kiconloader.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include "info.h" diff --git a/tdeioslave/ldap/CMakeLists.txt b/tdeioslave/ldap/CMakeLists.txt index d05048e0..f32c3132 100644 --- a/tdeioslave/ldap/CMakeLists.txt +++ b/tdeioslave/ldap/CMakeLists.txt @@ -32,6 +32,6 @@ install( FILES ldap.protocol ldaps.protocol DESTINATION ${SERVICES_INSTALL_DIR} tde_add_kpart( tdeio_ldap AUTOMOC SOURCES tdeio_ldap.cpp - LINK kabc-shared ${LDAP_LIBRARIES} + LINK tdeabc-shared ${LDAP_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tdeioslave/ldap/tdeio_ldap.cpp b/tdeioslave/ldap/tdeio_ldap.cpp index 2e22e699..29fc2490 100644 --- a/tdeioslave/ldap/tdeio_ldap.cpp +++ b/tdeioslave/ldap/tdeio_ldap.cpp @@ -11,7 +11,7 @@ #include <kdebug.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #ifdef HAVE_SASL_SASL_H //prefer libsasl2 #include <sasl/sasl.h> @@ -20,7 +20,7 @@ #include <sasl.h> #endif #endif -#include <kabc/ldif.h> +#include <tdeabc/ldif.h> #include "tdeio_ldap.h" diff --git a/tdeioslave/ldap/tdeio_ldap.h b/tdeioslave/ldap/tdeio_ldap.h index f3bd61fe..dfab32a7 100644 --- a/tdeioslave/ldap/tdeio_ldap.h +++ b/tdeioslave/ldap/tdeio_ldap.h @@ -10,7 +10,7 @@ #define LDAP_DEPRECATED 1 /* Needed for ldap_simple_bind_s with openldap >= 2.3.x */ #include <lber.h> #include <ldap.h> -#include <kabc/ldapurl.h> +#include <tdeabc/ldapurl.h> class LDAPProtocol : public TDEIO::SlaveBase { diff --git a/tdeioslave/mac/tdeio_mac.cpp b/tdeioslave/mac/tdeio_mac.cpp index 707d995e..caef5078 100644 --- a/tdeioslave/mac/tdeio_mac.cpp +++ b/tdeioslave/mac/tdeio_mac.cpp @@ -20,7 +20,7 @@ #include <kinstance.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tqstring.h> #include <tqregexp.h> diff --git a/tdeioslave/man/kmanpart.cpp b/tdeioslave/man/kmanpart.cpp index 09cc0251..556b287e 100644 --- a/tdeioslave/man/kmanpart.cpp +++ b/tdeioslave/man/kmanpart.cpp @@ -21,9 +21,9 @@ #include <tqstring.h> #include <kinstance.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdeaboutdata.h> #include <tdeversion.h> diff --git a/tdeioslave/man/tdeio_man.cpp b/tdeioslave/man/tdeio_man.cpp index 032de3ec..7412077c 100644 --- a/tdeioslave/man/tdeio_man.cpp +++ b/tdeioslave/man/tdeio_man.cpp @@ -33,10 +33,10 @@ #include <kdebug.h> #include <kinstance.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kprocess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmimetype.h> #include "tdeio_man.h" diff --git a/tdeioslave/man/tdeio_man_test.cpp b/tdeioslave/man/tdeio_man_test.cpp index d409570b..131e0354 100644 --- a/tdeioslave/man/tdeio_man_test.cpp +++ b/tdeioslave/man/tdeio_man_test.cpp @@ -6,7 +6,7 @@ #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> class tdeio_man_test : public MANProtocol diff --git a/tdeioslave/media/libmediacommon/actionlistboxitem.cpp b/tdeioslave/media/libmediacommon/actionlistboxitem.cpp index 271d2e48..9fd3b2bf 100644 --- a/tdeioslave/media/libmediacommon/actionlistboxitem.cpp +++ b/tdeioslave/media/libmediacommon/actionlistboxitem.cpp @@ -19,7 +19,7 @@ #include "actionlistboxitem.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqpixmap.h> diff --git a/tdeioslave/media/libmediacommon/medium.cpp b/tdeioslave/media/libmediacommon/medium.cpp index 7b97fb1a..ca526ea4 100644 --- a/tdeioslave/media/libmediacommon/medium.cpp +++ b/tdeioslave/media/libmediacommon/medium.cpp @@ -19,7 +19,7 @@ #include "medium.h" #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> const TQString Medium::SEPARATOR = "---"; diff --git a/tdeioslave/media/libmediacommon/notifieraction.cpp b/tdeioslave/media/libmediacommon/notifieraction.cpp index 0dfc4110..5222b9e6 100644 --- a/tdeioslave/media/libmediacommon/notifieraction.cpp +++ b/tdeioslave/media/libmediacommon/notifieraction.cpp @@ -20,7 +20,7 @@ #include "notifieraction.h" #include <tqfile.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kicontheme.h> diff --git a/tdeioslave/media/libmediacommon/notifiernothingaction.cpp b/tdeioslave/media/libmediacommon/notifiernothingaction.cpp index 6a86ad92..b1c4bae3 100644 --- a/tdeioslave/media/libmediacommon/notifiernothingaction.cpp +++ b/tdeioslave/media/libmediacommon/notifiernothingaction.cpp @@ -19,7 +19,7 @@ #include "notifiernothingaction.h" -#include <klocale.h> +#include <tdelocale.h> NotifierNothingAction::NotifierNothingAction() : NotifierAction() diff --git a/tdeioslave/media/libmediacommon/notifieropenaction.cpp b/tdeioslave/media/libmediacommon/notifieropenaction.cpp index 4d6d8025..110b9fe2 100644 --- a/tdeioslave/media/libmediacommon/notifieropenaction.cpp +++ b/tdeioslave/media/libmediacommon/notifieropenaction.cpp @@ -19,7 +19,7 @@ #include "notifieropenaction.h" -#include <klocale.h> +#include <tdelocale.h> NotifierOpenAction::NotifierOpenAction() : NotifierAction() diff --git a/tdeioslave/media/libmediacommon/notifierserviceaction.cpp b/tdeioslave/media/libmediacommon/notifierserviceaction.cpp index c7bece4f..2405dfb3 100644 --- a/tdeioslave/media/libmediacommon/notifierserviceaction.cpp +++ b/tdeioslave/media/libmediacommon/notifierserviceaction.cpp @@ -24,7 +24,7 @@ #include <tqfileinfo.h> #include <kstddirs.h> #include <kdesktopfile.h> -#include <klocale.h> +#include <tdelocale.h> NotifierServiceAction::NotifierServiceAction() : NotifierAction() diff --git a/tdeioslave/media/libmediacommon/notifiersettings.cpp b/tdeioslave/media/libmediacommon/notifiersettings.cpp index 254e591c..a7dc7ee2 100644 --- a/tdeioslave/media/libmediacommon/notifiersettings.cpp +++ b/tdeioslave/media/libmediacommon/notifiersettings.cpp @@ -19,7 +19,7 @@ #include "notifiersettings.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <kdesktopfile.h> #include <kstandarddirs.h> #include <tqdir.h> diff --git a/tdeioslave/media/mediaimpl.cpp b/tdeioslave/media/mediaimpl.cpp index 59dba75c..e00cedcc 100644 --- a/tdeioslave/media/mediaimpl.cpp +++ b/tdeioslave/media/mediaimpl.cpp @@ -19,7 +19,7 @@ #include "mediaimpl.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <dcopclient.h> #include <dcopref.h> diff --git a/tdeioslave/media/mediamanager/dialog.h b/tdeioslave/media/mediamanager/dialog.h index dc1d552d..6a164b8e 100644 --- a/tdeioslave/media/mediamanager/dialog.h +++ b/tdeioslave/media/mediamanager/dialog.h @@ -23,8 +23,8 @@ #ifndef DIALOG_H_ #define DIALOG_H_ -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> #include <kdialogbase.h> diff --git a/tdeioslave/media/mediamanager/fstabbackend.cpp b/tdeioslave/media/mediamanager/fstabbackend.cpp index 2f5bea22..84910352 100644 --- a/tdeioslave/media/mediamanager/fstabbackend.cpp +++ b/tdeioslave/media/mediamanager/fstabbackend.cpp @@ -36,7 +36,7 @@ #include <tqfile.h> #endif -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/job.h> #include <tdeio/netaccess.h> #include <kdebug.h> diff --git a/tdeioslave/media/mediamanager/halbackend.cpp b/tdeioslave/media/mediamanager/halbackend.cpp index e3c1b198..a9db771b 100644 --- a/tdeioslave/media/mediamanager/halbackend.cpp +++ b/tdeioslave/media/mediamanager/halbackend.cpp @@ -24,17 +24,17 @@ #include <locale.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqeventloop.h> #include <tqfile.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <kdebug.h> #include <kprocess.h> #include <tdeconfig.h> #include <tqstylesheet.h> #include <kmountpoint.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeio/job.h> #include <kprotocolinfo.h> #include <kstandarddirs.h> diff --git a/tdeioslave/media/mediamanager/mediamanager.cpp b/tdeioslave/media/mediamanager/mediamanager.cpp index 295f4269..9a4089ca 100644 --- a/tdeioslave/media/mediamanager/mediamanager.cpp +++ b/tdeioslave/media/mediamanager/mediamanager.cpp @@ -22,8 +22,8 @@ #include <tqtimer.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdirnotify_stub.h> #include <kstandarddirs.h> diff --git a/tdeioslave/media/mediamanager/removablebackend.cpp b/tdeioslave/media/mediamanager/removablebackend.cpp index dc619701..54df3d6f 100644 --- a/tdeioslave/media/mediamanager/removablebackend.cpp +++ b/tdeioslave/media/mediamanager/removablebackend.cpp @@ -18,7 +18,7 @@ #include "removablebackend.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdirwatch.h> #include <kurl.h> #include <kmountpoint.h> diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp index 6ee284dc..31481b6e 100644 --- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp +++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp @@ -23,14 +23,14 @@ #include <tqeventloop.h> #include <tqstylesheet.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdeio/job.h> #include <kprocess.h> #include <kmimetype.h> #include <kmountpoint.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include <kprotocolinfo.h> diff --git a/tdeioslave/media/medianotifier/medianotifier.cpp b/tdeioslave/media/medianotifier/medianotifier.cpp index ab9d8ad6..e500731a 100644 --- a/tdeioslave/media/medianotifier/medianotifier.cpp +++ b/tdeioslave/media/medianotifier/medianotifier.cpp @@ -27,12 +27,12 @@ #include <tqcheckbox.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> #include <krun.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstdguiitem.h> #include <kstandarddirs.h> diff --git a/tdeioslave/media/medianotifier/medianotifier.h b/tdeioslave/media/medianotifier/medianotifier.h index 9e9a772b..3e30d12b 100644 --- a/tdeioslave/media/medianotifier/medianotifier.h +++ b/tdeioslave/media/medianotifier/medianotifier.h @@ -23,7 +23,7 @@ #include <kdedmodule.h> #include <tdefileitem.h> #include <tdeio/job.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqstring.h> #include <tqmap.h> diff --git a/tdeioslave/media/medianotifier/notificationdialog.cpp b/tdeioslave/media/medianotifier/notificationdialog.cpp index 4efe155d..981d48e6 100644 --- a/tdeioslave/media/medianotifier/notificationdialog.cpp +++ b/tdeioslave/media/medianotifier/notificationdialog.cpp @@ -21,7 +21,7 @@ #include <tqlayout.h> #include <krun.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdeio/global.h> #include <tdelistbox.h> diff --git a/tdeioslave/media/mounthelper/dialog.h b/tdeioslave/media/mounthelper/dialog.h index dc1d552d..6a164b8e 100644 --- a/tdeioslave/media/mounthelper/dialog.h +++ b/tdeioslave/media/mounthelper/dialog.h @@ -23,8 +23,8 @@ #ifndef DIALOG_H_ #define DIALOG_H_ -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> #include <kdialogbase.h> diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp index c130d5dc..230d6971 100644 --- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp +++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp @@ -20,18 +20,18 @@ */ #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kurl.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <dcopclient.h> #include <dcopref.h> #include <tqtimer.h> #include <stdlib.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kprocess.h> -#include <kstartupinfo.h> +#include <tdestartupinfo.h> #include <kmimetype.h> #include "dialog.h" diff --git a/tdeioslave/media/propsdlgplugin/propertiespage.cpp b/tdeioslave/media/propsdlgplugin/propertiespage.cpp index 33d481ef..5b54c8c5 100644 --- a/tdeioslave/media/propsdlgplugin/propertiespage.cpp +++ b/tdeioslave/media/propsdlgplugin/propertiespage.cpp @@ -25,8 +25,8 @@ #include <tqlabel.h> #include <tqregexp.h> #include <kpushbutton.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tqcombobox.h> #include <tqtimer.h> #include <kdebug.h> diff --git a/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp b/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp index 1ceff0bc..ea830d2e 100644 --- a/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp +++ b/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp @@ -27,11 +27,11 @@ #include <kdebug.h> #include <kpushbutton.h> #include <tdefileshare.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <kstandarddirs.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <dcopref.h> #include "propertiespage.h" diff --git a/tdeioslave/media/tdecmodule/main.cpp b/tdeioslave/media/tdecmodule/main.cpp index 96d7135b..e2d367e7 100644 --- a/tdeioslave/media/tdecmodule/main.cpp +++ b/tdeioslave/media/tdecmodule/main.cpp @@ -22,7 +22,7 @@ #include <tqtabwidget.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kdialog.h> diff --git a/tdeioslave/media/tdecmodule/managermodule.cpp b/tdeioslave/media/tdecmodule/managermodule.cpp index 3a44c446..39ea8fe0 100644 --- a/tdeioslave/media/tdecmodule/managermodule.cpp +++ b/tdeioslave/media/tdecmodule/managermodule.cpp @@ -22,7 +22,7 @@ #include "managermodule.h" #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopref.h> #include <tqbutton.h> #include <tqcheckbox.h> diff --git a/tdeioslave/media/tdecmodule/notifiermodule.cpp b/tdeioslave/media/tdecmodule/notifiermodule.cpp index 4146c514..4364d93a 100644 --- a/tdeioslave/media/tdecmodule/notifiermodule.cpp +++ b/tdeioslave/media/tdecmodule/notifiermodule.cpp @@ -19,7 +19,7 @@ #include "notifiermodule.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <kcombobox.h> diff --git a/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp b/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp index 98941970..4147e437 100644 --- a/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp +++ b/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp @@ -19,7 +19,7 @@ #include "serviceconfigdialog.h" -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <tdeactionselector.h> #include <kicondialog.h> diff --git a/tdeioslave/media/tdeio_media.cpp b/tdeioslave/media/tdeio_media.cpp index be30ec5d..1d32b14c 100644 --- a/tdeioslave/media/tdeio_media.cpp +++ b/tdeioslave/media/tdeio_media.cpp @@ -20,7 +20,7 @@ #include <stdlib.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <dcopclient.h> #include <tdecmdlineargs.h> diff --git a/tdeioslave/nfs/tdeio_nfs.cpp b/tdeioslave/nfs/tdeio_nfs.cpp index d0051e10..8a7fd94b 100644 --- a/tdeioslave/nfs/tdeio_nfs.cpp +++ b/tdeioslave/nfs/tdeio_nfs.cpp @@ -50,7 +50,7 @@ #include <kdebug.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/global.h> #include <iostream> diff --git a/tdeioslave/nntp/nntp.cpp b/tdeioslave/nntp/nntp.cpp index 7353e0e2..7b5fedf6 100644 --- a/tdeioslave/nntp/nntp.cpp +++ b/tdeioslave/nntp/nntp.cpp @@ -17,8 +17,8 @@ #include <kinstance.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "nntp.h" diff --git a/tdeioslave/pop3/pop3.cc b/tdeioslave/pop3/pop3.cc index 9b45f47f..4f85c409 100644 --- a/tdeioslave/pop3/pop3.cc +++ b/tdeioslave/pop3/pop3.cc @@ -53,9 +53,9 @@ extern "C" { #include <kdebug.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmdcodec.h> -#include <kprotocolmanager.h> +#include <tdeprotocolmanager.h> #include <ksock.h> #include <tdeio/connection.h> diff --git a/tdeioslave/remote/kdedmodule/remotedirnotify.cpp b/tdeioslave/remote/kdedmodule/remotedirnotify.cpp index 7ed66ce0..5b042295 100644 --- a/tdeioslave/remote/kdedmodule/remotedirnotify.cpp +++ b/tdeioslave/remote/kdedmodule/remotedirnotify.cpp @@ -19,8 +19,8 @@ #include "remotedirnotify.h" #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kdesktopfile.h> diff --git a/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp b/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp index 04b7a2be..a93ec7ea 100644 --- a/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp +++ b/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp @@ -19,8 +19,8 @@ #include "remotedirnotifymodule.h" #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> RemoteDirNotifyModule::RemoteDirNotifyModule(const TQCString &obj) : KDEDModule(obj) diff --git a/tdeioslave/remote/remoteimpl.cpp b/tdeioslave/remote/remoteimpl.cpp index d977781e..a0f37b62 100644 --- a/tdeioslave/remote/remoteimpl.cpp +++ b/tdeioslave/remote/remoteimpl.cpp @@ -20,11 +20,11 @@ #include "remoteimpl.h" #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstandarddirs.h> #include <kdesktopfile.h> #include <kservice.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqdir.h> #include <tqfile.h> diff --git a/tdeioslave/remote/tdeio_remote.cpp b/tdeioslave/remote/tdeio_remote.cpp index 5cbbb871..b5350b7e 100644 --- a/tdeioslave/remote/tdeio_remote.cpp +++ b/tdeioslave/remote/tdeio_remote.cpp @@ -20,11 +20,11 @@ #include <stdlib.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <dcopclient.h> #include <tdecmdlineargs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "tdeio_remote.h" diff --git a/tdeioslave/settings/tdeio_settings.cc b/tdeioslave/settings/tdeio_settings.cc index 47635693..db797fab 100644 --- a/tdeioslave/settings/tdeio_settings.cc +++ b/tdeioslave/settings/tdeio_settings.cc @@ -21,7 +21,7 @@ #include <kinstance.h> #include <kdebug.h> #include <tqtextstream.h> -#include <klocale.h> +#include <tdelocale.h> #include <sys/stat.h> #include <dcopclient.h> #include <tqdatastream.h> diff --git a/tdeioslave/sftp/ksshprocess.cpp b/tdeioslave/sftp/ksshprocess.cpp index 67880660..0f19126d 100644 --- a/tdeioslave/sftp/ksshprocess.cpp +++ b/tdeioslave/sftp/ksshprocess.cpp @@ -66,7 +66,7 @@ #endif #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqregexp.h> /* diff --git a/tdeioslave/sftp/tdeio_sftp.cpp b/tdeioslave/sftp/tdeio_sftp.cpp index 2af66f04..1e529363 100644 --- a/tdeioslave/sftp/tdeio_sftp.cpp +++ b/tdeioslave/sftp/tdeio_sftp.cpp @@ -55,11 +55,11 @@ So we can't connect. #include <tdeapplication.h> #include <kuser.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kinstance.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <tdeio/ioslave_defaults.h> #include <kmimetype.h> diff --git a/tdeioslave/smb/tdeio_smb.h b/tdeioslave/smb/tdeio_smb.h index 0c89eae9..b2566cb5 100644 --- a/tdeioslave/smb/tdeio_smb.h +++ b/tdeioslave/smb/tdeio_smb.h @@ -53,7 +53,7 @@ #include <tdeio/global.h> #include <tdeio/slavebase.h> #include <kurl.h> -#include <klocale.h> +#include <tdelocale.h> //----------------------------- // Standard C library includes diff --git a/tdeioslave/smb/tdeio_smb_browse.cpp b/tdeioslave/smb/tdeio_smb_browse.cpp index e06bb81d..c8d39b8f 100644 --- a/tdeioslave/smb/tdeio_smb_browse.cpp +++ b/tdeioslave/smb/tdeio_smb_browse.cpp @@ -36,7 +36,7 @@ #include <tqtextcodec.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "tdeio_smb.h" #include "tdeio_smb_internal.h" diff --git a/tdeioslave/smb/tdeio_smb_internal.cpp b/tdeioslave/smb/tdeio_smb_internal.cpp index de3f9812..ebb91b30 100644 --- a/tdeioslave/smb/tdeio_smb_internal.cpp +++ b/tdeioslave/smb/tdeio_smb_internal.cpp @@ -34,7 +34,7 @@ #include <tqtextcodec.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> //=========================================================================== diff --git a/tdeioslave/smtp/command.cc b/tdeioslave/smtp/command.cc index 8543f6c0..eaab13fb 100644 --- a/tdeioslave/smtp/command.cc +++ b/tdeioslave/smtp/command.cc @@ -38,7 +38,7 @@ #include "transactionstate.h" #include <kidna.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kmdcodec.h> #include <tdeio/slavebase.h> // for test_commands, where SMTPProtocol is not derived from TCPSlaveBase diff --git a/tdeioslave/smtp/response.cc b/tdeioslave/smtp/response.cc index 6c29d31b..b630051d 100644 --- a/tdeioslave/smtp/response.cc +++ b/tdeioslave/smtp/response.cc @@ -33,7 +33,7 @@ #include "response.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/global.h> #include <tqstring.h> diff --git a/tdeioslave/smtp/smtp.cc b/tdeioslave/smtp/smtp.cc index 3dfb8a05..43c15ecd 100644 --- a/tdeioslave/smtp/smtp.cc +++ b/tdeioslave/smtp/smtp.cc @@ -53,13 +53,13 @@ using KioSMTP::Request; using KioSMTP::Response; using KioSMTP::TransactionState; -#include <kemailsettings.h> +#include <tdeemailsettings.h> #include <ksock.h> #include <kdebug.h> #include <kinstance.h> #include <tdeio/connection.h> #include <tdeio/slaveinterface.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqstring.h> #include <tqstringlist.h> diff --git a/tdeioslave/smtp/transactionstate.cc b/tdeioslave/smtp/transactionstate.cc index 71a3e682..58e5adf5 100644 --- a/tdeioslave/smtp/transactionstate.cc +++ b/tdeioslave/smtp/transactionstate.cc @@ -34,7 +34,7 @@ #include "transactionstate.h" #include <tdeio/global.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqstringlist.h> diff --git a/tdeioslave/system/kdedmodule/systemdirnotify.cpp b/tdeioslave/system/kdedmodule/systemdirnotify.cpp index bd27af59..e61a69f2 100644 --- a/tdeioslave/system/kdedmodule/systemdirnotify.cpp +++ b/tdeioslave/system/kdedmodule/systemdirnotify.cpp @@ -19,8 +19,8 @@ #include "systemdirnotify.h" #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kdesktopfile.h> diff --git a/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp b/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp index 9f9b422b..ec95c0e3 100644 --- a/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp +++ b/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp @@ -19,8 +19,8 @@ #include "systemdirnotifymodule.h" #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> SystemDirNotifyModule::SystemDirNotifyModule(const TQCString &obj) : KDEDModule(obj) diff --git a/tdeioslave/system/systemimpl.cpp b/tdeioslave/system/systemimpl.cpp index 84f7c986..2cd8226a 100644 --- a/tdeioslave/system/systemimpl.cpp +++ b/tdeioslave/system/systemimpl.cpp @@ -20,7 +20,7 @@ #include "systemimpl.h" #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstandarddirs.h> #include <kdesktopfile.h> diff --git a/tdeioslave/system/tdeio_system.cpp b/tdeioslave/system/tdeio_system.cpp index 9f2d556a..d904eda0 100644 --- a/tdeioslave/system/tdeio_system.cpp +++ b/tdeioslave/system/tdeio_system.cpp @@ -20,7 +20,7 @@ #include <stdlib.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <dcopclient.h> diff --git a/tdeioslave/tar/tar.cc b/tdeioslave/tar/tar.cc index 1cc8dcfe..6d71d8b2 100644 --- a/tdeioslave/tar/tar.cc +++ b/tdeioslave/tar/tar.cc @@ -9,7 +9,7 @@ #include <tqfile.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kurl.h> #include <kdebug.h> #include <kinstance.h> @@ -17,7 +17,7 @@ #include <kzip.h> #include <kar.h> #include <kmimemagic.h> -#include <klocale.h> +#include <tdelocale.h> #include <kde_file.h> #include <tdeio/global.h> #include <kremoteencoding.h> diff --git a/tdeioslave/thumbnail/exrcreator.cpp b/tdeioslave/thumbnail/exrcreator.cpp index 59c1fba7..5708b899 100644 --- a/tdeioslave/thumbnail/exrcreator.cpp +++ b/tdeioslave/thumbnail/exrcreator.cpp @@ -22,7 +22,7 @@ #include <kimageio.h> #include <kdebug.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tqfile.h> #include <ImfInputFile.h> diff --git a/tdeioslave/thumbnail/thumbnail.cpp b/tdeioslave/thumbnail/thumbnail.cpp index 63d061d2..764f8993 100644 --- a/tdeioslave/thumbnail/thumbnail.cpp +++ b/tdeioslave/thumbnail/thumbnail.cpp @@ -37,7 +37,7 @@ #include <kdatastream.h> // Do not remove, needed for correct bool serialization #include <kurl.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kimageeffect.h> #include <kmimetype.h> @@ -47,7 +47,7 @@ #include <kservicetype.h> #include <kuserprofile.h> #include <tdefilemetainfo.h> -#include <klocale.h> +#include <tdelocale.h> #include <config.h> // For HAVE_NICE #include "thumbnail.h" diff --git a/tdeioslave/trash/ktrash.cpp b/tdeioslave/trash/ktrash.cpp index c355a2fa..162d2787 100644 --- a/tdeioslave/trash/ktrash.cpp +++ b/tdeioslave/trash/ktrash.cpp @@ -21,7 +21,7 @@ #include <tdeio/netaccess.h> #include <tdeio/job.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdirnotify_stub.h> #include <kdebug.h> diff --git a/tdeioslave/trash/tdeio_trash.cpp b/tdeioslave/trash/tdeio_trash.cpp index 1b29aa5b..02cda02d 100644 --- a/tdeioslave/trash/tdeio_trash.cpp +++ b/tdeioslave/trash/tdeio_trash.cpp @@ -22,7 +22,7 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <klargefile.h> #include <tdecmdlineargs.h> #include <kmimetype.h> diff --git a/tdeioslave/trash/testtrash.cpp b/tdeioslave/trash/testtrash.cpp index c2b6283b..db2e73fb 100644 --- a/tdeioslave/trash/testtrash.cpp +++ b/tdeioslave/trash/testtrash.cpp @@ -27,7 +27,7 @@ #include <config.h> #include <kurl.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdeio/netaccess.h> #include <tdeio/job.h> diff --git a/tdeioslave/trash/trashimpl.cpp b/tdeioslave/trash/trashimpl.cpp index d4912357..cf37b8b9 100644 --- a/tdeioslave/trash/trashimpl.cpp +++ b/tdeioslave/trash/trashimpl.cpp @@ -18,7 +18,7 @@ */ #include "trashimpl.h" -#include <klocale.h> +#include <tdelocale.h> #include <klargefile.h> #include <tdeio/global.h> #include <tdeio/renamedlg.h> @@ -26,9 +26,9 @@ #include <kdebug.h> #include <kurl.h> #include <kdirnotify_stub.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kmountpoint.h> #include <tdefileitem.h> #include <tdeio/chmodjob.h> diff --git a/tdeprint/kjobviewer/kjobviewer.cpp b/tdeprint/kjobviewer/kjobviewer.cpp index 73613dfe..0d456b1e 100644 --- a/tdeprint/kjobviewer/kjobviewer.cpp +++ b/tdeprint/kjobviewer/kjobviewer.cpp @@ -26,14 +26,14 @@ #include <tqpixmap.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <ksystemtray.h> #include <kdebug.h> #include <kiconloader.h> #include <tdepopupmenu.h> #include <twin.h> -#include <kstartupinfo.h> +#include <tdestartupinfo.h> class JobTray : public KSystemTray { diff --git a/tdeprint/kjobviewer/main.cpp b/tdeprint/kjobviewer/main.cpp index ed1b4f3b..a7e43fe8 100644 --- a/tdeprint/kjobviewer/main.cpp +++ b/tdeprint/kjobviewer/main.cpp @@ -22,7 +22,7 @@ #include <tdeaboutdata.h> #include "kjobviewer.h" -#include <klocale.h> +#include <tdelocale.h> #include <stdlib.h> static TDECmdLineOptions options[] = { diff --git a/tdeprint/kprinter/main.cpp b/tdeprint/kprinter/main.cpp index 95ab3bac..fd528b70 100644 --- a/tdeprint/kprinter/main.cpp +++ b/tdeprint/kprinter/main.cpp @@ -22,7 +22,7 @@ #include <tqtimer.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> static TDECmdLineOptions options[] = { diff --git a/tdeprint/kprinter/printwrapper.cpp b/tdeprint/kprinter/printwrapper.cpp index 78370ccc..102951ff 100644 --- a/tdeprint/kprinter/printwrapper.cpp +++ b/tdeprint/kprinter/printwrapper.cpp @@ -26,7 +26,7 @@ #include <tqstring.h> #include <tqstringlist.h> #include <stdlib.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqfile.h> #include <tqtimer.h> #include <tqregexp.h> @@ -34,12 +34,12 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdeio/netaccess.h> #include <kurl.h> #include <kdebug.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kprinter.h> #include <tdeprint/kmmanager.h> diff --git a/tdeprint/printmgr/kcmprintmgr.cpp b/tdeprint/printmgr/kcmprintmgr.cpp index 02954e1b..75fc4274 100644 --- a/tdeprint/printmgr/kcmprintmgr.cpp +++ b/tdeprint/printmgr/kcmprintmgr.cpp @@ -25,7 +25,7 @@ #include <kgenericfactory.h> #include <tdeaboutdata.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> typedef KGenericFactory<KCMPrintMgr, TQWidget> KPrintMgrFactory; K_EXPORT_COMPONENT_FACTORY( kcm_printmgr, KPrintMgrFactory("kcmprintmgr") ) diff --git a/tdeprint/slave/tdeio_print.cpp b/tdeprint/slave/tdeio_print.cpp index cfbd0570..1106b802 100644 --- a/tdeprint/slave/tdeio_print.cpp +++ b/tdeprint/slave/tdeio_print.cpp @@ -26,7 +26,7 @@ #include <tqfile.h> #include <tqtextstream.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kinstance.h> #include <tdeio/global.h> @@ -38,7 +38,7 @@ #include <tdecmdlineargs.h> #include <tdeaboutdata.h> #include <kprocess.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqfile.h> #include <tqdom.h> diff --git a/tdeprint/tdeprint_part/printpart.cpp b/tdeprint/tdeprint_part/printpart.cpp index 2de7b319..3ae57e7a 100644 --- a/tdeprint/tdeprint_part/printpart.cpp +++ b/tdeprint/tdeprint_part/printpart.cpp @@ -22,7 +22,7 @@ #include <tdeprint/kmmainview.h> #include <tdeprint/kiconselectaction.h> #include <tdeaction.h> -#include <klocale.h> +#include <tdelocale.h> #include <kinstance.h> #include <kiconloader.h> #include <tdeaboutdata.h> diff --git a/tdeprint/tdeprintfax/CMakeLists.txt b/tdeprint/tdeprintfax/CMakeLists.txt index 53871947..e2ca9a90 100644 --- a/tdeprint/tdeprintfax/CMakeLists.txt +++ b/tdeprint/tdeprintfax/CMakeLists.txt @@ -37,6 +37,6 @@ tde_add_executable( tdeprintfax AUTOMOC confgeneral.cpp configdlg.cpp conffax.cpp confsystem.cpp conffilters.cpp filterdlg.cpp defcmds.cpp - LINK kabc-shared tdeprint-shared + LINK tdeabc-shared tdeprint-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/tdeprint/tdeprintfax/conffax.cpp b/tdeprint/tdeprintfax/conffax.cpp index 26b6b77a..6c0266f5 100644 --- a/tdeprint/tdeprintfax/conffax.cpp +++ b/tdeprint/tdeprintfax/conffax.cpp @@ -26,9 +26,9 @@ #include <tqlayout.h> #include <tqprinter.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kseparator.h> #include <stdlib.h> diff --git a/tdeprint/tdeprintfax/conffilters.cpp b/tdeprint/tdeprintfax/conffilters.cpp index 4937b88b..64ce6ee7 100644 --- a/tdeprint/tdeprintfax/conffilters.cpp +++ b/tdeprint/tdeprintfax/conffilters.cpp @@ -29,11 +29,11 @@ #include <tqregexp.h> #include <tqheader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdelistview.h> #include <kiconloader.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> ConfFilters::ConfFilters(TQWidget *parent, const char *name) : TQWidget(parent, name) diff --git a/tdeprint/tdeprintfax/confgeneral.cpp b/tdeprint/tdeprintfax/confgeneral.cpp index d7471fc5..ad7512d8 100644 --- a/tdeprint/tdeprintfax/confgeneral.cpp +++ b/tdeprint/tdeprintfax/confgeneral.cpp @@ -25,9 +25,9 @@ #include <tqlayout.h> #include <tqcheckbox.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kseparator.h> #include <stdlib.h> diff --git a/tdeprint/tdeprintfax/configdlg.cpp b/tdeprint/tdeprintfax/configdlg.cpp index 57f5ac64..f2dae996 100644 --- a/tdeprint/tdeprintfax/configdlg.cpp +++ b/tdeprint/tdeprintfax/configdlg.cpp @@ -25,7 +25,7 @@ #include "conffilters.h" #include <tqvbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> ConfigDlg::ConfigDlg(TQWidget *parent, const char *name) diff --git a/tdeprint/tdeprintfax/confsystem.cpp b/tdeprint/tdeprintfax/confsystem.cpp index 167e8b6f..fbb27aac 100644 --- a/tdeprint/tdeprintfax/confsystem.cpp +++ b/tdeprint/tdeprintfax/confsystem.cpp @@ -26,9 +26,9 @@ #include <tqlayout.h> #include <tqcombobox.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kseparator.h> #include <stdlib.h> diff --git a/tdeprint/tdeprintfax/faxab.cpp b/tdeprint/tdeprintfax/faxab.cpp index 4385827d..14b87a44 100644 --- a/tdeprint/tdeprintfax/faxab.cpp +++ b/tdeprint/tdeprintfax/faxab.cpp @@ -25,13 +25,13 @@ #include <kpushbutton.h> #include <tdelistview.h> #include <tqheader.h> -#include <klocale.h> -#include <kabc/stdaddressbook.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdeabc/stdaddressbook.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include <krun.h> #include <kstdguiitem.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> FaxAB::FaxAB(TQWidget *parent, const char *name) diff --git a/tdeprint/tdeprintfax/faxab.h b/tdeprint/tdeprintfax/faxab.h index abf40de2..8491fb96 100644 --- a/tdeprint/tdeprintfax/faxab.h +++ b/tdeprint/tdeprintfax/faxab.h @@ -24,7 +24,7 @@ #include <kdialog.h> #include <tqmap.h> #include <tqstringlist.h> -#include <kabc/phonenumber.h> +#include <tdeabc/phonenumber.h> class TDEListView; class AddressBook; diff --git a/tdeprint/tdeprintfax/faxctrl.cpp b/tdeprint/tdeprintfax/faxctrl.cpp index e8048d7c..5ea6a65a 100644 --- a/tdeprint/tdeprintfax/faxctrl.cpp +++ b/tdeprint/tdeprintfax/faxctrl.cpp @@ -36,19 +36,19 @@ #include <tqstylesheet.h> #include <kprocess.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialogbase.h> #include <kmimetype.h> #include <kstandarddirs.h> #include <tdeapplication.h> #include <twin.h> -#include <kemailsettings.h> +#include <tdeemailsettings.h> #include <kdebug.h> #include <kstdguiitem.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <stdlib.h> #include <stdarg.h> diff --git a/tdeprint/tdeprintfax/filterdlg.cpp b/tdeprint/tdeprintfax/filterdlg.cpp index 0324863b..141e7138 100644 --- a/tdeprint/tdeprintfax/filterdlg.cpp +++ b/tdeprint/tdeprintfax/filterdlg.cpp @@ -25,7 +25,7 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> FilterDlg::FilterDlg(TQWidget *parent, const char *name) : KDialogBase(parent, name, true, i18n("Filter Parameters"), Ok|Cancel, Ok) diff --git a/tdeprint/tdeprintfax/main.cpp b/tdeprint/tdeprintfax/main.cpp index 5f69774d..1e9f2662 100644 --- a/tdeprint/tdeprintfax/main.cpp +++ b/tdeprint/tdeprintfax/main.cpp @@ -23,7 +23,7 @@ #include <tqfile.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> TQString debugFlag; diff --git a/tdeprint/tdeprintfax/tdeprintfax.cpp b/tdeprint/tdeprintfax/tdeprintfax.cpp index 181d0da1..4b4a58f1 100644 --- a/tdeprint/tdeprintfax/tdeprintfax.cpp +++ b/tdeprint/tdeprintfax/tdeprintfax.cpp @@ -35,16 +35,16 @@ #include <tdeapplication.h> #include <kstdaction.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <tdetoolbar.h> #include <tdeaction.h> #include <tdelistbox.h> #include <tdelistview.h> #include <tqheader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeio/netaccess.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> #include <kmimetype.h> #include <kseparator.h> diff --git a/tdescreensaver/blankscrn.cpp b/tdescreensaver/blankscrn.cpp index fd6860f5..fce4491e 100644 --- a/tdescreensaver/blankscrn.cpp +++ b/tdescreensaver/blankscrn.cpp @@ -11,12 +11,12 @@ #include <tqlabel.h> #include <tqlayout.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kcolordialog.h> #include <kbuttonbox.h> #include <kcolorbutton.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "blankscrn.h" #include "blankscrn.moc" diff --git a/tdescreensaver/random.cpp b/tdescreensaver/random.cpp index a624cff0..ae2bce60 100644 --- a/tdescreensaver/random.cpp +++ b/tdescreensaver/random.cpp @@ -23,8 +23,8 @@ #include <tdeapplication.h> #include <kstandarddirs.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdesktopfile.h> #include <krandomsequence.h> #include <kdebug.h> diff --git a/tdesu/tdesu/sudlg.cpp b/tdesu/tdesu/sudlg.cpp index 086e3a42..71340963 100644 --- a/tdesu/tdesu/sudlg.cpp +++ b/tdesu/tdesu/sudlg.cpp @@ -8,8 +8,8 @@ #include <tqstring.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdesu/su.h> #include "sudlg.h" diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp index 24b07cef..ede3b4df 100644 --- a/tdesu/tdesu/tdesu.cpp +++ b/tdesu/tdesu/tdesu.cpp @@ -28,14 +28,14 @@ #include <dcopclient.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeapplication.h> #include <kstandarddirs.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <krun.h> #include <kuser.h> diff --git a/tdesu/tdesud/tdesud.cpp b/tdesu/tdesud/tdesud.cpp index e6a6e24f..592fb9ff 100644 --- a/tdesu/tdesud/tdesud.cpp +++ b/tdesu/tdesud/tdesud.cpp @@ -63,7 +63,7 @@ #include <kinstance.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <kstandarddirs.h> #include <tdeaboutdata.h> diff --git a/tdm/kfrontend/kchooser.cpp b/tdm/kfrontend/kchooser.cpp index 00b08cd3..9f0c714c 100644 --- a/tdm/kfrontend/kchooser.cpp +++ b/tdm/kfrontend/kchooser.cpp @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "tdmconfig.h" #include "tdm_greet.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqlabel.h> diff --git a/tdm/kfrontend/kconsole.cpp b/tdm/kfrontend/kconsole.cpp index 834507bd..bf1560ae 100644 --- a/tdm/kfrontend/kconsole.cpp +++ b/tdm/kfrontend/kconsole.cpp @@ -56,7 +56,7 @@ extern "C" { #include "tdmconfig.h" #include "tdm_greet.h" -#include <klocale.h> +#include <tdelocale.h> #include <kpty.h> #include <tqsocketnotifier.h> diff --git a/tdm/kfrontend/kfdialog.cpp b/tdm/kfrontend/kfdialog.cpp index 4b3af723..ba05b029 100644 --- a/tdm/kfrontend/kfdialog.cpp +++ b/tdm/kfrontend/kfdialog.cpp @@ -25,10 +25,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "kfdialog.h" #include "tdmconfig.h" -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kstdguiitem.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp index 19007407..37c8130c 100644 --- a/tdm/kfrontend/kgapp.cpp +++ b/tdm/kfrontend/kgapp.cpp @@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <kcrash.h> #include <kstandarddirs.h> #include <ksimpleconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #ifdef WITH_XRANDR #include <libtderandr/libtderandr.h> diff --git a/tdm/kfrontend/kgdialog.cpp b/tdm/kfrontend/kgdialog.cpp index 667eca8e..5d5d2a18 100644 --- a/tdm/kfrontend/kgdialog.cpp +++ b/tdm/kfrontend/kgdialog.cpp @@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "tdmshutdown.h" #include "tdm_greet.h" -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tqaccel.h> diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp index bc906d6d..173b7def 100644 --- a/tdm/kfrontend/kgreeter.cpp +++ b/tdm/kfrontend/kgreeter.cpp @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "themer/tdmlabel.h" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kseparator.h> #include <tdelistview.h> diff --git a/tdm/kfrontend/kgverify.cpp b/tdm/kfrontend/kgverify.cpp index 6cca0886..c78d20b9 100644 --- a/tdm/kfrontend/kgverify.cpp +++ b/tdm/kfrontend/kgverify.cpp @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "themer/tdmitem.h" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <klibloader.h> #include <kseparator.h> #include <kstdguiitem.h> diff --git a/tdm/kfrontend/krootimage.cpp b/tdm/kfrontend/krootimage.cpp index 63c7cc41..7145eb18 100644 --- a/tdm/kfrontend/krootimage.cpp +++ b/tdm/kfrontend/krootimage.cpp @@ -23,7 +23,7 @@ Boston, MA 02110-1301, USA. #include <tdecmdlineargs.h> #include <ksimpleconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqfile.h> diff --git a/tdm/kfrontend/sakdlg.cc b/tdm/kfrontend/sakdlg.cc index a73d349b..d9f1a1e4 100644 --- a/tdm/kfrontend/sakdlg.cc +++ b/tdm/kfrontend/sakdlg.cc @@ -11,11 +11,11 @@ #include <dmctl.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kseparator.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeconfig.h> #include <kiconloader.h> #include <tdesu/defaults.h> @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kuser.h> #include <dcopref.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdialog.h> #include <tqlayout.h> diff --git a/tdm/kfrontend/tdmadmindialog.cpp b/tdm/kfrontend/tdmadmindialog.cpp index 5c3c87bc..7c792c08 100644 --- a/tdm/kfrontend/tdmadmindialog.cpp +++ b/tdm/kfrontend/tdmadmindialog.cpp @@ -30,7 +30,7 @@ #include <tdeapplication.h> #include <kseparator.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kstdguiitem.h> diff --git a/tdm/kfrontend/tdmconfig.cpp b/tdm/kfrontend/tdmconfig.cpp index 2b7b5ab2..2d68bf8e 100644 --- a/tdm/kfrontend/tdmconfig.cpp +++ b/tdm/kfrontend/tdmconfig.cpp @@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "tdm_greet.h" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <stdio.h> #include <stdlib.h> diff --git a/tdm/kfrontend/tdmshutdown.cpp b/tdm/kfrontend/tdmshutdown.cpp index 0e53ffe2..d8ab1635 100644 --- a/tdm/kfrontend/tdmshutdown.cpp +++ b/tdm/kfrontend/tdmshutdown.cpp @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <tdeapplication.h> #include <kseparator.h> -#include <klocale.h> |