Rename additional header files to avoid conflicts with KDE4

11 years ago · fa6008238f
parent d21f600cd2
commit fa6008238f
271 changed files with 418 additions and 418 deletions
--- a/digikam/digikam/album.cpp
+++ b/digikam/digikam/album.cpp
@ -24,7 +24,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>

 // Local includes.

--- a/digikam/digikam/albumdb.cpp
+++ b/digikam/digikam/albumdb.cpp
@ -47,7 +47,7 @@ extern "C"

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>

 // Local includes.

--- a/digikam/digikam/albumfiletip.cpp
+++ b/digikam/digikam/albumfiletip.cpp
@ -39,11 +39,11 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefileitem.h>
 #include <kmimetype.h>
-#include <kglobalsettings.h>
-#include <kglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
 #include <tdeversion.h>

 // LibKDcraw includes.
--- a/digikam/digikam/albumfolderview.cpp
+++ b/digikam/digikam/albumfolderview.cpp
@ -36,12 +36,12 @@

 // KDE includes.

-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kcalendarsystem.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
 #include <tdefiledialog.h>

--- a/digikam/digikam/albumicongroupitem.cpp
+++ b/digikam/digikam/albumicongroupitem.cpp
@ -28,8 +28,8 @@

 // KDE includes.

-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kcalendarsystem.h>

 // Local includes.
--- a/digikam/digikam/albumiconitem.cpp
+++ b/digikam/digikam/albumiconitem.cpp
@ -37,8 +37,8 @@
 // KDE includes.

 #include <kurl.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>

 // Local includes.
--- a/digikam/digikam/albumiconview.cpp
+++ b/digikam/digikam/albumiconview.cpp
@ -68,9 +68,9 @@ extern "C"
 #include <tdeapplication.h>
 #include <kurl.h>
 #include <kurldrag.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kpropsdlg.h>
 #include <ktrader.h>
--- a/digikam/digikam/albumiconviewfilter.cpp
+++ b/digikam/digikam/albumiconviewfilter.cpp
@ -28,7 +28,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>

 // Local includes.
--- a/digikam/digikam/albummanager.cpp
+++ b/digikam/digikam/albummanager.cpp
@ -53,9 +53,9 @@ extern "C"
 // KDE includes.

 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeversion.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/global.h>
--- a/digikam/digikam/albumpropsedit.cpp
+++ b/digikam/digikam/albumpropsedit.cpp
@ -46,9 +46,9 @@
 #include <kdatepicker.h>
 #include <ktextedit.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>

 #include <tdeversion.h>
--- a/digikam/digikam/albumsettings.cpp
+++ b/digikam/digikam/albumsettings.cpp
@ -30,7 +30,7 @@
 // KDE includes.

 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kdebug.h>

--- a/digikam/digikam/cameralist.cpp
+++ b/digikam/digikam/cameralist.cpp
@ -32,8 +32,8 @@

 // KDE includes.

-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>

 // Local includes.

--- a/digikam/digikam/daboutdata.h
+++ b/digikam/digikam/daboutdata.h
@ -56,7 +56,7 @@ extern "C"

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>

 static const char digikam_version[]     = "0.9.6";
--- a/digikam/digikam/datefolderview.cpp
+++ b/digikam/digikam/datefolderview.cpp
@ -34,8 +34,8 @@
 // KDE includes.

 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>

--- a/digikam/digikam/digikamapp.cpp
+++ b/digikam/digikam/digikamapp.cpp
@ -37,7 +37,7 @@
 // KDE includes.

 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <kstdaction.h>
@ -48,10 +48,10 @@
 #include <ktip.h>
 #include <tdeversion.h>
 #include <tdeapplication.h>
-#include <kmenubar.h>
-#include <kglobalsettings.h>
+#include <tdemenubar.h>
+#include <tdeglobalsettings.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <twin.h>
 #include <kimageio.h>
 #include <dcopref.h>
--- a/digikam/digikam/digikamfirstrun.cpp
+++ b/digikam/digikam/digikamfirstrun.cpp
@ -49,7 +49,7 @@ extern "C"

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
 #include <tdeapplication.h>
@ -57,7 +57,7 @@ extern "C"
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <kurlrequester.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>

 // Local includes.

--- a/digikam/digikam/digikamview.cpp
+++ b/digikam/digikam/digikamview.cpp
@ -42,7 +42,7 @@

 #include <kurl.h>
 #include <kpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
--- a/digikam/digikam/dio.cpp
+++ b/digikam/digikam/dio.cpp
@ -43,10 +43,10 @@ extern "C"
 // KDE includes.

 #include <kprotocolinfo.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeio/renamedlg.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>

 // Local includes.

--- a/digikam/digikam/firstrun.cpp
+++ b/digikam/digikam/firstrun.cpp
@ -34,7 +34,7 @@
 // KDE includes.

 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>

 // Local includes.

--- a/digikam/digikam/folderview.cpp
+++ b/digikam/digikam/folderview.cpp
@ -34,7 +34,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>

 // Local includes.

--- a/digikam/digikam/iconview.cpp
+++ b/digikam/digikam/iconview.cpp
@ -41,7 +41,7 @@
 // KDE includes.

 #include <kcursor.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>

 // Local includes.

--- a/digikam/digikam/imagepreviewview.cpp
+++ b/digikam/digikam/imagepreviewview.cpp
@ -35,7 +35,7 @@
 // KDE includes.

 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kservice.h>
 #include <krun.h>
 #include <ktrader.h>
--- a/digikam/digikam/kdateedit.cpp
+++ b/digikam/digikam/kdateedit.cpp
@ -31,9 +31,9 @@
 // KDE includes.

 #include <kcalendarsystem.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>

 // Local includes.

--- a/digikam/digikam/kdatepickerpopup.cpp
+++ b/digikam/digikam/kdatepickerpopup.cpp
@ -30,7 +30,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>

 // Local includes.

--- a/digikam/digikam/kipiinterface.cpp
+++ b/digikam/digikam/kipiinterface.cpp
@ -45,7 +45,7 @@ extern "C"

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdefilemetainfo.h>
 #include <tdeio/netaccess.h>
--- a/digikam/digikam/main.cpp
+++ b/digikam/digikam/main.cpp
@ -38,12 +38,12 @@
 #include <tdecmdlineargs.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <ktip.h>
 #include <tdeversion.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>

 // KIPI includes.

--- a/digikam/digikam/mediaplayerview.cpp
+++ b/digikam/digikam/mediaplayerview.cpp
@ -34,7 +34,7 @@
 #include <kmimetype.h>
 #include <kuserprofile.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>

 // Local includes.

--- a/digikam/digikam/mimefilter.cpp
+++ b/digikam/digikam/mimefilter.cpp
@ -28,8 +28,8 @@

 // KDE includes.

-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>

 // Local includes.

--- a/digikam/digikam/monthwidget.cpp
+++ b/digikam/digikam/monthwidget.cpp
@ -32,8 +32,8 @@

 // KDE includes.

-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kcalendarsystem.h>
 #include <tdeversion.h>

--- a/digikam/digikam/ratingfilter.cpp
+++ b/digikam/digikam/ratingfilter.cpp
@ -33,8 +33,8 @@
 // KDE includes.

 #include <kiconloader.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdepopupmenu.h>

