Rename additional header files to avoid conflicts with KDE4

author: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2013-02-15 21:44:25 -0600
committer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2013-02-15 21:44:25 -0600
commit: fa6008238fe6befd362a23c8767775a744e22bc2 (patch)
tree: e1cd2545f72128efed02d79e501397ced82e36bc /digikam
parent: d21f600cd26a3c713e33fd7065b6e769825d86ed (diff)
download: digikam-fa6008238fe6befd362a23c8767775a744e22bc2.tar.gz
digikam-fa6008238fe6befd362a23c8767775a744e22bc2.zip
271 files changed, 418 insertions, 418 deletions
diff --git a/digikam/digikam/album.cpp b/digikam/digikam/album.cpp
index 7301785..a6e3a29 100644
--- a/digikam/digikam/album.cpp
+++ b/digikam/digikam/album.cpp
@@ -24,7 +24,7 @@
 
 // KDE includes.
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Local includes.
 
diff --git a/digikam/digikam/albumdb.cpp b/digikam/digikam/albumdb.cpp
index b4414dc..ef46b5a 100644
--- 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.
 
diff --git a/digikam/digikam/albumfiletip.cpp b/digikam/digikam/albumfiletip.cpp
index 683d767..1950eab 100644
--- 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.
diff --git a/digikam/digikam/albumfolderview.cpp b/digikam/digikam/albumfolderview.cpp
index f485cc2..2155550 100644
--- 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>
 
diff --git a/digikam/digikam/albumicongroupitem.cpp b/digikam/digikam/albumicongroupitem.cpp
index 9ed1a14..07562f8 100644
--- 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.
diff --git a/digikam/digikam/albumiconitem.cpp b/digikam/digikam/albumiconitem.cpp
index 5b9767e..8c97f08 100644
--- 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.
diff --git a/digikam/digikam/albumiconview.cpp b/digikam/digikam/albumiconview.cpp
index 3277ff2..2ec28a8 100644
--- 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>
diff --git a/digikam/digikam/albumiconviewfilter.cpp b/digikam/digikam/albumiconviewfilter.cpp
index 7eaac19..e45566b 100644
--- 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.
diff --git a/digikam/digikam/albummanager.cpp b/digikam/digikam/albummanager.cpp
index 7255c68..80b477e 100644
--- 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>
diff --git a/digikam/digikam/albumpropsedit.cpp b/digikam/digikam/albumpropsedit.cpp
index 904c697..7983f42 100644
--- 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>
diff --git a/digikam/digikam/albumsettings.cpp b/digikam/digikam/albumsettings.cpp
index b8a21e7..6b7d431 100644
--- 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>
 
diff --git a/digikam/digikam/cameralist.cpp b/digikam/digikam/cameralist.cpp
index b10d750..bed6bcf 100644
--- 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.
 
diff --git a/digikam/digikam/daboutdata.h b/digikam/digikam/daboutdata.h
index 149d443..5ff23f4 100644
--- 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";
diff --git a/digikam/digikam/datefolderview.cpp b/digikam/digikam/datefolderview.cpp
index 4ce5e44..8c4bedb 100644
--- 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>
 
diff --git a/digikam/digikam/digikamapp.cpp b/digikam/digikam/digikamapp.cpp
index a0b6e80..463d7eb 100644
--- 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>
diff --git a/digikam/digikam/digikamfirstrun.cpp b/digikam/digikam/digikamfirstrun.cpp
index ec3c17a..e7a95c0 100644
--- 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.
 
diff --git a/digikam/digikam/digikamview.cpp b/digikam/digikam/digikamview.cpp
index 1637d96..33fd19f 100644
--- 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>
diff --git a/digikam/digikam/dio.cpp b/digikam/digikam/dio.cpp
index 063df25..857dc03 100644
--- 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.
 
diff --git a/digikam/digikam/firstrun.cpp b/digikam/digikam/firstrun.cpp
index fb376b9..4361303 100644
--- 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.
 
diff --git a/digikam/digikam/folderview.cpp b/digikam/digikam/folderview.cpp
index e4a7c0d..ffa5f03 100644
--- 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.
 
diff --git a/digikam/digikam/iconview.cpp b/digikam/digikam/iconview.cpp
index 1ce216f..e71e103 100644
--- 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.
 
diff --git a/digikam/digikam/imagepreviewview.cpp b/digikam/digikam/imagepreviewview.cpp
index 189b11b..44bf96f 100644
--- 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>
diff --git a/digikam/digikam/kdateedit.cpp b/digikam/digikam/kdateedit.cpp
index cab8832..020f77d 100644
--- 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.
 
diff --git a/digikam/digikam/kdatepickerpopup.cpp b/digikam/digikam/kdatepickerpopup.cpp
index 34e2654..b471642 100644
--- a/digikam/digikam/kdatepickerpopup.cpp
+++ b/digikam/digikam/kdatepickerpopup.cpp
@@ -30,7 +30,7 @@
 
 // KDE includes.
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Local includes.
 
diff --git a/digikam/digikam/kipiinterface.cpp b/digikam/digikam/kipiinterface.cpp
index 950b5e3..b721a13 100644
--- 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>
diff --git a/digikam/digikam/main.cpp b/digikam/digikam/main.cpp
index 71a9ea7..7760919 100644
--- 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.
 
diff --git a/digikam/digikam/mediaplayerview.cpp b/digikam/digikam/mediaplayerview.cpp
index 0bde3d4..23c313a 100644
--- 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.
 
diff --git a/digikam/digikam/mimefilter.cpp b/digikam/digikam/mimefilter.cpp
index 35696e4..80b3b50 100644
--- 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.
 
diff --git a/digikam/digikam/monthwidget.cpp b/digikam/digikam/monthwidget.cpp
index 6906629..e6c255f 100644
--- 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>
 
