From e396c148d1ce9c6407b2fa245f1648ed63309f31 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:09:43 -0600
Subject: [PATCH] Rename many classes and header files to avoid conflicts with
 KDE4

---
 ChangeLog                                            |  6 +++---
 digikam/digikam/albumfolderview.cpp                  |  4 ++--
 digikam/digikam/albumiconview.cpp                    |  2 +-
 digikam/digikam/cameratype.cpp                       |  2 +-
 digikam/digikam/digikamapp.cpp                       |  2 +-
 digikam/digikam/digikamapp.h                         |  2 +-
 digikam/digikam/digikamappprivate.h                  |  6 +++---
 digikam/digikam/ratingfilter.cpp                     |  2 +-
 digikam/digikam/searchfolderview.cpp                 |  2 +-
 digikam/digikam/tageditdlg.cpp                       |  2 +-
 digikam/digikam/tagfilterview.cpp                    |  2 +-
 digikam/digikam/tagfolderview.cpp                    |  2 +-
 digikam/digikam/timelinefolderview.cpp               |  2 +-
 digikam/imageplugins/adjustcurves/adjustcurves.cpp   |  4 ++--
 .../imageplugins/adjustcurves/adjustcurvestool.cpp   |  4 ++--
 .../adjustcurves/imageplugin_adjustcurves.cpp        |  2 +-
 digikam/imageplugins/adjustlevels/adjustlevels.cpp   |  4 ++--
 .../imageplugins/adjustlevels/adjustlevelstool.cpp   |  4 ++--
 .../adjustlevels/imageplugin_adjustlevels.cpp        |  2 +-
 .../antivignetting/imageplugin_antivignetting.cpp    |  2 +-
 digikam/imageplugins/blurfx/imageplugin_blurfx.cpp   |  2 +-
 digikam/imageplugins/border/imageplugin_border.cpp   |  2 +-
 digikam/imageplugins/channelmixer/channelmixer.cpp   |  4 ++--
 .../imageplugins/channelmixer/channelmixertool.cpp   |  4 ++--
 .../channelmixer/imageplugin_channelmixer.cpp        |  2 +-
 .../imageplugins/charcoal/imageplugin_charcoal.cpp   |  2 +-
 digikam/imageplugins/colorfx/colorfxtool.cpp         |  2 +-
 digikam/imageplugins/colorfx/imageeffect_colorfx.cpp |  2 +-
 digikam/imageplugins/colorfx/imageplugin_colorfx.cpp |  2 +-
 digikam/imageplugins/coreplugin/imageplugin_core.cpp |  2 +-
 .../distortionfx/imageplugin_distortionfx.cpp        |  2 +-
 digikam/imageplugins/emboss/imageplugin_emboss.cpp   |  2 +-
 .../imageplugins/filmgrain/imageplugin_filmgrain.cpp |  2 +-
 .../freerotation/imageplugin_freerotation.cpp        |  2 +-
 .../imageplugins/hotpixels/imageplugin_hotpixels.cpp |  2 +-
 .../imageplugins/infrared/imageplugin_infrared.cpp   |  2 +-
 .../inpainting/imageeffect_inpainting.cpp            |  2 +-
 .../inpainting/imageplugin_inpainting.cpp            |  2 +-
 digikam/imageplugins/inpainting/inpaintingtool.cpp   |  2 +-
 .../imageplugins/inserttext/fontchooserwidget.cpp    |  2 +-
 .../inserttext/imageeffect_inserttext.cpp            |  2 +-
 .../inserttext/imageplugin_inserttext.cpp            |  2 +-
 digikam/imageplugins/inserttext/inserttexttool.cpp   |  2 +-
 .../lensdistortion/imageplugin_lensdistortion.cpp    |  2 +-
 .../noisereduction/imageplugin_noisereduction.cpp    |  2 +-
 .../imageplugins/oilpaint/imageplugin_oilpaint.cpp   |  2 +-
 .../perspective/imageeffect_perspective.cpp          |  2 +-
 .../perspective/imageplugin_perspective.cpp          |  2 +-
 digikam/imageplugins/perspective/perspectivetool.cpp |  2 +-
 .../imageplugins/raindrop/imageplugin_raindrop.cpp   |  2 +-
 .../restoration/imageplugin_restoration.cpp          |  2 +-
 .../imageplugins/sheartool/imageplugin_sheartool.cpp |  2 +-
 .../superimpose/imageeffect_superimpose.cpp          |  2 +-
 .../superimpose/imageplugin_superimpose.cpp          |  2 +-
 digikam/imageplugins/superimpose/superimposetool.cpp |  2 +-
 digikam/imageplugins/texture/imageplugin_texture.cpp |  2 +-
 .../whitebalance/imageeffect_whitebalance.cpp        |  2 +-
 .../whitebalance/imageplugin_whitebalance.cpp        |  2 +-
 .../imageplugins/whitebalance/whitebalancetool.cpp   |  2 +-
 digikam/libs/dialogs/ctrlpaneldlg.cpp                |  2 +-
 digikam/libs/dialogs/deletedialogbase.ui             |  2 +-
 digikam/libs/dialogs/imagedlgbase.cpp                |  2 +-
 digikam/libs/dialogs/imageguidedlg.cpp               |  2 +-
 digikam/libs/imageproperties/imagedescedittab.cpp    |  2 +-
 digikam/libs/imageproperties/talbumlistview.cpp      |  2 +-
 digikam/libs/widgets/common/dlogoaction.cpp          |  2 +-
 digikam/libs/widgets/common/dlogoaction.h            |  2 +-
 digikam/libs/widgets/common/dpopupmenu.h             |  2 +-
 digikam/showfoto/showfoto.cpp                        |  6 +++---
 digikam/utilities/cameragui/albumselectdialog.cpp    |  2 +-
 digikam/utilities/cameragui/cameraiconview.cpp       |  2 +-
 digikam/utilities/cameragui/cameraui.cpp             |  2 +-
 .../utilities/imageeditor/editor/editorwindow.cpp    |  6 +++---
 digikam/utilities/imageeditor/editor/editorwindow.h  |  2 +-
 digikam/utilities/imageeditor/editor/imagewindow.cpp |  8 ++++----
 digikam/utilities/lighttable/lighttablebar.cpp       |  2 +-
 digikam/utilities/lighttable/lighttablewindow.h      |  2 +-
 .../utilities/lighttable/lighttablewindowprivate.h   |  4 ++--
 digikam/utilities/setup/setupcollections.cpp         |  2 +-
 po/nds/digikam.po                                    | 12 ++++++------
 80 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b9a185d..9c6623d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -55883,7 +55883,7 @@ v0.7.2				28/02/05
 
 	* utilities/imageeditor/imagewindow.cpp:
 
