Rename additional header files to avoid conflicts with KDE4

56 files changed, 90 insertions, 90 deletions

diff --git a/konqueror/KonqMainWindowIface.cc b/konqueror/KonqMainWindowIface.cc
index ade50e948..a18301a2f 100644
--- a/konqueror/KonqMainWindowIface.cc
+++ b/konqueror/KonqMainWindowIface.cc
@@ -28,7 +28,7 @@
 #include <kdcopactionproxy.h>
 #include <kdcoppropertyproxy.h>
 #include <kdebug.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #include <twin.h>
 
 KonqMainWindowIface::KonqMainWindowIface( KonqMainWindow * mainWindow )
diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc
index f10c0ecb0..92176b0ea 100644
--- a/konqueror/about/konq_aboutpage.cc
+++ b/konqueror/about/konq_aboutpage.cc
@@ -5,8 +5,8 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <tdeaction.h>
diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc
index 37e7a1502..c0f0c5c69 100644
--- a/konqueror/client/kfmclient.cc
+++ b/konqueror/client/kfmclient.cc
@@ -28,13 +28,13 @@
 #include <tdeio/job.h>
 #include <tdecmdlineargs.h>
 #include <kpropertiesdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktrader.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <kopenwith.h>
 #include <kurlrequesterdlg.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
 #include <dcopclient.h>
diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc
index 1e495efe3..a7bb5a812 100644
--- a/konqueror/iconview/konq_iconview.cc
+++ b/konqueror/iconview/konq_iconview.cc
@@ -31,16 +31,16 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdirlister.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kinputdialog.h>
 #include <konq_settings.h>
 #include <kpropertiesdialog.h>
 #include <kstdaction.h>
 #include <tdeparts/factory.h>
 #include <ktrader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kivdirectoryoverlay.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstaticdeleter.h>
 
 #include <tqregexp.h>
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index d191718f9..197d5ab99 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -36,7 +36,7 @@
 #include <tqpopupmenu.h>
 #include <tqpainter.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <kdebug.h>
@@ -47,12 +47,12 @@
 #include <kedittoolbar.h>
 #include <tdefiledialog.h>
 #include <kkeydialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
 #include <krun.h>
 
 #include <kdatastream.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kstandarddirs.h>
 
 #include <tdeparts/part.h>
diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp
index c84ce50de..95ae0707f 100644
--- a/konqueror/keditbookmarks/bookmarkinfo.cpp
+++ b/konqueror/keditbookmarks/bookmarkinfo.cpp
@@ -29,7 +29,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tdeapplication.h>
@@ -40,7 +40,7 @@
 
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 #include <tdefiledialog.h>
 
diff --git a/konqueror/keditbookmarks/commands.cpp b/konqueror/keditbookmarks/commands.cpp
index 2ad58a682..4cfb95a7e 100644
--- a/konqueror/keditbookmarks/commands.cpp
+++ b/konqueror/keditbookmarks/commands.cpp
@@ -30,7 +30,7 @@
 #include <tqvaluevector.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kbookmarkdrag.h>
 #include <kbookmarkmanager.h>
diff --git a/konqueror/keditbookmarks/dcop.cpp b/konqueror/keditbookmarks/dcop.cpp
index 5b7886895..570445cae 100644
--- a/konqueror/keditbookmarks/dcop.cpp
+++ b/konqueror/keditbookmarks/dcop.cpp
@@ -30,7 +30,7 @@
 #include <tqpopupmenu.h>
 #include <tqpainter.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kbookmarkmanager.h>
 #include <dcopclient.h>
 #include <kdebug.h>
diff --git a/konqueror/keditbookmarks/exporters.cpp b/konqueror/keditbookmarks/exporters.cpp
index 784802564..681883883 100644
--- a/konqueror/keditbookmarks/exporters.cpp
+++ b/konqueror/keditbookmarks/exporters.cpp
@@ -21,7 +21,7 @@
 #include "exporters.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 #include <tqfile.h>
diff --git a/konqueror/keditbookmarks/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp
index 19bdb39db..f4e2183ea 100644
--- a/konqueror/keditbookmarks/favicons.cpp
+++ b/konqueror/keditbookmarks/favicons.cpp
@@ -26,7 +26,7 @@
 #include "updater.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 FavIconsItrHolder *FavIconsItrHolder::s_self = 0;