diff --git a/digikam/digikam/ratingfilter.cpp b/digikam/digikam/ratingfilter.cpp
index c0d4c3a..9900635 100644
--- 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>
 
diff --git a/digikam/digikam/ratingpopupmenu.cpp b/digikam/digikam/ratingpopupmenu.cpp
index b419b65..a1d17ba 100644
--- 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.
diff --git a/digikam/digikam/ratingwidget.cpp b/digikam/digikam/ratingwidget.cpp
index 0cfc605..f22ecb4 100644
--- 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.
diff --git a/digikam/digikam/scanlib.cpp b/digikam/digikam/scanlib.cpp
index e55cc62..92bc395 100644
--- 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.
diff --git a/digikam/digikam/searchadvanceddialog.cpp b/digikam/digikam/searchadvanceddialog.cpp
index 0a10e23..dff2b55 100644
--- 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.
diff --git a/digikam/digikam/searchfolderview.cpp b/digikam/digikam/searchfolderview.cpp
index 3dd46ae..9591da7 100644
--- 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>
diff --git a/digikam/digikam/searchquickdialog.cpp b/digikam/digikam/searchquickdialog.cpp
index 094b65e..67ca2a6 100644
--- 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.
diff --git a/digikam/digikam/searchwidgets.cpp b/digikam/digikam/searchwidgets.cpp
index 402313d..6089d54 100644
--- 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>
 
diff --git a/digikam/digikam/syncjob.cpp b/digikam/digikam/syncjob.cpp
index 55c9914..44b6829 100644
--- 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>
 
diff --git a/digikam/digikam/tageditdlg.cpp b/digikam/digikam/tageditdlg.cpp
index 550b1ff..956fd2e 100644
--- 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>
diff --git a/digikam/digikam/tagfilterview.cpp b/digikam/digikam/tagfilterview.cpp
index 48b20df..27ef49c 100644
--- 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.
 
diff --git a/digikam/digikam/tagfolderview.cpp b/digikam/digikam/tagfolderview.cpp
index 118e480..26f7bba 100644
--- 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.
 
diff --git a/digikam/digikam/tagspopupmenu.cpp b/digikam/digikam/tagspopupmenu.cpp
index 344fdad..bb0e052 100644
--- 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.
 
diff --git a/digikam/digikam/timelinefolderview.cpp b/digikam/digikam/timelinefolderview.cpp
index 8a08326..9fd1926 100644
--- 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.
 
diff --git a/digikam/digikam/timelineview.cpp b/digikam/digikam/timelineview.cpp
index 591f82b..cc9ae2f 100644
--- 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>
diff --git a/digikam/digikam/timelinewidget.cpp b/digikam/digikam/timelinewidget.cpp
index eecc0c9..46aff0e 100644
--- 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.
 
diff --git a/digikam/digikam/welcomepageview.cpp b/digikam/digikam/welcomepageview.cpp
index f0d9e1e..eef7e74 100644
--- 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>
diff --git a/digikam/imageplugins/adjustcurves/adjustcurves.cpp b/digikam/imageplugins/adjustcurves/adjustcurves.cpp
index 6da1d1f..28af631 100644
--- 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>
diff --git a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp b/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp
index 498b97d..2c7862c 100644
--- 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>
diff --git a/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp b/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp
index 2be813d..affae05 100644
--- 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>
diff --git a/digikam/imageplugins/adjustlevels/adjustlevels.cpp b/digikam/imageplugins/adjustlevels/adjustlevels.cpp
index fdef3de..930325b 100644
--- 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>
diff --git a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp
index b205537..97a9543 100644
--- 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>
diff --git a/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp b/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp
index ff145b1..242c95a 100644
--- 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>
diff --git a/digikam/imageplugins/antivignetting/antivignettingtool.cpp b/digikam/imageplugins/antivignetting/antivignettingtool.cpp
index 6f1d1ec..f1a163a 100644
--- 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>
diff --git a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp b/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp
index dc5484e..441ee20 100644
--- 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>
diff --git a/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp b/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp
index 8ce215c..9f02f88 100644
--- 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>
diff --git a/digikam/imageplugins/blurfx/blurfxtool.cpp b/digikam/imageplugins/blurfx/blurfxtool.cpp
index 982e282..01627a6 100644
--- 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.
diff --git a/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp b/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp
index 82e47f4..e604ae2 100644
--- 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>
diff --git a/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp b/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp
index a98944d..b4786ec 100644
--- 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>
diff --git a/digikam/imageplugins/border/bordertool.cpp b/digikam/imageplugins/border/bordertool.cpp
index d40ec51..a125b52 100644
--- 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>
 
diff --git a/digikam/imageplugins/border/imageeffect_border.cpp b/digikam/imageplugins/border/imageeffect_border.cpp
index f8f5f97..13f4e3f 100644
--- 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>
diff --git a/digikam/imageplugins/border/imageplugin_border.cpp b/digikam/imageplugins/border/imageplugin_border.cpp
index 631f4a6..75d9370 100644
--- 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>
diff --git a/digikam/imageplugins/channelmixer/channelmixer.cpp b/digikam/imageplugins/channelmixer/channelmixer.cpp
index 9304fff..2d40d15 100644
--- 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>
diff --git a/digikam/imageplugins/channelmixer/channelmixertool.cpp b/digikam/imageplugins/channelmixer/channelmixertool.cpp
index 3487856..473863f 100644
--- 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>
diff --git a/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp b/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp
index 9bd67bb..2afbafd 100644
--- 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>
diff --git a/digikam/imageplugins/charcoal/charcoaltool.cpp b/digikam/imageplugins/charcoal/charcoaltool.cpp
index 0a28299..772cbe3 100644
--- 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>
diff --git a/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp b/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp
index c64919b..f57f1ec 100644
--- 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>
diff --git a/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp b/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp
index fe5c8af..c2aa269 100644
--- 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>
diff --git a/digikam/imageplugins/colorfx/colorfxtool.cpp b/digikam/imageplugins/colorfx/colorfxtool.cpp
index 042ba01..ad9fd04 100644
--- 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>
 