-	  the toolbar "name" got changed in the transition to kmainwindow.
+	  the toolbar "name" got changed in the transition to tdemainwindow.
 	  change. fixes bug with toolbar not hiding in full screen mode
 
 2005-02-20 19:05  pahlibar
@@ -58858,7 +58858,7 @@ v0.7-beta1		10/13/04
          hide menubar & statusbar in fullscreen mode for the imagewindow.
          plug and unplug the fullscreen action in the toolbar accordingly
         * pahlibar (2004-09-06):
-          create the toolbar with proper object name. dunno why ktoolbar took off
+          create the toolbar with proper object name. dunno why tdetoolbar took off
           the option to specify the object name in the constructor
         * pahlibar (2004-09-05):
           following a suggestion from mornfall, its now possible to assign/remove tags
@@ -59025,7 +59025,7 @@ v0.7-beta1		10/13/04
         * rhoezler (2004-08-10): Implemented EXIF-based rotation in the image editor via
           the Imlib interface.
         * jahrens (2004-08-09): Removed populatetags to rebuild the tag layout. Instead
-          adding/removing a TAlbumChecklistItem.
+          adding/removing a TAlbumChectdelistItem.
         * pahlibar (2004-08-08): in thumbview, controlbutton + drawrubber should preserve
           existing selection
         * jahrens (2004-08-07): Context menu appears after RMB everywhere in the listctrl
diff --git a/digikam/digikam/albumfolderview.cpp b/digikam/digikam/albumfolderview.cpp
index 7514ceb..aad48c9 100644
--- a/digikam/digikam/albumfolderview.cpp
+++ b/digikam/digikam/albumfolderview.cpp
@@ -28,7 +28,7 @@
 #include <tqpixmap.h>
 #include <tqguardedptr.h>
 #include <tqdir.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqcursor.h>
 #include <tqdatastream.h>
 #include <tqvaluelist.h>
@@ -42,7 +42,7 @@
 #include <kiconloader.h>
 #include <kapplication.h>
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdefiledialog.h>
 
 #include <tdeversion.h>
diff --git a/digikam/digikam/albumiconview.cpp b/digikam/digikam/albumiconview.cpp
index 34db45d..a765837 100644
--- a/digikam/digikam/albumiconview.cpp
+++ b/digikam/digikam/albumiconview.cpp
@@ -76,7 +76,7 @@ extern "C"
 #include <ktrader.h>
 #include <kservice.h>
 #include <krun.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstandarddirs.h>
 #include <kiconeffect.h>
 #include <kdebug.h>
diff --git a/digikam/digikam/cameratype.cpp b/digikam/digikam/cameratype.cpp
index 61396c3..28d8383 100644
--- a/digikam/digikam/cameratype.cpp
+++ b/digikam/digikam/cameratype.cpp
@@ -24,7 +24,7 @@
 
 // KDE includes.
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 // Local includes.
 
diff --git a/digikam/digikam/digikamapp.cpp b/digikam/digikam/digikamapp.cpp
index 3f925e7..b2115d2 100644
--- a/digikam/digikam/digikamapp.cpp
+++ b/digikam/digikam/digikamapp.cpp
@@ -41,7 +41,7 @@
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <kstdaction.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
 #include <kiconloader.h>