--- a/digikam/digikam/ratingpopupmenu.cpp
+++ b/digikam/digikam/ratingpopupmenu.cpp
@ -30,8 +30,8 @@

 // KDE includes.

-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>

 // Local includes.
--- a/digikam/digikam/ratingwidget.cpp
+++ b/digikam/digikam/ratingwidget.cpp
@ -30,7 +30,7 @@

 // KDE includes.

-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>

 // Local includes.
--- a/digikam/digikam/scanlib.cpp
+++ b/digikam/digikam/scanlib.cpp
@ -48,9 +48,9 @@ extern "C"
 // KDE includes.

 #include <kprogress.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>

 // Local includes.
--- a/digikam/digikam/searchadvanceddialog.cpp
+++ b/digikam/digikam/searchadvanceddialog.cpp
@ -41,7 +41,7 @@

 #include <kurl.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>

 // Local includes.
--- a/digikam/digikam/searchfolderview.cpp
+++ b/digikam/digikam/searchfolderview.cpp
@ -33,11 +33,11 @@
 // KDE includes.

 #include <tdepopupmenu.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>

 #if KDE_IS_VERSION(3,2,0)
 #include <kinputdialog.h>
--- a/digikam/digikam/searchquickdialog.cpp
+++ b/digikam/digikam/searchquickdialog.cpp
@ -36,7 +36,7 @@
 // KDE includes.

 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>

 // Local includes.
--- a/digikam/digikam/searchwidgets.cpp
+++ b/digikam/digikam/searchwidgets.cpp
@ -40,7 +40,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kdialog.h>

--- a/digikam/digikam/syncjob.cpp
+++ b/digikam/digikam/syncjob.cpp
@ -36,7 +36,7 @@

 #include <tdeio/job.h>
 #include <kprotocolinfo.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>

--- a/digikam/digikam/tageditdlg.cpp
+++ b/digikam/digikam/tageditdlg.cpp
@ -29,7 +29,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kicondialog.h>
 #include <tdeapplication.h>
 #include <tdeversion.h>
--- a/digikam/digikam/tagfilterview.cpp
+++ b/digikam/digikam/tagfilterview.cpp
@ -33,15 +33,15 @@

 // KDE includes.

-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kcursor.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>

 // Local includes.

--- a/digikam/digikam/tagfolderview.cpp
+++ b/digikam/digikam/tagfolderview.cpp
@ -32,11 +32,11 @@
 // KDE includes.

 #include <tdepopupmenu.h>
-#include <klocale.h>
-#include <kabc/stdaddressbook.h>
+#include <tdelocale.h>
+#include <tdeabc/stdaddressbook.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>

 // Local includes.

--- a/digikam/digikam/tagspopupmenu.cpp
+++ b/digikam/digikam/tagspopupmenu.cpp
@ -39,8 +39,8 @@

 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>

 // Local includes.

--- a/digikam/digikam/timelinefolderview.cpp
+++ b/digikam/digikam/timelinefolderview.cpp
@ -32,10 +32,10 @@
 // KDE includes.

 #include <tdepopupmenu.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>

 // Local includes.

--- a/digikam/digikam/timelineview.cpp
+++ b/digikam/digikam/timelineview.cpp
@ -37,7 +37,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
 #include <klineedit.h>
@ -46,7 +46,7 @@
 #include <ksqueezedtextlabel.h>
 #include <kstandarddirs.h>
 #include <tdeversion.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>

 #if KDE_IS_VERSION(3,2,0)
 #include <kinputdialog.h>
--- a/digikam/digikam/timelinewidget.cpp
+++ b/digikam/digikam/timelinewidget.cpp
@ -34,10 +34,10 @@
 // KDE includes.

 #include <kcursor.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kcalendarsystem.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>

 // Local includes.

--- a/digikam/digikam/welcomepageview.cpp
+++ b/digikam/digikam/welcomepageview.cpp
@ -30,7 +30,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcursor.h>
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
--- a/digikam/imageplugins/adjustcurves/adjustcurves.cpp
+++ b/digikam/imageplugins/adjustcurves/adjustcurves.cpp
@ -49,12 +49,12 @@

 #include <tdeconfig.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeselect.h>
 #include <tdefiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
--- a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp
+++ b/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp
@ -49,12 +49,12 @@

 #include <tdeconfig.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeselect.h>
 #include <tdefiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
--- a/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp
+++ b/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp
@ -23,7 +23,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
--- a/digikam/imageplugins/adjustlevels/adjustlevels.cpp
+++ b/digikam/imageplugins/adjustlevels/adjustlevels.cpp
@ -49,12 +49,12 @@

 #include <tdeconfig.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeselect.h>
 #include <tdefiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
--- a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp
+++ b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp
@ -51,11 +51,11 @@
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <tdefiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <tdeselect.h>
 #include <kstandarddirs.h>
--- a/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp
+++ b/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp
@ -23,7 +23,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
--- a/digikam/imageplugins/antivignetting/antivignettingtool.cpp
+++ b/digikam/imageplugins/antivignetting/antivignettingtool.cpp
@ -36,7 +36,7 @@
 // KDE includes.

 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
--- a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp
+++ b/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp
@ -36,7 +36,7 @@
 // KDE includes.

 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
--- a/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp
+++ b/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp
@ -24,7 +24,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
--- a/digikam/imageplugins/blurfx/blurfxtool.cpp
+++ b/digikam/imageplugins/blurfx/blurfxtool.cpp
@ -36,7 +36,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>

 // LibKDcraw includes.
--- a/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp
+++ b/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp
@ -35,7 +35,7 @@
 // KDE includes.

 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <knuminput.h>
--- a/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp
+++ b/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp
@ -23,7 +23,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
--- a/digikam/imageplugins/border/bordertool.cpp
+++ b/digikam/imageplugins/border/bordertool.cpp
@ -37,7 +37,7 @@
 #include <kcolorbutton.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kseparator.h>
 #include <kstandarddirs.h>

--- a/digikam/imageplugins/border/imageeffect_border.cpp
+++ b/digikam/imageplugins/border/imageeffect_border.cpp
@ -34,7 +34,7 @@
 // KDE includes.

 #include <kseparator.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
--- a/digikam/imageplugins/border/imageplugin_border.cpp
+++ b/digikam/imageplugins/border/imageplugin_border.cpp
@ -24,7 +24,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
--- a/digikam/imageplugins/channelmixer/channelmixer.cpp
+++ b/digikam/imageplugins/channelmixer/channelmixer.cpp
@ -58,12 +58,12 @@

 #include <tdeconfig.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeselect.h>
 #include <tdefiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
--- a/digikam/imageplugins/channelmixer/channelmixertool.cpp
+++ b/digikam/imageplugins/channelmixer/channelmixertool.cpp
@ -57,11 +57,11 @@
 #include <tdeapplication.h>
 #include <kcursor.h>
 #include <tdefiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <tdeselect.h>
 #include <kstandarddirs.h>
--- a/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp
+++ b/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp
@ -23,7 +23,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
--- a/digikam/imageplugins/charcoal/charcoaltool.cpp
+++ b/digikam/imageplugins/charcoal/charcoaltool.cpp
@ -31,7 +31,7 @@
 // KDE includes.

 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
--- a/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp
+++ b/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp
@ -31,7 +31,7 @@
 // KDE includes.

 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