diff --git a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp
index 9b86656..8edb2a1 100644
--- 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>
diff --git a/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp b/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp
index 207abaf..21af85b 100644
--- 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>
diff --git a/digikam/imageplugins/coreplugin/autocorrectiontool.cpp b/digikam/imageplugins/coreplugin/autocorrectiontool.cpp
index baac89d..8a661c0 100644
--- 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.
diff --git a/digikam/imageplugins/coreplugin/bcgtool.cpp b/digikam/imageplugins/coreplugin/bcgtool.cpp
index 1335348..1f7954d 100644
--- 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.
diff --git a/digikam/imageplugins/coreplugin/blurtool.cpp b/digikam/imageplugins/coreplugin/blurtool.cpp
index 3da8a55..85e1dc1 100644
--- 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.
diff --git a/digikam/imageplugins/coreplugin/bwsepiatool.cpp b/digikam/imageplugins/coreplugin/bwsepiatool.cpp
index 3de92e7..6fdca4e 100644
--- 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>
 
diff --git a/digikam/imageplugins/coreplugin/hsl/hsltool.cpp b/digikam/imageplugins/coreplugin/hsl/hsltool.cpp
index 95b0e38..a5a4075 100644
--- 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.
diff --git a/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.cpp b/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.cpp
index 3f10be2..3841ca3 100644
--- 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.
diff --git a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp
index 6e4a849..367919a 100644
--- 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>
diff --git a/digikam/imageplugins/coreplugin/iccprooftool.cpp b/digikam/imageplugins/coreplugin/iccprooftool.cpp
index 28ea2e2..3ecc1a8 100644
--- 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>
diff --git a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp
index 0e19b61..bd116d6 100644
--- 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.
diff --git a/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp b/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp
index f056863..bafe063 100644
--- 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>
diff --git a/digikam/imageplugins/coreplugin/imageeffect_blur.cpp b/digikam/imageplugins/coreplugin/imageeffect_blur.cpp
index b307e18..bd23854 100644
--- 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.
diff --git a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp
index a05416a..e7aebd8 100644
--- 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>
diff --git a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp
index b597b4b..7a07eee 100644
--- 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>
 
diff --git a/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp b/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp
index bb768e9..496de54 100644
--- 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>
diff --git a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp b/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp
index f39aab1..0ee78bc 100644
--- 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>
diff --git a/digikam/imageplugins/coreplugin/imageplugin_core.cpp b/digikam/imageplugins/coreplugin/imageplugin_core.cpp
index 4ee4b3f..0bc4a18 100644
--- 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.
diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp
index 5ef79e2..18882fc 100644
--- 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>
diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp b/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp
index f4d5a11..7baa2ee 100644
--- 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.
 
diff --git a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp
index af411b2..c223ed3 100644
--- 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>
 
diff --git a/digikam/imageplugins/coreplugin/redeyetool.cpp b/digikam/imageplugins/coreplugin/redeyetool.cpp
index 5e5e217..b1e5579 100644
--- 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.
diff --git a/digikam/imageplugins/coreplugin/rgbtool.cpp b/digikam/imageplugins/coreplugin/rgbtool.cpp
index 505517b..c337d27 100644
--- 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.
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp
index 1e22e6d..8792695 100644
--- 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.
 
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp
index 468f88a..b2a8239 100644
--- 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.
 
diff --git a/digikam/imageplugins/distortionfx/distortionfxtool.cpp b/digikam/imageplugins/distortionfx/distortionfxtool.cpp
index 86d16ab..3be193c 100644
--- 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>
 
diff --git a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp b/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp
index aa0116f..bf5fc9f 100644
--- 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>
diff --git a/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp b/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp
index a3e1a5d..c6e6108 100644
--- 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>
diff --git a/digikam/imageplugins/emboss/embosstool.cpp b/digikam/imageplugins/emboss/embosstool.cpp
index 0a40440..be03d07 100644
--- 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.
diff --git a/digikam/imageplugins/emboss/imageeffect_emboss.cpp b/digikam/imageplugins/emboss/imageeffect_emboss.cpp
index 4a25e28..9ec68b4 100644
--- 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>
diff --git a/digikam/imageplugins/emboss/imageplugin_emboss.cpp b/digikam/imageplugins/emboss/imageplugin_emboss.cpp
index 33cd150..9580480 100644
--- 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>
diff --git a/digikam/imageplugins/filmgrain/filmgraintool.cpp b/digikam/imageplugins/filmgrain/filmgraintool.cpp
index 48aea52..7bb3aad 100644
--- 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>
diff --git a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp b/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp
index 9f354da..25bfc08 100644
--- 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>
diff --git a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp b/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp
index 112db9f..2d4efe4 100644
--- 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>
diff --git a/digikam/imageplugins/freerotation/freerotationtool.cpp b/digikam/imageplugins/freerotation/freerotationtool.cpp
index 0c16903..70c053c 100644
--- 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>
 
diff --git a/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp b/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp
index e1141e8..9e546e0 100644
--- 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>
diff --git a/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp b/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp
index c08adb2..acf632b 100644
--- 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>
diff --git a/digikam/imageplugins/hotpixels/blackframelistview.h b/digikam/imageplugins/hotpixels/blackframelistview.h
index 5e5cafa..fe296d0 100644
--- 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.
 