diff --git a/konqueror/keditbookmarks/importers.cpp b/konqueror/keditbookmarks/importers.cpp
index bbaf6b956..ec0d5e249 100644
--- a/konqueror/keditbookmarks/importers.cpp
+++ b/konqueror/keditbookmarks/importers.cpp
@@ -27,9 +27,9 @@
 
 #include <tqregexp.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 
 #include <kbookmarkmanager.h>
diff --git a/konqueror/keditbookmarks/importers.h b/konqueror/keditbookmarks/importers.h
index eee00823a..0550e46f0 100644
--- a/konqueror/keditbookmarks/importers.h
+++ b/konqueror/keditbookmarks/importers.h
@@ -23,7 +23,7 @@
 #define __importers_h
 
 #include "commands.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/job.h>
 
 #include <kcommand.h>
diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp
index e33737956..92eb1c48b 100644
--- a/konqueror/keditbookmarks/listview.cpp
+++ b/konqueror/keditbookmarks/listview.cpp
@@ -35,7 +35,7 @@
 #include <tqheader.h>
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
@@ -45,7 +45,7 @@
 #include <kedittoolbar.h>
 #include <tdefiledialog.h>
 #include <kkeydialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 #include <krun.h>
 #include <tdelistviewsearchline.h>
diff --git a/konqueror/keditbookmarks/listview.h b/konqueror/keditbookmarks/listview.h
index 13bf2a15b..f693c608f 100644
--- a/konqueror/keditbookmarks/listview.h
+++ b/konqueror/keditbookmarks/listview.h
@@ -26,7 +26,7 @@
 #include <tqmap.h>
 #include <tqvaluevector.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kbookmark.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp
index 8f6b3695e..d64f6bce7 100644
--- a/konqueror/keditbookmarks/main.cpp
+++ b/konqueror/keditbookmarks/main.cpp
@@ -26,7 +26,7 @@
 
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 
@@ -34,7 +34,7 @@
 #include <tdeaboutdata.h>
 #include <kuniqueapplication.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <twin.h>
 
 #include <kbookmarkmanager.h>
diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp
index 737fdd4f7..9402e49a0 100644
--- a/konqueror/keditbookmarks/toplevel.cpp
+++ b/konqueror/keditbookmarks/toplevel.cpp
@@ -37,7 +37,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tdeapplication.h>
@@ -47,7 +47,7 @@
 #include <dcopref.h>
 
 #include <kedittoolbar.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 #include <tdefiledialog.h>
 
diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp
index 8c8a662f9..082102223 100644
--- a/konqueror/keditbookmarks/updater.cpp
+++ b/konqueror/keditbookmarks/updater.cpp
@@ -27,7 +27,7 @@
 #include "toplevel.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 #include <tdeio/job.h>
diff --git a/konqueror/konq_extensionmanager.cc b/konqueror/konq_extensionmanager.cc
index d7b36c37b..0bda1db98 100644
--- a/konqueror/konq_extensionmanager.cc
+++ b/konqueror/konq_extensionmanager.cc
@@ -19,7 +19,7 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/componentfactory.h>
 #include <tdeparts/plugin.h>
 #include <kplugininfo.h>
diff --git a/konqueror/konq_factory.cc b/konqueror/konq_factory.cc
index f6535c97c..9921b7126 100644
--- a/konqueror/konq_factory.cc
+++ b/konqueror/konq_factory.cc
@@ -27,8 +27,8 @@
 #include <konq_mainwindow.h>
 #include <kdebug.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqwidget.h>
 #include <tqfile.h>
diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cc
index 05eb3be10..0acf39b49 100644
--- a/konqueror/konq_frame.cc
+++ b/konqueror/konq_frame.cc
@@ -29,10 +29,10 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kprogress.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksqueezedtextlabel.h>
 #include <networkstatusindicator.h>
 
diff --git a/konqueror/konq_guiclients.cc b/konqueror/konq_guiclients.cc
index 738e75338..31647b0c3 100644
--- a/konqueror/konq_guiclients.cc
+++ b/konqueror/konq_guiclients.cc
@@ -18,8 +18,8 @@
 */
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmenubar.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
 #include "konq_view.h"
 #include "konq_settingsxt.h"
 #include "konq_frame.h"