--- a/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp
+++ b/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp
@ -24,7 +24,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
--- a/digikam/imageplugins/colorfx/colorfxtool.cpp
+++ b/digikam/imageplugins/colorfx/colorfxtool.cpp
@ -45,7 +45,7 @@
 #include <kcursor.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>

--- a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp
+++ b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp
@ -41,7 +41,7 @@

 #include <tdeconfig.h>
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcursor.h>
 #include <tdeaboutdata.h>
 #include <khelpmenu.h>
--- a/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp
+++ b/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp
@ -25,7 +25,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
--- a/digikam/imageplugins/coreplugin/autocorrectiontool.cpp
+++ b/digikam/imageplugins/coreplugin/autocorrectiontool.cpp
@ -47,7 +47,7 @@
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>

 // Digikam includes.
--- a/digikam/imageplugins/coreplugin/bcgtool.cpp
+++ b/digikam/imageplugins/coreplugin/bcgtool.cpp
@ -46,7 +46,7 @@
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>

 // LibKDcraw includes.
--- a/digikam/imageplugins/coreplugin/blurtool.cpp
+++ b/digikam/imageplugins/coreplugin/blurtool.cpp
@ -33,7 +33,7 @@
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>

 // Digikam includes.
--- a/digikam/imageplugins/coreplugin/bwsepiatool.cpp
+++ b/digikam/imageplugins/coreplugin/bwsepiatool.cpp
@ -49,10 +49,10 @@
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <tdefiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <ktabwidget.h>

--- a/digikam/imageplugins/coreplugin/hsl/hsltool.cpp
+++ b/digikam/imageplugins/coreplugin/hsl/hsltool.cpp
@ -46,7 +46,7 @@
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>

 // LibKDcraw includes.
--- a/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.cpp
+++ b/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.cpp
@ -31,7 +31,7 @@
 // KDE includes.

 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kimageeffect.h>

 // Local includes.
--- a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp
+++ b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp
@ -43,7 +43,7 @@
 // KDE includes.

 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
--- a/digikam/imageplugins/coreplugin/iccprooftool.cpp
+++ b/digikam/imageplugins/coreplugin/iccprooftool.cpp
@ -52,10 +52,10 @@
 #include <kcursor.h>
 #include <tdefile.h>
 #include <tdefiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <ksqueezedtextlabel.h>
 #include <kstandarddirs.h>
 #include <ktabwidget.h>
--- a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp
+++ b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp
@ -49,7 +49,7 @@
 #include <kcursor.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>

 // Digikam includes.
--- a/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp
+++ b/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp
@ -44,7 +44,7 @@
 // KDE includes.

 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
--- a/digikam/imageplugins/coreplugin/imageeffect_blur.cpp
+++ b/digikam/imageplugins/coreplugin/imageeffect_blur.cpp
@ -33,7 +33,7 @@
 #include <knuminput.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>

 // Digikam includes.
--- a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp
+++ b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp
@ -47,10 +47,10 @@
 // KDE includes.

 #include <tdefiledialog.h>
-#include <kglobalsettings.h>
-#include <kmessagebox.h>
+#include <tdeglobalsettings.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 #include <knuminput.h>
--- a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp
+++ b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp
@ -49,7 +49,7 @@
 // KDE includes.

 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kcursor.h>
 #include <kstandarddirs.h>
@ -59,8 +59,8 @@
 #include <kurllabel.h>
 #include <tdefiledialog.h>
 #include <tdefile.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <ksqueezedtextlabel.h>

--- a/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp
+++ b/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp
@ -43,7 +43,7 @@

 #include <kcolordialog.h>
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
--- a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp
+++ b/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp
@ -44,7 +44,7 @@
 // KDE includes.

 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kcursor.h>
 #include <kstandarddirs.h>
--- a/digikam/imageplugins/coreplugin/imageplugin_core.cpp
+++ b/digikam/imageplugins/coreplugin/imageplugin_core.cpp
@ -26,12 +26,12 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
 #include <kcursor.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>

 // Local includes.
--- a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp
+++ b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp
@ -41,7 +41,7 @@
 // KDE includes.

 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
--- a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp
+++ b/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp
@ -59,7 +59,7 @@

 #include <kstandarddirs.h>
 #include <kcursor.h>
-#include <kglobal.h>
+#include <tdeglobal.h>

 // Local includes.

--- a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp
+++ b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp
@ -45,7 +45,7 @@
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>

--- a/digikam/imageplugins/coreplugin/redeyetool.cpp
+++ b/digikam/imageplugins/coreplugin/redeyetool.cpp
@ -47,7 +47,7 @@
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>

 // Digikam includes.
--- a/digikam/imageplugins/coreplugin/rgbtool.cpp
+++ b/digikam/imageplugins/coreplugin/rgbtool.cpp
@ -45,7 +45,7 @@
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>

 // LibKDcraw includes.
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp
+++ b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp
@ -40,14 +40,14 @@
 #include <tdeaboutdata.h>
 #include <knuminput.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kseparator.h>
 #include <tdeconfig.h>
 #include <kurl.h>
 #include <tdefiledialog.h>
-#include <kglobalsettings.h>
-#include <kmessagebox.h>
+#include <tdeglobalsettings.h>
+#include <tdemessagebox.h>

 // Local includes.

--- a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp
+++ b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp
@ -38,15 +38,15 @@

 #include <tdeaboutdata.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kseparator.h>
 #include <tdeconfig.h>
 #include <kurl.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
-#include <kglobalsettings.h>
-#include <kmessagebox.h>
+#include <tdeglobalsettings.h>
+#include <tdemessagebox.h>

 // LibKDcraw includes.

--- a/digikam/imageplugins/distortionfx/distortionfxtool.cpp
+++ b/digikam/imageplugins/distortionfx/distortionfxtool.cpp
@ -42,7 +42,7 @@
 #include <kcursor.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 #include <kstandarddirs.h>

--- a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp
+++ b/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp
@ -38,7 +38,7 @@
 // KDE includes.

 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcursor.h>
 #include <tdeaboutdata.h>
 #include <khelpmenu.h>
--- a/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp
+++ b/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp
@ -26,7 +26,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
--- a/digikam/imageplugins/emboss/embosstool.cpp
+++ b/digikam/imageplugins/emboss/embosstool.cpp
@ -35,7 +35,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>

 // LibKDcraw includes.
--- a/digikam/imageplugins/emboss/imageeffect_emboss.cpp
+++ b/digikam/imageplugins/emboss/imageeffect_emboss.cpp
@ -31,7 +31,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
--- a/digikam/imageplugins/emboss/imageplugin_emboss.cpp
+++ b/digikam/imageplugins/emboss/imageplugin_emboss.cpp
@ -24,7 +24,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
--- a/digikam/imageplugins/filmgrain/filmgraintool.cpp
+++ b/digikam/imageplugins/filmgrain/filmgraintool.cpp
@ -34,7 +34,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
--- a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp
+++ b/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp
@ -34,7 +34,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
--- a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp
+++ b/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp
@ -24,7 +24,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
--- a/digikam/imageplugins/freerotation/freerotationtool.cpp
+++ b/digikam/imageplugins/freerotation/freerotationtool.cpp
@ -37,7 +37,7 @@
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kseparator.h>
 #include <kstandarddirs.h>