diff --git a/digikam/imageplugins/hotpixels/hotpixelstool.cpp b/digikam/imageplugins/hotpixels/hotpixelstool.cpp
index 61afe38..4cabb68 100644
--- 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>
diff --git a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp
index eb2cf57..b8b9b86 100644
--- 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>
diff --git a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp b/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp
index de94e26..aaf26a3 100644
--- 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>
diff --git a/digikam/imageplugins/infrared/imageeffect_infrared.cpp b/digikam/imageplugins/infrared/imageeffect_infrared.cpp
index 90f43d3..06b6223 100644
--- 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>
diff --git a/digikam/imageplugins/infrared/imageplugin_infrared.cpp b/digikam/imageplugins/infrared/imageplugin_infrared.cpp
index faf6b7a..fcd991b 100644
--- 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>
diff --git a/digikam/imageplugins/infrared/infraredtool.cpp b/digikam/imageplugins/infrared/infraredtool.cpp
index 34fa6f5..6a482c5 100644
--- 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>
diff --git a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp
index 8203141..f83ab76 100644
--- 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.
diff --git a/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp b/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp
index 921abef..34073dc 100644
--- 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>
diff --git a/digikam/imageplugins/inpainting/inpaintingtool.cpp b/digikam/imageplugins/inpainting/inpaintingtool.cpp
index 9c1e1aa..95190ab 100644
--- 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>
diff --git a/digikam/imageplugins/inserttext/fontchooserwidget.cpp b/digikam/imageplugins/inserttext/fontchooserwidget.cpp
index efa0043..7b0dfca 100644
--- 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>
diff --git a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp b/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp
index b05180f..97f0637 100644
--- 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>
diff --git a/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp b/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp
index c06ef6c..6ee5994 100644
--- 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>
diff --git a/digikam/imageplugins/inserttext/inserttexttool.cpp b/digikam/imageplugins/inserttext/inserttexttool.cpp
index 746db95..80b3269 100644
--- 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>
diff --git a/digikam/imageplugins/inserttext/inserttextwidget.cpp b/digikam/imageplugins/inserttext/inserttextwidget.cpp
index 0595d23..214a3cb 100644
--- 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.
 
diff --git a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp b/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp
index 6a8ff66..5d9dbf1 100644
--- 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>
diff --git a/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp b/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp
index 02cf17b..dd1d022 100644
--- 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>
diff --git a/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp b/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp
index 08e8cac..dde7aab 100644
--- 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.
diff --git a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp
index 50cc093..9072855 100644
--- 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.
diff --git a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp b/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp
index a787c53..01d05a5 100644
--- 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>
diff --git a/digikam/imageplugins/noisereduction/noisereductiontool.cpp b/digikam/imageplugins/noisereduction/noisereductiontool.cpp
index fd4651a..d1e4908 100644
--- 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.
diff --git a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp b/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp
index b194063..ea20ab1 100644
--- 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>
diff --git a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp b/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp
index c647b40..7d44dd4 100644
--- 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>
diff --git a/digikam/imageplugins/oilpaint/oilpainttool.cpp b/digikam/imageplugins/oilpaint/oilpainttool.cpp
index f3eb418..80a6cd6 100644
--- 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.
diff --git a/digikam/imageplugins/perspective/imageeffect_perspective.cpp b/digikam/imageplugins/perspective/imageeffect_perspective.cpp
index 2b00d60..cf03ebc 100644
--- 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>
diff --git a/digikam/imageplugins/perspective/imageplugin_perspective.cpp b/digikam/imageplugins/perspective/imageplugin_perspective.cpp
index 75d1228..f99fd37 100644
--- 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>
diff --git a/digikam/imageplugins/perspective/perspectivetool.cpp b/digikam/imageplugins/perspective/perspectivetool.cpp
index 7205a45..eadf9a7 100644
--- 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>
diff --git a/digikam/imageplugins/perspective/perspectivewidget.cpp b/digikam/imageplugins/perspective/perspectivewidget.cpp
index 92b4837..a43aacf 100644
--- 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.
diff --git a/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp b/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp
index 7b99f97..07101f5 100644
--- 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>
diff --git a/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp b/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp
index 9a06919..d309b85 100644
--- 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>
diff --git a/digikam/imageplugins/raindrop/raindroptool.cpp b/digikam/imageplugins/raindrop/raindroptool.cpp
index 14d13f6..3c153a4 100644
--- 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.
diff --git a/digikam/imageplugins/restoration/imageeffect_restoration.cpp b/digikam/imageplugins/restoration/imageeffect_restoration.cpp
index 96b86b0..7edf075 100644
--- 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.
 
diff --git a/digikam/imageplugins/restoration/imageplugin_restoration.cpp b/digikam/imageplugins/restoration/imageplugin_restoration.cpp
index 8975578..4bcb9ad 100644
--- 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>
diff --git a/digikam/imageplugins/restoration/restorationtool.cpp b/digikam/imageplugins/restoration/restorationtool.cpp
index f4b9780..977633e 100644
--- 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.
 
diff --git a/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp b/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp
index a927bc9..dba6d20 100644
--- 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>
diff --git a/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp b/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp
index 68265af..e0490a2 100644
--- 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>
diff --git a/digikam/imageplugins/sheartool/sheartool.cpp b/digikam/imageplugins/sheartool/sheartool.cpp
index 4b6e9e7..4e2538a 100644
--- 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>
 
diff --git a/digikam/imageplugins/superimpose/dirselectwidget.cpp b/digikam/imageplugins/superimpose/dirselectwidget.cpp
index a4be444..858bbd2 100644
--- 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.
 
diff --git a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp
index f3c73ee..bb674ed 100644
--- 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.
 
diff --git a/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp b/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp
index d690d27..9672471 100644
--- 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>
diff --git a/digikam/imageplugins/superimpose/superimposetool.cpp b/digikam/imageplugins/superimpose/superimposetool.cpp
index 681bf00..ccd3029 100644
--- 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.
 
diff --git a/digikam/imageplugins/superimpose/superimposewidget.cpp b/digikam/imageplugins/superimpose/superimposewidget.cpp
index 7994db4..cc89e8a 100644
--- 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.
 