diff --git a/konqueror/konq_main.cc b/konqueror/konq_main.cc
index ad3706a36..ee1fc71db 100644
--- a/konqueror/konq_main.cc
+++ b/konqueror/konq_main.cc
@@ -25,8 +25,8 @@
 #include "konq_settingsxt.h"
 #include "KonquerorIface.h"
 
-#include <ktempfile.h>
-#include <klocale.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <tdecmdlineargs.h>
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index 67a907671..a3cda9154 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -75,8 +75,8 @@
 #include <kdebug.h>
 #include <kedittoolbar.h>
 #include <kkeydialog.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
 #include <knewmenu.h>
 #include <konq_defaults.h>
 #include <konq_dirpart.h>
@@ -89,13 +89,13 @@
 #include <kstdaction.h>
 #include <kstandarddirs.h>
 #include <tdesycoca.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurlrequesterdlg.h>
 #include <kurlrequester.h>
 #include <kuserprofile.h>
 #include <twin.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 #include <kprocess.h>
diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h
index ad31c4360..3e9c71ac5 100644
--- a/konqueror/konq_mainwindow.h
+++ b/konqueror/konq_mainwindow.h
@@ -34,7 +34,7 @@
 #include <kbookmarkmanager.h>
 #include <kcompletion.h>
 #include <kurlcompletion.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <dcopobject.h>
 #include <kxmlguifactory.h>
 #include <kxmlguiclient.h>
diff --git a/konqueror/konq_misc.cc b/konqueror/konq_misc.cc
index 690dd6d1f..b76f44ad2 100644
--- a/konqueror/konq_misc.cc
+++ b/konqueror/konq_misc.cc
@@ -24,14 +24,14 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurifilter.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <twin.h>
 #include <kprotocolinfo.h>
 #include <kurldrag.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 
 #include "konq_misc.h"
 #include "konq_mainwindow.h"
diff --git a/konqueror/konq_profiledlg.cc b/konqueror/konq_profiledlg.cc
index 9226c9e16..5f8626f8e 100644
--- a/konqueror/konq_profiledlg.cc
+++ b/konqueror/konq_profiledlg.cc
@@ -33,7 +33,7 @@
 #include <kstdguiitem.h>
 #include <tdeio/global.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kseparator.h>
 #include <kpushbutton.h>
diff --git a/konqueror/konq_run.cc b/konqueror/konq_run.cc
index f5e10897c..64bb3203f 100644
--- a/konqueror/konq_run.cc
+++ b/konqueror/konq_run.cc
@@ -22,8 +22,8 @@
 #include "konq_run.h"
 #include "konq_view.h"
 #include <kuserprofile.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <konq_historymgr.h>
 
diff --git a/konqueror/konq_tabs.cc b/konqueror/konq_tabs.cc
index be7df5a07..1bf5115c0 100644
--- a/konqueror/konq_tabs.cc
+++ b/konqueror/konq_tabs.cc
@@ -30,7 +30,7 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurldrag.h>
 #include <kstringhandler.h>
 
diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc
index aec59ef0b..fff2d04b0 100644
--- a/konqueror/konq_view.cc
+++ b/konqueror/konq_view.cc
@@ -46,8 +46,8 @@
 #include <tqobjectlist.h>
 #include <config.h>
 #include <tqucomextra_p.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <fixx11h.h>
 
diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc
index 148d7db1b..635d0b1ae 100644
--- a/konqueror/konq_viewmgr.cc
+++ b/konqueror/konq_viewmgr.cc
@@ -33,11 +33,11 @@
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
-#include <ktempfile.h>
+#include <tdeglobalsettings.h>
+#include <tdetempfile.h>
 #include <dcopclient.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <assert.h>
 #include <tdepopupmenu.h>
diff --git a/konqueror/kttsplugin/tdehtmlkttsd.cpp b/konqueror/kttsplugin/tdehtmlkttsd.cpp
index af2eae5d8..49d206664 100644
--- a/konqueror/kttsplugin/tdehtmlkttsd.cpp
+++ b/konqueror/kttsplugin/tdehtmlkttsd.cpp
@@ -23,7 +23,7 @@
 #include <kgenericfactory.h>
 #include <kiconloader.h>
 #include <tqmessagebox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstring.h>
 #include <tqtimer.h>
 #include <kspeech.h>
diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc
index 056fbe757..5f4a0f636 100644
--- a/konqueror/listview/konq_infolistviewitem.cc
+++ b/konqueror/listview/konq_infolistviewitem.cc
@@ -21,7 +21,7 @@
 #include <konq_settings.h>
 #include <tdefilemetainfo.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <assert.h>
 #include <stdio.h>
 #include <tqpainter.h>
diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc
index ef77cc1bd..fab798906 100644
--- a/konqueror/listview/konq_infolistviewwidget.cc
+++ b/konqueror/listview/konq_infolistviewwidget.cc
@@ -21,7 +21,7 @@
 #include "konq_infolistviewitem.h"
 #include "konq_listview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefilemetainfo.h>
 #include <kdebug.h>
 #include <tdeaction.h>
diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc
index 3d1090e1f..7d0a8d628 100644
--- a/konqueror/listview/konq_listview.cc
+++ b/konqueror/listview/konq_listview.cc
@@ -28,7 +28,7 @@
 #include <kdebug.h>
 #include <kdirlister.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <konq_drag.h>
 #include <kpropertiesdialog.h>
 #include <kstdaction.h>
diff --git a/konqueror/listview/konq_listview.h b/konqueror/listview/konq_listview.h
index 5b175e13a..f7592d73f 100644
--- a/konqueror/listview/konq_listview.h
+++ b/konqueror/listview/konq_listview.h
@@ -21,7 +21,7 @@
 #define __konq_listview_h__
 
 #include <tdeparts/browserextension.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <konq_operations.h>
 #include <tdeparts/factory.h>
 #include <konq_dirpart.h>
diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cc
index 0077c6da5..12952fb23 100644
--- a/konqueror/listview/konq_listviewitems.cc
+++ b/konqueror/listview/konq_listviewitems.cc
@@ -20,7 +20,7 @@
 #include "konq_listview.h"
 #include <konq_settings.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <assert.h>
 #include <stdio.h>
 #include <tqpainter.h>
diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc
index 673362063..c885aef42 100644
--- a/konqueror/listview/konq_listviewwidget.cc
+++ b/konqueror/listview/konq_listviewwidget.cc
@@ -27,11 +27,11 @@
 
 #include <kdebug.h>
 #include <kdirlister.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprotocolinfo.h>
 #include <tdeaction.h>
 #include <kurldrag.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kiconeffect.h>
 