diff --git a/digikam/digikam/digikamapp.h b/digikam/digikam/digikamapp.h
index be37e6c..64864e7 100644
--- a/digikam/digikam/digikamapp.h
+++ b/digikam/digikam/digikamapp.h
@@ -36,7 +36,7 @@
 
 // KDE includes.
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tdeio/global.h>
 #include <tdeio/netaccess.h>
 
diff --git a/digikam/digikam/digikamappprivate.h b/digikam/digikam/digikamappprivate.h
index d9559f5..cf5e43a 100644
--- a/digikam/digikam/digikamappprivate.h
+++ b/digikam/digikam/digikamappprivate.h
@@ -32,9 +32,9 @@
 // KDE includes.
 
 #include <tdeconfig.h>
-#include <kaction.h>
-#include <kaccel.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdeaccel.h>
+#include <tdepopupmenu.h>
 #include <kstatusbar.h>
 
 // libKipi includes.
diff --git a/digikam/digikam/ratingfilter.cpp b/digikam/digikam/ratingfilter.cpp
index 6e0add3..c0d4c3a 100644
--- a/digikam/digikam/ratingfilter.cpp
+++ b/digikam/digikam/ratingfilter.cpp
@@ -36,7 +36,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 // Local includes.
 
diff --git a/digikam/digikam/searchfolderview.cpp b/digikam/digikam/searchfolderview.cpp
index b69f3e7..3dd46ae 100644
--- a/digikam/digikam/searchfolderview.cpp
+++ b/digikam/digikam/searchfolderview.cpp
@@ -32,7 +32,7 @@
 
 // KDE includes.
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/digikam/digikam/tageditdlg.cpp b/digikam/digikam/tageditdlg.cpp
index c99e2aa..2ae0f71 100644
--- a/digikam/digikam/tageditdlg.cpp
+++ b/digikam/digikam/tageditdlg.cpp
@@ -35,7 +35,7 @@
 #include <tdeversion.h>
 #include <kiconloader.h>
 #include <kseparator.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 // Local includes.
 
diff --git a/digikam/digikam/tagfilterview.cpp b/digikam/digikam/tagfilterview.cpp
index a65ed94..98d7c43 100644
--- a/digikam/digikam/tagfilterview.cpp
+++ b/digikam/digikam/tagfilterview.cpp
@@ -34,7 +34,7 @@
 // KDE includes.
 
 #include <kabc/stdaddressbook.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
diff --git a/digikam/digikam/tagfolderview.cpp b/digikam/digikam/tagfolderview.cpp
index 2e49b00..2a540c5 100644
--- a/digikam/digikam/tagfolderview.cpp
+++ b/digikam/digikam/tagfolderview.cpp
@@ -31,7 +31,7 @@
 
 // KDE includes.
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kabc/stdaddressbook.h>
 #include <kiconloader.h>
diff --git a/digikam/digikam/timelinefolderview.cpp b/digikam/digikam/timelinefolderview.cpp
index 9cb5bf6..8a08326 100644
--- a/digikam/digikam/timelinefolderview.cpp
+++ b/digikam/digikam/timelinefolderview.cpp
@@ -31,7 +31,7 @@
 
 // KDE includes.
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/digikam/imageplugins/adjustcurves/adjustcurves.cpp b/digikam/imageplugins/adjustcurves/adjustcurves.cpp
index 559efe2..ad49d02 100644
--- a/digikam/imageplugins/adjustcurves/adjustcurves.cpp
+++ b/digikam/imageplugins/adjustcurves/adjustcurves.cpp
@@ -52,14 +52,14 @@
 #include <klocale.h>
 #include <knuminput.h>
 #include <kmessagebox.h>
-#include <kselect.h>
+#include <tdeselect.h>
 #include <tdefiledialog.h>
 #include <kglobalsettings.h>
 #include <kaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <kapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
 // Local includes.
diff --git a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp b/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp
index 6ada614..58f059f 100644
--- a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp
+++ b/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp
@@ -52,14 +52,14 @@
 #include <klocale.h>
 #include <knuminput.h>
 #include <kmessagebox.h>
-#include <kselect.h>
+#include <tdeselect.h>
 #include <tdefiledialog.h>
 #include <kglobalsettings.h>
 #include <kaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <kapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kpushbutton.h>
 
diff --git a/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp b/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp
index e785fd5..2be813d 100644
--- a/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp
+++ b/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp
@@ -26,7 +26,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 
 // Local includes.
diff --git a/digikam/imageplugins/adjustlevels/adjustlevels.cpp b/digikam/imageplugins/adjustlevels/adjustlevels.cpp
index eef0062..f4b9971 100644
--- a/digikam/imageplugins/adjustlevels/adjustlevels.cpp
+++ b/digikam/imageplugins/adjustlevels/adjustlevels.cpp
@@ -52,14 +52,14 @@
 #include <klocale.h>
 #include <knuminput.h>
 #include <kmessagebox.h>
