Rename common header files for consistency with class renaming

181 files changed, 254 insertions, 254 deletions

diff --git a/digikam/digikam/albumfolderview.cpp b/digikam/digikam/albumfolderview.cpp
index aad48c9..f485cc2 100644
--- a/digikam/digikam/albumfolderview.cpp
+++ b/digikam/digikam/albumfolderview.cpp
@@ -40,7 +40,7 @@
 #include <kglobal.h>
 #include <kcalendarsystem.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <tdeaction.h>
 #include <tdefiledialog.h>
diff --git a/digikam/digikam/albumiconview.cpp b/digikam/digikam/albumiconview.cpp
index 61e2ab2..3277ff2 100644
--- a/digikam/digikam/albumiconview.cpp
+++ b/digikam/digikam/albumiconview.cpp
@@ -65,7 +65,7 @@ extern "C"
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurl.h>
 #include <kurldrag.h>
 #include <klocale.h>
diff --git a/digikam/digikam/albumlister.cpp b/digikam/digikam/albumlister.cpp
index d1ab4c3..170d033 100644
--- a/digikam/digikam/albumlister.cpp
+++ b/digikam/digikam/albumlister.cpp
@@ -49,7 +49,7 @@ extern "C"
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <tdeio/job.h>
 #include <kurl.h>
diff --git a/digikam/digikam/albumsettings.cpp b/digikam/digikam/albumsettings.cpp
index 124b01d..b8a21e7 100644
--- a/digikam/digikam/albumsettings.cpp
+++ b/digikam/digikam/albumsettings.cpp
@@ -31,7 +31,7 @@
 
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 // LibKDcraw includes.
diff --git a/digikam/digikam/albumthumbnailloader.cpp b/digikam/digikam/albumthumbnailloader.cpp
index a658f35..4e5c94d 100644
--- a/digikam/digikam/albumthumbnailloader.cpp
+++ b/digikam/digikam/albumthumbnailloader.cpp
@@ -33,7 +33,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
diff --git a/digikam/digikam/daboutdata.h b/digikam/digikam/daboutdata.h
index c777d53..149d443 100644
--- a/digikam/digikam/daboutdata.h
+++ b/digikam/digikam/daboutdata.h
@@ -57,7 +57,7 @@ extern "C"
 // KDE includes.
 
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 static const char digikam_version[]     = "0.9.6";
 static const char showfoto_version[]    = "0.9.6";
diff --git a/digikam/digikam/datefolderview.cpp b/digikam/digikam/datefolderview.cpp
index 2c6cd68..4ce5e44 100644
--- a/digikam/digikam/datefolderview.cpp
+++ b/digikam/digikam/datefolderview.cpp
@@ -33,7 +33,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/digikam/digikam/digikamapp.cpp b/digikam/digikam/digikamapp.cpp
index b2115d2..a0b6e80 100644
--- a/digikam/digikam/digikamapp.cpp
+++ b/digikam/digikam/digikamapp.cpp
@@ -36,7 +36,7 @@
 
 // KDE includes.
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
@@ -47,7 +47,7 @@
 #include <kiconloader.h>
 #include <ktip.h>
 #include <tdeversion.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmenubar.h>
 #include <kglobalsettings.h>
 #include <tdefiledialog.h>
diff --git a/digikam/digikam/digikamfirstrun.cpp b/digikam/digikam/digikamfirstrun.cpp
index aac0fb0..ec3c17a 100644
--- a/digikam/digikam/digikamfirstrun.cpp
+++ b/digikam/digikam/digikamfirstrun.cpp
@@ -52,7 +52,7 @@ extern "C"
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
diff --git a/digikam/digikam/digikamview.cpp b/digikam/digikam/digikamview.cpp
index fb7be83..1637d96 100644
--- a/digikam/digikam/digikamview.cpp
+++ b/digikam/digikam/digikamview.cpp
@@ -43,7 +43,7 @@
 #include <kurl.h>
 #include <kpushbutton.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <krun.h>
diff --git a/digikam/digikam/folderview.cpp b/digikam/digikam/folderview.cpp
index 1d20cd6..e4a7c0d 100644
--- a/digikam/digikam/folderview.cpp
+++ b/digikam/digikam/folderview.cpp
@@ -31,7 +31,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kglobalsettings.h>
diff --git a/digikam/digikam/imagepreviewview.cpp b/digikam/digikam/imagepreviewview.cpp
index 21a3ef8..189b11b 100644
--- a/digikam/digikam/imagepreviewview.cpp
+++ b/digikam/digikam/imagepreviewview.cpp
@@ -45,7 +45,7 @@
 #include <kdatetbl.h>
 #include <kiconloader.h>
 #include <kprocess.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // LibKipi includes.
 
diff --git a/digikam/digikam/main.cpp b/digikam/digikam/main.cpp
index 69a57bb..71a9ea7 100644
--- a/digikam/digikam/main.cpp
+++ b/digikam/digikam/main.cpp
@@ -35,9 +35,9 @@
 
 // KDE includes.
 
-#include <kcmdlineargs.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
diff --git a/digikam/digikam/scanlib.cpp b/digikam/digikam/scanlib.cpp
index a0bc177..e55cc62 100644
--- a/digikam/digikam/scanlib.cpp
+++ b/digikam/digikam/scanlib.cpp
@@ -49,7 +49,7 @@ extern "C"
 
 #include <kprogress.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kiconloader.h>
 
diff --git a/digikam/digikam/syncjob.cpp b/digikam/digikam/syncjob.cpp
index c0c78f7..55c9914 100644
--- a/digikam/digikam/syncjob.cpp
+++ b/digikam/digikam/syncjob.cpp
@@ -38,7 +38,7 @@
 #include <kprotocolinfo.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/digikam/tageditdlg.cpp b/digikam/digikam/tageditdlg.cpp
index 92a3aa2..550b1ff 100644
--- a/digikam/digikam/tageditdlg.cpp
+++ b/digikam/digikam/tageditdlg.cpp
@@ -31,7 +31,7 @@
 
 #include <klocale.h>
 #include <kicondialog.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeversion.h>
 #include <kiconloader.h>
 #include <kseparator.h>
diff --git a/digikam/digikam/tagfilterview.cpp b/digikam/digikam/tagfilterview.cpp
index 98d7c43..48b20df 100644
--- a/digikam/digikam/tagfilterview.cpp
+++ b/digikam/digikam/tagfilterview.cpp
@@ -36,7 +36,7 @@
 #include <kabc/stdaddressbook.h>
 #include <tdepopupmenu.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kglobalsettings.h>
diff --git a/digikam/digikam/tagfolderview.cpp b/digikam/digikam/tagfolderview.cpp
index 2a540c5..118e480 100644
--- a/digikam/digikam/tagfolderview.cpp
+++ b/digikam/digikam/tagfolderview.cpp
@@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <kabc/stdaddressbook.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 
 // Local includes.
diff --git a/digikam/digikam/tagspopupmenu.cpp b/digikam/digikam/tagspopupmenu.cpp
index 225dd04..344fdad 100644
--- a/digikam/digikam/tagspopupmenu.cpp
+++ b/digikam/digikam/tagspopupmenu.cpp
@@ -37,7 +37,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/digikam/digikam/timelineview.cpp b/digikam/digikam/timelineview.cpp
index b7f05d6..591f82b 100644
--- a/digikam/digikam/timelineview.cpp
+++ b/digikam/digikam/timelineview.cpp
@@ -42,7 +42,7 @@
 #include <kdialog.h>
 #include <klineedit.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ksqueezedtextlabel.h>
 #include <kstandarddirs.h>
 #include <tdeversion.h>
diff --git a/digikam/digikam/welcomepageview.cpp b/digikam/digikam/welcomepageview.cpp
index dfc1c23..f0d9e1e 100644
--- a/digikam/digikam/welcomepageview.cpp
+++ b/digikam/digikam/welcomepageview.cpp
@@ -34,7 +34,7 @@
 #include <kcursor.h>
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
 
