From bd3c603465110b74a0ddcee72e6f020a78d44e59 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 22:00:22 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 buildtools/ada/adaproject_part.cpp                     | 4 ++--
 buildtools/ada/adaprojectoptionsdlg.cpp                | 4 ++--
 buildtools/autotools/addapplicationdlg.cpp             | 4 ++--
 buildtools/autotools/addexistingdirectoriesdlg.cpp     | 2 +-
 buildtools/autotools/addexistingfilesdlg.cpp           | 2 +-
 buildtools/autotools/addfiledlg.cpp                    | 2 +-
 buildtools/autotools/addicondlg.cpp                    | 2 +-
 buildtools/autotools/addprefixdlg.cpp                  | 2 +-
 buildtools/autotools/addservicedlg.cpp                 | 4 ++--
 buildtools/autotools/addsubprojectdlg.cpp              | 2 +-
 buildtools/autotools/addtargetdlg.cpp                  | 4 ++--
 buildtools/autotools/addtranslationdlg.cpp             | 4 ++--
 buildtools/autotools/autodetailsview.cpp               | 2 +-
 buildtools/autotools/autoprojectpart.cpp               | 4 ++--
 buildtools/autotools/autoprojectwidget.cpp             | 2 +-
 buildtools/autotools/autoprojectwidget.h               | 2 +-
 buildtools/autotools/autosubprojectview.cpp            | 4 ++--
 buildtools/autotools/choosetargetdialog.cpp            | 2 +-
 buildtools/autotools/configureoptionswidget.cpp        | 4 ++--
 buildtools/autotools/fileselectorwidget.cpp            | 4 ++--
 buildtools/autotools/fileselectorwidget.h              | 2 +-
 buildtools/autotools/kimporticonview.cpp               | 4 ++--
 buildtools/autotools/managecustomcommand.cpp           | 2 +-
 buildtools/autotools/removetargetdlg.cpp               | 2 +-
 buildtools/autotools/subprojectoptionsdlg.cpp          | 2 +-
 buildtools/autotools/targetoptionsdlg.cpp              | 2 +-
 buildtools/custommakefiles/custommakeconfigwidget.cpp  | 2 +-
 buildtools/custommakefiles/custommanagerwidget.cpp     | 2 +-
 buildtools/custommakefiles/customotherconfigwidget.cpp | 2 +-
 buildtools/custommakefiles/customprojectpart.cpp       | 4 ++--
 buildtools/custommakefiles/selectnewfilesdialog.cpp    | 2 +-
 buildtools/lib/widgets/addenvvardlg.cpp                | 2 +-
 buildtools/lib/widgets/addfilesdialog.cpp              | 2 +-
 buildtools/lib/widgets/runoptionswidget.cpp            | 2 +-
 buildtools/pascal/pascalproject_part.cpp               | 4 ++--
 buildtools/pascal/pascalprojectoptionsdlg.cpp          | 4 ++--
 buildtools/qmake/createscopedlg.cpp                    | 4 ++--
 buildtools/qmake/projectconfigurationdlg.cpp           | 4 ++--
 buildtools/qmake/qmakedefaultopts.cpp                  | 2 +-
 buildtools/qmake/qmakescopeitem.cpp                    | 2 +-
 buildtools/qmake/scope.cpp                             | 4 ++--
 buildtools/qmake/trollprojectpart.cpp                  | 4 ++--
 buildtools/qmake/trollprojectwidget.cpp                | 2 +-
 buildtools/qmake/trollprojectwidget.h                  | 2 +-
 buildtools/script/scriptnewfiledlg.cpp                 | 4 ++--
 buildtools/script/scriptprojectpart.cpp                | 4 ++--
 46 files changed, 66 insertions(+), 66 deletions(-)

(limited to 'buildtools')

diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp
index ba77c3d3..32833dfd 100644
--- a/buildtools/ada/adaproject_part.cpp
+++ b/buildtools/ada/adaproject_part.cpp
@@ -16,12 +16,12 @@
 #include <tqvbox.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klibloader.h>
 #include <kprocess.h>
 #include <kservice.h>
diff --git a/buildtools/ada/adaprojectoptionsdlg.cpp b/buildtools/ada/adaprojectoptionsdlg.cpp
index 436316f6..28549efc 100644
--- a/buildtools/ada/adaprojectoptionsdlg.cpp
+++ b/buildtools/ada/adaprojectoptionsdlg.cpp
@@ -9,8 +9,8 @@
 #include <kurlrequester.h>
 #include <kservice.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <tqlineedit.h>
 #include <tqcombobox.h>
diff --git a/buildtools/autotools/addapplicationdlg.cpp b/buildtools/autotools/addapplicationdlg.cpp
index d7c6e3e6..ce8fe262 100644
--- a/buildtools/autotools/addapplicationdlg.cpp
+++ b/buildtools/autotools/addapplicationdlg.cpp
@@ -21,8 +21,8 @@
 #include <klineedit.h>
 #include <kdebug.h>
 #include <kicondialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 
 #include "autolistviewitems.h"
diff --git a/buildtools/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp
index 1fe346aa..6af3be99 100644
--- a/buildtools/autotools/addexistingdirectoriesdlg.cpp
+++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp
@@ -18,7 +18,7 @@
 #include <tqlayout.h>
 
 #include <kprogress.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <kprocess.h>
 
diff --git a/buildtools/autotools/addexistingfilesdlg.cpp b/buildtools/autotools/addexistingfilesdlg.cpp
index 5e6be576..20dbf41b 100644
--- a/buildtools/autotools/addexistingfilesdlg.cpp
+++ b/buildtools/autotools/addexistingfilesdlg.cpp
@@ -32,7 +32,7 @@
 #include <kprogress.h>
 #include <kprocess.h>
 #include <kurldrag.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <kiconview.h>
 #include <ksqueezedtextlabel.h>
diff --git a/buildtools/autotools/addfiledlg.cpp b/buildtools/autotools/addfiledlg.cpp
index 34108fb3..926fa370 100644
--- a/buildtools/autotools/addfiledlg.cpp
+++ b/buildtools/autotools/addfiledlg.cpp
@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksqueezedtextlabel.h>
 #include <kurl.h>
 
diff --git a/buildtools/autotools/addicondlg.cpp b/buildtools/autotools/addicondlg.cpp
index 965d3b4e..7491c70e 100644
--- a/buildtools/autotools/addicondlg.cpp
+++ b/buildtools/autotools/addicondlg.cpp
@@ -15,7 +15,7 @@
 #include <tqlabel.h>
 #include <klineedit.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <kicontheme.h>
diff --git a/buildtools/autotools/addprefixdlg.cpp b/buildtools/autotools/addprefixdlg.cpp
index f37b6626..807abb41 100644
--- a/buildtools/autotools/addprefixdlg.cpp
+++ b/buildtools/autotools/addprefixdlg.cpp
@@ -16,7 +16,7 @@
 #include <tqpushbutton.h>
 #include <kbuttonbox.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
 
diff --git a/buildtools/autotools/addservicedlg.cpp b/buildtools/autotools/addservicedlg.cpp
index e8e47c98..c5a36dfc 100644
--- a/buildtools/autotools/addservicedlg.cpp
+++ b/buildtools/autotools/addservicedlg.cpp
@@ -20,8 +20,8 @@
 #include <kdebug.h>
 #include <kicondialog.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kservicetype.h>
 
 #include "autolistviewitems.h"
diff --git a/buildtools/autotools/addsubprojectdlg.cpp b/buildtools/autotools/addsubprojectdlg.cpp
index 373a3861..ef61cd3a 100644
--- a/buildtools/autotools/addsubprojectdlg.cpp
+++ b/buildtools/autotools/addsubprojectdlg.cpp
@@ -21,7 +21,7 @@
 #include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "autolistviewitems.h"
 
