Rename additional header files to avoid conflicts with KDE4

121 files changed, 171 insertions, 171 deletions

diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp
index 2b69c7d5..1bb9851e 100644
--- a/parts/abbrev/abbrevpart.cpp
+++ b/parts/abbrev/abbrevpart.cpp
@@ -21,7 +21,7 @@
 #include <tqvbox.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <kstandarddirs.h>
 #include <kdevgenericfactory.h>
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index ec876712..83247cf6 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -37,13 +37,13 @@
 #include <kiconview.h>
 #include <tdeconfig.h>
 #include <kdebug.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 <kprocess.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <tdefile.h>
diff --git a/parts/appwizard/appwizardpart.cpp b/parts/appwizard/appwizardpart.cpp
index 6cec2631..09c3ea17 100644
--- a/parts/appwizard/appwizardpart.cpp
+++ b/parts/appwizard/appwizardpart.cpp
@@ -16,8 +16,8 @@
 #include "appwizardpart.h"
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kdevcore.h>
 #include <kgenericfactory.h>
diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py
index 579e0447..953a86e3 100644
--- a/parts/appwizard/common/scons/admin/kde.py
+++ b/parts/appwizard/common/scons/admin/kde.py
@@ -423,7 +423,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 
 	## ui file processing
 	def uic_processing(target, source, env):
-		inc_kde  = '#include <klocale.h>\n#include <kdialog.h>\n'
+		inc_kde  = '#include <tdelocale.h>\n#include <kdialog.h>\n'
 		inc_moc  = '#include "%s"\n' % target[2].name
 		comp_h   = '$QT_UIC $QT_UIC_HFLAGS -o %s %s' % (target[0].path, source[0].path)
 		comp_c   = '$QT_UIC $QT_UIC_CFLAGS -impl %s %s' % (target[0].path, source[0].path)
diff --git a/parts/appwizard/filepropspage.cpp b/parts/appwizard/filepropspage.cpp
index 3e946abf..a084db13 100644
--- a/parts/appwizard/filepropspage.cpp
+++ b/parts/appwizard/filepropspage.cpp
@@ -2,7 +2,7 @@
 #include <tqlistbox.h>
 #include <klineedit.h>
 #include <tqtextview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqmultilineedit.h>
 
diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp
index 9c38ccef..bd08198d 100644
--- a/parts/appwizard/importdlg.cpp
+++ b/parts/appwizard/importdlg.cpp
@@ -27,8 +27,8 @@
 #include <kdialog.h>
 #include <tdefiledialog.h>
 #include <kinstance.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kcursor.h>
 #include <tdefile.h>
diff --git a/parts/appwizard/misc.cpp b/parts/appwizard/misc.cpp
index 5546b404..0a993345 100644
--- a/parts/appwizard/misc.cpp
+++ b/parts/appwizard/misc.cpp
@@ -12,12 +12,12 @@
 #include "misc.h"
 
 #include <tqstring.h>
-#include <kemailsettings.h>
+#include <tdeemailsettings.h>
 
 #include <pwd.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 
diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp
index 26a8e151..16d590ab 100644
--- a/parts/astyle/astyle_part.cpp
+++ b/parts/astyle/astyle_part.cpp
@@ -9,7 +9,7 @@
 #include <kdialogbase.h>
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <tdeparts/partmanager.h>
 #include <tdetexteditor/editinterface.h>
@@ -25,8 +25,8 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqlineedit.h>
 #include <tqregexp.h>
 
diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp
index b12289c9..f7ac78cb 100644
--- a/parts/bookmarks/bookmarks_part.cpp
+++ b/parts/bookmarks/bookmarks_part.cpp
@@ -17,7 +17,7 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <tdetexteditor/markinterface.h>
 #include <tdetexteditor/editinterface.h>
diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp
index fef9405a..cc7316c8 100644
--- a/parts/bookmarks/bookmarks_widget.cpp
+++ b/parts/bookmarks/bookmarks_widget.cpp
@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kdevpartcontroller.h>
 #include <kdevcore.h>
diff --git a/parts/classview/classtooldlg.cpp b/parts/classview/classtooldlg.cpp
index 845352fb..f803c6c1 100644
--- a/parts/classview/classtooldlg.cpp
+++ b/parts/classview/classtooldlg.cpp
@@ -18,7 +18,7 @@
 #include <tqtooltip.h>
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kdevlanguagesupport.h"
 #include "classstore.h"
diff --git a/parts/classview/classtoolwidget.cpp b/parts/classview/classtoolwidget.cpp
index 56301edd..cb7d259b 100644
--- a/parts/classview/classtoolwidget.cpp
+++ b/parts/classview/classtoolwidget.cpp
@@ -14,8 +14,8 @@
 #include "classtoolwidget.h"
 
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdepopupmenu.h>
 #include "classstore.h"
 
diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp
index d6d75974..7fb7397f 100644
--- a/parts/classview/classtreebase.cpp
+++ b/parts/classview/classtreebase.cpp
@@ -19,7 +19,7 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #include "kdevcore.h"
diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp
index 3bff2daf..59d0163d 100644
--- a/parts/classview/classviewpart.cpp
+++ b/parts/classview/classviewpart.cpp
@@ -25,7 +25,7 @@
 #include <tqlineedit.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <tdepopupmenu.h>
 #include <kdebug.h>
diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp
index 89c0db1e..851e8739 100644
--- a/parts/classview/classviewwidget.cpp
+++ b/parts/classview/classviewwidget.cpp
@@ -38,7 +38,7 @@
 #include <codemodel.h>
 #include <codemodel_utils.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqheader.h>