-#include <kselect.h>
+#include <tdeselect.h>
 #include <tdefiledialog.h>
 #include <kglobalsettings.h>
 #include <kaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <kapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
 // Local includes.
diff --git a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp
index 65dac6d..ee2a09e 100644
--- a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp
+++ b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp
@@ -56,8 +56,8 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
-#include <kselect.h>
+#include <tdepopupmenu.h>
+#include <tdeselect.h>
 #include <kstandarddirs.h>
 
 // LibKDcraw includes.
diff --git a/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp b/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp
index 1e013dc..ff145b1 100644
--- a/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp
+++ b/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp
@@ -26,7 +26,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 
 // Local includes.
diff --git a/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp b/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp
index 89e729d..8ce215c 100644
--- a/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp
+++ b/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 
 // Local includes.
diff --git a/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp b/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp
index 9245f7a..1cf30ac 100644
--- a/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp
+++ b/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp
@@ -26,7 +26,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 #include <kapplication.h>
 
diff --git a/digikam/imageplugins/border/imageplugin_border.cpp b/digikam/imageplugins/border/imageplugin_border.cpp
index 7a5ab86..631f4a6 100644
--- a/digikam/imageplugins/border/imageplugin_border.cpp
+++ b/digikam/imageplugins/border/imageplugin_border.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 
 // Local includes.
diff --git a/digikam/imageplugins/channelmixer/channelmixer.cpp b/digikam/imageplugins/channelmixer/channelmixer.cpp
index 32629fb..dd1c2ea 100644
--- a/digikam/imageplugins/channelmixer/channelmixer.cpp
+++ b/digikam/imageplugins/channelmixer/channelmixer.cpp
@@ -61,14 +61,14 @@
 #include <klocale.h>
 #include <knuminput.h>
 #include <kmessagebox.h>
-#include <kselect.h>
+#include <tdeselect.h>
 #include <tdefiledialog.h>
 #include <kglobalsettings.h>
 #include <kaboutdata.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <kapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
 // Local includes.
diff --git a/digikam/imageplugins/channelmixer/channelmixertool.cpp b/digikam/imageplugins/channelmixer/channelmixertool.cpp
index 16d153f..f66e5b4 100644
--- a/digikam/imageplugins/channelmixer/channelmixertool.cpp
+++ b/digikam/imageplugins/channelmixer/channelmixertool.cpp
@@ -62,8 +62,8 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
-#include <kselect.h>
+#include <tdepopupmenu.h>
+#include <tdeselect.h>
 #include <kstandarddirs.h>
 
 // LibKDcraw includes.
diff --git a/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp b/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp
index 3154c84..9bd67bb 100644
--- a/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp
+++ b/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp
@@ -26,7 +26,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 
 // Local includes.
diff --git a/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp b/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp
index 4b09ef9..7336efb 100644
--- a/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp
+++ b/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 #include <kapplication.h>
 
diff --git a/digikam/imageplugins/colorfx/colorfxtool.cpp b/digikam/imageplugins/colorfx/colorfxtool.cpp
index 56460fc..a2c4843 100644
--- a/digikam/imageplugins/colorfx/colorfxtool.cpp
+++ b/digikam/imageplugins/colorfx/colorfxtool.cpp
@@ -46,7 +46,7 @@
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
 // LibKDcraw includes.
diff --git a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp
index 32065f3..5eb8fff 100644
--- a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp
+++ b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp
@@ -47,7 +47,7 @@
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <kapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
 // Local includes.
diff --git a/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp b/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp
index 2d5f014..4b89ece 100644
--- a/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp
+++ b/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp
@@ -28,7 +28,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 #include <kapplication.h>
 
diff --git a/digikam/imageplugins/coreplugin/imageplugin_core.cpp b/digikam/imageplugins/coreplugin/imageplugin_core.cpp
index e262314..aec6f83 100644
--- a/digikam/imageplugins/coreplugin/imageplugin_core.cpp
+++ b/digikam/imageplugins/coreplugin/imageplugin_core.cpp
@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
diff --git a/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp b/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp
index d107694..a3e1a5d 100644
--- a/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp
+++ b/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp
@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 
 // Local includes.
diff --git a/digikam/imageplugins/emboss/imageplugin_emboss.cpp b/digikam/imageplugins/emboss/imageplugin_emboss.cpp
index 2794505..10dc191 100644
--- a/digikam/imageplugins/emboss/imageplugin_emboss.cpp
+++ b/digikam/imageplugins/emboss/imageplugin_emboss.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 #include <kapplication.h>
 
diff --git a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp b/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp
index e629059..cb2f4c2 100644
--- a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp
+++ b/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 #include <kapplication.h>
 
diff --git a/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp b/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp
index de50824..c08adb2 100644
--- a/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp
+++ b/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 
 // Local includes.
diff --git a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp b/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp
index e2b0de9..f1072e9 100644
--- a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp
+++ b/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp
@@ -28,7 +28,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 #include <kapplication.h>
 