diff --git a/buildtools/autotools/addtargetdlg.cpp b/buildtools/autotools/addtargetdlg.cpp
index d2a832c1..21de4bd0 100644
--- a/buildtools/autotools/addtargetdlg.cpp
+++ b/buildtools/autotools/addtargetdlg.cpp
@@ -17,8 +17,8 @@
 #include <tqvalidator.h>
 
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <ksqueezedtextlabel.h>
 
 #include "autolistviewitems.h"
diff --git a/buildtools/autotools/addtranslationdlg.cpp b/buildtools/autotools/addtranslationdlg.cpp
index 2498a73e..c1a10eb9 100644
--- a/buildtools/autotools/addtranslationdlg.cpp
+++ b/buildtools/autotools/addtranslationdlg.cpp
@@ -22,8 +22,8 @@
 #include <tqstrlist.h>
 #include <kbuttonbox.h>
 #include <kdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
 
diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp
index 82c7a22c..91b6d75c 100644
--- a/buildtools/autotools/autodetailsview.cpp
+++ b/buildtools/autotools/autodetailsview.cpp
@@ -27,7 +27,7 @@
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <tdepopupmenu.h>
 
diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp
index 1606873e..940c9924 100644
--- a/buildtools/autotools/autoprojectpart.cpp
+++ b/buildtools/autotools/autoprojectpart.cpp
@@ -37,9 +37,9 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeparts/part.h>
 #include <tdeversion.h>
 #include <kprocess.h>
diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp
index a6341b0b..b8e1b700 100644
--- a/buildtools/autotools/autoprojectwidget.cpp
+++ b/buildtools/autotools/autoprojectwidget.cpp
@@ -35,7 +35,7 @@
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kregexp.h>
 #include <kurl.h>
 #include <tdefile.h>
diff --git a/buildtools/autotools/autoprojectwidget.h b/buildtools/autotools/autoprojectwidget.h
index 8ad8bf7e..f827d93b 100644
--- a/buildtools/autotools/autoprojectwidget.h
+++ b/buildtools/autotools/autoprojectwidget.h
@@ -25,7 +25,7 @@
 #include <tqlayout.h>
 #include <tqtoolbutton.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "domutil.h"
 #include "makefilehandler.h"
diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp
index 0015f688..8353e2ea 100644
--- a/buildtools/autotools/autosubprojectview.cpp
+++ b/buildtools/autotools/autosubprojectview.cpp
@@ -24,9 +24,9 @@
 #include <kxmlguiclient.h>
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <kprocess.h>
 #include <ksqueezedtextlabel.h>
diff --git a/buildtools/autotools/choosetargetdialog.cpp b/buildtools/autotools/choosetargetdialog.cpp
index ef33ae14..8b59545f 100644
--- a/buildtools/autotools/choosetargetdialog.cpp
+++ b/buildtools/autotools/choosetargetdialog.cpp
@@ -30,7 +30,7 @@
 #include <kdialog.h>
 #include <kdebug.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <ksqueezedtextlabel.h>
 #include <kurl.h>
diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp
index 53f3cb3c..944c8aab 100644
--- a/buildtools/autotools/configureoptionswidget.cpp
+++ b/buildtools/autotools/configureoptionswidget.cpp
@@ -24,8 +24,8 @@
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kservice.h>
 #include <ktrader.h>
 
diff --git a/buildtools/autotools/fileselectorwidget.cpp b/buildtools/autotools/fileselectorwidget.cpp
index 842358e4..c10db050 100644
--- a/buildtools/autotools/fileselectorwidget.cpp
+++ b/buildtools/autotools/fileselectorwidget.cpp
@@ -28,13 +28,13 @@
 #include <kurlcompletion.h>
 #include <kprotocolinfo.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 
 #include <kdebug.h>
 
 #include "fileselectorwidget.h"
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <kcombiview.h>
 #include <tdefilepreview.h>
 #include <tdefileview.h>