--- a/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp
+++ b/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp
@ -33,7 +33,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
--- a/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp
+++ b/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp
@ -24,7 +24,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
--- a/digikam/imageplugins/hotpixels/blackframelistview.h
+++ b/digikam/imageplugins/hotpixels/blackframelistview.h
@ -37,7 +37,7 @@
 // KDE includes.

 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>

 // Local includes.

--- a/digikam/imageplugins/hotpixels/hotpixelstool.cpp
+++ b/digikam/imageplugins/hotpixels/hotpixelstool.cpp
@ -34,7 +34,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kimageio.h>
 #include <tdeaboutdata.h>
--- a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp
+++ b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp
@ -34,7 +34,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kimageio.h>
 #include <tdeaboutdata.h>
--- a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp
+++ b/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp
@ -25,7 +25,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
--- a/digikam/imageplugins/infrared/imageeffect_infrared.cpp
+++ b/digikam/imageplugins/infrared/imageeffect_infrared.cpp
@ -36,7 +36,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
--- a/digikam/imageplugins/infrared/imageplugin_infrared.cpp
+++ b/digikam/imageplugins/infrared/imageplugin_infrared.cpp
@ -24,7 +24,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
--- a/digikam/imageplugins/infrared/infraredtool.cpp
+++ b/digikam/imageplugins/infrared/infraredtool.cpp
@ -36,7 +36,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
--- a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp
+++ b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp
@ -51,7 +51,7 @@

 #include <kcursor.h>
 #include <kurllabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
@ -60,9 +60,9 @@
 #include <tdefiledialog.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kpassivepopup.h>

 // Local includes.
--- a/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp
+++ b/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp
@ -24,7 +24,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
--- a/digikam/imageplugins/inpainting/inpaintingtool.cpp
+++ b/digikam/imageplugins/inpainting/inpaintingtool.cpp
@ -53,11 +53,11 @@
 #include <tdeapplication.h>
 #include <kcursor.h>
 #include <tdefiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kprogress.h>
 #include <kstandarddirs.h>
--- a/digikam/imageplugins/inserttext/fontchooserwidget.cpp
+++ b/digikam/imageplugins/inserttext/fontchooserwidget.cpp
@ -46,10 +46,10 @@
 #include <kcharsets.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kstandarddirs.h>
 #include <tqlineedit.h>
--- a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp
+++ b/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp
@ -43,7 +43,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcursor.h>
 #include <tdeaboutdata.h>
 #include <khelpmenu.h>
--- a/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp
+++ b/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp
@ -23,7 +23,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
--- a/digikam/imageplugins/inserttext/inserttexttool.cpp
+++ b/digikam/imageplugins/inserttext/inserttexttool.cpp
@ -49,7 +49,7 @@
 #include <kcursor.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <ktextedit.h>
--- a/digikam/imageplugins/inserttext/inserttextwidget.cpp
+++ b/digikam/imageplugins/inserttext/inserttextwidget.cpp
@ -37,7 +37,7 @@

 #include <kstandarddirs.h>
 #include <kcursor.h>
-#include <kglobal.h>
+#include <tdeglobal.h>

 // Digikam includes.

--- a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp
+++ b/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp
@ -40,7 +40,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeaboutdata.h>
 #include <kiconloader.h>
--- a/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp
+++ b/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp
@ -23,7 +23,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
--- a/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp
+++ b/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp
@ -45,7 +45,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>

 // LibKDcraw includes.
--- a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp
+++ b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp
@ -36,15 +36,15 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <knuminput.h>
 #include <tdefiledialog.h>
-#include <kglobalsettings.h>
-#include <kmessagebox.h>
+#include <tdeglobalsettings.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>

 // Local includes.
--- a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp
+++ b/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp
@ -23,7 +23,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
--- a/digikam/imageplugins/noisereduction/noisereductiontool.cpp
+++ b/digikam/imageplugins/noisereduction/noisereductiontool.cpp
@ -40,10 +40,10 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>

 // LibKDcraw includes.
--- a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp
+++ b/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp
@ -32,7 +32,7 @@
 // KDE includes.

 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
--- a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp
+++ b/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp
@ -23,7 +23,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
--- a/digikam/imageplugins/oilpaint/oilpainttool.cpp
+++ b/digikam/imageplugins/oilpaint/oilpainttool.cpp
@ -36,7 +36,7 @@
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>

 // LibKDcraw includes.
--- a/digikam/imageplugins/perspective/imageeffect_perspective.cpp
+++ b/digikam/imageplugins/perspective/imageeffect_perspective.cpp
@ -38,7 +38,7 @@
 #include <kcolorbutton.h>
 #include <kcursor.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
--- a/digikam/imageplugins/perspective/imageplugin_perspective.cpp
+++ b/digikam/imageplugins/perspective/imageplugin_perspective.cpp
@ -23,7 +23,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
--- a/digikam/imageplugins/perspective/perspectivetool.cpp
+++ b/digikam/imageplugins/perspective/perspectivetool.cpp
@ -41,7 +41,7 @@
 #include <kcursor.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kseparator.h>
 #include <kstandarddirs.h>
--- a/digikam/imageplugins/perspective/perspectivewidget.cpp
+++ b/digikam/imageplugins/perspective/perspectivewidget.cpp
@ -45,7 +45,7 @@

 #include <kstandarddirs.h>
 #include <kcursor.h>
-#include <kglobal.h> 
+#include <tdeglobal.h> 
 #include <tdeapplication.h>

 // Local includes.
--- a/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp
+++ b/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp
@ -33,7 +33,7 @@
 // KDE includes.

 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
--- a/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp
+++ b/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp
@ -23,7 +23,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
--- a/digikam/imageplugins/raindrop/raindroptool.cpp
+++ b/digikam/imageplugins/raindrop/raindroptool.cpp
@ -36,7 +36,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>

 // LibKDcraw includes.
--- a/digikam/imageplugins/restoration/imageeffect_restoration.cpp
+++ b/digikam/imageplugins/restoration/imageeffect_restoration.cpp
@ -36,14 +36,14 @@
 // KDE includes.

 #include <kurllabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 #include <tdefiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>

 // Local includes.

--- a/digikam/imageplugins/restoration/imageplugin_restoration.cpp
+++ b/digikam/imageplugins/restoration/imageplugin_restoration.cpp
@ -24,7 +24,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
--- a/digikam/imageplugins/restoration/restorationtool.cpp
+++ b/digikam/imageplugins/restoration/restorationtool.cpp
@ -36,14 +36,14 @@
 // KDE includes.

 #include <kurllabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 #include <tdefiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>

 // Local includes.

--- a/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp
+++ b/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp
@ -31,7 +31,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
--- a/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp
+++ b/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp
@ -23,7 +23,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
--- a/digikam/imageplugins/sheartool/sheartool.cpp
+++ b/digikam/imageplugins/sheartool/sheartool.cpp
@ -36,7 +36,7 @@
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kseparator.h>
 #include <kstandarddirs.h>

--- a/digikam/imageplugins/superimpose/dirselectwidget.cpp
+++ b/digikam/imageplugins/superimpose/dirselectwidget.cpp
@ -32,7 +32,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>

 // Local includes.

--- a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp
+++ b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp
@ -41,7 +41,7 @@
 // KDE includes.

 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
@ -54,7 +54,7 @@
 #include <tdefiledialog.h> 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>

 // Local includes.