diff --git a/digikam/imageplugins/infrared/imageplugin_infrared.cpp b/digikam/imageplugins/infrared/imageplugin_infrared.cpp
index 39b1364..416e949 100644
--- a/digikam/imageplugins/infrared/imageplugin_infrared.cpp
+++ b/digikam/imageplugins/infrared/imageplugin_infrared.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 #include <kapplication.h>
 
diff --git a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp
index ac2a5e2..4da497b 100644
--- a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp
+++ b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp
@@ -56,7 +56,7 @@
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <kapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdefiledialog.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
diff --git a/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp b/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp
index cbabc0a..30f593f 100644
--- a/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp
+++ b/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 #include <kapplication.h>
 
diff --git a/digikam/imageplugins/inpainting/inpaintingtool.cpp b/digikam/imageplugins/inpainting/inpaintingtool.cpp
index 82e5b46..3d42a43 100644
--- a/digikam/imageplugins/inpainting/inpaintingtool.cpp
+++ b/digikam/imageplugins/inpainting/inpaintingtool.cpp
@@ -58,7 +58,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprogress.h>
 #include <kstandarddirs.h>
 #include <kurllabel.h>
diff --git a/digikam/imageplugins/inserttext/fontchooserwidget.cpp b/digikam/imageplugins/inserttext/fontchooserwidget.cpp
index 3efdc70..c2cc726 100644
--- a/digikam/imageplugins/inserttext/fontchooserwidget.cpp
+++ b/digikam/imageplugins/inserttext/fontchooserwidget.cpp
@@ -48,7 +48,7 @@
 #include <kdialog.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <knuminput.h>
 #include <kstandarddirs.h>
diff --git a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp b/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp
index a019f16..d2c2af9 100644
--- a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp
+++ b/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp
@@ -49,7 +49,7 @@
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <kapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <kcolorbutton.h>
diff --git a/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp b/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp
index a9ac817..c06ef6c 100644
--- a/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp
+++ b/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp
@@ -26,7 +26,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 
 // Local includes.
diff --git a/digikam/imageplugins/inserttext/inserttexttool.cpp b/digikam/imageplugins/inserttext/inserttexttool.cpp
index e0059e2..713685b 100644
--- a/digikam/imageplugins/inserttext/inserttexttool.cpp
+++ b/digikam/imageplugins/inserttext/inserttexttool.cpp
@@ -50,7 +50,7 @@
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <ktextedit.h>
 
diff --git a/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp b/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp
index a7eddd8..02cf17b 100644
--- a/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp
+++ b/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp
@@ -26,7 +26,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 
 // Local includes.
diff --git a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp b/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp
index 3de48a1..2ffa188 100644
--- a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp
+++ b/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp
@@ -26,7 +26,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 #include <kapplication.h>
 
diff --git a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp b/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp
index d49ce9e..6d6002f 100644
--- a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp
+++ b/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp
@@ -26,7 +26,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 #include <kapplication.h>
 
diff --git a/digikam/imageplugins/perspective/imageeffect_perspective.cpp b/digikam/imageplugins/perspective/imageeffect_perspective.cpp
index e53cb0a..c82350c 100644
--- a/digikam/imageplugins/perspective/imageeffect_perspective.cpp
+++ b/digikam/imageplugins/perspective/imageeffect_perspective.cpp
@@ -43,7 +43,7 @@
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <kapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kseparator.h>
 
diff --git a/digikam/imageplugins/perspective/imageplugin_perspective.cpp b/digikam/imageplugins/perspective/imageplugin_perspective.cpp
index cfa99ec..75d1228 100644
--- a/digikam/imageplugins/perspective/imageplugin_perspective.cpp
+++ b/digikam/imageplugins/perspective/imageplugin_perspective.cpp
@@ -26,7 +26,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 
 // Local includes.
diff --git a/digikam/imageplugins/perspective/perspectivetool.cpp b/digikam/imageplugins/perspective/perspectivetool.cpp
index 47a69da..6093f71 100644
--- a/digikam/imageplugins/perspective/perspectivetool.cpp
+++ b/digikam/imageplugins/perspective/perspectivetool.cpp
@@ -42,7 +42,7 @@
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kseparator.h>
 #include <kstandarddirs.h>
 
diff --git a/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp b/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp
index db2f7b4..9a06919 100644
--- a/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp
+++ b/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp
@@ -26,7 +26,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 
 // Local includes.
diff --git a/digikam/imageplugins/restoration/imageplugin_restoration.cpp b/digikam/imageplugins/restoration/imageplugin_restoration.cpp
index c6cdb1b..88d0a55 100644
--- a/digikam/imageplugins/restoration/imageplugin_restoration.cpp
+++ b/digikam/imageplugins/restoration/imageplugin_restoration.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 #include <kapplication.h>
 
diff --git a/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp b/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp
index 522536c..68265af 100644
--- a/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp
+++ b/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp
@@ -26,7 +26,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 
 // Local includes.