diff --git a/buildtools/autotools/fileselectorwidget.h b/buildtools/autotools/fileselectorwidget.h
index 67becdc7..a03ad906 100644
--- a/buildtools/autotools/fileselectorwidget.h
+++ b/buildtools/autotools/fileselectorwidget.h
@@ -31,7 +31,7 @@
 #include <tdefileview.h>
 #include <tdefileitem.h>
 
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 
 class AutoProjectPart;
 class SubprojectItem;
diff --git a/buildtools/autotools/kimporticonview.cpp b/buildtools/autotools/kimporticonview.cpp
index bf5296cd..d696ab2e 100644
--- a/buildtools/autotools/kimporticonview.cpp
+++ b/buildtools/autotools/kimporticonview.cpp
@@ -19,8 +19,8 @@
 #include <tqrect.h>
 #include <tqwidget.h>
 
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kwordwrap.h>
 
 #include "kimporticonview.h"
diff --git a/buildtools/autotools/managecustomcommand.cpp b/buildtools/autotools/managecustomcommand.cpp
index af0f0e93..6ee60cb7 100644
--- a/buildtools/autotools/managecustomcommand.cpp
+++ b/buildtools/autotools/managecustomcommand.cpp
@@ -20,7 +20,7 @@
 
 #include <tqtable.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 ManageCustomCommand::ManageCustomCommand(TQWidget *parent, const char *name)
     :ManageCustomBuildCommandsBase(parent, name)
diff --git a/buildtools/autotools/removetargetdlg.cpp b/buildtools/autotools/removetargetdlg.cpp
index 6bf6da27..dd501818 100644
--- a/buildtools/autotools/removetargetdlg.cpp
+++ b/buildtools/autotools/removetargetdlg.cpp
@@ -31,7 +31,7 @@
 #include <tdelistbox.h>
 #include <kprogress.h>
 #include <ksqueezedtextlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "autolistviewitems.h"
 
diff --git a/buildtools/autotools/subprojectoptionsdlg.cpp b/buildtools/autotools/subprojectoptionsdlg.cpp
index f25a3958..a7871b7d 100644
--- a/buildtools/autotools/subprojectoptionsdlg.cpp
+++ b/buildtools/autotools/subprojectoptionsdlg.cpp
@@ -24,7 +24,7 @@
 #include <kdialog.h>
 #include <keditlistbox.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 #include <kservice.h>
 #include <kurlrequesterdlg.h>
diff --git a/buildtools/autotools/targetoptionsdlg.cpp b/buildtools/autotools/targetoptionsdlg.cpp
index bc81ef30..e8e0c248 100644
--- a/buildtools/autotools/targetoptionsdlg.cpp
+++ b/buildtools/autotools/targetoptionsdlg.cpp
@@ -23,7 +23,7 @@
 #include <kurlrequesterdlg.h>
 #include <kurlrequester.h>
 #include <kurlcompletion.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 #include <tdefiledialog.h>
 #include "autolistviewitems.h"
diff --git a/buildtools/custommakefiles/custommakeconfigwidget.cpp b/buildtools/custommakefiles/custommakeconfigwidget.cpp
index 354e8777..6a12cdfb 100644
--- a/buildtools/custommakefiles/custommakeconfigwidget.cpp
+++ b/buildtools/custommakefiles/custommakeconfigwidget.cpp
@@ -24,7 +24,7 @@
 #include <tqvalidator.h>
 #include <klineedit.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <environmentvariableswidget.h>
 
diff --git a/buildtools/custommakefiles/custommanagerwidget.cpp b/buildtools/custommakefiles/custommanagerwidget.cpp
index 6c09541b..85f77d52 100644
--- a/buildtools/custommakefiles/custommanagerwidget.cpp
+++ b/buildtools/custommakefiles/custommanagerwidget.cpp
@@ -22,7 +22,7 @@
 #include <kurlcompletion.h>
 #include <tdefiledialog.h>
 #include <keditlistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "customprojectpart.h"