diff --git a/digikam/imageplugins/texture/imageeffect_texture.cpp b/digikam/imageplugins/texture/imageeffect_texture.cpp
index e235dab..56f08d7 100644
--- 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>
diff --git a/digikam/imageplugins/texture/imageplugin_texture.cpp b/digikam/imageplugins/texture/imageplugin_texture.cpp
index 04683bd..7114fa6 100644
--- 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>
diff --git a/digikam/imageplugins/texture/texturetool.cpp b/digikam/imageplugins/texture/texturetool.cpp
index 74c68b8..143cf14 100644
--- 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.
diff --git a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp
index d740bbc..2994084 100644
--- 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>
diff --git a/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp b/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp
index 41bd05d..ada29ae 100644
--- 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>
diff --git a/digikam/imageplugins/whitebalance/whitebalancetool.cpp b/digikam/imageplugins/whitebalance/whitebalancetool.cpp
index c74a37f..8e6da1e 100644
--- 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>
diff --git a/digikam/libs/dialogs/ctrlpaneldlg.cpp b/digikam/libs/dialogs/ctrlpaneldlg.cpp
index 47edc82..a40dc68 100644
--- 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.
 
diff --git a/digikam/libs/dialogs/deletedialog.cpp b/digikam/libs/dialogs/deletedialog.cpp
index dde5e84..bbe7041 100644
--- 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.
diff --git a/digikam/libs/dialogs/dprogressdlg.cpp b/digikam/libs/dialogs/dprogressdlg.cpp
index b9349a7..754047d 100644
--- 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>
diff --git a/digikam/libs/dialogs/iccprofileinfodlg.cpp b/digikam/libs/dialogs/iccprofileinfodlg.cpp
index 1c17490..04f30c0 100644
--- 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.
 
diff --git a/digikam/libs/dialogs/imagedialog.cpp b/digikam/libs/dialogs/imagedialog.cpp
index 4f8eb56..ade4b98 100644
--- 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>
diff --git a/digikam/libs/dialogs/imagedlgbase.cpp b/digikam/libs/dialogs/imagedlgbase.cpp
index 074cb3c..fbc2b86 100644
--- 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>
diff --git a/digikam/libs/dialogs/imageguidedlg.cpp b/digikam/libs/dialogs/imageguidedlg.cpp
index 94d2229..9c6c086 100644
--- 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>
diff --git a/digikam/libs/dialogs/rawcameradlg.cpp b/digikam/libs/dialogs/rawcameradlg.cpp
index 1e2b2a5..e67a565 100644
--- 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>
diff --git a/digikam/libs/dimg/loaders/jp2ksettings.cpp b/digikam/libs/dimg/loaders/jp2ksettings.cpp
index 32a2ca2..ca5c473 100644
--- 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>
 
diff --git a/digikam/libs/dimg/loaders/jpegsettings.cpp b/digikam/libs/dimg/loaders/jpegsettings.cpp
index 3b15dfa..62bd636 100644
--- 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>
diff --git a/digikam/libs/dimg/loaders/pngsettings.cpp b/digikam/libs/dimg/loaders/pngsettings.cpp
index e140d46..ce39219 100644
--- 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>
 
diff --git a/digikam/libs/dimg/loaders/tiffsettings.cpp b/digikam/libs/dimg/loaders/tiffsettings.cpp
index 96d6d6a..3ea7e20 100644
--- 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.
diff --git a/digikam/libs/greycstoration/greycstorationwidget.cpp b/digikam/libs/greycstoration/greycstorationwidget.cpp
index 5a4bae7..147a92f 100644
--- 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.
 
diff --git a/digikam/libs/imageproperties/cameraitempropertiestab.cpp b/digikam/libs/imageproperties/cameraitempropertiestab.cpp
index 5d1d487..0427840 100644
--- 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>
diff --git a/digikam/libs/imageproperties/imagedescedittab.cpp b/digikam/libs/imageproperties/imagedescedittab.cpp
index 7fe479c..296ea35 100644
--- 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>
diff --git a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp
index 53b758d..7388444 100644
--- 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>
diff --git a/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp b/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp
index d28f8cb..5a48aae 100644
--- 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>
diff --git a/digikam/libs/imageproperties/imagepropertiessidebar.cpp b/digikam/libs/imageproperties/imagepropertiessidebar.cpp
index 8e89d09..9f1dccc 100644
--- 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.
diff --git a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp b/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp
index 4c948b6..6a13df1 100644
--- 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.
diff --git a/digikam/libs/imageproperties/imagepropertiessidebardb.cpp b/digikam/libs/imageproperties/imagepropertiessidebardb.cpp
index 7e3c92a..e360622 100644
--- 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.
diff --git a/digikam/libs/imageproperties/imagepropertiestab.cpp b/digikam/libs/imageproperties/imagepropertiestab.cpp
index b75ad4c..952bb64 100644
--- 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>
diff --git a/digikam/libs/imageproperties/navigatebarwidget.cpp b/digikam/libs/imageproperties/navigatebarwidget.cpp
index ea01df0..ba923cf 100644
--- 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.
 
diff --git a/digikam/libs/imageproperties/talbumlistview.cpp b/digikam/libs/imageproperties/talbumlistview.cpp
index 7258563..4191962 100644
--- 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.
diff --git a/digikam/libs/themeengine/themeengine.cpp b/digikam/libs/themeengine/themeengine.cpp
index 5833b89..f788def 100644
--- 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.
 
diff --git a/digikam/libs/thumbbar/thumbbar.cpp b/digikam/libs/thumbbar/thumbbar.cpp
index 914f79f..fecfbf1 100644
--- 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.
 
diff --git a/digikam/libs/thumbbar/thumbnailjob.cpp b/digikam/libs/thumbbar/thumbnailjob.cpp
index 9ad8f14..1df7530 100644
--- 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.
 
diff --git a/digikam/libs/widgets/common/curveswidget.cpp b/digikam/libs/widgets/common/curveswidget.cpp
index 7f168ea..6409a0b 100644
--- 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.
 