diff --git a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp
index cd5445a..46d020a 100644
--- a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp
+++ b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp
@@ -46,7 +46,7 @@
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <kapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
 #include <knuminput.h>
diff --git a/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp b/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp
index 5a10e7d..d690d27 100644
--- a/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp
+++ b/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp
@@ -28,7 +28,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 
 // Local includes.
diff --git a/digikam/imageplugins/superimpose/superimposetool.cpp b/digikam/imageplugins/superimpose/superimposetool.cpp
index f8594f8..93d3524 100644
--- a/digikam/imageplugins/superimpose/superimposetool.cpp
+++ b/digikam/imageplugins/superimpose/superimposetool.cpp
@@ -46,7 +46,7 @@
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <kapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
 #include <knuminput.h>
diff --git a/digikam/imageplugins/texture/imageplugin_texture.cpp b/digikam/imageplugins/texture/imageplugin_texture.cpp
index 26df17f..2e01541 100644
--- a/digikam/imageplugins/texture/imageplugin_texture.cpp
+++ b/digikam/imageplugins/texture/imageplugin_texture.cpp
@@ -26,7 +26,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 #include <kapplication.h>
 
diff --git a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp
index aaeae63..3e7d7b5 100644
--- a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp
+++ b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp
@@ -49,7 +49,7 @@
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <kapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
 #include <kmessagebox.h>
diff --git a/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp b/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp
index cc83e5d..41bd05d 100644
--- a/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp
+++ b/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 
 // Local includes.
diff --git a/digikam/imageplugins/whitebalance/whitebalancetool.cpp b/digikam/imageplugins/whitebalance/whitebalancetool.cpp
index 25da16b..bd83bdd 100644
--- a/digikam/imageplugins/whitebalance/whitebalancetool.cpp
+++ b/digikam/imageplugins/whitebalance/whitebalancetool.cpp
@@ -54,7 +54,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprogress.h>
 #include <kseparator.h>
 #include <kstandarddirs.h>
diff --git a/digikam/libs/dialogs/ctrlpaneldlg.cpp b/digikam/libs/dialogs/ctrlpaneldlg.cpp
index 455c1f9..7e3afe0 100644
--- a/digikam/libs/dialogs/ctrlpaneldlg.cpp
+++ b/digikam/libs/dialogs/ctrlpaneldlg.cpp
@@ -41,7 +41,7 @@
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <kapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
 
diff --git a/digikam/libs/dialogs/deletedialogbase.ui b/digikam/libs/dialogs/deletedialogbase.ui
index 129c719..9d7f9f1 100644
--- a/digikam/libs/dialogs/deletedialogbase.ui
+++ b/digikam/libs/dialogs/deletedialogbase.ui
@@ -183,6 +183,6 @@
 	</connections>
 	<layoutdefaults spacing="6" margin="11"/>
 	<includehints>
-		<includehint>klistbox.h</includehint>
+		<includehint>tdelistbox.h</includehint>
 	</includehints>
 </UI>
diff --git a/digikam/libs/dialogs/imagedlgbase.cpp b/digikam/libs/dialogs/imagedlgbase.cpp
index 6f46d04..0f1608d 100644
--- a/digikam/libs/dialogs/imagedlgbase.cpp
+++ b/digikam/libs/dialogs/imagedlgbase.cpp
@@ -46,7 +46,7 @@
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <kapplication.h>
-#include <kpopupmenu.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 2019ee3..b91c3dc 100644
--- a/digikam/libs/dialogs/imageguidedlg.cpp
+++ b/digikam/libs/dialogs/imageguidedlg.cpp
@@ -44,7 +44,7 @@
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <kapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
 #include <kprogress.h>
diff --git a/digikam/libs/imageproperties/imagedescedittab.cpp b/digikam/libs/imageproperties/imagedescedittab.cpp
index 3936140..bae5c17 100644
--- a/digikam/libs/imageproperties/imagedescedittab.cpp
+++ b/digikam/libs/imageproperties/imagedescedittab.cpp
@@ -40,7 +40,7 @@
 // KDE includes.
 
 #include <kabc/stdaddressbook.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kurl.h>
 #include <kcursor.h>
diff --git a/digikam/libs/imageproperties/talbumlistview.cpp b/digikam/libs/imageproperties/talbumlistview.cpp
index af0fde8..c492287 100644
--- a/digikam/libs/imageproperties/talbumlistview.cpp
+++ b/digikam/libs/imageproperties/talbumlistview.cpp
@@ -28,7 +28,7 @@
 
 // KDE includes.
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kurl.h>
 #include <kcursor.h>
diff --git a/digikam/libs/widgets/common/dlogoaction.cpp b/digikam/libs/widgets/common/dlogoaction.cpp
index 3e3c57b..1fafb08 100644
--- a/digikam/libs/widgets/common/dlogoaction.cpp
+++ b/digikam/libs/widgets/common/dlogoaction.cpp
@@ -29,7 +29,7 @@
 // KDE includes.
 
 #include <kurllabel.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kiconloader.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>
