Rename many classes and header files to avoid conflicts with KDE4

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

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>

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>

digikam/digikam/cameratype.cpp

@@ -24,7 +24,7 @@
 
 // KDE includes.
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 // Local includes.
 

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>

digikam/digikam/digikamapp.h

@@ -36,7 +36,7 @@
 
 // KDE includes.
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tdeio/global.h>
 #include <tdeio/netaccess.h>
 

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.

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.
 

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>

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.
 

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>

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>

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>

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.

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>
 

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.

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.

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.

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.

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.

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>
 

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.

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.

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.

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.

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>
 

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.

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.

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>
 

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>

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.

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>
 

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>
 

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.

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>
 

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>
 

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>

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>
 

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>

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>

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>

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.

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>
 

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.

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>
 

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>
 

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>
 

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.

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>
 

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.

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>
 

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.

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>

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.

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>

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>
 

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>

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.

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>

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>
 

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>

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>
 

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>

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>

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>

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>

digikam/libs/widgets/common/dlogoaction.h

@@ -26,7 +26,7 @@
 
 // KDE includes.
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 // Local includes.
 

digikam/libs/widgets/common/dpopupmenu.h

@@ -35,7 +35,7 @@
 
 // KDE includes.
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 // Local includes.
 

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>
 

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>
 

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.

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>

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>

digikam/utilities/imageeditor/editor/editorwindow.h

@@ -32,7 +32,7 @@
 
 // KDE includes.
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kurl.h>
 
 // Local includes.

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>

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.

digikam/utilities/lighttable/lighttablewindow.h

@@ -31,7 +31,7 @@
 // KDE includes.
 
 #include <kurl.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 // Local includes.
 

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.
 

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>

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..."