diff --git a/parts/classview/digraphview.cpp b/parts/classview/digraphview.cpp
index 6c9eeb88..68b10a2f 100644
--- a/parts/classview/digraphview.cpp
+++ b/parts/classview/digraphview.cpp
@@ -17,13 +17,13 @@
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqtextstream.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
-#include <ktempfile.h>
+#include <tdeglobalsettings.h>
+#include <tdetempfile.h>
 #include <tdeversion.h>
 #include <kdebug.h>
 
diff --git a/parts/classview/hierarchydlg.cpp b/parts/classview/hierarchydlg.cpp
index bda529d5..d19f13cb 100644
--- a/parts/classview/hierarchydlg.cpp
+++ b/parts/classview/hierarchydlg.cpp
@@ -12,14 +12,14 @@
 #include "hierarchydlg.h"
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 #include <tdefile.h>
 #include <tdefiledialog.h>
 #include <kurlrequesterdlg.h>
 #include <kurlrequester.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include <tqlayout.h>
diff --git a/parts/classview/viewcombos.cpp b/parts/classview/viewcombos.cpp
index 52afd26f..cdb5c368 100644
--- a/parts/classview/viewcombos.cpp
+++ b/parts/classview/viewcombos.cpp
@@ -18,7 +18,7 @@
  *
  */
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "tdelistviewaction.h"
diff --git a/parts/classview/viewcombos.h b/parts/classview/viewcombos.h
index 14a44eaf..ea288b1d 100644
--- a/parts/classview/viewcombos.h
+++ b/parts/classview/viewcombos.h
@@ -20,7 +20,7 @@
 #ifndef VIEWCOMBOS_H
 #define VIEWCOMBOS_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlistview.h>
 
diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp
index 95c710c4..324ded8a 100644
--- a/parts/ctags2/ctags2_part.cpp
+++ b/parts/ctags2/ctags2_part.cpp
@@ -18,7 +18,7 @@
 #include <klineedit.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/document.h>
 #include <tdetexteditor/editinterface.h>
diff --git a/parts/ctags2/ctags2_widget.cpp b/parts/ctags2/ctags2_widget.cpp
index 1715402b..bd1b138d 100644
--- a/parts/ctags2/ctags2_widget.cpp
+++ b/parts/ctags2/ctags2_widget.cpp
@@ -17,7 +17,7 @@
 
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurl.h>
 #include <tdeapplication.h>
diff --git a/parts/ctags2/ctagskinds.cpp b/parts/ctags2/ctagskinds.cpp
index 526baa31..3ea2dee5 100644
--- a/parts/ctags2/ctagskinds.cpp
+++ b/parts/ctags2/ctagskinds.cpp
@@ -11,7 +11,7 @@
 
 #include "ctagskinds.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 struct CTagsKindMapping {
     char abbrev;
diff --git a/parts/diff/diffdlg.cpp b/parts/diff/diffdlg.cpp
index 1974f39e..3fd4b666 100644
--- a/parts/diff/diffdlg.cpp
+++ b/parts/diff/diffdlg.cpp
@@ -11,7 +11,7 @@
 
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
  
 #include "diffdlg.h"
 #include "diffwidget.h"
diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp
index 3861f202..70e676c8 100644
--- a/parts/diff/diffpart.cpp
+++ b/parts/diff/diffpart.cpp
@@ -15,7 +15,7 @@
 #include <tqwhatsthis.h>
 #include <tqpopupmenu.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <tdeaction.h>
 #include <tdefiledialog.h>
@@ -24,7 +24,7 @@
 #include <tdeio/job.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/editinterface.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 
diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp
index a7ab3077..b766b064 100644
--- a/parts/diff/diffwidget.cpp
+++ b/parts/diff/diffwidget.cpp
@@ -17,13 +17,13 @@
 
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kservice.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tdeparts/componentfactory.h>
 #include <tdeparts/part.h>
diff --git a/parts/distpart/distpart_part.cpp b/parts/distpart/distpart_part.cpp
index b6e86da0..e8a3e11a 100644
--- a/parts/distpart/distpart_part.cpp
+++ b/parts/distpart/distpart_part.cpp
@@ -22,7 +22,7 @@
 #include <tqwhatsthis.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
 
diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp
index b29b4d6c..c628fe26 100644
--- a/parts/distpart/distpart_widget.cpp
+++ b/parts/distpart/distpart_widget.cpp
@@ -26,11 +26,11 @@
 #include <kprocess.h>
 #include <tdefiledialog.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "kdevproject.h"
 #include "domutil.h"
 #include <ktar.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <kdevcore.h>
 #include <tqgroupbox.h>
diff --git a/parts/distpart/specsupport.cpp b/parts/distpart/specsupport.cpp
index a942d69e..f6cb69f2 100644
--- a/parts/distpart/specsupport.cpp
+++ b/parts/distpart/specsupport.cpp
@@ -25,7 +25,7 @@
 
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <tqfile.h>
 #include <tqdir.h>
diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp
index 7b2945f4..f626e246 100644
--- a/parts/documentation/bookmarkview.cpp
+++ b/parts/documentation/bookmarkview.cpp
@@ -25,7 +25,7 @@
 
 #include <klineedit.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <kpushbutton.h>
 #include <kurlrequester.h>
diff --git a/parts/documentation/contentsview.cpp b/parts/documentation/contentsview.cpp
index 2d1c8230..532feefd 100644
--- a/parts/documentation/contentsview.cpp
+++ b/parts/documentation/contentsview.cpp
@@ -24,7 +24,7 @@
 
 #include <kdebug.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kdevpartcontroller.h>
 #include <kdevdocumentationplugin.h>