diff --git a/digikam/libs/widgets/common/dlogoaction.h b/digikam/libs/widgets/common/dlogoaction.h
index f716f74..c731ab1 100644
--- a/digikam/libs/widgets/common/dlogoaction.h
+++ b/digikam/libs/widgets/common/dlogoaction.h
@@ -26,7 +26,7 @@
 
 // KDE includes.
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 // Local includes.
 
diff --git a/digikam/libs/widgets/common/dpopupmenu.h b/digikam/libs/widgets/common/dpopupmenu.h
index 2e3ed93..f357658 100644
--- a/digikam/libs/widgets/common/dpopupmenu.h
+++ b/digikam/libs/widgets/common/dpopupmenu.h
@@ -35,7 +35,7 @@
 
 // KDE includes.
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 // Local includes.
 
diff --git a/digikam/showfoto/showfoto.cpp b/digikam/showfoto/showfoto.cpp
index 2d5ee7a..f38c7ac 100644
--- a/digikam/showfoto/showfoto.cpp
+++ b/digikam/showfoto/showfoto.cpp
@@ -49,7 +49,7 @@ extern "C"
 // KDE includes.
 
 #include <kcursor.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
@@ -57,7 +57,7 @@ extern "C"
 #include <tdefiledialog.h>
 #include <kmenubar.h>
 #include <kimageio.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <tdeversion.h>
 #include <kmessagebox.h>
 #include <kglobal.h>
@@ -67,7 +67,7 @@ extern "C"
 #include <tdeio/job.h>
 #include <kprotocolinfo.h>
 #include <kglobalsettings.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kstatusbar.h>
 #include <kprogress.h>
 
diff --git a/digikam/utilities/cameragui/albumselectdialog.cpp b/digikam/utilities/cameragui/albumselectdialog.cpp
index 785b8bf..962990f 100644
--- a/digikam/utilities/cameragui/albumselectdialog.cpp
+++ b/digikam/utilities/cameragui/albumselectdialog.cpp
@@ -38,7 +38,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>
 
diff --git a/digikam/utilities/cameragui/cameraiconview.cpp b/digikam/utilities/cameragui/cameraiconview.cpp
index 18f1ea2..81b55ad 100644
--- a/digikam/utilities/cameragui/cameraiconview.cpp
+++ b/digikam/utilities/cameragui/cameraiconview.cpp
@@ -41,7 +41,7 @@
 #include <kmimetype.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 
 // Local includes.
diff --git a/digikam/utilities/cameragui/cameraui.cpp b/digikam/utilities/cameragui/cameraui.cpp
index 42b9ef0..c6d2d3e 100644
--- a/digikam/utilities/cameragui/cameraui.cpp
+++ b/digikam/utilities/cameragui/cameraui.cpp
@@ -61,7 +61,7 @@
 #include <tdeconfig.h>
 #include <kapplication.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <khelpmenu.h>
 #include <kcalendarsystem.h>
diff --git a/digikam/utilities/imageeditor/editor/editorwindow.cpp b/digikam/utilities/imageeditor/editor/editorwindow.cpp
index 117bce3..03974f3 100644
--- a/digikam/utilities/imageeditor/editor/editorwindow.cpp
+++ b/digikam/utilities/imageeditor/editor/editorwindow.cpp
@@ -53,7 +53,7 @@ extern "C"
 #include <kprinter.h>
 #include <kkeydialog.h>
 #include <tdeversion.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kedittoolbar.h>
 #include <kaboutdata.h>
 #include <kcursor.h>
@@ -64,7 +64,7 @@ extern "C"
 #include <tdefiledialog.h>
 #include <kmenubar.h>
 #include <kimageio.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kmessagebox.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
@@ -73,7 +73,7 @@ extern "C"
 #include <tdeio/job.h>
 #include <kprotocolinfo.h>
 #include <kglobalsettings.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kstatusbar.h>
 #include <kprogress.h>
 #include <twin.h>
diff --git a/digikam/utilities/imageeditor/editor/editorwindow.h b/digikam/utilities/imageeditor/editor/editorwindow.h
index 2faef0e..e469dfc 100644
--- a/digikam/utilities/imageeditor/editor/editorwindow.h
+++ b/digikam/utilities/imageeditor/editor/editorwindow.h
@@ -32,7 +32,7 @@
 
 // KDE includes.
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kurl.h>
 
 // Local includes.
diff --git a/digikam/utilities/imageeditor/editor/imagewindow.cpp b/digikam/utilities/imageeditor/editor/imagewindow.cpp
index 43bad31..5cf90b8 100644
--- a/digikam/utilities/imageeditor/editor/imagewindow.cpp
+++ b/digikam/utilities/imageeditor/editor/imagewindow.cpp
@@ -49,10 +49,10 @@
 #include <tdefiledialog.h>
 #include <tdeversion.h>
 #include <kmenubar.h>