diff --git a/digikam/imageplugins/adjustcurves/adjustcurves.cpp b/digikam/imageplugins/adjustcurves/adjustcurves.cpp
index ad49d02..6da1d1f 100644
--- a/digikam/imageplugins/adjustcurves/adjustcurves.cpp
+++ b/digikam/imageplugins/adjustcurves/adjustcurves.cpp
@@ -55,10 +55,10 @@
 #include <tdeselect.h>
 #include <tdefiledialog.h>
 #include <kglobalsettings.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
diff --git a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp b/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp
index 58f059f..498b97d 100644
--- a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp
+++ b/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp
@@ -55,10 +55,10 @@
 #include <tdeselect.h>
 #include <tdefiledialog.h>
 #include <kglobalsettings.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kpushbutton.h>
diff --git a/digikam/imageplugins/adjustlevels/adjustlevels.cpp b/digikam/imageplugins/adjustlevels/adjustlevels.cpp
index 03112c3..fdef3de 100644
--- a/digikam/imageplugins/adjustlevels/adjustlevels.cpp
+++ b/digikam/imageplugins/adjustlevels/adjustlevels.cpp
@@ -55,10 +55,10 @@
 #include <tdeselect.h>
 #include <tdefiledialog.h>
 #include <kglobalsettings.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
diff --git a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp
index e9a9756..b205537 100644
--- a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp
+++ b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp
@@ -46,8 +46,8 @@
 
 // KDE includes.
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <tdefiledialog.h>
diff --git a/digikam/imageplugins/antivignetting/antivignettingtool.cpp b/digikam/imageplugins/antivignetting/antivignettingtool.cpp
index d06452d..6f1d1ec 100644
--- a/digikam/imageplugins/antivignetting/antivignettingtool.cpp
+++ b/digikam/imageplugins/antivignetting/antivignettingtool.cpp
@@ -37,9 +37,9 @@
 
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kseparator.h>
 
diff --git a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp b/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp
index ca8ad86..dc5484e 100644
--- a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp
+++ b/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp
@@ -37,9 +37,9 @@
 
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <knuminput.h>
 #include <kseparator.h>
diff --git a/digikam/imageplugins/blurfx/blurfxtool.cpp b/digikam/imageplugins/blurfx/blurfxtool.cpp
index 7455686..982e282 100644
--- a/digikam/imageplugins/blurfx/blurfxtool.cpp
+++ b/digikam/imageplugins/blurfx/blurfxtool.cpp
@@ -33,8 +33,8 @@
 
 // KDE includes.
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp b/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp
index 52129de..82e47f4 100644
--- a/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp
+++ b/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp
@@ -36,8 +36,8 @@
 
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <knuminput.h>
 
 // Local includes.
diff --git a/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp b/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp
index 1cf30ac..a98944d 100644
--- a/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp
+++ b/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp
@@ -28,7 +28,7 @@
 #include <klibloader.h>
 #include <tdeaction.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/imageplugins/border/bordertool.cpp b/digikam/imageplugins/border/bordertool.cpp
index b5ea20a..d40ec51 100644
--- a/digikam/imageplugins/border/bordertool.cpp
+++ b/digikam/imageplugins/border/bordertool.cpp
@@ -32,8 +32,8 @@
 
 // KDE includes.
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
diff --git a/digikam/imageplugins/border/imageeffect_border.cpp b/digikam/imageplugins/border/imageeffect_border.cpp
index c0b8bbd..f8f5f97 100644
--- a/digikam/imageplugins/border/imageeffect_border.cpp
+++ b/digikam/imageplugins/border/imageeffect_border.cpp
@@ -35,9 +35,9 @@
 
 #include <kseparator.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <knuminput.h>
diff --git a/digikam/imageplugins/channelmixer/channelmixer.cpp b/digikam/imageplugins/channelmixer/channelmixer.cpp
index dd1c2ea..9304fff 100644
--- a/digikam/imageplugins/channelmixer/channelmixer.cpp
+++ b/digikam/imageplugins/channelmixer/channelmixer.cpp
@@ -64,10 +64,10 @@
 #include <tdeselect.h>
 #include <tdefiledialog.h>
 #include <kglobalsettings.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
diff --git a/digikam/imageplugins/channelmixer/channelmixertool.cpp b/digikam/imageplugins/channelmixer/channelmixertool.cpp
index f66e5b4..3487856 100644
--- a/digikam/imageplugins/channelmixer/channelmixertool.cpp
+++ b/digikam/imageplugins/channelmixer/channelmixertool.cpp
@@ -53,8 +53,8 @@
 // KDE includes.
 
 #include <tdeconfig.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <tdefiledialog.h>
 #include <kglobalsettings.h>
diff --git a/digikam/imageplugins/charcoal/charcoaltool.cpp b/digikam/imageplugins/charcoal/charcoaltool.cpp
index d41627a..0a28299 100644
--- a/digikam/imageplugins/charcoal/charcoaltool.cpp
+++ b/digikam/imageplugins/charcoal/charcoaltool.cpp
@@ -32,9 +32,9 @@
 
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 
 // LibKDcraw includes.
diff --git a/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp b/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp
index 89f4215..c64919b 100644
--- a/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp
+++ b/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp
@@ -32,9 +32,9 @@
 
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knuminput.h>
 #include <kstandarddirs.h>
 
diff --git a/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp b/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp
index 7336efb..fe5c8af 100644
--- a/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp
+++ b/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp
@@ -29,7 +29,7 @@
 #include <klibloader.h>
 #include <tdeaction.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/imageplugins/colorfx/colorfxtool.cpp b/digikam/imageplugins/colorfx/colorfxtool.cpp
index a2c4843..042ba01 100644
--- a/digikam/imageplugins/colorfx/colorfxtool.cpp
+++ b/digikam/imageplugins/colorfx/colorfxtool.cpp
@@ -39,8 +39,8 @@
 
 // KDE includes.
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <khelpmenu.h>
diff --git a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp
index 5eb8fff..9b86656 100644
--- a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp
+++ b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp
@@ -43,10 +43,10 @@
 #include <knuminput.h>
 #include <klocale.h>
 #include <kcursor.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
diff --git a/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp b/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp
index 4b89ece..207abaf 100644
--- a/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp
+++ b/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp
@@ -30,7 +30,7 @@
 #include <klibloader.h>
 #include <tdeaction.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/imageplugins/coreplugin/autocorrectiontool.cpp b/digikam/imageplugins/coreplugin/autocorrectiontool.cpp
index 1b780ce..baac89d 100644
--- a/digikam/imageplugins/coreplugin/autocorrectiontool.cpp
+++ b/digikam/imageplugins/coreplugin/autocorrectiontool.cpp
@@ -43,7 +43,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kiconloader.h>
diff --git a/digikam/imageplugins/coreplugin/bcgtool.cpp b/digikam/imageplugins/coreplugin/bcgtool.cpp
index 0b2eef7..1335348 100644
--- a/digikam/imageplugins/coreplugin/bcgtool.cpp
+++ b/digikam/imageplugins/coreplugin/bcgtool.cpp
@@ -42,7 +42,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kiconloader.h>
diff --git a/digikam/imageplugins/coreplugin/blurtool.cpp b/digikam/imageplugins/coreplugin/blurtool.cpp
index c3e9699..3da8a55 100644
--- a/digikam/imageplugins/coreplugin/blurtool.cpp
+++ b/digikam/imageplugins/coreplugin/blurtool.cpp
@@ -29,12 +29,12 @@
 
 // KDE includes.
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Digikam includes.
 