diff --git a/buildtools/custommakefiles/customotherconfigwidget.cpp b/buildtools/custommakefiles/customotherconfigwidget.cpp
index 67f168c2..945d7c91 100644
--- a/buildtools/custommakefiles/customotherconfigwidget.cpp
+++ b/buildtools/custommakefiles/customotherconfigwidget.cpp
@@ -25,7 +25,7 @@
 #include <tqgroupbox.h>
 #include <tqvalidator.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <environmentvariableswidget.h>
 
diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp
index 889e68b3..92f2fe24 100644
--- a/buildtools/custommakefiles/customprojectpart.cpp
+++ b/buildtools/custommakefiles/customprojectpart.cpp
@@ -33,9 +33,9 @@
 #include <keditlistbox.h>
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeparts/part.h>
 #include <tdepopupmenu.h>
 #include <tdeversion.h>
diff --git a/buildtools/custommakefiles/selectnewfilesdialog.cpp b/buildtools/custommakefiles/selectnewfilesdialog.cpp
index ce418ad4..a223c87a 100644
--- a/buildtools/custommakefiles/selectnewfilesdialog.cpp
+++ b/buildtools/custommakefiles/selectnewfilesdialog.cpp
@@ -16,7 +16,7 @@
 #include <tdelistview.h>
 #include <tqheader.h>
 #include <tqstringlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include "selectnewfilesdialogbase.h"
 
diff --git a/buildtools/lib/widgets/addenvvardlg.cpp b/buildtools/lib/widgets/addenvvardlg.cpp
index 23cc9b57..b395a375 100644
--- a/buildtools/lib/widgets/addenvvardlg.cpp
+++ b/buildtools/lib/widgets/addenvvardlg.cpp
@@ -21,7 +21,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/buildtools/lib/widgets/addfilesdialog.cpp b/buildtools/lib/widgets/addfilesdialog.cpp
index b3f31ce9..f02d5b56 100644
--- a/buildtools/lib/widgets/addfilesdialog.cpp
+++ b/buildtools/lib/widgets/addfilesdialog.cpp
@@ -16,7 +16,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 #include <tqcombobox.h>
diff --git a/buildtools/lib/widgets/runoptionswidget.cpp b/buildtools/lib/widgets/runoptionswidget.cpp
index 079f436e..19b072d1 100644
--- a/buildtools/lib/widgets/runoptionswidget.cpp
+++ b/buildtools/lib/widgets/runoptionswidget.cpp
@@ -19,7 +19,7 @@
 
 #include "runoptionswidget.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kurlrequester.h>
 #include <kurlcompletion.h>
diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp
index 3c5cddcd..01b0734a 100644
--- a/buildtools/pascal/pascalproject_part.cpp
+++ b/buildtools/pascal/pascalproject_part.cpp
@@ -19,12 +19,12 @@
 #include <tqlabel.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klibloader.h>
 #include <kservice.h>
 #include <tdeconfig.h>
diff --git a/buildtools/pascal/pascalprojectoptionsdlg.cpp b/buildtools/pascal/pascalprojectoptionsdlg.cpp
index e878eec5..9c7c2518 100644
--- a/buildtools/pascal/pascalprojectoptionsdlg.cpp
+++ b/buildtools/pascal/pascalprojectoptionsdlg.cpp
@@ -11,8 +11,8 @@
 #include <kurlrequester.h>
 #include <kservice.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <tqlineedit.h>
 #include <tqcombobox.h>
diff --git a/buildtools/qmake/createscopedlg.cpp b/buildtools/qmake/createscopedlg.cpp
index 267bd471..dfb8683a 100644
--- a/buildtools/qmake/createscopedlg.cpp
+++ b/buildtools/qmake/createscopedlg.cpp
@@ -16,8 +16,8 @@
 #include <tqcheckbox.h>
 #include <tdefile.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kurlcompletion.h>
 
