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

20 files changed, 49 insertions, 49 deletions

diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc
index 75721c689..45ae1e8e5 100644
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cc
@@ -48,17 +48,17 @@
 #include <kimageio.h>
 #include <kinputdialog.h>
 #include <kipc.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <kprocess.h>
 #include <tdesycoca.h>
-#include <ktempfile.h>
-#include <kmessagebox.h>
+#include <tdetempfile.h>
+#include <tdemessagebox.h>
 #include <kglobalaccel.h>
 #include <twinmodule.h>
 #include <krun.h>
 #include <twin.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdepopupmenu.h>
 #include <tdeapplication.h>
 #include <kdirlister.h>
diff --git a/kdesktop/init.cc b/kdesktop/init.cc
index be6f0c5d9..6bf87f333 100644
--- a/kdesktop/init.cc
+++ b/kdesktop/init.cc
@@ -21,11 +21,11 @@
 #include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
 #include <kdesktopfile.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeapplication.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kdesktopsettings.h>
 
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
index 68897eb94..e00fbada2 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cc
@@ -29,9 +29,9 @@
 #include <kdebug.h>
 #include <kdesktopfile.h>
 #include <kdirlister.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kpropertiesdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <konqbookmarkmanager.h>
 #include <konq_defaults.h>
 #include <konq_drag.h>
diff --git a/kdesktop/kdiconview.h b/kdesktop/kdiconview.h
index f74b67954..bc24308f6 100644
--- a/kdesktop/kdiconview.h
+++ b/kdesktop/kdiconview.h
@@ -26,7 +26,7 @@
 #include <tdeaction.h>
 #include <tdefileitem.h>
 #include <kdirnotify.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <dcopclient.h>
 
diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc
index 38435d0bb..02f073136 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cc
@@ -40,7 +40,7 @@
 #include <kcmultidialog.h>
 #include <kbookmarkmenu.h>
 #include <konqbookmarkmanager.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knewmenu.h>
 #include <dcopclient.h>
 #include <dcopref.h>
@@ -48,8 +48,8 @@
 #include <kdebug.h>
 #include <twindowlistmenu.h>
 #include <twin.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
 #include <kuser.h>
 #include <tqfile.h>
 
diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp
index 885f1ce5b..1e2499ea2 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.cpp
+++ b/kdesktop/kwebdesktop/kwebdesktop.cpp
@@ -24,7 +24,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 #include <kurifilter.h>
diff --git a/kdesktop/kxdglauncher.cpp b/kdesktop/kxdglauncher.cpp
index a6e45da30..6ee3a03f3 100644
--- a/kdesktop/kxdglauncher.cpp
+++ b/kdesktop/kxdglauncher.cpp
@@ -24,12 +24,12 @@
 #include <tqtextcodec.h>
 
 #include <krun.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 
 #include <stdlib.h>
diff --git a/kdesktop/lock/autologout.cc b/kdesktop/lock/autologout.cc
index 41a1946ec..07a68c50d 100644
--- a/kdesktop/lock/autologout.cc
+++ b/kdesktop/lock/autologout.cc
@@ -8,13 +8,13 @@
 #include "autologout.h"
 
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <dcopref.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdialog.h>
 
 #include <tqlayout.h>
diff --git a/kdesktop/lock/infodlg.cc b/kdesktop/lock/infodlg.cc
index c241a1acd..97e2ea2a6 100644
--- a/kdesktop/lock/infodlg.cc
+++ b/kdesktop/lock/infodlg.cc
@@ -11,11 +11,11 @@
 #include <dmctl.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kseparator.h>
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdesu/defaults.h>
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <kuser.h>
 #include <dcopref.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqlayout.h>
 #include <tqpushbutton.h>
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
index e8e0f901c..a3fe9828c 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cc
@@ -16,11 +16,11 @@
 #include <dmctl.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kseparator.h>
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdesu/defaults.h>
@@ -28,7 +28,7 @@
 #include <kdebug.h>
 #include <kuser.h>
 #include <dcopref.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqlayout.h>
 #include <tqpushbutton.h>
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 604b93a84..f4b6278f5 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -40,9 +40,9 @@
 #include <tdeapplication.h>
 #include <kservicegroup.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <klibloader.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index 1d7475a90..377080d23 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -24,10 +24,10 @@
 #include "kdesktopsettings.h"
 
 #include <tdecmdlineargs.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <dcopref.h>
 #include <ksimpleconfig.h>
 
diff --git a/kdesktop/lock/querydlg.cc b/kdesktop/lock/querydlg.cc
index f1f1d5171..a278fcb8b 100644
--- a/kdesktop/lock/querydlg.cc
+++ b/kdesktop/lock/querydlg.cc
@@ -11,11 +11,11 @@
 #include <dmctl.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kseparator.h>
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdesu/defaults.h>
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <kuser.h>
 #include <dcopref.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqlayout.h>
 #include <tqpushbutton.h>
diff --git a/kdesktop/lock/sakdlg.cc b/kdesktop/lock/sakdlg.cc
index 7a77feb0c..5fca73e24 100644
--- a/kdesktop/lock/sakdlg.cc
+++ b/kdesktop/lock/sakdlg.cc
@@ -11,11 +11,11 @@
 #include <dmctl.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kseparator.h>
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdesu/defaults.h>
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <kuser.h>
 #include <dcopref.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdialog.h>
 
 #include <tqlayout.h>
diff --git a/kdesktop/lock/securedlg.cc b/kdesktop/lock/securedlg.cc
index 57e76ed14..d19df99a5 100644
--- a/kdesktop/lock/securedlg.cc
+++ b/kdesktop/lock/securedlg.cc
@@ -11,11 +11,11 @@
 #include <dmctl.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kseparator.h>
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdesu/defaults.h>
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <kuser.h>
 #include <dcopref.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdialog.h>
 
 #include <tqlayout.h>
diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cc
index 24d950ab5..a8c98cf35 100644
--- a/kdesktop/lockeng.cc
+++ b/kdesktop/lockeng.cc
@@ -15,7 +15,7 @@
 #include <tdeapplication.h>
 #include <kservicegroup.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 #include <tqtimer.h>
 #include <dcopclient.h>
diff --git a/kdesktop/main.cc b/kdesktop/main.cc
index 93b8d42c7..0cff73420 100644
--- a/kdesktop/main.cc
+++ b/kdesktop/main.cc
@@ -19,15 +19,15 @@
 
 #include <config.h>
 #include <kuniqueapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <kopenwith.h>
 #include <kcrash.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
-#include <kglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kmanagerselection.h>
 
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index 971b855eb..86e241391 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -48,8 +48,8 @@
 #include <tqstylesheet.h>
 
 #include <dcopclient.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kcombobox.h>
 #include <klineedit.h>
diff --git a/kdesktop/startupid.h b/kdesktop/startupid.h
index 4c0027bfa..893d0b8db 100644
--- a/kdesktop/startupid.h
+++ b/kdesktop/startupid.h
@@ -27,7 +27,7 @@
 #include <tqstring.h>
 #include <tqtimer.h>
 #include <tqmap.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 
 class TQStyle;
 
diff --git a/kdesktop/tdefileividesktop.cpp b/kdesktop/tdefileividesktop.cpp
index 04e8db163..7d20e4d81 100644
--- a/kdesktop/tdefileividesktop.cpp
+++ b/kdesktop/tdefileividesktop.cpp
@@ -31,7 +31,7 @@
 #include <kwordwrap.h>
 #include <kiconview.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <kshadowengine.h>
 #include "kdesktopshadowsettings.h"