diff --git a/parts/documentation/docconfiglistview.cpp b/parts/documentation/docconfiglistview.cpp
index 055daeb5..d2753653 100644
--- a/parts/documentation/docconfiglistview.cpp
+++ b/parts/documentation/docconfiglistview.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "docconfiglistview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kdevdocumentationplugin.h"
 
diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp
index ce93d565..624236e8 100644
--- a/parts/documentation/documentation_part.cpp
+++ b/parts/documentation/documentation_part.cpp
@@ -32,7 +32,7 @@
 #include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktrader.h>
 #include <kdebug.h>
 #include <tdeparts/componentfactory.h>
diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp
index e0fb4065..b1ab69ca 100644
--- a/parts/documentation/documentation_widget.cpp
+++ b/parts/documentation/documentation_widget.cpp
@@ -26,7 +26,7 @@
 #include <tdeparts/part.h>
 #include <klibloader.h>
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
diff --git a/parts/documentation/docutils.cpp b/parts/documentation/docutils.cpp
index 879177db..5360a73f 100644
--- a/parts/documentation/docutils.cpp
+++ b/parts/documentation/docutils.cpp
@@ -24,7 +24,7 @@
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstringhandler.h>
 
 #include <kdevpartcontroller.h>
diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp
index 91f94af8..ebddcd4c 100644
--- a/parts/documentation/find_documentation.cpp
+++ b/parts/documentation/find_documentation.cpp
@@ -39,7 +39,7 @@
 #include "docutils.h"
 #include "contentsview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 FindDocumentation::FindDocumentation(DocumentationWidget* parent, const char* name)
     :FindDocumentationBase(parent, name),
diff --git a/parts/documentation/find_documentation_options.cpp b/parts/documentation/find_documentation_options.cpp
index 4772f27b..ef0deaca 100644
--- a/parts/documentation/find_documentation_options.cpp
+++ b/parts/documentation/find_documentation_options.cpp
@@ -23,7 +23,7 @@
 #include <tqcheckbox.h>
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tdeconfig.h>
 #include <tdeapplication.h>
diff --git a/parts/documentation/indexview.cpp b/parts/documentation/indexview.cpp
index ad61b4f3..cae33db5 100644
--- a/parts/documentation/indexview.cpp
+++ b/parts/documentation/indexview.cpp
@@ -26,7 +26,7 @@
 
 #include <klineedit.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kdebug.h>
 
diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
index 5aee560e..afc9abad 100644
--- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp
+++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
@@ -29,7 +29,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 //class DocumentationItem
 
diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp
index c23784a3..5acecce3 100644
--- a/parts/documentation/plugins/chm/docchmplugin.cpp
+++ b/parts/documentation/plugins/chm/docchmplugin.cpp
@@ -22,7 +22,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <tdeio/netaccess.h>
 #include <iostream>
diff --git a/parts/documentation/plugins/custom/doccustomplugin.cpp b/parts/documentation/plugins/custom/doccustomplugin.cpp
index c187b462..dd141eba 100644
--- a/parts/documentation/plugins/custom/doccustomplugin.cpp
+++ b/parts/documentation/plugins/custom/doccustomplugin.cpp
@@ -22,7 +22,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 
 #include <kdevgenericfactory.h>
diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
index 1c151777..4f2d50d6 100644
--- a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
+++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
@@ -29,7 +29,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <kdevgenericfactory.h>
diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.cpp b/parts/documentation/plugins/djvu/docdjvuplugin.cpp
index 2a06f76c..7851a516 100644
--- a/parts/documentation/plugins/djvu/docdjvuplugin.cpp
+++ b/parts/documentation/plugins/djvu/docdjvuplugin.cpp
@@ -22,7 +22,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 
 #include <kdevgenericfactory.h>
diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
index c4ae9306..9a5a6912 100644
--- a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
+++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
@@ -31,7 +31,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <urlutil.h>
diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
index 7cc7e47c..fa17549b 100644
--- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
+++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
@@ -29,7 +29,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kstandarddirs.h>
 
diff --git a/parts/documentation/plugins/pdb/docpdbplugin.cpp b/parts/documentation/plugins/pdb/docpdbplugin.cpp
index 7d9ef39c..fc647d34 100644
--- a/parts/documentation/plugins/pdb/docpdbplugin.cpp
+++ b/parts/documentation/plugins/pdb/docpdbplugin.cpp
@@ -22,7 +22,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 
 #include <kdevgenericfactory.h>
diff --git a/parts/documentation/plugins/pdf/docpdfplugin.cpp b/parts/documentation/plugins/pdf/docpdfplugin.cpp
index 639232d2..65bddd1b 100644
--- a/parts/documentation/plugins/pdf/docpdfplugin.cpp
+++ b/parts/documentation/plugins/pdf/docpdfplugin.cpp
@@ -22,7 +22,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 
 #include <kdevgenericfactory.h>
diff --git a/parts/documentation/plugins/qt/docqtplugin.cpp b/parts/documentation/plugins/qt/docqtplugin.cpp
index 8736a549..10271524 100644
--- a/parts/documentation/plugins/qt/docqtplugin.cpp
+++ b/parts/documentation/plugins/qt/docqtplugin.cpp
@@ -28,7 +28,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 
 #include <urlutil.h>
diff --git a/parts/documentation/protocols/chm/chm.cpp b/parts/documentation/protocols/chm/chm.cpp
index 1d208ca5..787a8f32 100644
--- a/parts/documentation/protocols/chm/chm.cpp
+++ b/parts/documentation/protocols/chm/chm.cpp
@@ -27,10 +27,10 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kurl.h>
 #include <kmimemagic.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include "chm.h"
 
diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp
index f985bf43..952228c4 100644
--- a/parts/documentation/protocols/chm/kchmpart.cpp
+++ b/parts/documentation/protocols/chm/kchmpart.cpp
@@ -18,9 +18,9 @@
 #include <tqstring.h>
 
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeaboutdata.h>
 
diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp
index 8c45aea6..0beeab40 100644
--- a/parts/documentation/searchview.cpp
+++ b/parts/documentation/searchview.cpp
@@ -34,13 +34,13 @@
 #include <tdelistview.h>
 #include <klineedit.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <kprocess.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include <kdevpartcontroller.h>
diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp
index a416fdc5..f59e29da 100644
--- a/parts/documentation/tools/htdig/htdigindex.cpp
+++ b/parts/documentation/tools/htdig/htdigindex.cpp
@@ -29,9 +29,9 @@
 #include <tdecmdlineargs.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 <kstandarddirs.h>
 #include <kprocess.h>
 #include <tdeversion.h>
diff --git a/parts/doxygen/doxygenconfigwidget.cpp b/parts/doxygen/doxygenconfigwidget.cpp
index d9e138e8..be0b2145 100644
--- a/parts/doxygen/doxygenconfigwidget.cpp
+++ b/parts/doxygen/doxygenconfigwidget.cpp
@@ -18,9 +18,9 @@
 #include <tqwhatsthis.h>
 #include <tqtextstream.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "config.h"
 #include "input.h"
diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp
index 04233e25..e37774cc 100644
--- a/parts/doxygen/doxygenpart.cpp
+++ b/parts/doxygen/doxygenpart.cpp
@@ -26,10 +26,10 @@
 #include <domutil.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdemainwindow.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/document.h>
diff --git a/parts/doxygen/input.cpp b/parts/doxygen/input.cpp
index f9ec69a8..6059bc10 100644
--- a/parts/doxygen/input.cpp
+++ b/parts/doxygen/input.cpp
@@ -18,9 +18,9 @@
 #include <tqpushbutton.h>
 #include <tqspinbox.h>
 #include <tqtooltip.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include "input.h"
diff --git a/parts/doxygen/messages.cpp b/parts/doxygen/messages.cpp
index 8819b109..76e932cd 100644
--- a/parts/doxygen/messages.cpp
+++ b/parts/doxygen/messages.cpp
@@ -2,7 +2,7 @@
 
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 static TQMap<TQCString,TQString> sMessages;
diff --git a/parts/filecreate/addglobaldlg.cpp b/parts/filecreate/addglobaldlg.cpp
index 90897630..c8c1676b 100644
--- a/parts/filecreate/addglobaldlg.cpp
+++ b/parts/filecreate/addglobaldlg.cpp
@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './addglobaldlg.ui'
 **