-#include <ktoolbar.h>
-#include <kaccel.h>
-#include <kaction.h>
-#include <kstdaccel.h>
+#include <tdetoolbar.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kstdguiitem.h>
 #include <kstatusbar.h>
diff --git a/digikam/utilities/lighttable/lighttablebar.cpp b/digikam/utilities/lighttable/lighttablebar.cpp
index d09e432..5111b91 100644
--- a/digikam/utilities/lighttable/lighttablebar.cpp
+++ b/digikam/utilities/lighttable/lighttablebar.cpp
@@ -33,7 +33,7 @@
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
 // Local includes.
diff --git a/digikam/utilities/lighttable/lighttablewindow.h b/digikam/utilities/lighttable/lighttablewindow.h
index cd879ec..d30f49f 100644
--- a/digikam/utilities/lighttable/lighttablewindow.h
+++ b/digikam/utilities/lighttable/lighttablewindow.h
@@ -31,7 +31,7 @@
 // KDE includes.
 
 #include <kurl.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 // Local includes.
 
diff --git a/digikam/utilities/lighttable/lighttablewindowprivate.h b/digikam/utilities/lighttable/lighttablewindowprivate.h
index aadf1d8..a96e0b0 100644
--- a/digikam/utilities/lighttable/lighttablewindowprivate.h
+++ b/digikam/utilities/lighttable/lighttablewindowprivate.h
@@ -27,8 +27,8 @@
 
 // KDE includes.
 
-#include <kaction.h>
-#include <kaccel.h>
+#include <tdeaction.h>
+#include <tdeaccel.h>
 
 // Local includes.
 
diff --git a/digikam/utilities/setup/setupcollections.cpp b/digikam/utilities/setup/setupcollections.cpp
index 4ee7d5a..9ffd148 100644
--- a/digikam/utilities/setup/setupcollections.cpp
+++ b/digikam/utilities/setup/setupcollections.cpp
@@ -38,7 +38,7 @@
 
 // KDE includes.
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kdialog.h>
 #include <tdefiledialog.h>
diff --git a/po/nds/digikam.po b/po/nds/digikam.po
index 8177a5b..ec6b93e 100644
--- a/po/nds/digikam.po
+++ b/po/nds/digikam.po
@@ -2061,7 +2061,7 @@ msgstr ""
 #: digikam/timelinefolderview.cpp:96 digikam/timelinefolderview.cpp:273
 #, fuzzy
 msgid "My Date Searches"
-msgstr "Mien Sööklist"
+msgstr "Mien Söötdelist"
 
 #: digikam/timelinefolderview.cpp:173
 #, fuzzy
@@ -2749,7 +2749,7 @@ msgstr "Verleden Söök"
 #: digikam/searchfolderview.cpp:108 digikam/searchfolderview.cpp:401
 #: digikam/searchfolderview.cpp:426
 msgid "My Searches"
-msgstr "Mien Sööklist"
+msgstr "Mien Söötdelist"
 
 #: digikam/searchfolderview.cpp:238 digikam/timelineview.cpp:570
 msgid ""
@@ -3317,7 +3317,7 @@ msgid ""
 "<p>Enter the name used to save the current search in \"My Searches\" view"
 msgstr ""
 "<p>Giff den Naam in, den Du för't Sekern vun de aktuelle Söök ünner \"Mien "
-"Sööklist\" bruken wullt"
+"Söötdelist\" bruken wullt"
 
 #: digikam/ratingfilter.cpp:80
 #, fuzzy
@@ -4142,7 +4142,7 @@ msgid ""
 "Searches\" view"
 msgstr ""
 "<p>Giff den Naam in, den Du för't Sekern vun de aktuelle Söök ünner \"Mien "
-"Sööklist\" bruken wullt"
+"Söötdelist\" bruken wullt"
 
 #: digikam/timelineview.cpp:209
 msgid "Save current selection to a new virtual Album"
@@ -4193,7 +4193,7 @@ msgid ""
 "<p>Enter the name of the current search to save in the \"My Searches\" view"
 msgstr ""
 "<p>Giff den Naam in, den Du för't Sekern vun de aktuelle Söök ünner \"Mien "
-"Sööklist\" bruken wullt"
+"Söötdelist\" bruken wullt"
 
 #: digikam/digikamview.cpp:215 utilities/setup/setup.cpp:142
 msgid "Albums"
@@ -13266,7 +13266,7 @@ msgstr "För't Beennen hier klicken..."
 #~ msgstr "Un ok"
 
 #~ msgid "<p>Enter here the name used to save the current search in \"My Searches\" view"
-#~ msgstr "<p>Giff hier den Naam in, de för't Sekern vun de aktuelle Söök ünner \"Mien Sööklist\" bruukt warrn schall"
+#~ msgstr "<p>Giff hier den Naam in, de för't Sekern vun de aktuelle Söök ünner \"Mien Söötdelist\" bruukt warrn schall"
 
 #~ msgid "Donate money..."
 #~ msgstr "Geld bistüern..."