Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase

22 files changed, 59 insertions, 59 deletions

diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp
index c78309fb4..9cba61cc6 100644
--- a/kate/app/kateapp.cpp
+++ b/kate/app/kateapp.cpp
@@ -37,10 +37,10 @@
 #include <ktip.h>
 #include <kdebug.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 
 #include <tqfile.h>
 #include <tqtimer.h>
diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp
index 1d0ce7afe..76809241e 100644
--- a/kate/app/kateconfigdialog.cpp
+++ b/kate/app/kateconfigdialog.cpp
@@ -48,12 +48,12 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kglobalaccel.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kkeydialog.h>
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
diff --git a/kate/app/kateconfigplugindialogpage.cpp b/kate/app/kateconfigplugindialogpage.cpp
index 8e12e2d81..90d7262e5 100644
--- a/kate/app/kateconfigplugindialogpage.cpp
+++ b/kate/app/kateconfigplugindialogpage.cpp
@@ -27,7 +27,7 @@
 #include <tqstringlist.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpushbutton.h>
 #include <tqtooltip.h>
 #include <kiconloader.h>
diff --git a/kate/app/kateconsole.cpp b/kate/app/kateconsole.cpp
index 26627181a..cb49ef16e 100644
--- a/kate/app/kateconsole.cpp
+++ b/kate/app/kateconsole.cpp
@@ -35,9 +35,9 @@
 
 #include <kurl.h>
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 KateConsole::KateConsole (KateMainWindow *mw, KateMDI::ToolView* parent)
  : TQVBox (parent)
diff --git a/kate/app/katedocmanager.cpp b/kate/app/katedocmanager.cpp
index 178e63d07..6cca9efe0 100644
--- a/kate/app/katedocmanager.cpp
+++ b/kate/app/katedocmanager.cpp
@@ -32,12 +32,12 @@
 
 #include <tdeparts/factory.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <klibloader.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kencodingfiledialog.h>
 #include <tdeio/job.h>
 #include <twin.h>
diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp
index f24a0cf97..e0057fb2c 100644
--- a/kate/app/kateexternaltools.cpp
+++ b/kate/app/kateexternaltools.cpp
@@ -34,9 +34,9 @@
 #include <kate/document.h>
 
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimetypechooser.h>
 #include <tdeconfig.h>
 #include <krun.h>
diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp
index e91a8df4b..24062336a 100644
--- a/kate/app/katefilelist.cpp
+++ b/kate/app/katefilelist.cpp
@@ -40,8 +40,8 @@
 
 #include <kiconloader.h>
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <kpassivepopup.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp
index 9747a9da0..06cd0c3c3 100644
--- a/kate/app/katefileselector.cpp
+++ b/kate/app/katefileselector.cpp
@@ -52,12 +52,12 @@
 #include <kurlcombobox.h>
 #include <kurlcompletion.h>
 #include <kprotocolinfo.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdetoolbarbutton.h>
 #include <tqtoolbar.h>
 #include <tdepopupmenu.h>
diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp
index aa69f3416..b180fd516 100644
--- a/kate/app/kategrepdialog.cpp
+++ b/kate/app/kategrepdialog.cpp
@@ -37,9 +37,9 @@
 #include <tdefiledialog.h>
 #include <kprocess.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kurlrequester.h>
 #include <kurlcompletion.h>
diff --git a/kate/app/katemailfilesdialog.cpp b/kate/app/katemailfilesdialog.cpp
index b402ca58d..858caa5f1 100644
--- a/kate/app/katemailfilesdialog.cpp
+++ b/kate/app/katemailfilesdialog.cpp
@@ -22,7 +22,7 @@
 #include "katedocmanager.h"
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 
 #include <tqevent.h>
diff --git a/kate/app/katemain.cpp b/kate/app/katemain.cpp
index 38e14f308..33c049cef 100644
--- a/kate/app/katemain.cpp
+++ b/kate/app/katemain.cpp
@@ -20,13 +20,13 @@
 #include "kateapp.h"
 
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kinstance.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <kdebug.h>
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index 7584e09da..cf62e77f1 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -50,17 +50,17 @@
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <kdockwidget.h>
 #include <kedittoolbar.h>
 #include <tdefiledialog.h>
 #include <kglobalaccel.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kkeydialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <kopenwith.h>
 #include <tdepopupmenu.h>