--- a/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp
+++ b/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp
@ -25,7 +25,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
--- a/digikam/imageplugins/superimpose/superimposetool.cpp
+++ b/digikam/imageplugins/superimpose/superimposetool.cpp
@ -41,7 +41,7 @@
 // KDE includes.

 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
@ -54,7 +54,7 @@
 #include <tdefiledialog.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>

 // Local includes.

--- a/digikam/imageplugins/superimpose/superimposewidget.cpp
+++ b/digikam/imageplugins/superimpose/superimposewidget.cpp
@ -35,7 +35,7 @@

 #include <kstandarddirs.h>
 #include <kcursor.h>
-#include <kglobal.h> 
+#include <tdeglobal.h> 

 // Local includes.

--- a/digikam/imageplugins/texture/imageeffect_texture.cpp
+++ b/digikam/imageplugins/texture/imageeffect_texture.cpp
@ -33,7 +33,7 @@
 // KDE includes.

 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
--- a/digikam/imageplugins/texture/imageplugin_texture.cpp
+++ b/digikam/imageplugins/texture/imageplugin_texture.cpp
@ -23,7 +23,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
--- a/digikam/imageplugins/texture/texturetool.cpp
+++ b/digikam/imageplugins/texture/texturetool.cpp
@ -35,7 +35,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>

 // LibKDcraw includes.
--- a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp
+++ b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp
@ -44,7 +44,7 @@
 // KDE includes.

 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
@ -52,9 +52,9 @@
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdefiledialog.h>
 #include <kseparator.h>
 #include <tdeconfig.h>
--- a/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp
+++ b/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp
@ -24,7 +24,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
 #include <tdeaction.h>
--- a/digikam/imageplugins/whitebalance/whitebalancetool.cpp
+++ b/digikam/imageplugins/whitebalance/whitebalancetool.cpp
@ -49,11 +49,11 @@
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <tdefiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kprogress.h>
 #include <kseparator.h>
--- a/digikam/libs/dialogs/ctrlpaneldlg.cpp
+++ b/digikam/libs/dialogs/ctrlpaneldlg.cpp
@ -36,14 +36,14 @@
 // KDE includes.

 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>

 // Local includes.

--- a/digikam/libs/dialogs/deletedialog.cpp
+++ b/digikam/libs/dialogs/deletedialog.cpp
@ -39,10 +39,10 @@
 #include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kdialogbase.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>

 // Local includes.
--- a/digikam/libs/dialogs/dprogressdlg.cpp
+++ b/digikam/libs/dialogs/dprogressdlg.cpp
@ -33,7 +33,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 #include <tdeapplication.h>
 #include <kdialogbase.h>
--- a/digikam/libs/dialogs/iccprofileinfodlg.cpp
+++ b/digikam/libs/dialogs/iccprofileinfodlg.cpp
@ -23,7 +23,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>

 // Local includes.

--- a/digikam/libs/dialogs/imagedialog.cpp
+++ b/digikam/libs/dialogs/imagedialog.cpp
@ -31,7 +31,7 @@
 // KDE includes.

 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
 #include <kimageio.h>
--- a/digikam/libs/dialogs/imagedlgbase.cpp
+++ b/digikam/libs/dialogs/imagedlgbase.cpp
@ -40,8 +40,8 @@
 // KDE includes.

 #include <kcursor.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
--- a/digikam/libs/dialogs/imageguidedlg.cpp
+++ b/digikam/libs/dialogs/imageguidedlg.cpp
@ -39,14 +39,14 @@
 // KDE includes.

 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kprogress.h>
 #include <kcolorbutton.h>
 #include <tdeconfig.h>
--- a/digikam/libs/dialogs/rawcameradlg.cpp
+++ b/digikam/libs/dialogs/rawcameradlg.cpp
@ -32,7 +32,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
--- a/digikam/libs/dimg/loaders/jp2ksettings.cpp
+++ b/digikam/libs/dimg/loaders/jp2ksettings.cpp
@ -31,7 +31,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <knuminput.h>

--- a/digikam/libs/dimg/loaders/jpegsettings.cpp
+++ b/digikam/libs/dimg/loaders/jpegsettings.cpp
@ -31,7 +31,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <knuminput.h>
 #include <kactivelabel.h>
--- a/digikam/libs/dimg/loaders/pngsettings.cpp
+++ b/digikam/libs/dimg/loaders/pngsettings.cpp
@ -30,7 +30,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <knuminput.h>

--- a/digikam/libs/dimg/loaders/tiffsettings.cpp
+++ b/digikam/libs/dimg/loaders/tiffsettings.cpp
@ -31,7 +31,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>

 // Local includes.
--- a/digikam/libs/greycstoration/greycstorationwidget.cpp
+++ b/digikam/libs/greycstoration/greycstorationwidget.cpp
@ -34,7 +34,7 @@
 // KDE includes.

 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>

 // LibKDcraw includes.

--- a/digikam/libs/imageproperties/cameraitempropertiestab.cpp
+++ b/digikam/libs/imageproperties/cameraitempropertiestab.cpp
@ -35,7 +35,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
--- a/digikam/libs/imageproperties/imagedescedittab.cpp
+++ b/digikam/libs/imageproperties/imagedescedittab.cpp
@ -39,14 +39,14 @@

 // KDE includes.

-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kcursor.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ktextedit.h>
 #include <tdeconfig.h>
 #include <klineedit.h>
--- a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp
+++ b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp
@ -41,7 +41,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksqueezedtextlabel.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
--- a/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp
+++ b/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp
@ -32,7 +32,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
--- a/digikam/libs/imageproperties/imagepropertiessidebar.cpp
+++ b/digikam/libs/imageproperties/imagepropertiessidebar.cpp
@ -29,11 +29,11 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 #include <kcursor.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>

 // Local includes.
--- a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp
+++ b/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp
@ -28,11 +28,11 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 #include <kcursor.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>

 // Local includes.
--- a/digikam/libs/imageproperties/imagepropertiessidebardb.cpp
+++ b/digikam/libs/imageproperties/imagepropertiessidebardb.cpp
@ -31,11 +31,11 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 #include <kcursor.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>

 // Local includes.
--- a/digikam/libs/imageproperties/imagepropertiestab.cpp
+++ b/digikam/libs/imageproperties/imagepropertiestab.cpp
@ -35,7 +35,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <tdefileitem.h>
 #include <ksqueezedtextlabel.h>
--- a/digikam/libs/imageproperties/navigatebarwidget.cpp
+++ b/digikam/libs/imageproperties/navigatebarwidget.cpp
@ -29,7 +29,7 @@

 #include <ksqueezedtextlabel.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>

 // Local includes.

--- a/digikam/libs/imageproperties/talbumlistview.cpp
+++ b/digikam/libs/imageproperties/talbumlistview.cpp
@ -29,14 +29,14 @@
 // KDE includes.

 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kcursor.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdialogbase.h>

 // Local includes.
--- a/digikam/libs/themeengine/themeengine.cpp
+++ b/digikam/libs/themeengine/themeengine.cpp
@ -35,12 +35,12 @@

 // KDE includes.

-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kuser.h>
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>

 // Local includes.

--- a/digikam/libs/thumbbar/thumbbar.cpp
+++ b/digikam/libs/thumbbar/thumbbar.cpp
@ -52,10 +52,10 @@ extern "C"
 #include <tdefileitem.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <tdefileitem.h>