diff --git a/digikam/imageplugins/coreplugin/bwsepiatool.cpp b/digikam/imageplugins/coreplugin/bwsepiatool.cpp
index 0b93a40..3de92e7 100644
--- a/digikam/imageplugins/coreplugin/bwsepiatool.cpp
+++ b/digikam/imageplugins/coreplugin/bwsepiatool.cpp
@@ -45,7 +45,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <tdefiledialog.h>
diff --git a/digikam/imageplugins/coreplugin/hsl/hsltool.cpp b/digikam/imageplugins/coreplugin/hsl/hsltool.cpp
index 9a69cb2..95b0e38 100644
--- a/digikam/imageplugins/coreplugin/hsl/hsltool.cpp
+++ b/digikam/imageplugins/coreplugin/hsl/hsltool.cpp
@@ -41,7 +41,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolordialog.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
diff --git a/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.cpp b/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.cpp
index 3dc46f2..3f10be2 100644
--- a/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.cpp
+++ b/digikam/imageplugins/coreplugin/hsl/hspreviewwidget.cpp
@@ -30,7 +30,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kimageeffect.h>
 
diff --git a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp
index b1bea81..6e4a849 100644
--- a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp
+++ b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp
@@ -44,7 +44,7 @@
 
 #include <knuminput.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kstandarddirs.h>
diff --git a/digikam/imageplugins/coreplugin/iccprooftool.cpp b/digikam/imageplugins/coreplugin/iccprooftool.cpp
index 2d39852..28ea2e2 100644
--- a/digikam/imageplugins/coreplugin/iccprooftool.cpp
+++ b/digikam/imageplugins/coreplugin/iccprooftool.cpp
@@ -47,7 +47,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <tdefile.h>
diff --git a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp
index 475f4e3..0e19b61 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp
+++ b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp
@@ -50,7 +50,7 @@
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Digikam includes.
 
diff --git a/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp b/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp
index e585bd5..f056863 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp
+++ b/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp
@@ -45,7 +45,7 @@
 
 #include <knuminput.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kstandarddirs.h>
diff --git a/digikam/imageplugins/coreplugin/imageeffect_blur.cpp b/digikam/imageplugins/coreplugin/imageeffect_blur.cpp
index aa4705a..b307e18 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_blur.cpp
+++ b/digikam/imageplugins/coreplugin/imageeffect_blur.cpp
@@ -29,12 +29,12 @@
 
 // KDE includes.
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <knuminput.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Digikam includes.
 
diff --git a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp
index ec07149..a05416a 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp
+++ b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp
@@ -52,7 +52,7 @@
 #include <kcursor.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knuminput.h>
 #include <ktabwidget.h>
 #include <tdeconfig.h>
diff --git a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp
index 062a4bd..b597b4b 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp
+++ b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp
@@ -50,7 +50,7 @@
 
 #include <knuminput.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kstandarddirs.h>
 #include <ktabwidget.h>
diff --git a/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp b/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp
index 6094102..bb768e9 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp
+++ b/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp
@@ -44,7 +44,7 @@
 #include <kcolordialog.h>
 #include <knuminput.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kstandarddirs.h>
diff --git a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp b/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp
index 16adb62..f39aab1 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp
+++ b/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp
@@ -45,7 +45,7 @@
 
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kapplication.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 aec6f83..4ee4b3f 100644
--- a/digikam/imageplugins/coreplugin/imageplugin_core.cpp
+++ b/digikam/imageplugins/coreplugin/imageplugin_core.cpp
@@ -32,7 +32,7 @@
 #include <tdeaction.h>
 #include <kcursor.h>
 #include <kmessagebox.h>
-#include <kapplication.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 c315ae9..5ef79e2 100644
--- a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp
+++ b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp
@@ -43,7 +43,7 @@
 #include <kcursor.h>
 #include <klocale.h>
 #include <knuminput.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kcolorbutton.h>
diff --git a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp
index 8ad2a92..af411b2 100644
--- a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp
+++ b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp
@@ -40,7 +40,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
diff --git a/digikam/imageplugins/coreplugin/redeyetool.cpp b/digikam/imageplugins/coreplugin/redeyetool.cpp
index 8ab96ef..5e5e217 100644
--- a/digikam/imageplugins/coreplugin/redeyetool.cpp
+++ b/digikam/imageplugins/coreplugin/redeyetool.cpp
@@ -41,7 +41,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolordialog.h>
 #include <kcolordialog.h>
 #include <tdeconfig.h>
diff --git a/digikam/imageplugins/coreplugin/rgbtool.cpp b/digikam/imageplugins/coreplugin/rgbtool.cpp
index 26ebf52..505517b 100644
--- a/digikam/imageplugins/coreplugin/rgbtool.cpp
+++ b/digikam/imageplugins/coreplugin/rgbtool.cpp
@@ -41,7 +41,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kiconloader.h>
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp
index d2a026e..1e22e6d 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp
+++ b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp
@@ -37,11 +37,11 @@
 
 // KDE includes.
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <knuminput.h>
 #include <kcursor.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kseparator.h>
 #include <tdeconfig.h>
 #include <kurl.h>
diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp
index 99b9492..468f88a 100644
--- a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp
+++ b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp
@@ -36,10 +36,10 @@
 
 // KDE includes.
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kcursor.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kseparator.h>
 #include <tdeconfig.h>
 #include <kurl.h>
diff --git a/digikam/imageplugins/distortionfx/distortionfxtool.cpp b/digikam/imageplugins/distortionfx/distortionfxtool.cpp
index fd2f270..86d16ab 100644
--- a/digikam/imageplugins/distortionfx/distortionfxtool.cpp
+++ b/digikam/imageplugins/distortionfx/distortionfxtool.cpp
@@ -36,8 +36,8 @@
 
 // KDE includes.
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <khelpmenu.h>
diff --git a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp b/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp
index e4d162e..aa0116f 100644
--- a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp
+++ b/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp
@@ -40,9 +40,9 @@
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kcursor.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <khelpmenu.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knuminput.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
diff --git a/digikam/imageplugins/emboss/embosstool.cpp b/digikam/imageplugins/emboss/embosstool.cpp
index c526e9f..0a40440 100644
--- a/digikam/imageplugins/emboss/embosstool.cpp
+++ b/digikam/imageplugins/emboss/embosstool.cpp
@@ -31,8 +31,8 @@
 
 // KDE includes.
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/digikam/imageplugins/emboss/imageeffect_emboss.cpp b/digikam/imageplugins/emboss/imageeffect_emboss.cpp
index 8f65fd3..4a25e28 100644
--- a/digikam/imageplugins/emboss/imageeffect_emboss.cpp
+++ b/digikam/imageplugins/emboss/imageeffect_emboss.cpp
@@ -32,9 +32,9 @@
 // KDE includes.
 
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <knuminput.h>
 #include <tdeconfig.h>
diff --git a/digikam/imageplugins/emboss/imageplugin_emboss.cpp b/digikam/imageplugins/emboss/imageplugin_emboss.cpp
index 10dc191..33cd150 100644
--- a/digikam/imageplugins/emboss/imageplugin_emboss.cpp
+++ b/digikam/imageplugins/emboss/imageplugin_emboss.cpp
@@ -29,7 +29,7 @@
 #include <klibloader.h>
 #include <tdeaction.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/imageplugins/filmgrain/filmgraintool.cpp b/digikam/imageplugins/filmgrain/filmgraintool.cpp
index 54dc3a0..48aea52 100644
--- a/digikam/imageplugins/filmgrain/filmgraintool.cpp
+++ b/digikam/imageplugins/filmgrain/filmgraintool.cpp
@@ -35,9 +35,9 @@
 // KDE includes.
 
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 
diff --git a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp b/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp
index 63517fc..9f354da 100644
--- a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp
+++ b/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp
@@ -35,9 +35,9 @@
 // KDE includes.
 
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 
diff --git a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp b/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp
index cb2f4c2..112db9f 100644
--- a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp
+++ b/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp
@@ -29,7 +29,7 @@
 #include <klibloader.h>
 #include <tdeaction.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/imageplugins/freerotation/freerotationtool.cpp b/digikam/imageplugins/freerotation/freerotationtool.cpp
index 5c978a4..0c16903 100644
--- a/digikam/imageplugins/freerotation/freerotationtool.cpp
+++ b/digikam/imageplugins/freerotation/freerotationtool.cpp
@@ -32,8 +32,8 @@
 
 // KDE includes.
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kiconloader.h>
diff --git a/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp b/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp
index 9c99b77..e1141e8 100644
--- a/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp
+++ b/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp
@@ -34,9 +34,9 @@
 // KDE includes.
 
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <knuminput.h>
 #include <kcursor.h>