@@ -18,7 +18,7 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 /*
  *  Constructs a AddGlobalDlg as a child of 'parent', with the
diff --git a/parts/filecreate/fcconfigwidget.cpp b/parts/filecreate/fcconfigwidget.cpp
index dc818db1..7c6fabc4 100644
--- a/parts/filecreate/fcconfigwidget.cpp
+++ b/parts/filecreate/fcconfigwidget.cpp
@@ -24,8 +24,8 @@
 #include <tdeio/netaccess.h>
 #include <kurlrequester.h>
 #include <kicondialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
 
diff --git a/parts/filecreate/filecreate_listitem.cpp b/parts/filecreate/filecreate_listitem.cpp
index 6dd1e35a..e82f0f99 100644
--- a/parts/filecreate/filecreate_listitem.cpp
+++ b/parts/filecreate/filecreate_listitem.cpp
@@ -12,7 +12,7 @@
 
 #include "filecreate_listitem.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include <tqsimplerichtext.h>
diff --git a/parts/filecreate/filecreate_newfile.cpp b/parts/filecreate/filecreate_newfile.cpp
index b4b84de1..f1a69059 100644
--- a/parts/filecreate/filecreate_newfile.cpp
+++ b/parts/filecreate/filecreate_newfile.cpp
@@ -22,9 +22,9 @@
 #include <klineedit.h>
 #include <kurlrequester.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 namespace FileCreate {
diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp
index 192a22f5..19deeb66 100644
--- a/parts/filecreate/filecreate_part.cpp
+++ b/parts/filecreate/filecreate_part.cpp
@@ -18,7 +18,7 @@
 
 #include <tdeversion.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
@@ -28,7 +28,7 @@
 #include <tdeapplication.h>
 #include <tdeactionclasses.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kdevcore.h"
 #include "kdevmainwindow.h"
diff --git a/parts/filecreate/filecreate_widget2.cpp b/parts/filecreate/filecreate_widget2.cpp
index 57fbe8f3..4638725c 100644
--- a/parts/filecreate/filecreate_widget2.cpp
+++ b/parts/filecreate/filecreate_widget2.cpp
@@ -17,7 +17,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kdevcore.h>
 
diff --git a/parts/filecreate/filecreate_widget3.cpp b/parts/filecreate/filecreate_widget3.cpp
index 9226edf4..377d440b 100644
--- a/parts/filecreate/filecreate_widget3.cpp
+++ b/parts/filecreate/filecreate_widget3.cpp
@@ -16,7 +16,7 @@
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdevcore.h>
 
diff --git a/parts/filelist/filelist_widget.cpp b/parts/filelist/filelist_widget.cpp
index 2e5a240e..965e7ef1 100644
--- a/parts/filelist/filelist_widget.cpp
+++ b/parts/filelist/filelist_widget.cpp
@@ -18,7 +18,7 @@
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 
 #include <kdevcore.h>
diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp
index 86998619..45b5833b 100644
--- a/parts/filelist/projectviewpart.cpp
+++ b/parts/filelist/projectviewpart.cpp
@@ -38,11 +38,11 @@
 
 #include <tdemainwindow.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <tdetexteditor/encodinginterface.h>
 #include <tdeparts/part.h>
diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp
index 3e8d1f6b..a6b4a6bb 100644
--- a/parts/fileselector/fileselector_part.cpp
+++ b/parts/fileselector/fileselector_part.cpp
@@ -7,16 +7,16 @@
 #include <tqvbox.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <ktextbrowser.h>
 #include <tdeconfig.h>
 #include <tdefileitem.h>
 #include <kdevgenericfactory.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <kdevapi.h>
 #include <kdevcore.h>
diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp
index df40ab2a..fa637c43 100644
--- a/parts/fileselector/fileselector_widget.cpp
+++ b/parts/fileselector/fileselector_widget.cpp
@@ -57,10 +57,10 @@
 #include <kurlcompletion.h>
 #include <kprotocolinfo.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/parts/fileselector/fileselector_widget.h b/parts/fileselector/fileselector_widget.h
index e47f00c9..5ff80ed9 100644
--- a/parts/fileselector/fileselector_widget.h
+++ b/parts/fileselector/fileselector_widget.h
@@ -27,7 +27,7 @@
 #include <kurl.h>
 #include <tdetoolbar.h>
 #include <tqframe.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 
 class KDevMainWindow;
 class KDevPartController;
diff --git a/parts/fileselector/kbookmarkhandler.cpp b/parts/fileselector/kbookmarkhandler.cpp
index 004411ff..935b9d86 100644
--- a/parts/fileselector/kbookmarkhandler.cpp
+++ b/parts/fileselector/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/parts/fileselector/tdeactionselector.cpp b/parts/fileselector/tdeactionselector.cpp
index a4c75543..f6fd628d 100644
--- a/parts/fileselector/tdeactionselector.cpp
+++ b/parts/fileselector/tdeactionselector.cpp
@@ -19,7 +19,7 @@
 
 #include "tdeactionselector.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdialog.h> // for spacingHint()
 #include <kdebug.h>
diff --git a/parts/fileview/addfilegroupdlg.cpp b/parts/fileview/addfilegroupdlg.cpp
index 6d020332..9c1cdb03 100644
--- a/parts/fileview/addfilegroupdlg.cpp
+++ b/parts/fileview/addfilegroupdlg.cpp
@@ -13,7 +13,7 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <kbuttonbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
 
diff --git a/parts/fileview/filegroupsconfigwidget.cpp b/parts/fileview/filegroupsconfigwidget.cpp
index 17f58f9a..75682040 100644
--- a/parts/fileview/filegroupsconfigwidget.cpp
+++ b/parts/fileview/filegroupsconfigwidget.cpp
@@ -13,7 +13,7 @@
 
 #include <tqlistview.h>
 #include <knotifyclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "domutil.h"
 #include "addfilegroupdlg.h"
diff --git a/parts/fileview/filegroupspart.cpp b/parts/fileview/filegroupspart.cpp
index f0f61e51..06023d73 100644
--- a/parts/fileview/filegroupspart.cpp
+++ b/parts/fileview/filegroupspart.cpp
@@ -18,7 +18,7 @@
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kdialogbase.h>
 
diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp
index 31ccc10f..42978c8e 100644
--- a/parts/fileview/filegroupswidget.cpp
+++ b/parts/fileview/filegroupswidget.cpp
@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kxmlguiclient.h>
 #include <tdeaction.h>
diff --git a/parts/fileview/filetreeviewwidgetimpl.cpp b/parts/fileview/filetreeviewwidgetimpl.cpp
index 759b3204..af6f9e1f 100644
--- a/parts/fileview/filetreeviewwidgetimpl.cpp
+++ b/parts/fileview/filetreeviewwidgetimpl.cpp
@@ -13,7 +13,7 @@
 #include <kxmlguiclient.h>
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeversion.h>
 
 #include <kdevproject.h>
diff --git a/parts/fileview/filetreewidget.cpp b/parts/fileview/filetreewidget.cpp
index 13c5080f..07c88689 100644
--- a/parts/fileview/filetreewidget.cpp
+++ b/parts/fileview/filetreewidget.cpp
@@ -20,7 +20,7 @@
 #include <tqcolor.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <tdefileitem.h>
 #include <kurl.h>
diff --git a/parts/fileview/fileviewpart.cpp b/parts/fileview/fileviewpart.cpp
index a49dddf7..ae4093e1 100644
--- a/parts/fileview/fileviewpart.cpp
+++ b/parts/fileview/fileviewpart.cpp
@@ -22,7 +22,7 @@
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kdialogbase.h>
 
diff --git a/parts/fileview/partwidget.cpp b/parts/fileview/partwidget.cpp
index f03b3101..bf68de83 100644
--- a/parts/fileview/partwidget.cpp
+++ b/parts/fileview/partwidget.cpp
@@ -20,7 +20,7 @@
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kdevversioncontrol.h"
 #include "kdevcore.h"
diff --git a/parts/fileview/vcsfiletreewidgetimpl.cpp b/parts/fileview/vcsfiletreewidgetimpl.cpp
index aac3fb38..450a6a58 100644
--- a/parts/fileview/vcsfiletreewidgetimpl.cpp
+++ b/parts/fileview/vcsfiletreewidgetimpl.cpp
@@ -14,7 +14,7 @@
 #include <tqpopupmenu.h>
 #include <kxmlguiclient.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 
diff --git a/parts/filter/filterpart.cpp b/parts/filter/filterpart.cpp
index b21cea0a..85b8494d 100644
--- a/parts/filter/filterpart.cpp
+++ b/parts/filter/filterpart.cpp
@@ -13,7 +13,7 @@
 
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/selectioninterface.h>
diff --git a/parts/filter/shellfilterdlg.cpp b/parts/filter/shellfilterdlg.cpp
index a381098e..f3aab949 100644
--- a/parts/filter/shellfilterdlg.cpp
+++ b/parts/filter/shellfilterdlg.cpp
@@ -17,8 +17,8 @@
 #include <kbuttonbox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
diff --git a/parts/filter/shellinsertdlg.cpp b/parts/filter/shellinsertdlg.cpp
index 7b46ff7d..d05c9a0a 100644
--- a/parts/filter/shellinsertdlg.cpp
+++ b/parts/filter/shellinsertdlg.cpp
@@ -17,8 +17,8 @@
 #include <tdeconfig.h>
 #include <kbuttonbox.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <klineedit.h>
 #include <kstdguiitem.h>
diff --git a/parts/fullscreen/fullscreen_part.cpp b/parts/fullscreen/fullscreen_part.cpp
index fcf2a771..b60530a2 100644
--- a/parts/fullscreen/fullscreen_part.cpp
+++ b/parts/fullscreen/fullscreen_part.cpp
@@ -10,11 +10,11 @@
  ***************************************************************************/
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kstdaction.h>
 #include <tdemainwindow.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 
 #include <kdevcore.h>
 #include <kdevmainwindow.h>