diff --git a/konqueror/listview/konq_textviewitem.cc b/konqueror/listview/konq_textviewitem.cc
index ac63cd443..3919d6c82 100644
--- a/konqueror/listview/konq_textviewitem.cc
+++ b/konqueror/listview/konq_textviewitem.cc
@@ -22,7 +22,7 @@
 
 #include <assert.h>
 #include <stdio.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 int KonqTextViewItem::compare( TQListViewItem *item, int col, bool ascending ) const
 {
diff --git a/konqueror/listview/konq_textviewitem.h b/konqueror/listview/konq_textviewitem.h
index cbeda1730..506c1b592 100644
--- a/konqueror/listview/konq_textviewitem.h
+++ b/konqueror/listview/konq_textviewitem.h
@@ -23,7 +23,7 @@
 #include <tqlistview.h>
 #include <tqstring.h>
 #include <tdeio/global.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "konq_listviewitems.h"
 #include "konq_textviewwidget.h"
 
diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
index 846fae1be..8889861b3 100644
--- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
+++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
@@ -26,14 +26,14 @@
 
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kcharsets.h>
 #include <tdepopupmenu.h>
 #include <dcopclient.h>
 #include <kgenericfactory.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kprotocolinfo.h>
 #include <tdeio/slaveconfig.h>
 #include <konq_dirpart.h>
diff --git a/konqueror/shellcmdplugin/kshellcmddialog.cpp b/konqueror/shellcmdplugin/kshellcmddialog.cpp
index eefa57337..b4ea0cb5d 100644
--- a/konqueror/shellcmdplugin/kshellcmddialog.cpp
+++ b/konqueror/shellcmdplugin/kshellcmddialog.cpp
@@ -21,7 +21,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <kpushbutton.h>
 
diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
index 3f93feade..e5e8dabe4 100644
--- a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
+++ b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
@@ -27,9 +27,9 @@
 #include <tqsocketnotifier.h>
 
 #include <kinputdialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdesu/process.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KShellCommandExecutor::KShellCommandExecutor(const TQString& command, TQWidget* parent)
 :TQTextView(parent)
diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
index d4b3041ab..5c96fea85 100644
--- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp
+++ b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
@@ -18,7 +18,7 @@
 
 #include "kshellcmdplugin.h"
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <konq_dirpart.h>
 #include <kprocess.h>
 #include <tdeapplication.h>
diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp
index 91eb43bf5..bfff3c8e7 100644
--- a/konqueror/sidebar/konqsidebar.cpp
+++ b/konqueror/sidebar/konqsidebar.cpp
@@ -78,7 +78,7 @@ void KonqSidebar::customEvent(TQCustomEvent* ev)
 // It's usually safe to leave the factory code alone.. with the
 // notable exception of the TDEAboutData data
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 
 TDEInstance*  KonqSidebarFactory::s_instance = 0L;
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index a775f5160..62a26cba9 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -27,13 +27,13 @@
 #include <tqstringlist.h>
 #include <tqucomextra_p.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kicondialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
 #include <konq_events.h>
 #include <tdefileitem.h>
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index b190790de..675642c36 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -26,7 +26,7 @@
 #include <kbookmarkdrag.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <dcopclient.h>
 #include <dcopref.h>
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
index 637c428dc..15c162d70 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
@@ -23,7 +23,7 @@
 #include <konq_operations.h>
 #include <konq_drag.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kuserprofile.h>
 #include <tqapplication.h>
 #include <tqclipboard.h>
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
index 61e5eb43f..4f6ee0686 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <kprotocolinfo.h>
 #include <kdesktopfile.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kdirlister.h>
 #include "konqsidebariface_p.h"
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index a6c092e0e..6d5ac5094 100644
--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@@ -26,7 +26,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <krun.h>
 #include <kstaticdeleter.h>
 
diff --git a/konqueror/sidebar/trees/history_module/history_module.h b/konqueror/sidebar/trees/history_module/history_module.h
index 5c114a164..933097455 100644
--- a/konqueror/sidebar/trees/history_module/history_module.h
+++ b/konqueror/sidebar/trees/history_module/history_module.h
@@ -24,8 +24,8 @@
 #include <tqdict.h>
 #include <tqpixmap.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <konq_sidebartreemodule.h>
 
 #include "history_item.h"
diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp
index 5614122ca..eb1621ae9 100644
--- a/konqueror/sidebar/trees/history_module/history_settings.cpp
+++ b/konqueror/sidebar/trees/history_module/history_settings.cpp
@@ -1,7 +1,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <dcopclient.h>
 
 #include "history_settings.h"
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
index 52005e2b5..70e42e113 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
@@ -33,10 +33,10 @@
 #include <kdialog.h>
 #include <tdefontdialog.h>
 #include <kgenericfactory.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 #include "history_dlg.h"
 
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index e690c6000..1e8f4d791 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -35,7 +35,7 @@
 #include <kdebug.h>
 #include <kdesktopfile.h>
 #include <kdirnotify_stub.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
 #include <tdeio/netaccess.h>
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.h b/konqueror/sidebar/trees/konqsidebar_tree.h
index 5a198eeca..bdc58ad0c 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.h
+++ b/konqueror/sidebar/trees/konqsidebar_tree.h
@@ -9,7 +9,7 @@
 #include <kdialogbase.h>
 #include <tqcombobox.h>
 #include <tqstringlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlineedit.h>
 class KonqSidebarTree;
 class TQVBox;
diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp
index da5a5c9bb..44a94f02c 100644
--- a/konqueror/sidebar/web_module/web_module.cpp
+++ b/konqueror/sidebar/web_module/web_module.cpp
@@ -25,8 +25,8 @@
 #include <dom/html_inline.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <konq_pixmapprovider.h>
 #include <tdeparts/browserextension.h>
 #include <kstandarddirs.h>
diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h
index 494f1050a..938677d8d 100644
--- a/konqueror/sidebar/web_module/web_module.h
+++ b/konqueror/sidebar/web_module/web_module.h
@@ -22,7 +22,7 @@
 #include <assert.h>
 #include <tdehtml_part.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <konqsidebarplugin.h>
 #include <tdepopupmenu.h>
 #include <tqobject.h>