diff --git a/digikam/imageplugins/hotpixels/blackframeparser.cpp b/digikam/imageplugins/hotpixels/blackframeparser.cpp
index e17020f..b6e2c89 100644
--- a/digikam/imageplugins/hotpixels/blackframeparser.cpp
+++ b/digikam/imageplugins/hotpixels/blackframeparser.cpp
@@ -43,7 +43,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeversion.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>
diff --git a/digikam/imageplugins/hotpixels/hotpixelstool.cpp b/digikam/imageplugins/hotpixels/hotpixelstool.cpp
index 17ae8cc..61afe38 100644
--- a/digikam/imageplugins/hotpixels/hotpixelstool.cpp
+++ b/digikam/imageplugins/hotpixels/hotpixelstool.cpp
@@ -37,8 +37,8 @@
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kimageio.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
 #include <kprogress.h>
diff --git a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp
index a1d144f..eb2cf57 100644
--- a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp
+++ b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp
@@ -37,8 +37,8 @@
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kimageio.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
 #include <kprogress.h>
diff --git a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp b/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp
index f1072e9..de94e26 100644
--- a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp
+++ b/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp
@@ -30,7 +30,7 @@
 #include <klibloader.h>
 #include <tdeaction.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/imageplugins/infrared/imageeffect_infrared.cpp b/digikam/imageplugins/infrared/imageeffect_infrared.cpp
index 8b7193d..90f43d3 100644
--- a/digikam/imageplugins/infrared/imageeffect_infrared.cpp
+++ b/digikam/imageplugins/infrared/imageeffect_infrared.cpp
@@ -37,9 +37,9 @@
 // KDE includes.
 
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 
diff --git a/digikam/imageplugins/infrared/imageplugin_infrared.cpp b/digikam/imageplugins/infrared/imageplugin_infrared.cpp
index 416e949..faf6b7a 100644
--- a/digikam/imageplugins/infrared/imageplugin_infrared.cpp
+++ b/digikam/imageplugins/infrared/imageplugin_infrared.cpp
@@ -29,7 +29,7 @@
 #include <klibloader.h>
 #include <tdeaction.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/imageplugins/infrared/infraredtool.cpp b/digikam/imageplugins/infrared/infraredtool.cpp
index f432b14..34fa6f5 100644
--- a/digikam/imageplugins/infrared/infraredtool.cpp
+++ b/digikam/imageplugins/infrared/infraredtool.cpp
@@ -37,9 +37,9 @@
 // KDE includes.
 
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 
diff --git a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp
index 4da497b..8203141 100644
--- a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp
+++ b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp
@@ -52,10 +52,10 @@
 #include <kcursor.h>
 #include <kurllabel.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <tdefiledialog.h>
 #include <kstandarddirs.h>
diff --git a/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp b/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp
index 30f593f..921abef 100644
--- a/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp
+++ b/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp
@@ -29,7 +29,7 @@
 #include <klibloader.h>
 #include <tdeaction.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/imageplugins/inpainting/inpaintingtool.cpp b/digikam/imageplugins/inpainting/inpaintingtool.cpp
index 3d42a43..9c1e1aa 100644
--- a/digikam/imageplugins/inpainting/inpaintingtool.cpp
+++ b/digikam/imageplugins/inpainting/inpaintingtool.cpp
@@ -49,8 +49,8 @@
 
 // KDE includes.
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <tdefiledialog.h>
 #include <kglobalsettings.h>
diff --git a/digikam/imageplugins/inserttext/fontchooserwidget.cpp b/digikam/imageplugins/inserttext/fontchooserwidget.cpp
index c2cc726..efa0043 100644
--- a/digikam/imageplugins/inserttext/fontchooserwidget.cpp
+++ b/digikam/imageplugins/inserttext/fontchooserwidget.cpp
@@ -42,7 +42,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcharsets.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
diff --git a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp b/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp
index 6932733..b05180f 100644
--- a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp
+++ b/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp
@@ -45,10 +45,10 @@
 
 #include <klocale.h>
 #include <kcursor.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
diff --git a/digikam/imageplugins/inserttext/inserttexttool.cpp b/digikam/imageplugins/inserttext/inserttexttool.cpp
index 4bf9307..746db95 100644
--- a/digikam/imageplugins/inserttext/inserttexttool.cpp
+++ b/digikam/imageplugins/inserttext/inserttexttool.cpp
@@ -42,8 +42,8 @@
 
 // KDE includes.
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
diff --git a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp b/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp
index 6543768..6a8ff66 100644
--- a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp
+++ b/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp
@@ -42,9 +42,9 @@
 
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <knuminput.h>
 
diff --git a/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp b/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp
index 9f64a0a..08e8cac 100644
--- a/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp
+++ b/digikam/imageplugins/lensdistortion/lensdistortiontool.cpp
@@ -41,8 +41,8 @@
 
 // KDE includes.
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp
index 0ebdd66..50cc093 100644
--- a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp
+++ b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp
@@ -37,9 +37,9 @@
 // KDE includes.
 
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <knuminput.h>
 #include <tdefiledialog.h>
diff --git a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp b/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp
index 2ffa188..a787c53 100644
--- a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp
+++ b/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp
@@ -28,7 +28,7 @@
 #include <klibloader.h>
 #include <tdeaction.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/imageplugins/noisereduction/noisereductiontool.cpp b/digikam/imageplugins/noisereduction/noisereductiontool.cpp
index 635ba85..fd4651a 100644
--- a/digikam/imageplugins/noisereduction/noisereductiontool.cpp
+++ b/digikam/imageplugins/noisereduction/noisereductiontool.cpp
@@ -36,8 +36,8 @@
 
 // KDE includes.
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
 #include <kglobalsettings.h>
diff --git a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp b/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp
index a564d46..b194063 100644
--- a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp
+++ b/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp
@@ -33,9 +33,9 @@
 
 #include <kcursor.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <knuminput.h>
 #include <tdeconfig.h>
diff --git a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp b/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp
index 6d6002f..c647b40 100644
--- a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp
+++ b/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp
@@ -28,7 +28,7 @@
 #include <klibloader.h>
 #include <tdeaction.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/imageplugins/oilpaint/oilpainttool.cpp b/digikam/imageplugins/oilpaint/oilpainttool.cpp
index 57378ea..f3eb418 100644
--- a/digikam/imageplugins/oilpaint/oilpainttool.cpp
+++ b/digikam/imageplugins/oilpaint/oilpainttool.cpp
@@ -31,8 +31,8 @@
 
 // KDE includes.
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kiconloader.h>
diff --git a/digikam/imageplugins/perspective/imageeffect_perspective.cpp b/digikam/imageplugins/perspective/imageeffect_perspective.cpp
index c82350c..2b00d60 100644
--- a/digikam/imageplugins/perspective/imageeffect_perspective.cpp
+++ b/digikam/imageplugins/perspective/imageeffect_perspective.cpp
@@ -39,10 +39,10 @@
 #include <kcursor.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kseparator.h>
diff --git a/digikam/imageplugins/perspective/perspectivetool.cpp b/digikam/imageplugins/perspective/perspectivetool.cpp
index 6093f71..7205a45 100644
--- a/digikam/imageplugins/perspective/perspectivetool.cpp
+++ b/digikam/imageplugins/perspective/perspectivetool.cpp
@@ -34,8 +34,8 @@
 
 // KDE includes.
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
diff --git a/digikam/imageplugins/perspective/perspectivewidget.cpp b/digikam/imageplugins/perspective/perspectivewidget.cpp
index 8a4e9b2..92b4837 100644
--- a/digikam/imageplugins/perspective/perspectivewidget.cpp
+++ b/digikam/imageplugins/perspective/perspectivewidget.cpp
@@ -46,7 +46,7 @@
 #include <kstandarddirs.h>
 #include <kcursor.h>
 #include <kglobal.h> 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp b/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp
index 6311217..7b99f97 100644
--- a/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp
+++ b/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp
@@ -34,9 +34,9 @@
 
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <knuminput.h>
 
diff --git a/digikam/imageplugins/raindrop/raindroptool.cpp b/digikam/imageplugins/raindrop/raindroptool.cpp
index dce53c3..14d13f6 100644
--- a/digikam/imageplugins/raindrop/raindroptool.cpp
+++ b/digikam/imageplugins/raindrop/raindroptool.cpp
@@ -32,8 +32,8 @@
 
 // KDE includes.
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/digikam/imageplugins/restoration/imageeffect_restoration.cpp b/digikam/imageplugins/restoration/imageeffect_restoration.cpp
index 1547352..96b86b0 100644
--- a/digikam/imageplugins/restoration/imageeffect_restoration.cpp
+++ b/digikam/imageplugins/restoration/imageeffect_restoration.cpp
@@ -37,9 +37,9 @@
 
 #include <kurllabel.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <kglobalsettings.h>
 #include <kstandarddirs.h>
diff --git a/digikam/imageplugins/restoration/imageplugin_restoration.cpp b/digikam/imageplugins/restoration/imageplugin_restoration.cpp
index 88d0a55..8975578 100644
--- a/digikam/imageplugins/restoration/imageplugin_restoration.cpp
+++ b/digikam/imageplugins/restoration/imageplugin_restoration.cpp
@@ -29,7 +29,7 @@
 #include <klibloader.h>
 #include <tdeaction.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/imageplugins/restoration/restorationtool.cpp b/digikam/imageplugins/restoration/restorationtool.cpp
index 91ca904..f4b9780 100644
--- a/digikam/imageplugins/restoration/restorationtool.cpp
+++ b/digikam/imageplugins/restoration/restorationtool.cpp
@@ -37,9 +37,9 @@
 
 #include <kurllabel.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <kglobalsettings.h>
 #include <kstandarddirs.h>
diff --git a/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp b/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp
index 3baaec5..a927bc9 100644
--- a/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp
+++ b/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp
@@ -32,9 +32,9 @@
 // KDE includes.
 
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <knuminput.h>
 #include <kseparator.h>
diff --git a/digikam/imageplugins/sheartool/sheartool.cpp b/digikam/imageplugins/sheartool/sheartool.cpp
index 2ff74d1..4b6e9e7 100644
--- a/digikam/imageplugins/sheartool/sheartool.cpp
+++ b/digikam/imageplugins/sheartool/sheartool.cpp
@@ -31,8 +31,8 @@
 
 // KDE includes.
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kiconloader.h>
diff --git a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp
index acae848..f3c73ee 100644
--- a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp
+++ b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp
@@ -42,17 +42,17 @@
 
 #include <kcursor.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
 #include <knuminput.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h> 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobalsettings.h>
 
diff --git a/digikam/imageplugins/superimpose/superimposetool.cpp b/digikam/imageplugins/superimpose/superimposetool.cpp
index 235f91f..681bf00 100644
--- a/digikam/imageplugins/superimpose/superimposetool.cpp
+++ b/digikam/imageplugins/superimpose/superimposetool.cpp
@@ -42,17 +42,17 @@
 
 #include <kcursor.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
 #include <knuminput.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobalsettings.h>
 
diff --git a/digikam/imageplugins/texture/imageeffect_texture.cpp b/digikam/imageplugins/texture/imageeffect_texture.cpp
index d1702c3..e235dab 100644
--- a/digikam/imageplugins/texture/imageeffect_texture.cpp
+++ b/digikam/imageplugins/texture/imageeffect_texture.cpp
@@ -34,9 +34,9 @@
 
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <knuminput.h>
 
diff --git a/digikam/imageplugins/texture/imageplugin_texture.cpp b/digikam/imageplugins/texture/imageplugin_texture.cpp
index 2e01541..04683bd 100644
--- a/digikam/imageplugins/texture/imageplugin_texture.cpp
+++ b/digikam/imageplugins/texture/imageplugin_texture.cpp
@@ -28,7 +28,7 @@
 #include <klibloader.h>
 #include <tdeaction.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/imageplugins/texture/texturetool.cpp b/digikam/imageplugins/texture/texturetool.cpp
index 7a8b8ea..74c68b8 100644
--- a/digikam/imageplugins/texture/texturetool.cpp
+++ b/digikam/imageplugins/texture/texturetool.cpp
@@ -31,8 +31,8 @@
 
 // KDE includes.
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp
index a1068b2..d740bbc 100644
--- a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp
+++ b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp
@@ -45,10 +45,10 @@
 
 #include <kcursor.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
diff --git a/digikam/imageplugins/whitebalance/whitebalancetool.cpp b/digikam/imageplugins/whitebalance/whitebalancetool.cpp
index be2bc72..c74a37f 100644
--- a/digikam/imageplugins/whitebalance/whitebalancetool.cpp
+++ b/digikam/imageplugins/whitebalance/whitebalancetool.cpp
@@ -43,9 +43,9 @@
 
 // KDE includes.
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kactivelabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <tdefiledialog.h>
diff --git a/digikam/libs/dialogs/ctrlpaneldlg.cpp b/digikam/libs/dialogs/ctrlpaneldlg.cpp
index 7e3afe0..47edc82 100644
--- a/digikam/libs/dialogs/ctrlpaneldlg.cpp
+++ b/digikam/libs/dialogs/ctrlpaneldlg.cpp
@@ -37,10 +37,10 @@
 
 #include <kcursor.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
diff --git a/digikam/libs/dialogs/dprogressdlg.cpp b/digikam/libs/dialogs/dprogressdlg.cpp
index 22251b7..b9349a7 100644
--- a/digikam/libs/dialogs/dprogressdlg.cpp
+++ b/digikam/libs/dialogs/dprogressdlg.cpp
@@ -35,7 +35,7 @@
 
 #include <klocale.h>
 #include <kprogress.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
diff --git a/digikam/libs/dialogs/imagedialog.cpp b/digikam/libs/dialogs/imagedialog.cpp
index 0e1a959..4f8eb56 100644
--- a/digikam/libs/dialogs/imagedialog.cpp
+++ b/digikam/libs/dialogs/imagedialog.cpp
@@ -30,7 +30,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
diff --git a/digikam/libs/dialogs/imagedlgbase.cpp b/digikam/libs/dialogs/imagedlgbase.cpp
index 0f1608d..074cb3c 100644
--- a/digikam/libs/dialogs/imagedlgbase.cpp
+++ b/digikam/libs/dialogs/imagedlgbase.cpp
@@ -42,10 +42,10 @@
 #include <kcursor.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
diff --git a/digikam/libs/dialogs/imageguidedlg.cpp b/digikam/libs/dialogs/imageguidedlg.cpp
index b91c3dc..94d2229 100644
--- a/digikam/libs/dialogs/imageguidedlg.cpp
+++ b/digikam/libs/dialogs/imageguidedlg.cpp
@@ -40,10 +40,10 @@
 
 #include <kcursor.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
diff --git a/digikam/libs/dialogs/rawcameradlg.cpp b/digikam/libs/dialogs/rawcameradlg.cpp
index 2127ed7..1e2b2a5 100644
--- a/digikam/libs/dialogs/rawcameradlg.cpp
+++ b/digikam/libs/dialogs/rawcameradlg.cpp
@@ -34,8 +34,8 @@
 
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 
 // LibKDcraw includes.
 
diff --git a/digikam/libs/dimg/filters/dimgthreadedfilter.h b/digikam/libs/dimg/filters/dimgthreadedfilter.h
index 482240e..1d4a97b 100644
--- a/digikam/libs/dimg/filters/dimgthreadedfilter.h
+++ b/digikam/libs/dimg/filters/dimgthreadedfilter.h
@@ -31,7 +31,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/libs/dimg/filters/icctransform.cpp b/digikam/libs/dimg/filters/icctransform.cpp
index a70720d..0a1324d 100644
--- a/digikam/libs/dimg/filters/icctransform.cpp
+++ b/digikam/libs/dimg/filters/icctransform.cpp
@@ -33,7 +33,7 @@
 // KDE includes.
 
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Lcms includes.
 