diff --git a/digikam/libs/widgets/common/dlogoaction.cpp b/digikam/libs/widgets/common/dlogoaction.cpp
index 91bc9a9..eea2bc4 100644
--- 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.
 
diff --git a/digikam/libs/widgets/common/filesaveoptionsbox.cpp b/digikam/libs/widgets/common/filesaveoptionsbox.cpp
index efbfac9..26985fb 100644
--- 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>
diff --git a/digikam/libs/widgets/common/histogramwidget.cpp b/digikam/libs/widgets/common/histogramwidget.cpp
index 56a7987..44b52c7 100644
--- 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.
 
diff --git a/digikam/libs/widgets/common/previewwidget.cpp b/digikam/libs/widgets/common/previewwidget.cpp
index a7a15f2..9e34d00 100644
--- 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.
 
diff --git a/digikam/libs/widgets/common/searchtextbar.h b/digikam/libs/widgets/common/searchtextbar.h
index 7a8081a..9e59976 100644
--- 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.
 
diff --git a/digikam/libs/widgets/common/splashscreen.cpp b/digikam/libs/widgets/common/splashscreen.cpp
index 6ce56c7..20abac7 100644
--- 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.
 
diff --git a/digikam/libs/widgets/common/statusled.cpp b/digikam/libs/widgets/common/statusled.cpp
index 4e1e5f3..7d71c7f 100644
--- 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.
diff --git a/digikam/libs/widgets/common/statusnavigatebar.cpp b/digikam/libs/widgets/common/statusnavigatebar.cpp
index dab8e0f..c484483 100644
--- 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.
 
diff --git a/digikam/libs/widgets/common/statusprogressbar.cpp b/digikam/libs/widgets/common/statusprogressbar.cpp
index 31bcbd5..54c7f3b 100644
--- 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>
 
diff --git a/digikam/libs/widgets/common/statuszoombar.cpp b/digikam/libs/widgets/common/statuszoombar.cpp
index 1672253..10e7079 100644
--- 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.
diff --git a/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp b/digikam/libs/widgets/iccprofiles/cietonguewidget.cpp
index 5f9a85a..cd2efd5 100644
--- 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.
 
diff --git a/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp b/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp
index 5d952b6..2e5152f 100644
--- 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.
diff --git a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp b/digikam/libs/widgets/imageplugins/imageguidewidget.cpp
index eb94089..c8d3045 100644
--- 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.
 
diff --git a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp
index 4b69fd2..4b6ab95 100644
--- 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>
diff --git a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp
index f3585c3..27444a0 100644
--- 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>
diff --git a/digikam/libs/widgets/imageplugins/imageregionwidget.cpp b/digikam/libs/widgets/imageplugins/imageregionwidget.cpp
index b1a60b3..db80604 100644
--- 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.
diff --git a/digikam/libs/widgets/imageplugins/imagewidget.cpp b/digikam/libs/widgets/imageplugins/imagewidget.cpp
index c74814a..909dba9 100644
--- 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>
diff --git a/digikam/libs/widgets/metadata/exifwidget.cpp b/digikam/libs/widgets/metadata/exifwidget.cpp
index 286cf69..7761c25 100644
--- 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.
 
diff --git a/digikam/libs/widgets/metadata/gpswidget.cpp b/digikam/libs/widgets/metadata/gpswidget.cpp
index 0bc5a7b..fcb1646 100644
--- 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.
diff --git a/digikam/libs/widgets/metadata/iptcwidget.cpp b/digikam/libs/widgets/metadata/iptcwidget.cpp
index 24f782d..b0bcb00 100644
--- 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.
 
diff --git a/digikam/libs/widgets/metadata/makernotewidget.cpp b/digikam/libs/widgets/metadata/makernotewidget.cpp
index d2904ed..ddd1fe3 100644
--- 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.
 
diff --git a/digikam/libs/widgets/metadata/mdkeylistviewitem.cpp b/digikam/libs/widgets/metadata/mdkeylistviewitem.cpp
index c45ea72..27963ea 100644
--- 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.
 
diff --git a/digikam/libs/widgets/metadata/metadatalistview.cpp b/digikam/libs/widgets/metadata/metadatalistview.cpp
index a9aff2e..ed702b0 100644
--- 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.
 
diff --git a/digikam/libs/widgets/metadata/metadatawidget.cpp b/digikam/libs/widgets/metadata/metadatawidget.cpp
index fcc8564..dadec35 100644
--- 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>
 
diff --git a/digikam/libs/widgets/metadata/worldmapwidget.cpp b/digikam/libs/widgets/metadata/worldmapwidget.cpp
index cd59df3..17d07cc 100644
--- 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.
diff --git a/digikam/showfoto/main.cpp b/digikam/showfoto/main.cpp
index 0918dd6..0be2a54 100644
--- 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.
diff --git a/digikam/showfoto/setup/setup.cpp b/digikam/showfoto/setup/setup.cpp
index 0d53f17..6261ac5 100644
--- 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>
diff --git a/digikam/showfoto/setup/setupeditor.cpp b/digikam/showfoto/setup/setupeditor.cpp
index 72f58e3..dcb51e0 100644
--- 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>
diff --git a/digikam/showfoto/setup/setuptooltip.cpp b/digikam/showfoto/setup/setuptooltip.cpp
index c53001e..3fb1f3c 100644
--- 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>
diff --git a/digikam/showfoto/showfoto.cpp b/digikam/showfoto/showfoto.cpp
index 15ee618..0b1b5f2 100644
--- 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>
diff --git a/digikam/tdeioslave/digikamalbums.cpp b/digikam/tdeioslave/digikamalbums.cpp
index 17724ee..299df88 100644
--- 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>
diff --git a/digikam/tdeioslave/digikamdates.cpp b/digikam/tdeioslave/digikamdates.cpp
index 6cd7b89..8b6f5c1 100644
--- 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>
diff --git a/digikam/tdeioslave/digikamsearch.cpp b/digikam/tdeioslave/digikamsearch.cpp
index 462f5d1..3bc82ed 100644
--- 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>
diff --git a/digikam/tdeioslave/digikamtags.cpp b/digikam/tdeioslave/digikamtags.cpp
index 4163dc6..d03fda7 100644
--- 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>
diff --git a/digikam/tdeioslave/digikamthumbnail.cpp b/digikam/tdeioslave/digikamthumbnail.cpp
index 781fe0b..60d4be4 100644
--- 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>
diff --git a/digikam/themedesigner/main.cpp b/digikam/themedesigner/main.cpp
index 0b66671..27bc745 100644
--- 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.
 
