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

11 files changed, 20 insertions, 20 deletions

diff --git a/libkonq/kivdirectoryoverlay.cc b/libkonq/kivdirectoryoverlay.cc
index 405032ec6..c15c41d89 100644
--- a/libkonq/kivdirectoryoverlay.cc
+++ b/libkonq/kivdirectoryoverlay.cc
@@ -30,7 +30,7 @@
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <konq_settings.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kivdirectoryoverlay.h"
diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cc
index e27277ac8..d4cae95ad 100644
--- a/libkonq/knewmenu.cc
+++ b/libkonq/knewmenu.cc
@@ -24,8 +24,8 @@
 #include <kdirwatch.h>
 #include <kinstance.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kprotocolinfo.h>
 #include <tdepopupmenu.h>
diff --git a/libkonq/konq_bgnddlg.cc b/libkonq/konq_bgnddlg.cc
index 77905b0c8..60f3aa63d 100644
--- a/libkonq/konq_bgnddlg.cc
+++ b/libkonq/konq_bgnddlg.cc
@@ -27,7 +27,7 @@
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kimagefilepreview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 //#include <tderecentdocument.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cc
index 0ada02517..0e88a9925 100644
--- a/libkonq/konq_dirpart.cc
+++ b/libkonq/konq_dirpart.cc
@@ -29,14 +29,14 @@
 #include <kdebug.h>
 #include <kdirlister.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <konq_drag.h>
 #include <tdeparts/browserextension.h>
 #include <kurldrag.h>
 #include <kuserprofile.h>
 #include <kurifilter.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tqapplication.h>
 #include <tqclipboard.h>
diff --git a/libkonq/konq_faviconmgr.cc b/libkonq/konq_faviconmgr.cc
index 5baf83a0f..c5c828ec0 100644
--- a/libkonq/konq_faviconmgr.cc
+++ b/libkonq/konq_faviconmgr.cc
@@ -20,7 +20,7 @@
 #include <dcopclient.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kmimetype.h>
 
 #include "konq_faviconmgr.moc"
diff --git a/libkonq/konq_filetip.cc b/libkonq/konq_filetip.cc
index 78d2c0e2a..8ad1e0d6f 100644
--- a/libkonq/konq_filetip.cc
+++ b/libkonq/konq_filetip.cc
@@ -22,7 +22,7 @@
 #include <konq_filetip.h>
 
 #include <tdefileitem.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 
diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc
index a0a4dfd4c..18997a71b 100644
--- a/libkonq/konq_iconviewwidget.cc
+++ b/libkonq/konq_iconviewwidget.cc
@@ -39,7 +39,7 @@
 #include <tdefileivi.h>
 #include <konq_settings.h>
 #include <konq_drag.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kpropertiesdialog.h>
 #include <kipc.h>
 #include <kicontheme.h>
@@ -51,7 +51,7 @@
 
 #include <assert.h>
 #include <unistd.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 struct KonqIconViewWidgetPrivate
diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc
index 3e58bde5a..cd9a61174 100644
--- a/libkonq/konq_operations.cc
+++ b/libkonq/konq_operations.cc
@@ -21,8 +21,8 @@
 
 #include <kautomount.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knotifyclient.h>
 #include <krun.h>
 #include <kshell.h>
@@ -44,7 +44,7 @@
 #include <tdefileitem.h>
 #include <kdesktopfile.h>
 #include <kurldrag.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kimageio.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc
index 97b2eb994..fe962f3cb 100644
--- a/libkonq/konq_popupmenu.cc
+++ b/libkonq/konq_popupmenu.cc
@@ -21,7 +21,7 @@
 #include <tqdir.h>
 #include <tqeventloop.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kbookmarkmanager.h>
 #include <kdebug.h>
@@ -29,7 +29,7 @@
 #include <kprotocolinfo.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <kxmlguifactory.h>
 #include <kxmlguibuilder.h>
diff --git a/libkonq/konq_settings.cc b/libkonq/konq_settings.cc
index aef17475b..41460e8ae 100644
--- a/libkonq/konq_settings.cc
+++ b/libkonq/konq_settings.cc
@@ -19,8 +19,8 @@
 
 #include "konq_settings.h"
 #include "konq_defaults.h"
-#include "kglobalsettings.h"
-#include <kglobal.h>
+#include "tdeglobalsettings.h"
+#include <tdeglobal.h>
 #include <kservicetype.h>
 #include <kdesktopfile.h>
 #include <kdebug.h>
diff --git a/libkonq/konq_undo.cc b/libkonq/konq_undo.cc
index c81313aa8..a6072e800 100644
--- a/libkonq/konq_undo.cc
+++ b/libkonq/konq_undo.cc
@@ -32,8 +32,8 @@
 #include <tdeapplication.h>
 #include <kdatastream.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <tdeconfig.h>
 #include <kipc.h>