diff --git a/digikam/libs/histogram/imagehistogram.cpp b/digikam/libs/histogram/imagehistogram.cpp
index 8e036b0..72eaa0e 100644
--- a/digikam/libs/histogram/imagehistogram.cpp
+++ b/digikam/libs/histogram/imagehistogram.cpp
@@ -37,7 +37,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/libs/imageproperties/cameraitempropertiestab.cpp b/digikam/libs/imageproperties/cameraitempropertiestab.cpp
index e926e8a..5d1d487 100644
--- a/digikam/libs/imageproperties/cameraitempropertiestab.cpp
+++ b/digikam/libs/imageproperties/cameraitempropertiestab.cpp
@@ -36,7 +36,7 @@
 // KDE includes.
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <tdefileitem.h>
diff --git a/digikam/libs/imageproperties/imagedescedittab.cpp b/digikam/libs/imageproperties/imagedescedittab.cpp
index 54e5005..7fe479c 100644
--- a/digikam/libs/imageproperties/imagedescedittab.cpp
+++ b/digikam/libs/imageproperties/imagedescedittab.cpp
@@ -44,7 +44,7 @@
 #include <klocale.h>
 #include <kurl.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <ktextedit.h>
diff --git a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp
index 34f3f01..53b758d 100644
--- a/digikam/libs/imageproperties/imagepropertiescolorstab.cpp
+++ b/digikam/libs/imageproperties/imagepropertiescolorstab.cpp
@@ -43,7 +43,7 @@
 
 #include <klocale.h>
 #include <ksqueezedtextlabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kstandarddirs.h>
diff --git a/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp b/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp
index 34cbb37..d28f8cb 100644
--- a/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp
+++ b/digikam/libs/imageproperties/imagepropertiesmetadatatab.cpp
@@ -33,7 +33,7 @@
 // KDE includes.
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <tdefileitem.h>
diff --git a/digikam/libs/imageproperties/imagepropertiessidebar.cpp b/digikam/libs/imageproperties/imagepropertiessidebar.cpp
index 01ca36e..8e89d09 100644
--- a/digikam/libs/imageproperties/imagepropertiessidebar.cpp
+++ b/digikam/libs/imageproperties/imagepropertiessidebar.cpp
@@ -31,7 +31,7 @@
 
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp b/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp
index 743c1ec..4c948b6 100644
--- a/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp
+++ b/digikam/libs/imageproperties/imagepropertiessidebarcamgui.cpp
@@ -30,7 +30,7 @@
 
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/digikam/libs/imageproperties/imagepropertiessidebardb.cpp b/digikam/libs/imageproperties/imagepropertiessidebardb.cpp
index 6918728..7e3c92a 100644
--- a/digikam/libs/imageproperties/imagepropertiessidebardb.cpp
+++ b/digikam/libs/imageproperties/imagepropertiessidebardb.cpp
@@ -33,7 +33,7 @@
 
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/digikam/libs/imageproperties/talbumlistview.cpp b/digikam/libs/imageproperties/talbumlistview.cpp
index c492287..7258563 100644
--- a/digikam/libs/imageproperties/talbumlistview.cpp
+++ b/digikam/libs/imageproperties/talbumlistview.cpp
@@ -32,7 +32,7 @@
 #include <klocale.h>
 #include <kurl.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <tdeconfig.h>
diff --git a/digikam/libs/themeengine/themeengine.cpp b/digikam/libs/themeengine/themeengine.cpp
index ee9e4a6..5833b89 100644
--- a/digikam/libs/themeengine/themeengine.cpp
+++ b/digikam/libs/themeengine/themeengine.cpp
@@ -39,7 +39,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kuser.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 
 // Local includes.
diff --git a/digikam/libs/thumbbar/thumbbar.cpp b/digikam/libs/thumbbar/thumbbar.cpp
index db96b78..914f79f 100644
--- a/digikam/libs/thumbbar/thumbbar.cpp
+++ b/digikam/libs/thumbbar/thumbbar.cpp
@@ -50,7 +50,7 @@ extern "C"
 
 #include <kmdcodec.h>
 #include <tdefileitem.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmimetype.h>
diff --git a/digikam/libs/widgets/common/dlogoaction.cpp b/digikam/libs/widgets/common/dlogoaction.cpp
index 1fafb08..91bc9a9 100644
--- a/digikam/libs/widgets/common/dlogoaction.cpp
+++ b/digikam/libs/widgets/common/dlogoaction.cpp
@@ -31,7 +31,7 @@
 #include <kurllabel.h>
 #include <tdetoolbar.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 
diff --git a/digikam/libs/widgets/common/dpopupmenu.cpp b/digikam/libs/widgets/common/dpopupmenu.cpp
index af397dc..55139df 100644
--- a/digikam/libs/widgets/common/dpopupmenu.cpp
+++ b/digikam/libs/widgets/common/dpopupmenu.cpp
@@ -32,11 +32,11 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconeffect.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 // Local includes.
 
diff --git a/digikam/libs/widgets/common/filesaveoptionsbox.cpp b/digikam/libs/widgets/common/filesaveoptionsbox.cpp
index 24547da..efbfac9 100644
--- a/digikam/libs/widgets/common/filesaveoptionsbox.cpp
+++ b/digikam/libs/widgets/common/filesaveoptionsbox.cpp
@@ -38,7 +38,7 @@
 #include <kdialog.h>
 #include <knuminput.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 
 // Local includes.
diff --git a/digikam/libs/widgets/common/searchtextbar.cpp b/digikam/libs/widgets/common/searchtextbar.cpp
index 8a95ea6..a6379c4 100644
--- a/digikam/libs/widgets/common/searchtextbar.cpp
+++ b/digikam/libs/widgets/common/searchtextbar.cpp
@@ -32,7 +32,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kdialogbase.h>
 #include <tdeconfig.h>
diff --git a/digikam/libs/widgets/common/sidebar.cpp b/digikam/libs/widgets/common/sidebar.cpp
index 2d608a7..57dd502 100644
--- a/digikam/libs/widgets/common/sidebar.cpp
+++ b/digikam/libs/widgets/common/sidebar.cpp
@@ -33,7 +33,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kiconloader.h>
diff --git a/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp b/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp
index 7dc8234..5d952b6 100644
--- a/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp
+++ b/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp
@@ -40,7 +40,7 @@
 
 #include <kdialogbase.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Lcms includes.
 
diff --git a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp
index 7c75aa6..4b69fd2 100644
--- a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp
+++ b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp
@@ -40,7 +40,7 @@
 #include <kdialog.h>
 #include <klocale.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
diff --git a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp
index 8fca857..f3585c3 100644
--- a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp
+++ b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp
@@ -41,7 +41,7 @@
 #include <klocale.h>
 #include <kcursor.h>
 #include <kprogress.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
diff --git a/digikam/libs/widgets/imageplugins/imageregionwidget.cpp b/digikam/libs/widgets/imageplugins/imageregionwidget.cpp
index 3449146..b1a60b3 100644
--- a/digikam/libs/widgets/imageplugins/imageregionwidget.cpp
+++ b/digikam/libs/widgets/imageplugins/imageregionwidget.cpp
@@ -43,7 +43,7 @@
 #include <kstandarddirs.h>
 #include <kcursor.h>
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/libs/widgets/imageplugins/imagewidget.cpp b/digikam/libs/widgets/imageplugins/imagewidget.cpp
index 51ef558..c74814a 100644
--- a/digikam/libs/widgets/imageplugins/imagewidget.cpp
+++ b/digikam/libs/widgets/imageplugins/imagewidget.cpp
@@ -34,7 +34,7 @@
 
 #include <ksqueezedtextlabel.h>
 #include <kdialog.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