diff --git a/digikam/themedesigner/mainwindow.cpp b/digikam/themedesigner/mainwindow.cpp
index e9c6ccb..3b93fb2 100644
--- 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.
diff --git a/digikam/themedesigner/themedicongroupitem.cpp b/digikam/themedesigner/themedicongroupitem.cpp
index 585bd52..1da37fd 100644
--- a/digikam/themedesigner/themedicongroupitem.cpp
+++ b/digikam/themedesigner/themedicongroupitem.cpp
@@ -28,7 +28,7 @@
 
 // KDE includes.
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Local includes.
 
diff --git a/digikam/themedesigner/themediconitem.cpp b/digikam/themedesigner/themediconitem.cpp
index 939e12b..2ed7df8 100644
--- 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>
 
diff --git a/digikam/utilities/batch/batchalbumssyncmetadata.cpp b/digikam/utilities/batch/batchalbumssyncmetadata.cpp
index a148b43..60fbae6 100644
--- 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>
 
diff --git a/digikam/utilities/batch/batchsyncmetadata.cpp b/digikam/utilities/batch/batchsyncmetadata.cpp
index 91e36be..831cdaf 100644
--- 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.
diff --git a/digikam/utilities/batch/batchthumbsgenerator.cpp b/digikam/utilities/batch/batchthumbsgenerator.cpp
index 890a1e3..783226f 100644
--- 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.
diff --git a/digikam/utilities/cameragui/albumselectdialog.cpp b/digikam/utilities/cameragui/albumselectdialog.cpp
index 03931f8..ee3b5e8 100644
--- 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.
 
diff --git a/digikam/utilities/cameragui/cameracontroller.cpp b/digikam/utilities/cameragui/cameracontroller.cpp
index 8167a63..e288e60 100644
--- 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>
 
diff --git a/digikam/utilities/cameragui/camerafolderdialog.cpp b/digikam/utilities/cameragui/camerafolderdialog.cpp
index 84ebcaa..441492d 100644
--- 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>
 
diff --git a/digikam/utilities/cameragui/camerafolderview.cpp b/digikam/utilities/cameragui/camerafolderview.cpp
index e04c450..bfa95e8 100644
--- 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.
diff --git a/digikam/utilities/cameragui/cameraiconview.cpp b/digikam/utilities/cameragui/cameraiconview.cpp
index be3ea36..be52eb8 100644
--- 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>
diff --git a/digikam/utilities/cameragui/camerainfodialog.cpp b/digikam/utilities/cameragui/camerainfodialog.cpp
index 2ad0ac1..f101260 100644
--- 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.
diff --git a/digikam/utilities/cameragui/cameraui.cpp b/digikam/utilities/cameragui/cameraui.cpp
index 27af679..6e458fd 100644
--- 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>
diff --git a/digikam/utilities/cameragui/freespacewidget.cpp b/digikam/utilities/cameragui/freespacewidget.cpp
index d096433..4921c5a 100644
--- 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>
diff --git a/digikam/utilities/cameragui/gpcamera.cpp b/digikam/utilities/cameragui/gpcamera.cpp
index 7139e98..e03d92d 100644
--- 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"
diff --git a/digikam/utilities/cameragui/renamecustomizer.cpp b/digikam/utilities/cameragui/renamecustomizer.cpp
index 96690ca..265cfcd 100644
--- 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>
diff --git a/digikam/utilities/cameragui/umscamera.cpp b/digikam/utilities/cameragui/umscamera.cpp
index 84a9f2c..537c29b 100644
--- 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.
diff --git a/digikam/utilities/imageeditor/canvas/canvas.cpp b/digikam/utilities/imageeditor/canvas/canvas.cpp
index edda717..8154c09 100644
--- 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.
 
diff --git a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp
index 067c9a7..f81a70d 100644
--- 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>
diff --git a/digikam/utilities/imageeditor/canvas/dimginterface.cpp b/digikam/utilities/imageeditor/canvas/dimginterface.cpp
index dcc9040..4ad6929 100644
--- 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.
 
diff --git a/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp b/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp
index fc104b4..43c8a16 100644
--- 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.
diff --git a/digikam/utilities/imageeditor/canvas/undoaction.h b/digikam/utilities/imageeditor/canvas/undoaction.h
index 9a4c924..5f29486 100644
--- 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.
 
diff --git a/digikam/utilities/imageeditor/canvas/undocache.cpp b/digikam/utilities/imageeditor/canvas/undocache.cpp
index e9776c7..5f36ae7 100644
--- 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.
 
diff --git a/digikam/utilities/imageeditor/editor/editortoolsettings.cpp b/digikam/utilities/imageeditor/editor/editortoolsettings.cpp
index b412839..a929684 100644
--- 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>
diff --git a/digikam/utilities/imageeditor/editor/editorwindow.cpp b/digikam/utilities/imageeditor/editor/editorwindow.cpp
index 7e8ede3..2a7a949 100644
--- 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>
diff --git a/digikam/utilities/imageeditor/editor/imageiface.h b/digikam/utilities/imageeditor/editor/imageiface.h
index 70e1a3e..272c62a 100644
--- 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.
 