-#include <kglobal.h>
+#include <tdeglobal.h>

 // LibKDcraw includes.

--- a/digikam/libs/thumbbar/thumbnailjob.cpp
+++ b/digikam/libs/thumbbar/thumbnailjob.cpp
@ -46,7 +46,7 @@ extern "C"

 // KDE includes.

-#include <kglobal.h>
+#include <tdeglobal.h>

 // Local includes.

--- a/digikam/libs/widgets/common/curveswidget.cpp
+++ b/digikam/libs/widgets/common/curveswidget.cpp
@ -44,7 +44,7 @@
 // KDE includes.

 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>

 // Digikam includes.

--- a/digikam/libs/widgets/common/dlogoaction.cpp
+++ b/digikam/libs/widgets/common/dlogoaction.cpp
@ -33,7 +33,7 @@
 #include <kiconloader.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>

 // Local includes.

--- a/digikam/libs/widgets/common/filesaveoptionsbox.cpp
+++ b/digikam/libs/widgets/common/filesaveoptionsbox.cpp
@ -34,7 +34,7 @@
 // KDE includes.

 #include <kimageio.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <knuminput.h>
 #include <tdeconfig.h>
--- a/digikam/libs/widgets/common/histogramwidget.cpp
+++ b/digikam/libs/widgets/common/histogramwidget.cpp
@ -45,7 +45,7 @@
 // KDE includes.

 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>

 // Local includes.

--- a/digikam/libs/widgets/common/previewwidget.cpp
+++ b/digikam/libs/widgets/common/previewwidget.cpp
@ -39,7 +39,7 @@
 // KDE includes.

 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>

 // Local includes.

--- a/digikam/libs/widgets/common/searchtextbar.h
+++ b/digikam/libs/widgets/common/searchtextbar.h
@ -32,7 +32,7 @@
 // KDE includes.

 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>

 // Local includes.

--- a/digikam/libs/widgets/common/splashscreen.cpp
+++ b/digikam/libs/widgets/common/splashscreen.cpp
@ -31,9 +31,9 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>

 // Local includes.

--- a/digikam/libs/widgets/common/statusled.cpp
+++ b/digikam/libs/widgets/common/statusled.cpp
@ -28,7 +28,7 @@

 // KDE includes.

-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>

 // Local includes.
--- a/digikam/libs/widgets/common/statusnavigatebar.cpp
+++ b/digikam/libs/widgets/common/statusnavigatebar.cpp
@ -31,7 +31,7 @@
 // KDE includes.

 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>

 // Local includes.

--- a/digikam/libs/widgets/common/statusprogressbar.cpp
+++ b/digikam/libs/widgets/common/statusprogressbar.cpp
@ -32,7 +32,7 @@

 #include <ksqueezedtextlabel.h>
 #include <kprogress.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kcursor.h>

--- a/digikam/libs/widgets/common/statuszoombar.cpp
+++ b/digikam/libs/widgets/common/statuszoombar.cpp
@ -31,7 +31,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>

 // Local includes.
--- a/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp
+++ b/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp
@ -39,7 +39,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>

 // Local includes.

--- a/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp
+++ b/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp
@ -39,7 +39,7 @@
 // KDE includes.

 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>

 // Lcms includes.
--- a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp
+++ b/digikam/libs/widgets/imageplugins/imageguidewidget.cpp
@ -38,7 +38,7 @@

 #include <kstandarddirs.h>
 #include <kcursor.h>
-#include <kglobal.h> 
+#include <tdeglobal.h> 

 // Local includes.

--- a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp
+++ b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp
@ -38,7 +38,7 @@
 // KDE includes.

 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcursor.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
--- a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp
+++ b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp
@ -38,7 +38,7 @@
 // KDE includes.

 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcursor.h>
 #include <kprogress.h>
 #include <tdeapplication.h>
--- a/digikam/libs/widgets/imageplugins/imageregionwidget.cpp
+++ b/digikam/libs/widgets/imageplugins/imageregionwidget.cpp
@ -42,7 +42,7 @@

 #include <kstandarddirs.h>
 #include <kcursor.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>

 // Local includes.
--- a/digikam/libs/widgets/imageplugins/imagewidget.cpp
+++ b/digikam/libs/widgets/imageplugins/imagewidget.cpp
@ -35,7 +35,7 @@
 #include <ksqueezedtextlabel.h>
 #include <kdialog.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
--- a/digikam/libs/widgets/metadata/exifwidget.cpp
+++ b/digikam/libs/widgets/metadata/exifwidget.cpp
@ -28,7 +28,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>

 // Local includes.

--- a/digikam/libs/widgets/metadata/gpswidget.cpp
+++ b/digikam/libs/widgets/metadata/gpswidget.cpp
@ -39,7 +39,7 @@ http://www.gpspassion.com/forumsen/topic.asp?TOPIC_ID=16593
 // KDE includes.

 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>

 // Local includes.
--- a/digikam/libs/widgets/metadata/iptcwidget.cpp
+++ b/digikam/libs/widgets/metadata/iptcwidget.cpp
@ -28,7 +28,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>

 // Local includes.

--- a/digikam/libs/widgets/metadata/makernotewidget.cpp
+++ b/digikam/libs/widgets/metadata/makernotewidget.cpp
@ -29,7 +29,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>

 // Local includes.

--- a/digikam/libs/widgets/metadata/mdkeylistviewitem.cpp
+++ b/digikam/libs/widgets/metadata/mdkeylistviewitem.cpp
@ -30,7 +30,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>

 // Local includes.

--- a/digikam/libs/widgets/metadata/metadatalistview.cpp
+++ b/digikam/libs/widgets/metadata/metadatalistview.cpp
@ -32,7 +32,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>

 // Local includes.

--- a/digikam/libs/widgets/metadata/metadatawidget.cpp
+++ b/digikam/libs/widgets/metadata/metadatawidget.cpp
@ -44,11 +44,11 @@
 // KDE includes.

 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kprinter.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>

--- a/digikam/libs/widgets/metadata/worldmapwidget.cpp
+++ b/digikam/libs/widgets/metadata/worldmapwidget.cpp
@ -32,7 +32,7 @@

 #include <kstandarddirs.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstaticdeleter.h>

 // Local includes.
--- a/digikam/showfoto/main.cpp
+++ b/digikam/showfoto/main.cpp
@ -32,9 +32,9 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kimageio.h>

 // Local includes.
--- a/digikam/showfoto/setup/setup.cpp
+++ b/digikam/showfoto/setup/setup.cpp
@ -29,7 +29,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
--- a/digikam/showfoto/setup/setupeditor.cpp
+++ b/digikam/showfoto/setup/setupeditor.cpp
@ -35,7 +35,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <kcolorbutton.h>
 #include <knuminput.h>
--- a/digikam/showfoto/setup/setuptooltip.cpp
+++ b/digikam/showfoto/setup/setuptooltip.cpp
@ -30,7 +30,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
--- a/digikam/showfoto/showfoto.cpp
+++ b/digikam/showfoto/showfoto.cpp
@ -53,20 +53,20 @@ extern "C"
 #include <kstdaction.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kimageio.h>
 #include <tdeaccel.h>
 #include <tdeversion.h>
-#include <kmessagebox.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>
 #include <kprotocolinfo.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdetoolbar.h>
 #include <kstatusbar.h>
 #include <kprogress.h>