diff --git a/digikam/libs/widgets/metadata/gpswidget.cpp b/digikam/libs/widgets/metadata/gpswidget.cpp
index 88017a5..0bc5a7b 100644
--- a/digikam/libs/widgets/metadata/gpswidget.cpp
+++ b/digikam/libs/widgets/metadata/gpswidget.cpp
@@ -40,7 +40,7 @@ http://www.gpspassion.com/forumsen/topic.asp?TOPIC_ID=16593
 
 #include <kdialogbase.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/libs/widgets/metadata/metadatawidget.cpp b/digikam/libs/widgets/metadata/metadatawidget.cpp
index c5081ea..fcc8564 100644
--- a/digikam/libs/widgets/metadata/metadatawidget.cpp
+++ b/digikam/libs/widgets/metadata/metadatawidget.cpp
@@ -50,7 +50,7 @@
 #include <kprinter.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/showfoto/main.cpp b/digikam/showfoto/main.cpp
index 9627c7c..0918dd6 100644
--- a/digikam/showfoto/main.cpp
+++ b/digikam/showfoto/main.cpp
@@ -29,9 +29,9 @@
 
 // KDE includes.
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
diff --git a/digikam/showfoto/setup/setup.cpp b/digikam/showfoto/setup/setup.cpp
index 7d43b6e..0d53f17 100644
--- a/digikam/showfoto/setup/setup.cpp
+++ b/digikam/showfoto/setup/setup.cpp
@@ -32,7 +32,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/showfoto/setup/setupeditor.cpp b/digikam/showfoto/setup/setupeditor.cpp
index b11be57..72f58e3 100644
--- a/digikam/showfoto/setup/setupeditor.cpp
+++ b/digikam/showfoto/setup/setupeditor.cpp
@@ -40,7 +40,7 @@
 #include <kcolorbutton.h>
 #include <knuminput.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/showfoto/setup/setuptooltip.cpp b/digikam/showfoto/setup/setuptooltip.cpp
index b430ae4..c53001e 100644
--- a/digikam/showfoto/setup/setuptooltip.cpp
+++ b/digikam/showfoto/setup/setuptooltip.cpp
@@ -32,7 +32,7 @@
 
 #include <klocale.h>
 #include <kdialogbase.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 // Local includes.
diff --git a/digikam/showfoto/showfoto.cpp b/digikam/showfoto/showfoto.cpp
index f38c7ac..15ee618 100644
--- a/digikam/showfoto/showfoto.cpp
+++ b/digikam/showfoto/showfoto.cpp
@@ -51,7 +51,7 @@ extern "C"
 #include <kcursor.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <tdefiledialog.h>
diff --git a/digikam/themedesigner/main.cpp b/digikam/themedesigner/main.cpp
index 058fe19..0b66671 100644
--- a/digikam/themedesigner/main.cpp
+++ b/digikam/themedesigner/main.cpp
@@ -28,9 +28,9 @@
 
 // KDE includes.
 
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <klocale.h>
 
diff --git a/digikam/themedesigner/mainwindow.cpp b/digikam/themedesigner/mainwindow.cpp
index e1d4114..e9c6ccb 100644
--- a/digikam/themedesigner/mainwindow.cpp
+++ b/digikam/themedesigner/mainwindow.cpp
@@ -42,7 +42,7 @@
 #include <klocale.h>
 #include <kcolordialog.h>
 #include <kcolorbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>
diff --git a/digikam/themedesigner/themediconitem.cpp b/digikam/themedesigner/themediconitem.cpp
index a2eefe1..939e12b 100644
--- a/digikam/themedesigner/themediconitem.cpp
+++ b/digikam/themedesigner/themediconitem.cpp
@@ -35,7 +35,7 @@
 
 #include <kglobal.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 
 // Local includes.
diff --git a/digikam/utilities/batch/batchalbumssyncmetadata.cpp b/digikam/utilities/batch/batchalbumssyncmetadata.cpp
index b2f295f..a148b43 100644
--- a/digikam/utilities/batch/batchalbumssyncmetadata.cpp
+++ b/digikam/utilities/batch/batchalbumssyncmetadata.cpp
@@ -31,7 +31,7 @@
 // KDE includes.
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 
 // Local includes.
diff --git a/digikam/utilities/batch/batchsyncmetadata.cpp b/digikam/utilities/batch/batchsyncmetadata.cpp
index 8e7ff86..91e36be 100644
--- a/digikam/utilities/batch/batchsyncmetadata.cpp
+++ b/digikam/utilities/batch/batchsyncmetadata.cpp
@@ -29,7 +29,7 @@
 // KDE includes.
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/utilities/batch/batchthumbsgenerator.cpp b/digikam/utilities/batch/batchthumbsgenerator.cpp
index a2c732c..890a1e3 100644
--- a/digikam/utilities/batch/batchthumbsgenerator.cpp
+++ b/digikam/utilities/batch/batchthumbsgenerator.cpp
@@ -40,7 +40,7 @@ extern "C"
 
 #include <kmdcodec.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/utilities/cameragui/albumselectdialog.cpp b/digikam/utilities/cameragui/albumselectdialog.cpp
index 54b1e6e..03931f8 100644
--- a/digikam/utilities/cameragui/albumselectdialog.cpp
+++ b/digikam/utilities/cameragui/albumselectdialog.cpp
@@ -37,7 +37,7 @@
 
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>
diff --git a/digikam/utilities/cameragui/camerafolderdialog.cpp b/digikam/utilities/cameragui/camerafolderdialog.cpp
index 5d3c896..84ebcaa 100644
--- a/digikam/utilities/cameragui/camerafolderdialog.cpp
+++ b/digikam/utilities/cameragui/camerafolderdialog.cpp
@@ -31,7 +31,7 @@
 
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/utilities/cameragui/cameraiconview.cpp b/digikam/utilities/cameragui/cameraiconview.cpp
index 53d5d47..be3ea36 100644
--- a/digikam/utilities/cameragui/cameraiconview.cpp
+++ b/digikam/utilities/cameragui/cameraiconview.cpp
@@ -42,7 +42,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/utilities/cameragui/cameraui.cpp b/digikam/utilities/cameragui/cameraui.cpp
index c6d2d3e..27af679 100644
--- a/digikam/utilities/cameragui/cameraui.cpp
+++ b/digikam/utilities/cameragui/cameraui.cpp
@@ -53,13 +53,13 @@
 
 #include <tdefiledialog.h>
 #include <kimageio.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kmessagebox.h>
 #include <kprogress.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
diff --git a/digikam/utilities/cameragui/renamecustomizer.cpp b/digikam/utilities/cameragui/renamecustomizer.cpp
index cb49a23..96690ca 100644
--- a/digikam/utilities/cameragui/renamecustomizer.cpp
+++ b/digikam/utilities/cameragui/renamecustomizer.cpp
@@ -40,7 +40,7 @@
 
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <knuminput.h>
diff --git a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp
index 2847049..067c9a7 100644
--- a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp
+++ b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp
@@ -36,7 +36,7 @@
 
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kseparator.h>
 
 // Local includes.
diff --git a/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp b/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp
index 49a1b11..fc104b4 100644
--- a/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp
+++ b/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp
@@ -26,7 +26,7 @@
 
 #include <ktrader.h>
 #include <tdeparts/componentfactory.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kxmlguiclient.h>
 
diff --git a/digikam/utilities/imageeditor/canvas/undocache.cpp b/digikam/utilities/imageeditor/canvas/undocache.cpp
index b772be2..e9776c7 100644
--- a/digikam/utilities/imageeditor/canvas/undocache.cpp
+++ b/digikam/utilities/imageeditor/canvas/undocache.cpp
@@ -40,7 +40,7 @@ extern "C"
 // KDE includes.
 
 #include <kstandarddirs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kinstance.h>
 #include <kglobal.h>
 
diff --git a/digikam/utilities/imageeditor/editor/editortoolsettings.cpp b/digikam/utilities/imageeditor/editor/editortoolsettings.cpp
index 47a6a83..b412839 100644
--- a/digikam/utilities/imageeditor/editor/editortoolsettings.cpp
+++ b/digikam/utilities/imageeditor/editor/editortoolsettings.cpp
@@ -32,7 +32,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <kdialog.h>
 #include <kglobalsettings.h>
