Rename additional header files to avoid conflicts with KDE4

doc/ksplashml/index.docbook

@@ -1088,8 +1088,8 @@ appropriate plugin.</para>
 #include &lt;kdebug.h&gt;
 #include &lt;kdialogbase.h&gt;
 #include &lt;kgenericfactory.h&gt;
-#include &lt;kglobalsettings.h&gt;
-#include &lt;klocale.h&gt;
+#include &lt;tdeglobalsettings.h&gt;
+#include &lt;tdelocale.h&gt;
 #include &lt;ksplash/objkstheme.h&gt;
 #include &lt;kstandarddirs.h&gt;
 

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"

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"

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"

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>
 

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"

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>

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>

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"
 

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>

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>

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>

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>

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>

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)

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>
 

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>

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>

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>

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>

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>

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"

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>

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>

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>

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 )
 {

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>

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>

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>

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>

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>

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>
 

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>
 

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>
 

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>

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>

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);

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>

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"

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>
 
 

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>

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>

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>
 

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>

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>

kcontrol/ebrowsing/filteropts.cpp

@@ -25,7 +25,7 @@
 #include <tqlabel.h>
 
 #include <dcopclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "filteropts.h"
 

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>

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"

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"

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"

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>

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 )

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"

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"

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>
 

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>

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"

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);

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>

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>
 

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"
 

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>

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>

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"

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>
 

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>
 

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>
 

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>

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>

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>
 

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>

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>

kcontrol/input/mouse.h

@@ -40,7 +40,7 @@
 
 #include <tdeapplication.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <knuminput.h>
 
 #include <config.h>

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>

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>

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>
 

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>
 
 //--------------------------------------------------------------

kcontrol/joystick/joydevice.cpp

@@ -21,7 +21,7 @@
 
 #include "joydevice.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <sys/types.h>

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"

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>
 
 //--------------------------------------------------------------

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>

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>

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>

kcontrol/kcontrol/kcrootonly.cpp

@@ -19,7 +19,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kcrootonly.h"
 

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>
 

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>

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>

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>
 
 

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>

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>

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"

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>

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>
 

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 )

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>

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"

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

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>

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>
 

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"

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>

kcontrol/kicker/extensionInfo.cpp

@@ -20,7 +20,7 @@
 
 #include <kdebug.h>
 #include <kdesktopfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "extensionInfo.h"
 

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"

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"

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"

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>

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"

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>

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"

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>

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>

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>

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>

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>

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"

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>
 

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>

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"

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

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"

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>

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>

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>
 

kcontrol/konqhtml/jsopts.cpp

@@ -26,7 +26,7 @@
 #include "htmlopts.h"
 #include "policydlg.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "jsopts.h"
 

kcontrol/konqhtml/jspolicies.cpp

@@ -27,7 +27,7 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "jspolicies.h"
 

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"
 
 

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>

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>

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>
 

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"

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>

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>

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"

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)

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>

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>

kcontrol/locale/klocalesample.cpp