--- a/digikam/tdeioslave/digikamalbums.cpp
+++ b/digikam/tdeioslave/digikamalbums.cpp
@ -59,8 +59,8 @@ extern "C"

 // KDE includes.

-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 #include <tdefilemetainfo.h>
 #include <kmimetype.h>
--- a/digikam/tdeioslave/digikamdates.cpp
+++ b/digikam/tdeioslave/digikamdates.cpp
@ -49,8 +49,8 @@ extern "C"
 // KDE includes.

 #include <tdeio/global.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 #include <tdefilemetainfo.h>
 #include <kdebug.h>
--- a/digikam/tdeioslave/digikamsearch.cpp
+++ b/digikam/tdeioslave/digikamsearch.cpp
@ -52,8 +52,8 @@ extern "C"

 // KDE includes.

-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kcalendarsystem.h>
 #include <kinstance.h>
 #include <tdefilemetainfo.h>
--- a/digikam/tdeioslave/digikamtags.cpp
+++ b/digikam/tdeioslave/digikamtags.cpp
@ -51,8 +51,8 @@ extern "C"
 #include <kinstance.h>
 #include <kdebug.h>
 #include <kurl.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeio/global.h>
 #include <tdefilemetainfo.h>
--- a/digikam/tdeioslave/digikamthumbnail.cpp
+++ b/digikam/tdeioslave/digikamthumbnail.cpp
@ -53,11 +53,11 @@
 #include <kurl.h>
 #include <kinstance.h>
 #include <kimageio.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kmdcodec.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ktrader.h>
 #include <klibloader.h>
 #include <kmimetype.h>
--- a/digikam/themedesigner/main.cpp
+++ b/digikam/themedesigner/main.cpp
@ -31,8 +31,8 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>

 // Local includes.

--- a/digikam/themedesigner/mainwindow.cpp
+++ b/digikam/themedesigner/mainwindow.cpp
@ -39,13 +39,13 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcolordialog.h>
 #include <kcolorbutton.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kuser.h>

 // Local includes.
--- a/digikam/themedesigner/themedicongroupitem.cpp
+++ b/digikam/themedesigner/themedicongroupitem.cpp
@ -28,7 +28,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>

 // Local includes.

--- a/digikam/themedesigner/themediconitem.cpp
+++ b/digikam/themedesigner/themediconitem.cpp
@ -33,8 +33,8 @@

 // KDE includes.

-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>

--- a/digikam/utilities/batch/batchalbumssyncmetadata.cpp
+++ b/digikam/utilities/batch/batchalbumssyncmetadata.cpp
@ -30,7 +30,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>

--- a/digikam/utilities/batch/batchsyncmetadata.cpp
+++ b/digikam/utilities/batch/batchsyncmetadata.cpp
@ -28,7 +28,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>

 // Local includes.
--- a/digikam/utilities/batch/batchthumbsgenerator.cpp
+++ b/digikam/utilities/batch/batchthumbsgenerator.cpp
@ -39,7 +39,7 @@ extern "C"
 // KDE includes.

 #include <kmdcodec.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>

 // Local includes.
--- a/digikam/utilities/cameragui/albumselectdialog.cpp
+++ b/digikam/utilities/cameragui/albumselectdialog.cpp
@ -35,12 +35,12 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>

 // Local includes.

--- a/digikam/utilities/cameragui/cameracontroller.cpp
+++ b/digikam/utilities/cameragui/cameracontroller.cpp
@ -49,9 +49,9 @@ extern "C"

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/renamedlg.h>
 #include <kstandarddirs.h>

--- a/digikam/utilities/cameragui/camerafolderdialog.cpp
+++ b/digikam/utilities/cameragui/camerafolderdialog.cpp
@ -29,7 +29,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>

--- a/digikam/utilities/cameragui/camerafolderview.cpp
+++ b/digikam/utilities/cameragui/camerafolderview.cpp
@ -24,7 +24,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>

 // Local includes.
--- a/digikam/utilities/cameragui/cameraiconview.cpp
+++ b/digikam/utilities/cameragui/cameraiconview.cpp
@ -39,7 +39,7 @@

 #include <kurldrag.h>
 #include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeaction.h>
 #include <tdeapplication.h>
--- a/digikam/utilities/cameragui/camerainfodialog.cpp
+++ b/digikam/utilities/cameragui/camerainfodialog.cpp
@ -30,7 +30,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>

 // Local includes.
--- a/digikam/utilities/cameragui/cameraui.cpp
+++ b/digikam/utilities/cameragui/cameraui.cpp
@ -54,10 +54,10 @@
 #include <tdefiledialog.h>
 #include <kimageio.h>
 #include <tdeaboutdata.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprogress.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
--- a/digikam/utilities/cameragui/freespacewidget.cpp
+++ b/digikam/utilities/cameragui/freespacewidget.cpp
@ -36,7 +36,7 @@
 // KDE includes.

 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdiskfreesp.h>
 #include <tdeio/global.h>
 #include <kiconloader.h>
--- a/digikam/utilities/cameragui/gpcamera.cpp
+++ b/digikam/utilities/cameragui/gpcamera.cpp
@ -38,7 +38,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>

 // C Ansi includes.
 extern "C"
--- a/digikam/utilities/cameragui/renamecustomizer.cpp
+++ b/digikam/utilities/cameragui/renamecustomizer.cpp
@ -38,7 +38,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
--- a/digikam/utilities/cameragui/umscamera.cpp
+++ b/digikam/utilities/cameragui/umscamera.cpp
@ -43,7 +43,7 @@ extern "C"

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefilemetainfo.h>

 // LibKDcraw includes.
--- a/digikam/utilities/imageeditor/canvas/canvas.cpp
+++ b/digikam/utilities/imageeditor/canvas/canvas.cpp
@ -52,10 +52,10 @@
 // KDE includes.

 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdatetbl.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>

 // Local includes.

--- a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp
+++ b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp
@ -34,7 +34,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 #include <kseparator.h>
--- a/digikam/utilities/imageeditor/canvas/dimginterface.cpp
+++ b/digikam/utilities/imageeditor/canvas/dimginterface.cpp
@ -47,7 +47,7 @@
 // KDE includes.

 #include <kcursor.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>

 // Local includes.

--- a/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp
+++ b/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp
@ -27,7 +27,7 @@
 #include <ktrader.h>
 #include <tdeparts/componentfactory.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kxmlguiclient.h>

 // Local includes.
--- a/digikam/utilities/imageeditor/canvas/undoaction.h
+++ b/digikam/utilities/imageeditor/canvas/undoaction.h
@ -27,7 +27,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>

 // Local includes.

--- a/digikam/utilities/imageeditor/canvas/undocache.cpp
+++ b/digikam/utilities/imageeditor/canvas/undocache.cpp
@ -42,7 +42,7 @@ extern "C"
 #include <kstandarddirs.h>
 #include <tdeaboutdata.h>
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>

 // Local includes.

--- a/digikam/utilities/imageeditor/editor/editortoolsettings.cpp
+++ b/digikam/utilities/imageeditor/editor/editortoolsettings.cpp
@ -35,9 +35,9 @@
 #include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <kdialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 #include <kstdguiitem.h>