diff --git a/digikam/utilities/imageeditor/editor/editorwindow.cpp b/digikam/utilities/imageeditor/editor/editorwindow.cpp
index 03974f3..7e8ede3 100644
--- a/digikam/utilities/imageeditor/editor/editorwindow.cpp
+++ b/digikam/utilities/imageeditor/editor/editorwindow.cpp
@@ -55,10 +55,10 @@ extern "C"
 #include <tdeversion.h>
 #include <tdeaction.h>
 #include <kedittoolbar.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kcursor.h>
 #include <kstdaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <tdefiledialog.h>
diff --git a/digikam/utilities/imageeditor/editor/imagewindow.cpp b/digikam/utilities/imageeditor/editor/imagewindow.cpp
index 5cf90b8..df79709 100644
--- a/digikam/utilities/imageeditor/editor/imagewindow.cpp
+++ b/digikam/utilities/imageeditor/editor/imagewindow.cpp
@@ -42,7 +42,7 @@
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
 #include <kimageio.h>
diff --git a/digikam/utilities/imageeditor/rawimport/rawimport.cpp b/digikam/utilities/imageeditor/rawimport/rawimport.cpp
index 837eb06..1120cb9 100644
--- a/digikam/utilities/imageeditor/rawimport/rawimport.cpp
+++ b/digikam/utilities/imageeditor/rawimport/rawimport.cpp
@@ -32,7 +32,7 @@
 #include <kcursor.h>
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 
diff --git a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp
index a0ca726..58e5fd1 100644
--- a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp
+++ b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp
@@ -36,7 +36,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ktabwidget.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/digikam/utilities/imageeditor/tools/imageprint.cpp b/digikam/utilities/imageeditor/tools/imageprint.cpp
index bede283..ebd894c 100644
--- a/digikam/utilities/imageeditor/tools/imageprint.cpp
+++ b/digikam/utilities/imageeditor/tools/imageprint.cpp
@@ -58,7 +58,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kimageio.h>
 #include <kcombobox.h>
diff --git a/digikam/utilities/imageeditor/tools/imageresize.cpp b/digikam/utilities/imageeditor/tools/imageresize.cpp
index 1ffb957..9161a0a 100644
--- a/digikam/utilities/imageeditor/tools/imageresize.cpp
+++ b/digikam/utilities/imageeditor/tools/imageresize.cpp
@@ -51,7 +51,7 @@
 #include <kurllabel.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
diff --git a/digikam/utilities/lighttable/lighttablepreview.cpp b/digikam/utilities/lighttable/lighttablepreview.cpp
index 4177c19..dea0bb3 100644
--- a/digikam/utilities/lighttable/lighttablepreview.cpp
+++ b/digikam/utilities/lighttable/lighttablepreview.cpp
@@ -45,7 +45,7 @@
 #include <kdatetbl.h>
 #include <kiconloader.h>
 #include <kprocess.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/utilities/lighttable/lighttablewindow.cpp b/digikam/utilities/lighttable/lighttablewindow.cpp
index b4209eb..bb811c8 100644
--- a/digikam/utilities/lighttable/lighttablewindow.cpp
+++ b/digikam/utilities/lighttable/lighttablewindow.cpp
@@ -33,7 +33,7 @@
 #include <klocale.h>
 #include <twin.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kstatusbar.h>
 #include <kmenubar.h>
diff --git a/digikam/utilities/setup/cameraselection.cpp b/digikam/utilities/setup/cameraselection.cpp
index 45ed8a4..9983e20 100644
--- a/digikam/utilities/setup/cameraselection.cpp
+++ b/digikam/utilities/setup/cameraselection.cpp
@@ -43,7 +43,7 @@
 #include <klocale.h>
 #include <klineedit.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/utilities/setup/setup.cpp b/digikam/utilities/setup/setup.cpp
index 95899db..a453bd7 100644
--- a/digikam/utilities/setup/setup.cpp
+++ b/digikam/utilities/setup/setup.cpp
@@ -34,7 +34,7 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/utilities/setup/setupcamera.cpp b/digikam/utilities/setup/setupcamera.cpp
index d2bfa84..92675a3 100644
--- a/digikam/utilities/setup/setupcamera.cpp
+++ b/digikam/utilities/setup/setupcamera.cpp
@@ -41,7 +41,7 @@
 #include <kglobalsettings.h>
 #include <kstandarddirs.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/utilities/setup/setupdcraw.cpp b/digikam/utilities/setup/setupdcraw.cpp
index b738f1c..a401e63 100644
--- a/digikam/utilities/setup/setupdcraw.cpp
+++ b/digikam/utilities/setup/setupdcraw.cpp
@@ -39,7 +39,7 @@
 #include <kiconloader.h>
 #include <kdialog.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // LibKDcraw includes.
 
diff --git a/digikam/utilities/setup/setupeditor.cpp b/digikam/utilities/setup/setupeditor.cpp
index c24a838..73a1e58 100644
--- a/digikam/utilities/setup/setupeditor.cpp
+++ b/digikam/utilities/setup/setupeditor.cpp
@@ -38,7 +38,7 @@
 #include <kcolorbutton.h>
 #include <knuminput.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/utilities/setup/setupicc.cpp b/digikam/utilities/setup/setupicc.cpp
index b302e8b..3ce15ad 100644
--- a/digikam/utilities/setup/setupicc.cpp
+++ b/digikam/utilities/setup/setupicc.cpp
@@ -52,7 +52,7 @@
 #include <klineedit.h>
 #include <tdeconfig.h>
 #include <kcombobox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kurllabel.h>
 #include <kiconloader.h>
diff --git a/digikam/utilities/setup/setupiofiles.cpp b/digikam/utilities/setup/setupiofiles.cpp
index 3498a46..1fd93e5 100644
--- a/digikam/utilities/setup/setupiofiles.cpp
+++ b/digikam/utilities/setup/setupiofiles.cpp
@@ -30,7 +30,7 @@
 #include <klocale.h>
 #include <kdialog.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kseparator.h>
 
 // Local includes.
diff --git a/digikam/utilities/setup/setuplighttable.cpp b/digikam/utilities/setup/setuplighttable.cpp
index a02d0fc..ffd1784 100644
--- a/digikam/utilities/setup/setuplighttable.cpp
+++ b/digikam/utilities/setup/setuplighttable.cpp
@@ -36,7 +36,7 @@
 #include <klocale.h>
 #include <kdialog.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/utilities/setup/setupmetadata.cpp b/digikam/utilities/setup/setupmetadata.cpp
index 251d72a..66f66a5 100644
--- a/digikam/utilities/setup/setupmetadata.cpp
+++ b/digikam/utilities/setup/setupmetadata.cpp
@@ -44,7 +44,7 @@
 #include <kiconloader.h>
 #include <kglobalsettings.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/utilities/setup/setupslideshow.cpp b/digikam/utilities/setup/setupslideshow.cpp
index f8cba9f..07fb48f 100644
--- a/digikam/utilities/setup/setupslideshow.cpp
+++ b/digikam/utilities/setup/setupslideshow.cpp
@@ -34,7 +34,7 @@
 #include <kdialog.h>
 #include <knuminput.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // Local includes.
 
diff --git a/digikam/utilities/slideshow/slideshow.cpp b/digikam/utilities/slideshow/slideshow.cpp
index cc8fdb2..fdcb192 100644
--- a/digikam/utilities/slideshow/slideshow.cpp
+++ b/digikam/utilities/slideshow/slideshow.cpp
@@ -35,7 +35,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <tdeversion.h>
diff --git a/digikam/utilities/slideshow/toolbar.cpp b/digikam/utilities/slideshow/toolbar.cpp
index 5f3570d..e49ed5e 100644
--- a/digikam/utilities/slideshow/toolbar.cpp
+++ b/digikam/utilities/slideshow/toolbar.cpp
@@ -30,7 +30,7 @@
 
 // KDE includes.
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>