diff --git a/parts/grepview/grepdlg.cpp b/parts/grepview/grepdlg.cpp
index 7bd26a0f..93c1305f 100644
--- a/parts/grepview/grepdlg.cpp
+++ b/parts/grepview/grepdlg.cpp
@@ -23,9 +23,9 @@
 #include <kpushbutton.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <tqlabel.h>
diff --git a/parts/grepview/grepviewpart.cpp b/parts/grepview/grepviewpart.cpp
index 2e7b63e0..fea07907 100644
--- a/parts/grepview/grepviewpart.cpp
+++ b/parts/grepview/grepviewpart.cpp
@@ -15,7 +15,7 @@
 #include <tqvbox.h>
 #include <tqwhatsthis.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
diff --git a/parts/grepview/grepviewwidget.cpp b/parts/grepview/grepviewwidget.cpp
index f4cb34aa..a088f92c 100644
--- a/parts/grepview/grepviewwidget.cpp
+++ b/parts/grepview/grepviewwidget.cpp
@@ -15,7 +15,7 @@
 #include <tqpainter.h>
 #include <tqtoolbutton.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/selectioninterface.h>
@@ -24,7 +24,7 @@
 #include <ktabwidget.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 using namespace KTextEditor;
 
 #include "kdevcore.h"
diff --git a/parts/konsole/konsoleviewpart.cpp b/parts/konsole/konsoleviewpart.cpp
index f7dc8956..873ab790 100644
--- a/parts/konsole/konsoleviewpart.cpp
+++ b/parts/konsole/konsoleviewpart.cpp
@@ -15,7 +15,7 @@
 
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kdevcore.h"
 #include "kdevproject.h"
diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp
index cabc11f4..9de22794 100644
--- a/parts/outputviews/appoutputviewpart.cpp
+++ b/parts/outputviews/appoutputviewpart.cpp
@@ -14,7 +14,7 @@
 #include <tqwhatsthis.h>
 #include <tqdir.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kiconloader.h>
 #include <tdeparts/part.h>
diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp
index b2dba9d6..ab51c6a8 100644
--- a/parts/outputviews/appoutputwidget.cpp
+++ b/parts/outputviews/appoutputwidget.cpp
@@ -22,7 +22,7 @@
 #include <tqtextstream.h>
 #include <tqclipboard.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kstatusbar.h>
 #include <tdeapplication.h>
diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp
index cfc42904..51eeb8ee 100644
--- a/parts/outputviews/makeactionfilter.cpp
+++ b/parts/outputviews/makeactionfilter.cpp
@@ -16,7 +16,7 @@
 #include "makeactionfilter.moc"
 #include "makeitem.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 //#define DEBUG
 
diff --git a/parts/outputviews/makeitem.cpp b/parts/outputviews/makeitem.cpp
index e9d53ab1..b6d618c6 100644
--- a/parts/outputviews/makeitem.cpp
+++ b/parts/outputviews/makeitem.cpp
@@ -14,7 +14,7 @@
 #include <tqstylesheet.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "tdetexteditor/cursorinterface.h"
 
diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp
index 8937fa5d..c1df6522 100644
--- a/parts/outputviews/makeviewpart.cpp
+++ b/parts/outputviews/makeviewpart.cpp
@@ -14,7 +14,7 @@
 #include <tqwhatsthis.h>
 #include <tqdir.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kiconloader.h>
 #include <kdevgenericfactory.h>
diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp
index 4b247eed..543f97e1 100644
--- a/parts/outputviews/makewidget.cpp
+++ b/parts/outputviews/makewidget.cpp
@@ -23,10 +23,10 @@
 #include "urlutil.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 #include <kprocess.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kinstance.h>
 #include <kstatusbar.h>