@@ -75,7 +75,7 @@
 #include <khelpmenu.h>
 #include <tdemultitabbar.h>
 #include <ktip.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstringhandler.h>
 #include <tqlayout.h>
 #include <tqptrvector.h>
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index 1b85215c9..a6c657e2c 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -25,14 +25,14 @@
 
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqvbox.h>
 #include <tqhbox.h>
diff --git a/kate/app/katemwmodonhddialog.cpp b/kate/app/katemwmodonhddialog.cpp
index 3abf12754..ab1418477 100644
--- a/kate/app/katemwmodonhddialog.cpp
+++ b/kate/app/katemwmodonhddialog.cpp
@@ -26,11 +26,11 @@
 
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocio.h>
 #include <krun.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kpushbutton.h>
 
 #include <tqlabel.h>
diff --git a/kate/app/katepluginmanager.cpp b/kate/app/katepluginmanager.cpp
index 8f6fae52c..455866a0b 100644
--- a/kate/app/katepluginmanager.cpp
+++ b/kate/app/katepluginmanager.cpp
@@ -28,7 +28,7 @@
 
 #include <tdeconfig.h>
 #include <tqstringlist.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tqfile.h>
 
diff --git a/kate/app/katesavemodifieddialog.cpp b/kate/app/katesavemodifieddialog.cpp
index f4eb73e38..a89fe57f8 100644
--- a/kate/app/katesavemodifieddialog.cpp
+++ b/kate/app/katesavemodifieddialog.cpp
@@ -19,7 +19,7 @@
 #include "katesavemodifieddialog.h"
 #include "katesavemodifieddialog.moc"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlistview.h>
 #include <tdelistview.h>
 #include <kguiitem.h>
@@ -29,7 +29,7 @@
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kencodingfiledialog.h>
 #include <tdetexteditor/encodinginterface.h>
diff --git a/kate/app/katesession.cpp b/kate/app/katesession.cpp
index d55af0c9d..ed6ee3f95 100644
--- a/kate/app/katesession.cpp
+++ b/kate/app/katesession.cpp
@@ -24,13 +24,13 @@
 #include "katedocmanager.h"
 
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
 #include <tdelistview.h>
 #include <kinputdialog.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmdcodec.h>
 #include <kstdguiitem.h>
 #include <kpushbutton.h>
diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp
index 6b3549fd0..ca361232a 100644
--- a/kate/app/kateviewmanager.cpp
+++ b/kate/app/kateviewmanager.cpp
@@ -31,18 +31,18 @@
 #include <tdeaction.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <kdockwidget.h>
 #include <kencodingfiledialog.h>
 #include <kiconloader.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdetoolbar.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksimpleconfig.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdestdaccel.h>
 
 #include <tdetexteditor/encodinginterface.h>
diff --git a/kate/app/kateviewspace.cpp b/kate/app/kateviewspace.cpp
index 5bbd544de..ebc7a3b97 100644
--- a/kate/app/kateviewspace.cpp
+++ b/kate/app/kateviewspace.cpp
@@ -28,7 +28,7 @@
 #include "katesession.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksqueezedtextlabel.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp
index 22e0fc87e..de9309f5e 100644
--- a/kate/app/kateviewspacecontainer.cpp
+++ b/kate/app/kateviewspacecontainer.cpp
@@ -32,18 +32,18 @@
 #include <tdeaction.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <kdockwidget.h>
 #include <kencodingfiledialog.h>
 #include <kiconloader.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdetoolbar.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksimpleconfig.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstringhandler.h>
 
 #include <tdetexteditor/encodinginterface.h>
diff --git a/kate/app/kbookmarkhandler.cpp b/kate/app/kbookmarkhandler.cpp
index 2ff3c7e63..8dbf8461d 100644
--- a/kate/app/kbookmarkhandler.cpp
+++ b/kate/app/kbookmarkhandler.cpp
@@ -28,7 +28,7 @@
 #include <tdepopupmenu.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <tdeaction.h>
 
 #include "kbookmarkhandler.h"
diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp
index ce5486699..75d494832 100644
--- a/kate/app/kwritemain.cpp
+++ b/kate/app/kwritemain.cpp
@@ -38,24 +38,24 @@
 #include <dcopclient.h>
 #include <kurldrag.h>
 #include <kencodingfiledialog.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <kiconloader.h>
 #include <tdeaboutdata.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <tdeconfig.h>
 #include <tdecmdlineargs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
 #include <tdeparts/event.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 
 #include <tqdropsite.h>
 #include <tqdragobject.h>