diff --git a/buildtools/qmake/projectconfigurationdlg.cpp b/buildtools/qmake/projectconfigurationdlg.cpp
index a74b0793..e2ebe9a2 100644
--- a/buildtools/qmake/projectconfigurationdlg.cpp
+++ b/buildtools/qmake/projectconfigurationdlg.cpp
@@ -42,8 +42,8 @@
 #include <tqtabwidget.h>
 #include <kpushbutton.h>
 #include <kcombobox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "trollprojectwidget.h"
 #include "trollprojectpart.h"
diff --git a/buildtools/qmake/qmakedefaultopts.cpp b/buildtools/qmake/qmakedefaultopts.cpp
index e0e7fa63..8c34c34b 100644
--- a/buildtools/qmake/qmakedefaultopts.cpp
+++ b/buildtools/qmake/qmakedefaultopts.cpp
@@ -12,7 +12,7 @@
 #include "qmakedefaultopts.h"
 
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqregexp.h>
 #include <kprocess.h>
 
diff --git a/buildtools/qmake/qmakescopeitem.cpp b/buildtools/qmake/qmakescopeitem.cpp
index 36c3d5e2..70e9a6ba 100644
--- a/buildtools/qmake/qmakescopeitem.cpp
+++ b/buildtools/qmake/qmakescopeitem.cpp
@@ -18,7 +18,7 @@
 #include <tqregexp.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
 
diff --git a/buildtools/qmake/scope.cpp b/buildtools/qmake/scope.cpp
index 2c862fb3..6cf86bf8 100644
--- a/buildtools/qmake/scope.cpp
+++ b/buildtools/qmake/scope.cpp
@@ -23,8 +23,8 @@
 
 #include <kdirwatch.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <stdlib.h>
 
 #include "urlutil.h"
diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp
index 50e12595..bd3b5c1a 100644
--- a/buildtools/qmake/trollprojectpart.cpp
+++ b/buildtools/qmake/trollprojectpart.cpp
@@ -22,8 +22,8 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdirwatch.h>
 #include <kstatusbar.h>
 #include <tqmessagebox.h>
diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp
index 0e0ca572..c7d21796 100644
--- a/buildtools/qmake/trollprojectwidget.cpp
+++ b/buildtools/qmake/trollprojectwidget.cpp
@@ -43,7 +43,7 @@
 #include <tqtooltip.h>
 #include <kdebug.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kregexp.h>
 #include <kurl.h>
diff --git a/buildtools/qmake/trollprojectwidget.h b/buildtools/qmake/trollprojectwidget.h
index fdc6ce74..a3ced6a1 100644
--- a/buildtools/qmake/trollprojectwidget.h
+++ b/buildtools/qmake/trollprojectwidget.h
@@ -27,7 +27,7 @@
 #include <tqvbox.h>
 #include <tqtoolbutton.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeversion.h>
 #include <tqbutton.h>
 #include <tqfileinfo.h>
diff --git a/buildtools/script/scriptnewfiledlg.cpp b/buildtools/script/scriptnewfiledlg.cpp
index da17fda1..3ac3fc9f 100644
--- a/buildtools/script/scriptnewfiledlg.cpp
+++ b/buildtools/script/scriptnewfiledlg.cpp
@@ -20,8 +20,8 @@
 #include <tqpushbutton.h>
 #include <kbuttonbox.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
 
diff --git a/buildtools/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp
index 89c38abb..dd5a4f25 100644
--- a/buildtools/script/scriptprojectpart.cpp
+++ b/buildtools/script/scriptprojectpart.cpp
@@ -21,8 +21,8 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdevgenericfactory.h>
 #include <kdevcreatefile.h>
 #include <kdirwatch.h>
-- 
cgit v1.2.1