diff --git a/parts/partexplorer/partexplorer_plugin.cpp b/parts/partexplorer/partexplorer_plugin.cpp
index 63fd15dc..d5240edb 100644
--- a/parts/partexplorer/partexplorer_plugin.cpp
+++ b/parts/partexplorer/partexplorer_plugin.cpp
@@ -12,7 +12,7 @@
 #include "partexplorer_plugin.h"
 
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
 #include <tdeaction.h>
diff --git a/parts/partexplorer/partexplorerform.cpp b/parts/partexplorer/partexplorerform.cpp
index 3284a69a..76e4fc50 100644
--- a/parts/partexplorer/partexplorerform.cpp
+++ b/parts/partexplorer/partexplorerform.cpp
@@ -18,8 +18,8 @@
 #include <tqlabel.h>
 
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kcombobox.h>
 #include <kservicetype.h> 
diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp
index 60bd2044..27dae954 100644
--- a/parts/quickopen/quickopen_part.cpp
+++ b/parts/quickopen/quickopen_part.cpp
@@ -25,7 +25,7 @@
 
 #include <tdeaction.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
diff --git a/parts/quickopen/quickopenclassdialog.cpp b/parts/quickopen/quickopenclassdialog.cpp
index 2248dfcc..f6f70701 100644
--- a/parts/quickopen/quickopenclassdialog.cpp
+++ b/parts/quickopen/quickopenclassdialog.cpp
@@ -23,7 +23,7 @@
 #include <kdevlanguagesupport.h>
 
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcompletion.h>
 #include <klineedit.h>
diff --git a/parts/quickopen/quickopenfiledialog.cpp b/parts/quickopen/quickopenfiledialog.cpp
index ba2a674b..88f4ea41 100644
--- a/parts/quickopen/quickopenfiledialog.cpp
+++ b/parts/quickopen/quickopenfiledialog.cpp
@@ -23,7 +23,7 @@
 
 
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcompletion.h>
 #include <klineedit.h>
diff --git a/parts/quickopen/quickopenfunctionchooseform.cpp b/parts/quickopen/quickopenfunctionchooseform.cpp
index b18da8b7..590b988f 100644
--- a/parts/quickopen/quickopenfunctionchooseform.cpp
+++ b/parts/quickopen/quickopenfunctionchooseform.cpp
@@ -19,7 +19,7 @@
  */
 
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kdebug.h>
 #include <ksqueezedtextlabel.h>
diff --git a/parts/quickopen/quickopenfunctiondialog.cpp b/parts/quickopen/quickopenfunctiondialog.cpp
index 4a3a0888..bbcab7e4 100644
--- a/parts/quickopen/quickopenfunctiondialog.cpp
+++ b/parts/quickopen/quickopenfunctiondialog.cpp
@@ -18,14 +18,14 @@
  *
  */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqvaluelist.h>
 
 #include <kcompletion.h>
 #include <kdebug.h>
 #include <tdelistbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 
 #include <kdevplugin.h>
diff --git a/parts/regexptest/regexptestdlg.cpp b/parts/regexptest/regexptestdlg.cpp
index 95988bde..eddaa84d 100644
--- a/parts/regexptest/regexptestdlg.cpp
+++ b/parts/regexptest/regexptestdlg.cpp
@@ -24,8 +24,8 @@
 #include <tdeversion.h>
 #include <kregexp.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <tdetexteditor/editinterface.h>
diff --git a/parts/regexptest/regexptestpart.cpp b/parts/regexptest/regexptestpart.cpp
index 49d8b702..12cf860c 100644
--- a/parts/regexptest/regexptestpart.cpp
+++ b/parts/regexptest/regexptestpart.cpp
@@ -11,7 +11,7 @@
 
 #include "regexptestpart.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
 #include <tdeaction.h>
diff --git a/parts/replace/replace_part.cpp b/parts/replace/replace_part.cpp
index 7dfaaaf0..447548ef 100644
--- a/parts/replace/replace_part.cpp
+++ b/parts/replace/replace_part.cpp
@@ -14,7 +14,7 @@
 
 #include <tdeaction.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
 #include <kdebug.h>
diff --git a/parts/replace/replace_widget.cpp b/parts/replace/replace_widget.cpp
index fd7da41d..6b1bcbda 100644
--- a/parts/replace/replace_widget.cpp
+++ b/parts/replace/replace_widget.cpp
@@ -32,7 +32,7 @@
 #include <kdevproject.h>
 #include <kdevpartcontroller.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 
 #include <tqlayout.h>
diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp
index a2b8d1a3..80a33c9e 100644
--- a/parts/scripting/scriptingpart.cpp
+++ b/parts/scripting/scriptingpart.cpp
@@ -24,11 +24,11 @@
 #include <tqpopupmenu.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdevplugininfo.h>
 #include <kdevgenericfactory.h>
 
diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp
index ba30761f..82969151 100644
--- a/parts/snippet/snippet_part.cpp
+++ b/parts/snippet/snippet_part.cpp
@@ -11,7 +11,7 @@
 
 #include <tdeaction.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tqvbox.h>
 #include <kdialogbase.h>
diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp
index 279dc18b..9cd4ae4b 100644
--- a/parts/snippet/snippet_widget.cpp
+++ b/parts/snippet/snippet_widget.cpp
@@ -10,14 +10,14 @@
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <kpushbutton.h>
 #include <tdelistview.h>
 #include <tqheader.h>
 #include <klineedit.h>
 #include <ktextedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqsplitter.h>
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/editor.h>
diff --git a/parts/snippet/snippetdlg.ui.h b/parts/snippet/snippetdlg.ui.h
index 103a49b0..a62c722e 100644
--- a/parts/snippet/snippetdlg.ui.h
+++ b/parts/snippet/snippetdlg.ui.h
@@ -13,7 +13,7 @@
 ** init() function in place of a constructor, and a destroy() function in
 ** place of a destructor.
 *****************************************************************************/
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 void SnippetDlg::slotHelp()
 {
diff --git a/parts/snippet/snippetitem.h b/parts/snippet/snippetitem.h
index f534987c..0bf4e6a9 100644
--- a/parts/snippet/snippetitem.h
+++ b/parts/snippet/snippetitem.h
@@ -10,7 +10,7 @@
 #define SNIPPETITEM_H
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class TQString;
 
diff --git a/parts/texttools/texttoolspart.cpp b/parts/texttools/texttoolspart.cpp
index 0450782f..c500322d 100644
--- a/parts/texttools/texttoolspart.cpp
+++ b/parts/texttools/texttoolspart.cpp
@@ -13,7 +13,7 @@
 
 #include <tqwhatsthis.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
 #include <tdetexteditor/editinterface.h>
diff --git a/parts/texttools/texttoolswidget.cpp b/parts/texttools/texttoolswidget.cpp
index d1f5def4..82b9ac32 100644
--- a/parts/texttools/texttoolswidget.cpp
+++ b/parts/texttools/texttoolswidget.cpp
@@ -15,7 +15,7 @@
 #include <tqregexp.h>
 #include <tqtimer.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <tdepopupmenu.h>
 #include <tdetexteditor/viewcursorinterface.h>
diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp
index cb66d60e..6cd63deb 100644
--- a/parts/tipofday/tipofday_part.cpp
+++ b/parts/tipofday/tipofday_part.cpp
@@ -11,7 +11,7 @@
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <ktextbrowser.h>
 #include <ktip.h>
diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp
index 4affd6dc..8c13a4ea 100644
--- a/parts/tools/kapplicationtree.cpp
+++ b/parts/tools/kapplicationtree.cpp
@@ -38,9 +38,9 @@
 #include <kcombobox.h>
 #include <kdesktopfile.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kmimemagic.h>
 #include <krun.h>
diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp
index 1d1b4505..8734eadc 100644
--- a/parts/tools/tools_part.cpp
+++ b/parts/tools/tools_part.cpp
@@ -14,7 +14,7 @@
 #include <kdesktopfile.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <kprocess.h>
 #include <tdetexteditor/document.h>
diff --git a/parts/tools/toolsconfig.cpp b/parts/tools/toolsconfig.cpp
index 9d6e0f95..f21713e9 100644
--- a/parts/tools/toolsconfig.cpp
+++ b/parts/tools/toolsconfig.cpp
@@ -11,7 +11,7 @@
 #include <kdesktopfile.h>
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "tools_part.h"
 #include "kapplicationtree.h"
diff --git a/parts/tools/toolsconfigwidget.cpp b/parts/tools/toolsconfigwidget.cpp
index f6cec15a..11b352af 100644
--- a/parts/tools/toolsconfigwidget.cpp
+++ b/parts/tools/toolsconfigwidget.cpp
@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <kdesktopfile.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <kurldrag.h>
 
diff --git a/parts/uimode/uichooser_part.cpp b/parts/uimode/uichooser_part.cpp
index 855f4daf..fdc9fa6a 100644
--- a/parts/uimode/uichooser_part.cpp
+++ b/parts/uimode/uichooser_part.cpp
@@ -5,7 +5,7 @@
 #include <kdialogbase.h>
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevcore.h>
 #include <configwidgetproxy.h>
 #include <kdevplugininfo.h>
diff --git a/parts/valgrind/valgrind_dialog.cpp b/parts/valgrind/valgrind_dialog.cpp
index 6e0690b7..d32a74e4 100644
--- a/parts/valgrind/valgrind_dialog.cpp
+++ b/parts/valgrind/valgrind_dialog.cpp
@@ -4,11 +4,11 @@
 #include <tqwidgetstack.h>
 
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <klineedit.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "dialog_widget.h"
 #include "valgrind_dialog.h"
diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp
index 85a392fd..1b262175 100644
--- a/parts/valgrind/valgrind_part.cpp
+++ b/parts/valgrind/valgrind_part.cpp
@@ -5,11 +5,11 @@
 #include <tqfile.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <tdeaction.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
 
diff --git a/parts/valgrind/valgrind_widget.cpp b/parts/valgrind/valgrind_widget.cpp
index a1e17396..70484704 100644
--- a/parts/valgrind/valgrind_widget.cpp
+++ b/parts/valgrind/valgrind_widget.cpp
@@ -7,7 +7,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 
 #include <kdevcore.h>
diff --git a/parts/vcsmanager/vcsmanagerpart.cpp b/parts/vcsmanager/vcsmanagerpart.cpp
index f2d27387..ec176c47 100644
--- a/parts/vcsmanager/vcsmanagerpart.cpp
+++ b/parts/vcsmanager/vcsmanagerpart.cpp
@@ -24,11 +24,11 @@
 #include <tqpopupmenu.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdevplugininfo.h>
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
diff --git a/parts/vcsmanager/vcsmanagerprojectconfig.cpp b/parts/vcsmanager/vcsmanagerprojectconfig.cpp
index 2fe41c9c..8bb84aeb 100644
--- a/parts/vcsmanager/vcsmanagerprojectconfig.cpp
+++ b/parts/vcsmanager/vcsmanagerprojectconfig.cpp
@@ -21,7 +21,7 @@
 #include <tqstring.h>
 
 #include <ktrader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "domutil.h"