--- a/digikam/utilities/imageeditor/editor/editorwindow.cpp
+++ b/digikam/utilities/imageeditor/editor/editorwindow.cpp
@ -60,19 +60,19 @@ extern "C"
 #include <kstdaction.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kimageio.h>
 #include <tdeaccel.h>
-#include <kmessagebox.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>
 #include <kprotocolinfo.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdetoolbar.h>
 #include <kstatusbar.h>
 #include <kprogress.h>
--- a/digikam/utilities/imageeditor/editor/imageiface.h
+++ b/digikam/utilities/imageeditor/editor/imageiface.h
@ -32,7 +32,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>

 // Local includes.

--- a/digikam/utilities/imageeditor/editor/imagewindow.cpp
+++ b/digikam/utilities/imageeditor/editor/imagewindow.cpp
@ -39,16 +39,16 @@
 // KDE includes.

 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <kimageio.h>
 #include <tdefiledialog.h>
 #include <tdeversion.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdetoolbar.h>
 #include <tdeaccel.h>
 #include <tdeaction.h>
--- a/digikam/utilities/imageeditor/editor/savingcontextcontainer.h
+++ b/digikam/utilities/imageeditor/editor/savingcontextcontainer.h
@ -32,7 +32,7 @@
 // KDE includes.

 #include <kurl.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>

 // Local includes.

--- a/digikam/utilities/imageeditor/rawimport/rawimport.cpp
+++ b/digikam/utilities/imageeditor/rawimport/rawimport.cpp
@ -30,7 +30,7 @@
 // KDE includes.

 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
--- a/digikam/utilities/imageeditor/rawimport/rawpreview.cpp
+++ b/digikam/utilities/imageeditor/rawimport/rawpreview.cpp
@ -32,7 +32,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcursor.h>
 #include <kdatetbl.h>
 #include <kiconloader.h>
--- a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp
+++ b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp
@ -38,7 +38,7 @@

 #include <tdeapplication.h>
 #include <ktabwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
--- a/digikam/utilities/imageeditor/tools/imageprint.cpp
+++ b/digikam/utilities/imageeditor/tools/imageprint.cpp
@ -55,17 +55,17 @@

 // KDE includes.

-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kimageio.h>
 #include <kcombobox.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <knuminput.h>
 #include <kprinter.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kpropertiesdialog.h>

 // Local includes.
--- a/digikam/utilities/imageeditor/tools/imageresize.cpp
+++ b/digikam/utilities/imageeditor/tools/imageresize.cpp
@ -49,15 +49,15 @@
 #include <kseparator.h>
 #include <kcursor.h>
 #include <kurllabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>

 // LibKDcraw includes.

--- a/digikam/utilities/lighttable/lighttablebar.cpp
+++ b/digikam/utilities/lighttable/lighttablebar.cpp
@ -30,9 +30,9 @@

 // KDE includes.

-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>

--- a/digikam/utilities/lighttable/lighttablepreview.cpp
+++ b/digikam/utilities/lighttable/lighttablepreview.cpp
@ -36,7 +36,7 @@
 // KDE includes.

 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kservice.h>
 #include <krun.h>
 #include <ktrader.h>
--- a/digikam/utilities/lighttable/lighttablewindow.cpp
+++ b/digikam/utilities/lighttable/lighttablewindow.cpp
@ -30,13 +30,13 @@
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
 #include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <twin.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kstatusbar.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>

 // LibKDcraw includes.

--- a/digikam/utilities/setup/cameraselection.cpp
+++ b/digikam/utilities/setup/cameraselection.cpp
@ -37,10 +37,10 @@
 // KDE includes.

 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kactivelabel.h>
 #include <kurlrequester.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kcursor.h>
 #include <tdeapplication.h>
--- a/digikam/utilities/setup/setup.cpp
+++ b/digikam/utilities/setup/setup.cpp
@ -30,9 +30,9 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>

--- a/digikam/utilities/setup/setupcamera.cpp
+++ b/digikam/utilities/setup/setupcamera.cpp
@ -34,11 +34,11 @@

 // KDE includes.

-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurllabel.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <kcursor.h>
 #include <tdeapplication.h>
--- a/digikam/utilities/setup/setupcollections.cpp
+++ b/digikam/utilities/setup/setupcollections.cpp
@ -39,11 +39,11 @@
 // KDE includes.

 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <tdeversion.h>

--- a/digikam/utilities/setup/setupdcraw.cpp
+++ b/digikam/utilities/setup/setupdcraw.cpp
@ -35,7 +35,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdialog.h>
 #include <tdeconfig.h>
--- a/digikam/utilities/setup/setupeditor.cpp
+++ b/digikam/utilities/setup/setupeditor.cpp
@ -33,7 +33,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <kcolorbutton.h>
 #include <knuminput.h>
--- a/digikam/utilities/setup/setupgeneral.cpp
+++ b/digikam/utilities/setup/setupgeneral.cpp
@ -41,11 +41,11 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurlrequester.h>

 // Local includes.
--- a/digikam/utilities/setup/setupicc.cpp
+++ b/digikam/utilities/setup/setupicc.cpp
@ -45,7 +45,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
@ -53,10 +53,10 @@
 #include <tdeconfig.h>
 #include <kcombobox.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurllabel.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>

 // lcms includes.
--- a/digikam/utilities/setup/setupidentity.cpp
+++ b/digikam/utilities/setup/setupidentity.cpp
@ -32,7 +32,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <klineedit.h>
 #include <kactivelabel.h>
--- a/digikam/utilities/setup/setupiofiles.cpp
+++ b/digikam/utilities/setup/setupiofiles.cpp
@ -27,7 +27,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
--- a/digikam/utilities/setup/setuplighttable.cpp
+++ b/digikam/utilities/setup/setuplighttable.cpp
@ -33,7 +33,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
--- a/digikam/utilities/setup/setupmetadata.cpp
+++ b/digikam/utilities/setup/setupmetadata.cpp
@ -37,12 +37,12 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kactivelabel.h>
 #include <kdialog.h>
 #include <kurllabel.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>

--- a/digikam/utilities/setup/setupmime.cpp
+++ b/digikam/utilities/setup/setupmime.cpp
@ -35,7 +35,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <klineeditdlg.h>
 #include <kiconloader.h>
--- a/digikam/utilities/setup/setupmisc.cpp
+++ b/digikam/utilities/setup/setupmisc.cpp
@ -30,7 +30,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>

 // Local includes.
--- a/digikam/utilities/setup/setupplugins.cpp
+++ b/digikam/utilities/setup/setupplugins.cpp
@ -35,7 +35,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>

 // libkipi includes.
--- a/digikam/utilities/setup/setupslideshow.cpp
+++ b/digikam/utilities/setup/setupslideshow.cpp
@ -30,7 +30,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <knuminput.h>
 #include <tdeconfig.h>
--- a/digikam/utilities/setup/setuptooltip.cpp
+++ b/digikam/utilities/setup/setuptooltip.cpp
@ -30,7 +30,7 @@

 // KDE includes.

-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>

 // Local includes.
--- a/digikam/utilities/slideshow/slideshow.cpp
+++ b/digikam/utilities/slideshow/slideshow.cpp
@ -37,9 +37,9 @@

 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeversion.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>

 // Local includes.

--- a/digikam/utilities/slideshow/toolbar.cpp
+++ b/digikam/utilities/slideshow/toolbar.cpp
@ -32,7 +32,7 @@

 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>

 // Local includes.