diff --git a/digikam/utilities/imageeditor/editor/imagewindow.cpp b/digikam/utilities/imageeditor/editor/imagewindow.cpp
index df79709..2a45566 100644
--- 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>
diff --git a/digikam/utilities/imageeditor/editor/savingcontextcontainer.h b/digikam/utilities/imageeditor/editor/savingcontextcontainer.h
index b240a10..c747a35 100644
--- 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.
 
diff --git a/digikam/utilities/imageeditor/rawimport/rawimport.cpp b/digikam/utilities/imageeditor/rawimport/rawimport.cpp
index 1120cb9..7bc1e7a 100644
--- 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>
diff --git a/digikam/utilities/imageeditor/rawimport/rawpreview.cpp b/digikam/utilities/imageeditor/rawimport/rawpreview.cpp
index 7b70f7d..d4b409e 100644
--- 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>
diff --git a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp
index 58e5fd1..3e231ec 100644
--- 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>
diff --git a/digikam/utilities/imageeditor/tools/imageprint.cpp b/digikam/utilities/imageeditor/tools/imageprint.cpp
index ebd894c..1803a4d 100644
--- 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.
diff --git a/digikam/utilities/imageeditor/tools/imageresize.cpp b/digikam/utilities/imageeditor/tools/imageresize.cpp
index 9161a0a..a29efca 100644
--- 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.
 
diff --git a/digikam/utilities/lighttable/lighttablebar.cpp b/digikam/utilities/lighttable/lighttablebar.cpp
index 5111b91..68e5d4c 100644
--- 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>
 
diff --git a/digikam/utilities/lighttable/lighttablepreview.cpp b/digikam/utilities/lighttable/lighttablepreview.cpp
index dea0bb3..2c1b544 100644
--- 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>
diff --git a/digikam/utilities/lighttable/lighttablewindow.cpp b/digikam/utilities/lighttable/lighttablewindow.cpp
index bb811c8..5cac1dd 100644
--- 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.
 
diff --git a/digikam/utilities/setup/cameraselection.cpp b/digikam/utilities/setup/cameraselection.cpp
index 9983e20..2274d87 100644
--- 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>
diff --git a/digikam/utilities/setup/setup.cpp b/digikam/utilities/setup/setup.cpp
index a453bd7..cc40267 100644
--- 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>
 
diff --git a/digikam/utilities/setup/setupcamera.cpp b/digikam/utilities/setup/setupcamera.cpp
index 92675a3..f3f275c 100644
--- 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>
diff --git a/digikam/utilities/setup/setupcollections.cpp b/digikam/utilities/setup/setupcollections.cpp
index 9ffd148..d63db17 100644
--- 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>
 
diff --git a/digikam/utilities/setup/setupdcraw.cpp b/digikam/utilities/setup/setupdcraw.cpp
index a401e63..929e1d4 100644
--- 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>
diff --git a/digikam/utilities/setup/setupeditor.cpp b/digikam/utilities/setup/setupeditor.cpp
index 73a1e58..56f72e1 100644
--- 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>
diff --git a/digikam/utilities/setup/setupgeneral.cpp b/digikam/utilities/setup/setupgeneral.cpp
index bfe3679..b6fd47b 100644
--- 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.
diff --git a/digikam/utilities/setup/setupicc.cpp b/digikam/utilities/setup/setupicc.cpp
index 3ce15ad..f76ec24 100644
--- 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.
diff --git a/digikam/utilities/setup/setupidentity.cpp b/digikam/utilities/setup/setupidentity.cpp
index db24e80..a27c116 100644
--- 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>
diff --git a/digikam/utilities/setup/setupiofiles.cpp b/digikam/utilities/setup/setupiofiles.cpp
index 1fd93e5..c8b9891 100644
--- 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>
diff --git a/digikam/utilities/setup/setuplighttable.cpp b/digikam/utilities/setup/setuplighttable.cpp
index ffd1784..0ed01ea 100644
--- 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>
diff --git a/digikam/utilities/setup/setupmetadata.cpp b/digikam/utilities/setup/setupmetadata.cpp
index 66f66a5..3357b1c 100644
--- 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>
 
diff --git a/digikam/utilities/setup/setupmime.cpp b/digikam/utilities/setup/setupmime.cpp
index 8a112eb..e1fc680 100644
--- 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>
diff --git a/digikam/utilities/setup/setupmisc.cpp b/digikam/utilities/setup/setupmisc.cpp
index 21163c3..8dc16e9 100644
--- 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.
diff --git a/digikam/utilities/setup/setupplugins.cpp b/digikam/utilities/setup/setupplugins.cpp
index eb2f1f9..e0d9c49 100644
--- 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.
diff --git a/digikam/utilities/setup/setupslideshow.cpp b/digikam/utilities/setup/setupslideshow.cpp
index 07fb48f..970d9c6 100644
--- 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>
diff --git a/digikam/utilities/setup/setuptooltip.cpp b/digikam/utilities/setup/setuptooltip.cpp
index 83a43d9..d4f00dd 100644
--- 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.
diff --git a/digikam/utilities/slideshow/slideshow.cpp b/digikam/utilities/slideshow/slideshow.cpp
index fdcb192..31c6cf2 100644
--- 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.
 
diff --git a/digikam/utilities/slideshow/toolbar.cpp b/digikam/utilities/slideshow/toolbar.cpp
index e49ed5e..5239b14 100644
--- 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.
author	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2013-02-15 21:44:25 -0600
committer	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2013-02-15 21:44:25 -0600
commit	fa6008238fe6befd362a23c8767775a744e22bc2 (patch)
tree	e1cd2545f72128efed02d79e501397ced82e36bc /digikam
parent	d21f600cd26a3c713e33fd7065b6e769825d86ed (diff)
download	digikam-fa6008238fe6befd362a23c8767775a744e22bc2.tar.gz digikam-fa6008238fe6befd362a23c8767775a744e22bc2.zip