@@ -31,7 +31,7 @@
 
 #include <stdio.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "klocalesample.h"
 #include "klocalesample.moc"

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>
 

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>
 

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>

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"

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
 {

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
 {

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>

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"

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>

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"

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"
 

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"

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>

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>

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"

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>
 

kcontrol/samba/ksmbstatus.cpp

@@ -24,7 +24,7 @@
 
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 #include "ksmbstatus.h"

kcontrol/screensaver/advanceddialog.cpp

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tqcombobox.h>
 #include <kdebug.h>

kcontrol/screensaver/saverconfig.cpp

@@ -1,5 +1,5 @@
 #include <kdesktopfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "saverconfig.h"
 

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"

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>

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"
 

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"

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>
 

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",

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>

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>

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
 {

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>
 

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"

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"
 

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>

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>
 

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>

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>

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"

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>

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>

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>
 

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>
 

kcontrol/tdeio/fakeuaprovider.cpp

@@ -21,7 +21,7 @@
 
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "fakeuaprovider.h"

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>
 

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"

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>
 

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"

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>

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"

kcontrol/tdeio/kproxydlgbase.h

@@ -27,7 +27,7 @@
 #include <tqstringlist.h>
 
 #include <kdialogbase.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 
 class KProxyData
 {

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>
 

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;

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"

kcontrol/tdeio/main.h

@@ -22,7 +22,7 @@
 #define MYMAIN_H
 
 #include <tdecmodule.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TQTabWidget;
 

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>
 

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"

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>

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>
 

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>

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>
 

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"

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"

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>

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"
 

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"
 

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>
 

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"

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"

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"

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>

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>
 

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>

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 )

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>

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>

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>

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>
 

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">

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>

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>
 

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"

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>

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>
 

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>

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>
 

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>
 

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>

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>

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>

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>

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>

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>

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>
 

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>

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>

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>

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>

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>
 

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>

kdesktop/startupid.h

@@ -27,7 +27,7 @@
 #include <tqstring.h>
 #include <tqtimer.h>
 #include <tqmap.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 
 class TQStyle;
 

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"

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>

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 )

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"

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>

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>

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>

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>

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>

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>

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>
 

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>

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"

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>

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>

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>

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>
 
 

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"

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>

khelpcenter/htmlsearch/progressdialog.cpp

@@ -2,7 +2,7 @@
 #include <tqlabel.h>
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 #include <kstandarddirs.h>
 

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>

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>
 

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>

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>

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>

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>

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"

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>

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>
 

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"

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>
 

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>

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>

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>
 
 

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>

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>

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>
 

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>
 

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>
 

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>
 

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"

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>

khotkeys/kcontrol/info_tab.cpp

@@ -19,7 +19,7 @@
 #include <tqpushbutton.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace KHotKeys
 {

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>

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>

khotkeys/kcontrol/tab_widget.cpp

@@ -18,7 +18,7 @@
 
 #include <typeinfo>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <actions.h>

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>

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>

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>
 

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"

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>
 

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>

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>

khotkeys/shared/khotkeysglobal.h

@@ -20,7 +20,7 @@
 
 #include <tqstring.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 class TDEConfig;
 class TQObject;

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"

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>
 

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>
 

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"
 

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>

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>
 

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>

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>

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}
 )

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"

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>

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>

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>

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>

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>

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>

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>

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>
 

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>

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"

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"

kicker/applets/naughty/NaughtyProcessMonitor.cpp

@@ -42,7 +42,7 @@
 #include <tqmap.h>
 #include <tqdatetime.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "NaughtyProcessMonitor.h"
 

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"

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>

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>

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"

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>

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>
 

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"

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>
 

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>
 

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"

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"

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>
 

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>

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"
 

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>
 

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"

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"

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>
 

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>

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>

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>

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>
 

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
 )

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"

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>
 

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>
 

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>
 

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>

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>
 

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>

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"
 

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>
 

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"

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"

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>

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>
 

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>

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>
 

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>

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>

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"

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>

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>

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>

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>

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>

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
 {

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>

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"

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"
 

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>

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"

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"

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>

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"

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>

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>

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>

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>

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>

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>

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"

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>
 

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"
 

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"

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"

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"

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"

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>

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">

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"

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"

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>

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>
 

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>

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>

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,

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>

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>

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>

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>

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>

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>

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>

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>

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"

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>

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"
 

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>

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>

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"
 

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>
 

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>

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"

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>

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"

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>

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>

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>

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>

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>

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>
 

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"

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>

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>

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"
 

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 )

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>

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>

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>

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>

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>
 

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>

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>

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>

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;

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>

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>

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>

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>

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>

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>
 

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>

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>

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>

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>
 

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"

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>

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>

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>

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"

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>

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>
 

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>
 

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>
 

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>

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>

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>

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>

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>

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>

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>

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>
 

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
 {

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"
 

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>

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>
 

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)

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>

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;

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>

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>

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>

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"

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>
 

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"

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"

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"
 

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>

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;

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>

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>

konsole/konsole/TEHistory.h

@@ -25,7 +25,7 @@
 #include <tqptrvector.h>
 #include <tqbitarray.h>
 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include "TECommon.h"
 

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>
 

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>

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"

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>

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>

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>

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"

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>
 

konsole/konsole/printsettings.cpp

@@ -20,7 +20,7 @@
 
 #include "printsettings.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcheckbox.h>
 #include <tqlayout.h>
 

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>
 

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>

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,

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>

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>

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>

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>