Rename a number of classes to enhance compatibility with KDE4

96 files changed, 588 insertions, 588 deletions

diff --git a/ChangeLog b/ChangeLog
index 592084bc..b9a185d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10446,7 +10446,7 @@ v0.9.3-beta1 - 2007-010-08
 
 	* branches/extragear/trinity/graphics/digikam/digikam/digikamapp.cpp:
 	  Fix the bug that after an exit from full screen mode, the hidden
-	  menu & tabs would be saved by KMainWindow as default setting.
+	  menu & tabs would be saved by TDEMainWindow as default setting.
 	  The first patch from Arnd was correct, except one problem: all
 	  the showing of widgets works
 	  by events, and obviously needs to return to the event loop to be
@@ -12112,7 +12112,7 @@ v0.9.3-beta1 - 2007-010-08
 2007-06-19 13:30  cgilles
 
 	* branches/extragear/trinity/graphics/digikam/utilities/setup/setupcollections.cpp:
-	  QListBox ==> KListBox
+	  QListBox ==> TDEListBox
 
 2007-06-19 12:18  cgilles
 
@@ -18395,8 +18395,8 @@ v0.9.2-beta1 - 2007-05-04
 2007-03-29 08:42  cgilles
 
 	* trunk/extragear/graphics/digikam/utilities/imageeditor/canvas/canvas.cpp:
-	  digikam from trunk : use KPopupFrame::hide() instead
-	  KPopupFrame::close(int). Sound like some version of close()
+	  digikam from trunk : use TDEPopupFrame::hide() instead
+	  TDEPopupFrame::close(int). Sound like some version of close()
 	  method are uncomplete with any KDE version.
 
 	  CCBUGS: 143578
@@ -23830,7 +23830,7 @@ v0.9.1-beta1 - 11-Feb-2007
 	  - move action from Settings menu to View menu
 	  - use KStdAction::fullScreen() on KDE 3.2 or newer (improved
 	  toggle support)
-	  - use KToggleAction on older KDE
+	  - use TDEToggleAction on older KDE
 
 	  This makes it consistent with Editor, ShowFoto and other KDE
 	  applications.
@@ -27754,7 +27754,7 @@ v0.9.0-rc1 - 21-Nov-2006
 2006-10-26 08:17 +0000 [r599195]  cgilles
 
 	* digikam/digikam/digikamapp.cpp, digikam/digikam/digikamapp.h:
-	  using KPopupMenu instead QPopupMenu
+	  using TDEPopupMenu instead QPopupMenu
 
 2006-10-26 06:24 +0000 [r599179]  cgilles
 
@@ -29009,7 +29009,7 @@ v0.9.0-beta2 - 09/09/2006
 2006-09-06 13:09  cgilles
 
     * trunk/extragear/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
-      digikam from trunk :using KPopupMenu instead QPopupMenu
+      digikam from trunk :using TDEPopupMenu instead QPopupMenu
 
 2006-09-06 13:07  cgilles
 
@@ -29033,7 +29033,7 @@ v0.9.0-beta2 - 09/09/2006
 2006-09-06 13:04  cgilles
 
     * trunk/extragear/graphics/digikam/utilities/cameragui/cameraiconview.cpp:
-      digikam from trunk :using KPopupMenu instead QPopupMenu
+      digikam from trunk :using TDEPopupMenu instead QPopupMenu
 
 2006-09-06 11:57  mwiesweg
 
@@ -29087,25 +29087,25 @@ v0.9.0-beta2 - 09/09/2006
 
     * trunk/extragear/graphics/digikam/digikam/albumfolderview.cpp,
       trunk/extragear/graphics/digikam/digikam/albumfolderview.h:
-      digikam from trunk :using KPopupMenu instead QPopupMenu
+      digikam from trunk :using TDEPopupMenu instead QPopupMenu
 
 2006-09-05 13:28  cgilles
 
     * trunk/extragear/graphics/digikam/digikam/tagfilterview.cpp,
       trunk/extragear/graphics/digikam/digikam/tagfolderview.cpp:
-      digikam from trunk :using KPopupMenu instead QPopupMenu
+      digikam from trunk :using TDEPopupMenu instead QPopupMenu
 
 2006-09-05 12:54  cgilles
 
     * trunk/extragear/graphics/digikam/digikam/digikamapp.cpp,
       trunk/extragear/graphics/digikam/digikam/searchfolderview.cpp,
       trunk/extragear/graphics/digikam/digikam/searchfolderview.h:
-      digikam from trunk :using KPopupMenu instead QPopupMenu
+      digikam from trunk :using TDEPopupMenu instead QPopupMenu
 
 2006-09-05 12:32  cgilles
 
     * trunk/extragear/graphics/digikam/libs/imageproperties/imagedescedittab.cpp:
-      digikam from trunk :using KPopupMenu instead QPopupMenu
+      digikam from trunk :using TDEPopupMenu instead QPopupMenu
 
 2006-09-05 12:23  cgilles
 
@@ -29145,7 +29145,7 @@ v0.9.0-beta2 - 09/09/2006
       trunk/extragear/graphics/digikam/utilities/cameragui/cameraui.cpp,
 
       trunk/extragear/graphics/digikam/utilities/cameragui/cameraui.h:
-      digikam from trunk : camera gui : using KPopupMenu instead
+      digikam from trunk : camera gui : using TDEPopupMenu instead
       QPopupMenu
 
 2006-09-05 10:25  cgilles
@@ -29157,13 +29157,13 @@ v0.9.0-beta2 - 09/09/2006
 2006-09-05 07:15  cgilles
 
     * trunk/extragear/graphics/digikam/digikam/tagfilterview.cpp:
-      digikam from trunk :tag filters view: using KPopupMenu instead
+      digikam from trunk :tag filters view: using TDEPopupMenu instead
       QPopupMenu again
 
 2006-09-05 07:11  cgilles
 
     * trunk/extragear/graphics/digikam/digikam/tagfilterview.cpp:
-      digikam from trunk :tag filters view: using KPopupMenu instead
+      digikam from trunk :tag filters view: using TDEPopupMenu instead
       QPopupMenu
 
 2006-09-04 11:35  cgilles
@@ -38240,7 +38240,7 @@ v0.9.0-beta1 - 20/07/2006
 	  trunk/extragear/graphics/digikam/utilities/setup/setupcamera.h:
 	  digikam from trunk : improvement camera setup page :
 
-	  - Using KListView look better than QListView
+	  - Using TDEListView look better than QListView
 	  - Add gphoto logo to give more visibility to end users about
 	  internal camera interface (there is no camera drivers into
 	  digikam core).
@@ -40273,7 +40273,7 @@ v0.9.0-beta1 - 20/07/2006
 
 	  trunk/extragear/graphics/digikam/libs/widgets/metadata/metadatalistviewitem.h:
 	  Mix QListViewItem and KlistViewItem with the same parent is
-	  depreaced on KDE lib API. We using KListViewItem at all
+	  depreaced on KDE lib API. We using TDEListViewItem at all
 
 2006-03-03 10:39  cgilles
 
diff --git a/digikam/digikam/albumfolderview.cpp b/digikam/digikam/albumfolderview.cpp
index 957ec4a9..7514ceb6 100644
--- a/digikam/digikam/albumfolderview.cpp
+++ b/digikam/digikam/albumfolderview.cpp
@@ -580,11 +580,11 @@ void AlbumFolderView::slotSelectionChanged()
 
 void AlbumFolderView::slotContextMenu(TQListViewItem *listitem, const TQPoint &, int)
 {
-    KActionMenu menuImport(i18n("Import"));
-    KActionMenu menuExport(i18n("Export"));
-    KActionMenu menuKIPIBatch(i18n("Batch Process"));
+    TDEActionMenu menuImport(i18n("Import"));
+    TDEActionMenu menuExport(i18n("Export"));
+    TDEActionMenu menuKIPIBatch(i18n("Batch Process"));
 
-    KPopupMenu popmenu(this);
+    TDEPopupMenu popmenu(this);
     popmenu.insertTitle(SmallIcon("digikam"), i18n("My Albums"));
     popmenu.insertItem(SmallIcon("albumfolder-new"), i18n("New Album..."), 10);
 
@@ -604,11 +604,11 @@ void AlbumFolderView::slotContextMenu(TQListViewItem *listitem, const TQPoint &,
         popmenu.insertSeparator();
 
         // Add KIPI Albums plugins Actions
-        KAction *action;
-        const TQPtrList<KAction>& albumActions = DigikamApp::getinstance()->menuAlbumActions();
+        TDEAction *action;
+        const TQPtrList<TDEAction>& albumActions = DigikamApp::getinstance()->menuAlbumActions();
         if(!albumActions.isEmpty())
         {
-            TQPtrListIterator<KAction> it(albumActions);
+            TQPtrListIterator<TDEAction> it(albumActions);
             while((action = it.current()))
             {
                 action->plug(&popmenu);
@@ -617,10 +617,10 @@ void AlbumFolderView::slotContextMenu(TQListViewItem *listitem, const TQPoint &,
         }
 
         // Add All Import Actions
-        const TQPtrList<KAction> importActions = DigikamApp::getinstance()->menuImportActions();
+        const TQPtrList<TDEAction> importActions = DigikamApp::getinstance()->menuImportActions();
         if(!importActions.isEmpty())
         {
-            TQPtrListIterator<KAction> it3(importActions);
+            TQPtrListIterator<TDEAction> it3(importActions);
             while((action = it3.current()))
             {
                 menuImport.insert(action);
@@ -630,10 +630,10 @@ void AlbumFolderView::slotContextMenu(TQListViewItem *listitem, const TQPoint &,
         }
 
         // Add All Export Actions
-        const TQPtrList<KAction> exportActions = DigikamApp::getinstance()->menuExportActions();
+        const TQPtrList<TDEAction> exportActions = DigikamApp::getinstance()->menuExportActions();
         if(!exportActions.isEmpty())
         {
-            TQPtrListIterator<KAction> it4(exportActions);
+            TQPtrListIterator<TDEAction> it4(exportActions);
             while((action = it4.current()))
             {
                 menuExport.insert(action);
@@ -643,10 +643,10 @@ void AlbumFolderView::slotContextMenu(TQListViewItem *listitem, const TQPoint &,
         }
 
         // Add KIPI Batch processes plugins Actions
-        const TQPtrList<KAction>& batchActions = DigikamApp::getinstance()->menuBatchActions();
+        const TQPtrList<TDEAction>& batchActions = DigikamApp::getinstance()->menuBatchActions();
         if(!batchActions.isEmpty())
         {
-            TQPtrListIterator<KAction> it2(batchActions);
+            TQPtrListIterator<TDEAction> it2(batchActions);
             while((action = it2.current()))
             {
                 menuKIPIBatch.insert(action);
@@ -1059,7 +1059,7 @@ void AlbumFolderView::contentsDropEvent(TQDropEvent *e)
             == AlbumSettings::ByFolder)
         {
             // TODO: Copy?
-            KPopupMenu popMenu(this);
+            TDEPopupMenu popMenu(this);
             popMenu.insertTitle(SmallIcon("digikam"), i18n("My Albums"));
             popMenu.insertItem(SmallIcon("goto"), i18n("&Move Here"), 10);
             popMenu.insertSeparator(-1);
@@ -1158,7 +1158,7 @@ void AlbumFolderView::contentsDropEvent(TQDropEvent *e)
             }
             else
             {
-                KPopupMenu popMenu(this);
+                TDEPopupMenu popMenu(this);
                 popMenu.insertTitle(SmallIcon("digikam"), i18n("My Albums"));
                 popMenu.insertItem(i18n("Set as Album Thumbnail"), 12);
                 popMenu.insertSeparator(-1);
@@ -1191,7 +1191,7 @@ void AlbumFolderView::contentsDropEvent(TQDropEvent *e)
         }
         else
         {
-            KPopupMenu popMenu(this);
+            TDEPopupMenu popMenu(this);
             popMenu.insertTitle(SmallIcon("digikam"), i18n("My Albums"));
             popMenu.insertItem( SmallIcon("goto"), i18n("&Move Here"), 10 );
             popMenu.insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), 11 );
@@ -1249,7 +1249,7 @@ void AlbumFolderView::contentsDropEvent(TQDropEvent *e)
         CameraUI *ui = dynamic_cast<CameraUI*>(e->source());
         if (ui)
         {
-            KPopupMenu popMenu(this);
+            TDEPopupMenu popMenu(this);
             popMenu.insertTitle(SmallIcon("digikam"), i18n("My Albums"));
             popMenu.insertItem(SmallIcon("down"), i18n("Download from camera"),           10);
             popMenu.insertItem(SmallIcon("down"), i18n("Download && Delete from camera"), 11);
@@ -1319,7 +1319,7 @@ void AlbumFolderView::contentsDropEvent(TQDropEvent *e)
         }
         else
         {
-            KPopupMenu popMenu(this);
+            TDEPopupMenu popMenu(this);
             popMenu.insertTitle(SmallIcon("digikam"), i18n("My Albums"));
             popMenu.insertItem( SmallIcon("goto"), i18n("&Move Here"), 10 );
             popMenu.insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), 11 );
diff --git a/digikam/digikam/albumiconview.cpp b/digikam/digikam/albumiconview.cpp
index 5b0d0bc9..34db45d3 100644
--- a/digikam/digikam/albumiconview.cpp
+++ b/digikam/digikam/albumiconview.cpp
@@ -524,7 +524,7 @@ void AlbumIconView::slotRightButtonClicked(const TQPoint& pos)
     }
 
     TQPopupMenu popmenu(this);
-    KAction *paste    = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), 0);
+    TDEAction *paste    = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), 0);
     TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard);
 
     if(!data || !TQUriDrag::canDecode(data))
@@ -643,12 +643,12 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const TQPoint& pos)
         {
             DDebug() << "Found JPEGLossless plugin" << endl;
 
-            KActionPtrList actionList = plugin->actions();
+            TDEActionPtrList actionList = plugin->actions();
             
-            for (KActionPtrList::const_iterator iter = actionList.begin();
+            for (TDEActionPtrList::const_iterator iter = actionList.begin();
                  iter != actionList.end(); ++iter)
             {
-                KAction* action = *iter;
+                TDEAction* action = *iter;
                 
                 if (TQString::fromLatin1(action->name())
                     == TQString::fromLatin1("jpeglossless_rotate"))
@@ -682,8 +682,8 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const TQPoint& pos)
 
     // --------------------------------------------------------
     
-    KAction *copy     = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), 0);
-    KAction *paste    = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), 0);
+    TDEAction *copy     = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), 0);
+    TDEAction *paste    = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), 0);
     TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard);
     if(!data || !TQUriDrag::canDecode(data))
     {
diff --git a/digikam/digikam/cameratype.cpp b/digikam/digikam/cameratype.cpp
index 486805fd..61396c31 100644
--- a/digikam/digikam/cameratype.cpp
+++ b/digikam/digikam/cameratype.cpp
@@ -50,7 +50,7 @@ public:
 
     TQDateTime              lastAccess;
 
-    KAction               *action;
+    TDEAction               *action;
     bool                   valid;
 
     TQGuardedPtr<CameraUI>  currentCameraUI;
@@ -64,7 +64,7 @@ CameraType::CameraType()
 
 CameraType::CameraType(const TQString& title, const TQString& model,
                        const TQString& port, const TQString& path,
-                       const TQDateTime& lastAccess, KAction *action)
+                       const TQDateTime& lastAccess, TDEAction *action)
 {
     d = new CameraTypePrivate;
     d->title      = title;
@@ -133,7 +133,7 @@ void CameraType::setLastAccess(const TQDateTime& lastAccess)
     d->lastAccess = lastAccess;
 }
 
-void CameraType::setAction(KAction *action)
+void CameraType::setAction(TDEAction *action)
 {
     d->action = action;
 }
@@ -173,7 +173,7 @@ TQDateTime CameraType::lastAccess() const
     return d->lastAccess;
 }
 
-KAction* CameraType::action() const
+TDEAction* CameraType::action() const
 {
     return d->action;
 }
diff --git a/digikam/digikam/cameratype.h b/digikam/digikam/cameratype.h
index 47cd71c3..71ae0766 100644
--- a/digikam/digikam/cameratype.h
+++ b/digikam/digikam/cameratype.h
@@ -31,7 +31,7 @@
 #include <tqdatetime.h>
 #include <tqguardedptr.h>
 
-class KAction;
+class TDEAction;
 
 namespace Digikam
 {
@@ -47,7 +47,7 @@ public:
     CameraType();
     CameraType(const TQString& title, const TQString& model,
                const TQString& port, const TQString& path,
-               const TQDateTime& lastAccess, KAction* action=0);
+               const TQDateTime& lastAccess, TDEAction* action=0);
     ~CameraType();
 
     CameraType(const CameraType& ctype);
@@ -58,7 +58,7 @@ public:
     void setPort(const TQString& port);
     void setPath(const TQString& path);
     void setLastAccess(const TQDateTime& lastAccess);
-    void setAction(KAction *action);
+    void setAction(TDEAction *action);
     void setValid(bool valid);
     void setCurrentCameraUI(CameraUI *cameraui);
 
@@ -67,7 +67,7 @@ public:
     TQString   port()            const;
     TQString   path()            const;
     TQDateTime lastAccess()      const;
-    KAction*  action()          const;
+    TDEAction*  action()          const;
     bool      valid()           const;
     CameraUI *currentCameraUI() const;
 
diff --git a/digikam/digikam/digikamapp.cpp b/digikam/digikam/digikamapp.cpp
index b98ca80f..3f925e78 100644
--- a/digikam/digikam/digikamapp.cpp
+++ b/digikam/digikam/digikamapp.cpp
@@ -109,7 +109,7 @@ namespace Digikam
 DigikamApp* DigikamApp::m_instance = 0;
 
 DigikamApp::DigikamApp()
-          : KMainWindow( 0, "Digikam" )
+          : TDEMainWindow( 0, "Digikam" )
 {
     d = new DigikamAppPriv;
     m_instance = this;
@@ -136,7 +136,7 @@ DigikamApp::DigikamApp()
 
     AlbumLister::instance();
 
-    d->cameraMediaList = new KPopupMenu;
+    d->cameraMediaList = new TDEPopupMenu;
 
     connect(d->cameraMediaList, TQT_SIGNAL( aboutToShow() ),
             TQT_TQOBJECT(this), TQT_SLOT(slotCameraMediaMenu()));
@@ -256,7 +256,7 @@ void DigikamApp::show()
 
     // Display application window.
 
-    KMainWindow::show();
+    TDEMainWindow::show();
 
     // Report errors from ICC repository path.
 
@@ -293,31 +293,31 @@ void DigikamApp::show()
     slotThumbSizeChanged(d->albumSettings->getDefaultIconSize());
 }
 
-const TQPtrList<KAction>& DigikamApp::menuImageActions()
+const TQPtrList<TDEAction>& DigikamApp::menuImageActions()
 {
     return d->kipiImageActions;
 }
 
-const TQPtrList<KAction>& DigikamApp::menuBatchActions()
+const TQPtrList<TDEAction>& DigikamApp::menuBatchActions()
 {
     return d->kipiBatchActions;
 }
 
-const TQPtrList<KAction>& DigikamApp::menuAlbumActions()
+const TQPtrList<TDEAction>& DigikamApp::menuAlbumActions()
 {
     return d->kipiAlbumActions;
 }
 
-const TQPtrList<KAction> DigikamApp::menuImportActions()
+const TQPtrList<TDEAction> DigikamApp::menuImportActions()
 {
-    TQPtrList<KAction> importMenu;
+    TQPtrList<TDEAction> importMenu;
     importMenu = d->kipiFileActionsImport;
     importMenu.append( d->albumImportAction );
     importMenu.append( d->addImagesAction );
     return importMenu;
 }
 
-const TQPtrList<KAction> DigikamApp::menuExportActions()
+const TQPtrList<TDEAction> DigikamApp::menuExportActions()
 {
     return d->kipiFileActionsExport;
 }
@@ -442,7 +442,7 @@ void DigikamApp::setupStatusBar()
 
 void DigikamApp::setupAccelerators()
 {
-    d->accelerators = new KAccel(this);
+    d->accelerators = new TDEAccel(this);
 
     d->accelerators->insert("Exit Preview Mode", i18n("Exit Preview"),
                            i18n("Exit preview mode"),
@@ -499,7 +499,7 @@ void DigikamApp::setupActions()
 {
     // -----------------------------------------------------------------
 
-    d->cameraMenuAction = new KActionMenu(i18n("&Camera"),
+    d->cameraMenuAction = new TDEActionMenu(i18n("&Camera"),
                                     "digitalcam",
                                     actionCollection(),
                                     "camera_menu");
@@ -507,7 +507,7 @@ void DigikamApp::setupActions()
 
     // -----------------------------------------------------------------
 
-    d->themeMenuAction = new KSelectAction(i18n("&Themes"), 0, actionCollection(), "theme_menu");
+    d->themeMenuAction = new TDESelectAction(i18n("&Themes"), 0, actionCollection(), "theme_menu");
     connect(d->themeMenuAction, TQT_SIGNAL(activated(const TQString&)),
             TQT_TQOBJECT(this), TQT_SLOT(slotChangeTheme(const TQString&)));
 
@@ -516,7 +516,7 @@ void DigikamApp::setupActions()
 
     // -----------------------------------------------------------------
 
-    d->backwardActionMenu = new KToolBarPopupAction(i18n("&Back"),
+    d->backwardActionMenu = new TDEToolBarPopupAction(i18n("&Back"),
                                     "back",
                                     ALT+Key_Left,
                                     TQT_TQOBJECT(d->view),
@@ -531,7 +531,7 @@ void DigikamApp::setupActions()
     connect(d->backwardActionMenu->popupMenu(), TQT_SIGNAL(activated(int)),
             TQT_TQOBJECT(d->view), TQT_SLOT(slotAlbumHistoryBack(int)));
 
-    d->forwardActionMenu = new  KToolBarPopupAction(i18n("Forward"),
+    d->forwardActionMenu = new  TDEToolBarPopupAction(i18n("Forward"),
                                     "forward",
                                     ALT+Key_Right,
                                     TQT_TQOBJECT(d->view),
@@ -546,16 +546,16 @@ void DigikamApp::setupActions()
     connect(d->forwardActionMenu->popupMenu(), TQT_SIGNAL(activated(int)),
             TQT_TQOBJECT(d->view), TQT_SLOT(slotAlbumHistoryForward(int)));
 
-    d->newAction = new KAction(i18n("&New..."),
+    d->newAction = new TDEAction(i18n("&New..."),
                                    "albumfolder-new",
-                                   KStdAccel::shortcut(KStdAccel::New),
+                                   TDEStdAccel::shortcut(TDEStdAccel::New),
                                    TQT_TQOBJECT(d->view),
                                    TQT_SLOT(slotNewAlbum()),
                                    actionCollection(),
                                    "album_new");
     d->newAction->setWhatsThis(i18n("Creates a new empty Album in the database."));
 
-    d->albumSortAction = new KSelectAction(i18n("&Sort Albums"),
+    d->albumSortAction = new TDESelectAction(i18n("&Sort Albums"),
                                     0,
                                     0,
                                     actionCollection(),
@@ -571,7 +571,7 @@ void DigikamApp::setupActions()
     sortActionList.append(i18n("By Date"));
     d->albumSortAction->setItems(sortActionList);
 
-    d->recurseAlbumsAction = new KToggleAction(i18n("Include Album Sub-Tree"),
+    d->recurseAlbumsAction = new TDEToggleAction(i18n("Include Album Sub-Tree"),
                                                0,
                                                TQT_TQOBJECT(this),
                                                0,
@@ -583,7 +583,7 @@ void DigikamApp::setupActions()
     connect(d->recurseAlbumsAction, TQT_SIGNAL(toggled(bool)),
             TQT_TQOBJECT(this), TQT_SLOT(slotRecurseAlbums(bool)));
 
-    d->recurseTagsAction = new KToggleAction(i18n("Include Tag Sub-Tree"),
+    d->recurseTagsAction = new TDEToggleAction(i18n("Include Tag Sub-Tree"),
                                              0,
                                              TQT_TQOBJECT(this),
                                              0,
@@ -595,7 +595,7 @@ void DigikamApp::setupActions()
     connect(d->recurseTagsAction, TQT_SIGNAL(toggled(bool)),
             TQT_TQOBJECT(this), TQT_SLOT(slotRecurseTags(bool)));
 
-    d->deleteAction = new KAction(i18n("Delete"),
+    d->deleteAction = new TDEAction(i18n("Delete"),
                                     "editdelete",
                                     0,
                                     TQT_TQOBJECT(d->view),
@@ -603,7 +603,7 @@ void DigikamApp::setupActions()
                                     actionCollection(),
                                     "album_delete");
 
-    d->addImagesAction = new KAction( i18n("Add Images..."),
+    d->addImagesAction = new TDEAction( i18n("Add Images..."),
                                     "albumfolder-importimages",
                                     CTRL+Key_I,
                                     TQT_TQOBJECT(this),
@@ -612,7 +612,7 @@ void DigikamApp::setupActions()
                                     "album_addImages");
     d->addImagesAction->setWhatsThis(i18n("Adds new items to the current Album."));
 
-    d->albumImportAction = new KAction( i18n("Add Folders..."),
+    d->albumImportAction = new TDEAction( i18n("Add Folders..."),
                                     "albumfolder-importdir",
                                     0,
                                     TQT_TQOBJECT(d->view),
@@ -620,7 +620,7 @@ void DigikamApp::setupActions()
                                     actionCollection(),
                                     "album_importFolder");
 
-    d->propsEditAction = new KAction( i18n("Properties..."),
+    d->propsEditAction = new TDEAction( i18n("Properties..."),
                                     "albumfolder-properties",
                                     0,
                                     TQT_TQOBJECT(d->view),
@@ -629,7 +629,7 @@ void DigikamApp::setupActions()
                                     "album_propsEdit");
     d->propsEditAction->setWhatsThis(i18n("Edit Album Properties and Collection information."));
 
-    d->refreshAlbumAction = new KAction( i18n("Refresh"),
+    d->refreshAlbumAction = new TDEAction( i18n("Refresh"),
                                     "rebuild",
                                     Key_F5,
                                     TQT_TQOBJECT(d->view),
@@ -638,7 +638,7 @@ void DigikamApp::setupActions()
                                     "album_refresh");
     d->refreshAlbumAction->setWhatsThis(i18n("Refresh all album contents"));
 
-    d->syncAlbumMetadataAction = new KAction( i18n("Synchronize Images with Database"),
+    d->syncAlbumMetadataAction = new TDEAction( i18n("Synchronize Images with Database"),
                                     "rebuild",
                                     0,
                                     TQT_TQOBJECT(d->view),
@@ -649,7 +649,7 @@ void DigikamApp::setupActions()
                                                   "album with the contents of the digiKam database "
                                                   "(image metadata will be over-written with data from the database)."));
 
-    d->openInKonquiAction = new KAction( i18n("Open in File Manager"),
+    d->openInKonquiAction = new TDEAction( i18n("Open in File Manager"),
                                     "konqueror",
                                     0,
                                     TQT_TQOBJECT(d->view),
@@ -659,21 +659,21 @@ void DigikamApp::setupActions()
 
     // -----------------------------------------------------------
 
-    d->newTagAction = new KAction(i18n("New &Tag..."), "tag-new",
+    d->newTagAction = new TDEAction(i18n("New &Tag..."), "tag-new",
                                 0, TQT_TQOBJECT(d->view), TQT_SLOT(slotNewTag()),
                                 actionCollection(), "tag_new");
 
-    d->editTagAction = new KAction(i18n("Edit Tag Properties..."), "tag-properties",
+    d->editTagAction = new TDEAction(i18n("Edit Tag Properties..."), "tag-properties",
                                  0, TQT_TQOBJECT(d->view), TQT_SLOT(slotEditTag()),
                                  actionCollection(), "tag_edit");
 
-    d->deleteTagAction = new KAction(i18n("Delete Tag"), "tag-delete",
+    d->deleteTagAction = new TDEAction(i18n("Delete Tag"), "tag-delete",
                                    0, TQT_TQOBJECT(d->view), TQT_SLOT(slotDeleteTag()),
                                    actionCollection(), "tag_delete");
 
     // -----------------------------------------------------------
 
-    d->imagePreviewAction = new KToggleAction(i18n("View..."),
+    d->imagePreviewAction = new TDEToggleAction(i18n("View..."),
                                     "viewimage",
                                     Key_F3,
                                     TQT_TQOBJECT(d->view),
@@ -681,7 +681,7 @@ void DigikamApp::setupActions()
                                     actionCollection(),
                                     "image_view");
 
-    d->imageViewAction = new KAction(i18n("Edit..."),
+    d->imageViewAction = new TDEAction(i18n("Edit..."),
                                     "editimage",
                                     Key_F4,
                                     TQT_TQOBJECT(d->view),
@@ -690,7 +690,7 @@ void DigikamApp::setupActions()
                                     "image_edit");
     d->imageViewAction->setWhatsThis(i18n("Open the selected item in the image editor."));
 
-    d->imageLightTableAction = new KAction(i18n("Place onto Light Table"),
+    d->imageLightTableAction = new TDEAction(i18n("Place onto Light Table"),
                                     "lighttable",
                                     CTRL+Key_L,
                                     TQT_TQOBJECT(d->view),
@@ -699,7 +699,7 @@ void DigikamApp::setupActions()
                                     "image_lighttable");
     d->imageLightTableAction->setWhatsThis(i18n("Place the selected items on the light table thumbbar."));
 
-    d->imageAddLightTableAction = new KAction(i18n("Add to Light Table"),
+    d->imageAddLightTableAction = new TDEAction(i18n("Add to Light Table"),
                                     "lighttableadd",
                                     SHIFT+CTRL+Key_L,
                                     TQT_TQOBJECT(d->view),
@@ -708,7 +708,7 @@ void DigikamApp::setupActions()
                                     "image_add_to_lighttable");
     d->imageAddLightTableAction->setWhatsThis(i18n("Add selected items to the light table thumbbar."));
 
-    d->imageRenameAction = new KAction(i18n("Rename..."),
+    d->imageRenameAction = new TDEAction(i18n("Rename..."),
                                     "pencil",
                                     Key_F2,
                                     TQT_TQOBJECT(d->view),
@@ -718,7 +718,7 @@ void DigikamApp::setupActions()
     d->imageRenameAction->setWhatsThis(i18n("Change the filename of the currently selected item."));
 
     // Pop up dialog to ask user whether to move to trash
-    d->imageDeleteAction            = new KAction(i18n("Delete"),
+    d->imageDeleteAction            = new TDEAction(i18n("Delete"),
                                                 "edittrash",
                                                 Key_Delete,
                                                 TQT_TQOBJECT(d->view),
@@ -727,7 +727,7 @@ void DigikamApp::setupActions()
                                                 "image_delete");
 
     // Pop up dialog to ask user whether to permanently delete
-    d->imageDeletePermanentlyAction = new KAction(i18n("Delete permanently"),
+    d->imageDeletePermanentlyAction = new TDEAction(i18n("Delete permanently"),
                                                 "editdelete",
                                                 SHIFT+Key_Delete,
                                                 TQT_TQOBJECT(d->view),
@@ -737,7 +737,7 @@ void DigikamApp::setupActions()
 
     // These two actions are hidden, no menu entry, no toolbar entry, no shortcut.
     // Power users may add them.
-    d->imageDeletePermanentlyDirectlyAction = new KAction(i18n("Delete permanently without confirmation"),
+    d->imageDeletePermanentlyDirectlyAction = new TDEAction(i18n("Delete permanently without confirmation"),
                                                         "editdelete",
                                                         0,
                                                         TQT_TQOBJECT(d->view),
@@ -745,7 +745,7 @@ void DigikamApp::setupActions()
                                                         actionCollection(),
                                                         "image_delete_permanently_directly");
 
-    d->imageTrashDirectlyAction = new KAction(i18n("Move to trash without confirmation"),
+    d->imageTrashDirectlyAction = new TDEAction(i18n("Move to trash without confirmation"),
                                               "edittrash",
                                                0,
                                                TQT_TQOBJECT(d->view),
@@ -753,7 +753,7 @@ void DigikamApp::setupActions()
                                                actionCollection(),
                                                "image_trash_directly");
 
-    d->imageSortAction = new KSelectAction(i18n("&Sort Images"),
+    d->imageSortAction = new TDESelectAction(i18n("&Sort Images"),
                                            0,
                                            0,
                                            actionCollection(),
@@ -778,54 +778,54 @@ void DigikamApp::setupActions()
     connect(exifOrientationMapper, TQT_SIGNAL(mapped(int) ),
             TQT_TQOBJECT(d->view), TQT_SLOT(slotImageExifOrientation(int)));
 
-    d->imageExifOrientationActionMenu = new KActionMenu(i18n("Adjust Exif orientation tag"),
+    d->imageExifOrientationActionMenu = new TDEActionMenu(i18n("Adjust Exif orientation tag"),
                                                         actionCollection(),
                                                         "image_set_exif_orientation");
     d->imageExifOrientationActionMenu->setDelayed(false);
 
-    d->imageSetExifOrientation1Action = new KAction(i18n("Normal"),
+    d->imageSetExifOrientation1Action = new TDEAction(i18n("Normal"),
              0,
              d->imageExifOrientationActionMenu,
              0,
              actionCollection(),
              "image_set_exif_orientation_normal");
-    d->imageSetExifOrientation2Action = new KAction(i18n("Flipped Horizontally"),
+    d->imageSetExifOrientation2Action = new TDEAction(i18n("Flipped Horizontally"),
              0,
              d->imageExifOrientationActionMenu,
              0,
              actionCollection(),
              "image_set_exif_orientation_flipped_horizontal");
-    d->imageSetExifOrientation3Action = new KAction(i18n("Rotated Upside Down"),
+    d->imageSetExifOrientation3Action = new TDEAction(i18n("Rotated Upside Down"),
              0,
              d->imageExifOrientationActionMenu,
              0,
              actionCollection(),
              "image_set_exif_orientation_rotated_upside_down");
-    d->imageSetExifOrientation4Action = new KAction(i18n("Flipped Vertically"),
+    d->imageSetExifOrientation4Action = new TDEAction(i18n("Flipped Vertically"),
              0,
              d->imageExifOrientationActionMenu,
              0,
              actionCollection(),
              "image_set_exif_orientation_flipped_vertically");
-    d->imageSetExifOrientation5Action = new KAction(i18n("Rotated Right / Horiz. Flipped"),
+    d->imageSetExifOrientation5Action = new TDEAction(i18n("Rotated Right / Horiz. Flipped"),
              0,
              d->imageExifOrientationActionMenu,
              0,
              actionCollection(),
              "image_set_exif_orientation_rotated_right_hor_flipped");
-    d->imageSetExifOrientation6Action = new KAction(i18n("Rotated Right"),
+    d->imageSetExifOrientation6Action = new TDEAction(i18n("Rotated Right"),
              0,
              d->imageExifOrientationActionMenu,
              0,
              actionCollection(),
              "image_set_exif_orientation_rotated_right");
-    d->imageSetExifOrientation7Action = new KAction(i18n("Rotated Right / Vert. Flipped"),
+    d->imageSetExifOrientation7Action = new TDEAction(i18n("Rotated Right / Vert. Flipped"),
              0,
              d->imageExifOrientationActionMenu,
              0,
              actionCollection(),
              "image_set_exif_orientation_rotated_right_ver_flipped");
-    d->imageSetExifOrientation8Action = new KAction(i18n("Rotated Left"),
+    d->imageSetExifOrientation8Action = new TDEAction(i18n("Rotated Left"),
              0,
              d->imageExifOrientationActionMenu,
              0,
@@ -876,7 +876,7 @@ void DigikamApp::setupActions()
 
     // -----------------------------------------------------------------
 
-    d->selectAllAction = new KAction(i18n("Select All"),
+    d->selectAllAction = new TDEAction(i18n("Select All"),
                                      0,
                                      CTRL+Key_A,
                                      TQT_TQOBJECT(d->view),
@@ -884,7 +884,7 @@ void DigikamApp::setupActions()
                                      actionCollection(),
                                      "selectAll");
 
-    d->selectNoneAction = new KAction(i18n("Select None"),
+    d->selectNoneAction = new TDEAction(i18n("Select None"),
                                      0,
                                      CTRL+SHIFT+Key_A,
                                      TQT_TQOBJECT(d->view),
@@ -892,7 +892,7 @@ void DigikamApp::setupActions()
                                      actionCollection(),
                                      "selectNone");
 
-    d->selectInvertAction = new KAction(i18n("Invert Selection"),
+    d->selectInvertAction = new TDEAction(i18n("Invert Selection"),
                                         0,
                                         CTRL+Key_Asterisk,
                                         TQT_TQOBJECT(d->view),
@@ -910,7 +910,7 @@ void DigikamApp::setupActions()
 
     // -----------------------------------------------------------
 
-    d->zoomPlusAction = new KAction(i18n("Zoom In"),
+    d->zoomPlusAction = new TDEAction(i18n("Zoom In"),
                                    "viewmag+",
                                    CTRL+Key_Plus,
                                    TQT_TQOBJECT(d->view),
@@ -918,7 +918,7 @@ void DigikamApp::setupActions()
                                    actionCollection(),
                                    "album_zoomin");
 
-    d->zoomMinusAction = new KAction(i18n("Zoom Out"),
+    d->zoomMinusAction = new TDEAction(i18n("Zoom Out"),
                                    "viewmag-",
                                    CTRL+Key_Minus,
                                    TQT_TQOBJECT(d->view),
@@ -926,7 +926,7 @@ void DigikamApp::setupActions()
                                    actionCollection(),
                                    "album_zoomout");
 
-    d->zoomTo100percents = new KAction(i18n("Zoom to 100%"),
+    d->zoomTo100percents = new TDEAction(i18n("Zoom to 100%"),
                                    "viewmag1",
                                    ALT+CTRL+Key_0,      // NOTE: Photoshop 7 use ALT+CTRL+0.
                                    TQT_TQOBJECT(d->view),
@@ -934,7 +934,7 @@ void DigikamApp::setupActions()
                                    actionCollection(),
                                    "album_zoomto100percents");
 
-    d->zoomFitToWindowAction = new KAction(i18n("Fit to &Window"),
+    d->zoomFitToWindowAction = new TDEAction(i18n("Fit to &Window"),
                                    "view_fit_window",
                                    CTRL+SHIFT+Key_E,
                                    TQT_TQOBJECT(d->view),
@@ -943,7 +943,7 @@ void DigikamApp::setupActions()
                                    "album_zoomfit2window");
 
     // Do not use std KDE action for full screen because action text is too large for app. toolbar.
-    d->fullScreenAction = new KToggleAction(i18n("Full Screen"),
+    d->fullScreenAction = new TDEToggleAction(i18n("Full Screen"),
                                    "window_fullscreen",
                                    CTRL+SHIFT+Key_F,
                                    TQT_TQOBJECT(this),
@@ -952,24 +952,24 @@ void DigikamApp::setupActions()
                                    "full_screen");
     d->fullScreenAction->setWhatsThis(i18n("Switch the window to full screen mode"));
 
-    d->slideShowAction = new KActionMenu(i18n("Slideshow"), "slideshow",
+    d->slideShowAction = new TDEActionMenu(i18n("Slideshow"), "slideshow",
                                          actionCollection(), "slideshow");
 
     d->slideShowAction->setDelayed(false);
 
-    d->slideShowAllAction = new KAction(i18n("All"), 0, Key_F9,
+    d->slideShowAllAction = new TDEAction(i18n("All"), 0, Key_F9,
                                 TQT_TQOBJECT(d->view), TQT_SLOT(slotSlideShowAll()),
                                 actionCollection(), "slideshow_all");
     d->slideShowAction->insert(d->slideShowAllAction);
 
-    d->slideShowSelectionAction = new KAction(i18n("Selection"), 0, ALT+Key_F9,
+    d->slideShowSelectionAction = new TDEAction(i18n("Selection"), 0, ALT+Key_F9,
                                               TQT_TQOBJECT(d->view),
                                               TQT_SLOT(slotSlideShowSelection()),
                                               actionCollection(),
                                               "slideshow_selected");
     d->slideShowAction->insert(d->slideShowSelectionAction);
 
-    d->slideShowRecursiveAction = new KAction(i18n("With All Sub-Albums"), 0, SHIFT+Key_F9,
+    d->slideShowRecursiveAction = new TDEAction(i18n("With All Sub-Albums"), 0, SHIFT+Key_F9,
                                               TQT_TQOBJECT(d->view),
                                               TQT_SLOT(slotSlideShowRecursive()),
                                               actionCollection(),
@@ -981,7 +981,7 @@ void DigikamApp::setupActions()
                                    actionCollection(),
                                    "app_exit");
 
-    d->rawCameraListAction = new KAction(i18n("Supported RAW Cameras"),
+    d->rawCameraListAction = new TDEAction(i18n("Supported RAW Cameras"),
                                    "kdcraw",
                                    0,
                                    TQT_TQOBJECT(this),
@@ -989,7 +989,7 @@ void DigikamApp::setupActions()
                                    actionCollection(),
                                    "help_rawcameralist");
 
-    d->kipiHelpAction = new KAction(i18n("Kipi Plugins Handbook"),
+    d->kipiHelpAction = new TDEAction(i18n("Kipi Plugins Handbook"),
                                    "kipi",
                                    0,
                                    TQT_TQOBJECT(this),
@@ -1002,7 +1002,7 @@ void DigikamApp::setupActions()
                                    actionCollection(),
                                    "help_tipofday");
 
-    d->donateMoneyAction = new KAction(i18n("Donate..."),
+    d->donateMoneyAction = new TDEAction(i18n("Donate..."),
                                    0,
                                    0,
                                    TQT_TQOBJECT(this),
@@ -1010,7 +1010,7 @@ void DigikamApp::setupActions()
                                    actionCollection(),
                                    "help_donatemoney");
 
-    d->contributeAction = new KAction(i18n("Contribute..."),
+    d->contributeAction = new TDEAction(i18n("Contribute..."),
                                       0, 0,
                                       TQT_TQOBJECT(this), TQT_SLOT(slotContribute()),
                                       actionCollection(),
@@ -1020,50 +1020,50 @@ void DigikamApp::setupActions()
 
     // -- Rating actions ---------------------------------------------------------------
 
-    d->rating0Star = new KAction(i18n("Assign Rating \"No Stars\""), CTRL+Key_0,
+    d->rating0Star = new TDEAction(i18n("Assign Rating \"No Stars\""), CTRL+Key_0,
                           TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingNoStar()),
                           actionCollection(), "ratenostar");
-    d->rating1Star = new KAction(i18n("Assign Rating \"One Star\""), CTRL+Key_1,
+    d->rating1Star = new TDEAction(i18n("Assign Rating \"One Star\""), CTRL+Key_1,
                           TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingOneStar()),
                           actionCollection(), "rateonestar");
-    d->rating2Star = new KAction(i18n("Assign Rating \"Two Stars\""), CTRL+Key_2,
+    d->rating2Star = new TDEAction(i18n("Assign Rating \"Two Stars\""), CTRL+Key_2,
                           TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingTwoStar()),
                           actionCollection(), "ratetwostar");
-    d->rating3Star = new KAction(i18n("Assign Rating \"Three Stars\""), CTRL+Key_3,
+    d->rating3Star = new TDEAction(i18n("Assign Rating \"Three Stars\""), CTRL+Key_3,
                           TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingThreeStar()),
                           actionCollection(), "ratethreestar");
-    d->rating4Star = new KAction(i18n("Assign Rating \"Four Stars\""), CTRL+Key_4,
+    d->rating4Star = new TDEAction(i18n("Assign Rating \"Four Stars\""), CTRL+Key_4,
                           TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingFourStar()),
                           actionCollection(), "ratefourstar");
-    d->rating5Star = new KAction(i18n("Assign Rating \"Five Stars\""), CTRL+Key_5,
+    d->rating5Star = new TDEAction(i18n("Assign Rating \"Five Stars\""), CTRL+Key_5,
                           TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignRatingFiveStar()),
                           actionCollection(), "ratefivestar");
 
     // -----------------------------------------------------------
 
-    KAction* findAction = KStdAction::find(TQT_TQOBJECT(d->view), TQT_SLOT(slotNewQuickSearch()),
+    TDEAction* findAction = KStdAction::find(TQT_TQOBJECT(d->view), TQT_SLOT(slotNewQuickSearch()),
                                            actionCollection(), "search_quick");
     findAction->setText(i18n("Search..."));
     findAction->setIconSet(BarIcon("filefind"));
 
-    KAction* advFindAction = KStdAction::find(TQT_TQOBJECT(d->view), TQT_SLOT(slotNewAdvancedSearch()),
+    TDEAction* advFindAction = KStdAction::find(TQT_TQOBJECT(d->view), TQT_SLOT(slotNewAdvancedSearch()),
                                               actionCollection(), "search_advanced");
     advFindAction->setText(i18n("Advanced Search..."));
     advFindAction->setShortcut("Ctrl+Alt+F");
 
-    new KAction(i18n("Light Table"), "idea", Key_L,
+    new TDEAction(i18n("Light Table"), "idea", Key_L,
                 TQT_TQOBJECT(d->view), TQT_SLOT(slotLightTable()), actionCollection(),
                 "light_table");
 
-    new KAction(i18n("Scan for New Images"), "reload_page", 0,
+    new TDEAction(i18n("Scan for New Images"), "reload_page", 0,
                 TQT_TQOBJECT(this), TQT_SLOT(slotDatabaseRescan()), actionCollection(),
                 "database_rescan");
 
-    new KAction(i18n("Rebuild All Thumbnails..."), "reload_page", 0,
+    new TDEAction(i18n("Rebuild All Thumbnails..."), "reload_page", 0,
                 TQT_TQOBJECT(this), TQT_SLOT(slotRebuildAllThumbs()), actionCollection(),
                 "thumbs_rebuild");
 
-    new KAction(i18n("Update Metadata Database..."), "reload_page", 0,
+    new TDEAction(i18n("Update Metadata Database..."), "reload_page", 0,
                 TQT_TQOBJECT(this), TQT_SLOT(slotSyncAllPicturesMetadata()), actionCollection(),
                 "sync_metadata");
 
@@ -1192,7 +1192,7 @@ void DigikamApp::slotAlbumSelected(bool val)
         d->newAction->setEnabled(false);
         d->albumImportAction->setEnabled(false);
 
-        KAction *action;
+        TDEAction *action;
         for (action = d->kipiFileActionsImport.first(); action;
              action = d->kipiFileActionsImport.next())
         {
@@ -1209,7 +1209,7 @@ void DigikamApp::slotAlbumSelected(bool val)
         d->newAction->setEnabled(true);
         d->albumImportAction->setEnabled(true);
 
-        KAction *action;
+        TDEAction *action;
         for (action = d->kipiFileActionsImport.first(); action;
              action = d->kipiFileActionsImport.next())
         {
@@ -1236,7 +1236,7 @@ void DigikamApp::slotAlbumSelected(bool val)
             d->albumImportAction->setEnabled(false);
         }
 
-        KAction *action;
+        TDEAction *action;
         for (action = d->kipiFileActionsImport.first(); action;
              action = d->kipiFileActionsImport.next())
         {
@@ -1260,7 +1260,7 @@ void DigikamApp::slotTagSelected(bool val)
         d->deleteTagAction->setEnabled(true);
         d->editTagAction->setEnabled(true);
 
-        KAction *action;
+        TDEAction *action;
         for (action = d->kipiFileActionsImport.first(); action;
              action = d->kipiFileActionsImport.next())
         {
@@ -1272,7 +1272,7 @@ void DigikamApp::slotTagSelected(bool val)
         d->deleteTagAction->setEnabled(false);
         d->editTagAction->setEnabled(false);
 
-        KAction *action;
+        TDEAction *action;
         for (action = d->kipiFileActionsImport.first(); action;
              action = d->kipiFileActionsImport.next())
         {
@@ -1478,7 +1478,7 @@ void DigikamApp::slotDownloadImages()
 
     if (!alreadyThere)
     {
-        KAction *cAction  = new KAction(
+        TDEAction *cAction  = new TDEAction(
                  i18n("Browse %1").arg(KURL(d->cameraGuiPath).prettyURL()),
                  "camera",
                  0,
@@ -1540,7 +1540,7 @@ void DigikamApp::slotCameraAdded(CameraType *ctype)
 {
     if (!ctype) return;
 
-    KAction *cAction = new KAction(ctype->title(), "camera", 0,
+    TDEAction *cAction = new TDEAction(ctype->title(), "camera", 0,
                                    TQT_TQOBJECT(this), TQT_SLOT(slotCameraConnect()),
                                    actionCollection(),
                                    ctype->title().utf8());
@@ -1606,7 +1606,7 @@ void DigikamApp::slotCameraRemoved(CameraType *ctype)
 {
     if (!ctype) return;
 
-    KAction *cAction = ctype->action();
+    TDEAction *cAction = ctype->action();
 
     if (cAction)
         d->cameraMenuAction->remove(cAction);
@@ -1854,17 +1854,17 @@ void DigikamApp::slotKipiPluginPlug()
         ++cpt;
 
         plugin->setup( this );
-        TQPtrList<KAction>* popup = 0;
+        TQPtrList<TDEAction>* popup = 0;
 
-        // Plugin category identification using KAction method based.
+        // Plugin category identification using TDEAction method based.
 
-        KActionPtrList actions = plugin->actions();
+        TDEActionPtrList actions = plugin->actions();
 
         // List of obsolete kipi-plugins to not load.
         TQStringList pluginActionsDisabled;
         pluginActionsDisabled << TQString("raw_converter_single");  // Obsolete Since 0.9.5 and new Raw Import tool.
 
-        for( KActionPtrList::Iterator it2 = actions.begin(); it2 != actions.end(); ++it2 )
+        for( TDEActionPtrList::Iterator it2 = actions.begin(); it2 != actions.end(); ++it2 )
         {
             if ( plugin->category(*it2) == KIPI::IMAGESPLUGIN )
                popup = &d->kipiImageActions;
@@ -1886,7 +1886,7 @@ void DigikamApp::slotKipiPluginPlug()
 
             TQString actionName((*it2)->name());
 
-            // Plug the KIPI plugins actions in according with the KAction method.
+            // Plug the KIPI plugins actions in according with the TDEAction method.
 
             if (popup)
             {
@@ -1924,7 +1924,7 @@ void DigikamApp::loadCameras()
 
     d->cameraMenuAction->popupMenu()->insertSeparator();
 
-    d->cameraMenuAction->insert(new KAction(i18n("Add Camera..."), 0,
+    d->cameraMenuAction->insert(new TDEAction(i18n("Add Camera..."), 0,
                                           TQT_TQOBJECT(this), TQT_SLOT(slotSetupCamera()),
                                           actionCollection(),
                                           "camera_add"));
diff --git a/digikam/digikam/digikamapp.h b/digikam/digikam/digikamapp.h
index 9bbd01bb..be37e6c5 100644
--- a/digikam/digikam/digikamapp.h
+++ b/digikam/digikam/digikamapp.h
@@ -52,7 +52,7 @@ class ImageInfo;
 class CameraType;
 class DigikamAppPriv;
 
-class DIGIKAM_EXPORT DigikamApp : public KMainWindow
+class DIGIKAM_EXPORT DigikamApp : public TDEMainWindow
 {
     Q_OBJECT
 
@@ -66,12 +66,12 @@ public:
     static DigikamApp* getinstance();
 
     // KIPI Actions collections access.
-    const TQPtrList<KAction>& menuImageActions();
-    const TQPtrList<KAction>& menuBatchActions();
-    const TQPtrList<KAction>& menuAlbumActions();
+    const TQPtrList<TDEAction>& menuImageActions();
+    const TQPtrList<TDEAction>& menuBatchActions();
+    const TQPtrList<TDEAction>& menuAlbumActions();
 
-    const TQPtrList<KAction> menuImportActions();
-    const TQPtrList<KAction> menuExportActions();
+    const TQPtrList<TDEAction> menuImportActions();
+    const TQPtrList<TDEAction> menuExportActions();
 
     void autoDetect();
     void downloadFrom(const TQString &cameraGuiPath);
diff --git a/digikam/digikam/digikamappprivate.h b/digikam/digikam/digikamappprivate.h
index 9f360d5e..d9559f57 100644
--- a/digikam/digikam/digikamappprivate.h
+++ b/digikam/digikam/digikamappprivate.h
@@ -54,10 +54,10 @@
 #include "statusnavigatebar.h"
 #include "digikamview.h"
 
-class KToolBarPopupAction;
-class KToggleAction;
-class KActionMenu;
-class KSelectAction;
+class TDEToolBarPopupAction;
+class TDEToggleAction;
+class TDEActionMenu;
+class TDESelectAction;
 
 namespace Digikam
 {
@@ -158,98 +158,98 @@ public:
     bool                   validIccPath;
 
     // KIPI plugins support
-    TQPtrList<KAction>      kipiFileActionsExport;
-    TQPtrList<KAction>      kipiFileActionsImport;
-    TQPtrList<KAction>      kipiImageActions;
-    TQPtrList<KAction>      kipiToolsActions;
-    TQPtrList<KAction>      kipiBatchActions;
-    TQPtrList<KAction>      kipiAlbumActions;
+    TQPtrList<TDEAction>      kipiFileActionsExport;
+    TQPtrList<TDEAction>      kipiFileActionsImport;
+    TQPtrList<TDEAction>      kipiImageActions;
+    TQPtrList<TDEAction>      kipiToolsActions;
+    TQPtrList<TDEAction>      kipiBatchActions;
+    TQPtrList<TDEAction>      kipiAlbumActions;
 
     TQMap<int, TQString>     mediaItems;
 
     TQString                cameraGuiPath;
 
-    KPopupMenu            *cameraMediaList;
+    TDEPopupMenu            *cameraMediaList;
 
-    KAccel                *accelerators;
+    TDEAccel                *accelerators;
 
     TDEConfig               *config;
 
     // Album Actions
-    KAction               *newAction;
-    KAction               *deleteAction;
-    KAction               *imageDeletePermanentlyAction;
-    KAction               *imageDeletePermanentlyDirectlyAction;
-    KAction               *imageTrashDirectlyAction;
-    KToolBarPopupAction   *backwardActionMenu;
-    KToolBarPopupAction   *forwardActionMenu;
+    TDEAction               *newAction;
+    TDEAction               *deleteAction;
+    TDEAction               *imageDeletePermanentlyAction;
+    TDEAction               *imageDeletePermanentlyDirectlyAction;
+    TDEAction               *imageTrashDirectlyAction;
+    TDEToolBarPopupAction   *backwardActionMenu;
+    TDEToolBarPopupAction   *forwardActionMenu;
 
-    KAction               *addImagesAction;
-    KAction               *propsEditAction;
-    KAction               *albumImportAction;
-    KAction               *openInKonquiAction;
-    KAction               *refreshAlbumAction;
-    KAction               *syncAlbumMetadataAction;
+    TDEAction               *addImagesAction;
+    TDEAction               *propsEditAction;
+    TDEAction               *albumImportAction;
+    TDEAction               *openInKonquiAction;
+    TDEAction               *refreshAlbumAction;
+    TDEAction               *syncAlbumMetadataAction;
 
     // Tag Actions
-    KAction               *newTagAction;
-    KAction               *deleteTagAction;
-    KAction               *editTagAction;
+    TDEAction               *newTagAction;
+    TDEAction               *deleteTagAction;
+    TDEAction               *editTagAction;
 
     // Image Actions
-    KToggleAction         *imagePreviewAction;
-    KAction               *imageLightTableAction;
-    KAction               *imageAddLightTableAction;
-    KAction               *imageViewAction;
-    KAction               *imageSetExifOrientation1Action;
-    KAction               *imageSetExifOrientation2Action;
-    KAction               *imageSetExifOrientation3Action;
-    KAction               *imageSetExifOrientation4Action;
-    KAction               *imageSetExifOrientation5Action;
-    KAction               *imageSetExifOrientation6Action;
-    KAction               *imageSetExifOrientation7Action;
-    KAction               *imageSetExifOrientation8Action;
-    KAction               *imageRenameAction;
-    KAction               *imageDeleteAction;
-    KActionMenu           *imageExifOrientationActionMenu;
+    TDEToggleAction         *imagePreviewAction;
+    TDEAction               *imageLightTableAction;
+    TDEAction               *imageAddLightTableAction;
+    TDEAction               *imageViewAction;
+    TDEAction               *imageSetExifOrientation1Action;
+    TDEAction               *imageSetExifOrientation2Action;
+    TDEAction               *imageSetExifOrientation3Action;
+    TDEAction               *imageSetExifOrientation4Action;
+    TDEAction               *imageSetExifOrientation5Action;
+    TDEAction               *imageSetExifOrientation6Action;
+    TDEAction               *imageSetExifOrientation7Action;
+    TDEAction               *imageSetExifOrientation8Action;
+    TDEAction               *imageRenameAction;
+    TDEAction               *imageDeleteAction;
+    TDEActionMenu           *imageExifOrientationActionMenu;
 
     // Selection Actions
-    KAction               *selectAllAction;
-    KAction               *selectNoneAction;
-    KAction               *selectInvertAction;
+    TDEAction               *selectAllAction;
+    TDEAction               *selectNoneAction;
+    TDEAction               *selectInvertAction;
 
     // View Actions
-    KToggleAction         *fullScreenAction;
-    KToggleAction         *showMenuBarAction;
-    KActionMenu           *slideShowAction;
-    KAction               *slideShowAllAction;
-    KAction               *slideShowSelectionAction;
-    KAction               *slideShowRecursiveAction;
-    KSelectAction         *imageSortAction;
-    KSelectAction         *albumSortAction;
-    KToggleAction         *recurseAlbumsAction;
-    KToggleAction         *recurseTagsAction;
-    KAction               *zoomPlusAction;
-    KAction               *zoomMinusAction;
-    KAction               *zoomFitToWindowAction;
-    KAction               *zoomTo100percents;
+    TDEToggleAction         *fullScreenAction;
+    TDEToggleAction         *showMenuBarAction;
+    TDEActionMenu           *slideShowAction;
+    TDEAction               *slideShowAllAction;
+    TDEAction               *slideShowSelectionAction;
+    TDEAction               *slideShowRecursiveAction;
+    TDESelectAction         *imageSortAction;
+    TDESelectAction         *albumSortAction;
+    TDEToggleAction         *recurseAlbumsAction;
+    TDEToggleAction         *recurseTagsAction;
+    TDEAction               *zoomPlusAction;
+    TDEAction               *zoomMinusAction;
+    TDEAction               *zoomFitToWindowAction;
+    TDEAction               *zoomTo100percents;
 
-    KAction               *rating0Star;
-    KAction               *rating1Star;
-    KAction               *rating2Star;
-    KAction               *rating3Star;
-    KAction               *rating4Star;
-    KAction               *rating5Star;
+    TDEAction               *rating0Star;
+    TDEAction               *rating1Star;
+    TDEAction               *rating2Star;
+    TDEAction               *rating3Star;
+    TDEAction               *rating4Star;
+    TDEAction               *rating5Star;
 
     // Application Actions
-    KAction               *rawCameraListAction;
-    KAction               *quitAction;
-    KAction               *tipAction;
-    KAction               *kipiHelpAction;
-    KAction               *donateMoneyAction;
-    KAction               *contributeAction;
-    KActionMenu           *cameraMenuAction;
-    KSelectAction         *themeMenuAction;
+    TDEAction               *rawCameraListAction;
+    TDEAction               *quitAction;
+    TDEAction               *tipAction;
+    TDEAction               *kipiHelpAction;
+    TDEAction               *donateMoneyAction;
+    TDEAction               *contributeAction;
+    TDEActionMenu           *cameraMenuAction;
+    TDESelectAction         *themeMenuAction;
 
     AlbumSettings         *albumSettings;
     AlbumManager          *albumManager;
diff --git a/digikam/digikam/imagepreviewview.cpp b/digikam/digikam/imagepreviewview.cpp
index ebbbf6ed..66d410b9 100644
--- a/digikam/digikam/imagepreviewview.cpp
+++ b/digikam/digikam/imagepreviewview.cpp
@@ -110,7 +110,7 @@ public:
 
     TQToolButton       *cornerButton;
 
-    KPopupFrame       *panIconPopup;
+    TDEPopupFrame       *panIconPopup;
 
     PanIconWidget     *panIconWidget;
 
@@ -390,12 +390,12 @@ void ImagePreviewView::slotContextMenu()
         {
             DDebug() << "Found JPEGLossless plugin" << endl;
 
-            KActionPtrList actionList = plugin->actions();
+            TDEActionPtrList actionList = plugin->actions();
 
-            for (KActionPtrList::const_iterator iter = actionList.begin();
+            for (TDEActionPtrList::const_iterator iter = actionList.begin();
                 iter != actionList.end(); ++iter)
             {
-                KAction* action = *iter;
+                TDEAction* action = *iter;
 
                 if (TQString::fromLatin1(action->name())
                     == TQString::fromLatin1("jpeglossless_rotate"))
@@ -562,7 +562,7 @@ void ImagePreviewView::slotCornerButtonPressed()
         d->panIconPopup = 0;
     }
 
-    d->panIconPopup    = new KPopupFrame(this);
+    d->panIconPopup    = new TDEPopupFrame(this);
     PanIconWidget *pan = new PanIconWidget(d->panIconPopup);
     pan->setImage(180, 120, getImage());
     d->panIconPopup->setMainWidget(pan);
diff --git a/digikam/digikam/ratingfilter.cpp b/digikam/digikam/ratingfilter.cpp
index 487af2d9..6e0add3a 100644
--- a/digikam/digikam/ratingfilter.cpp
+++ b/digikam/digikam/ratingfilter.cpp
@@ -147,7 +147,7 @@ void RatingFilter::mousePressEvent(TQMouseEvent* e)
     {
         // Show pop-up menu about Rating Filter condition settings
 
-        KPopupMenu popmenu(this);
+        TDEPopupMenu popmenu(this);
         popmenu.insertTitle(SmallIcon("digikam"), i18n("Rating Filter"));
         popmenu.setCheckable(true);
         popmenu.insertItem(i18n("Greater Equal Condition"), AlbumLister::GreaterEqualCondition);
diff --git a/digikam/digikam/searchfolderview.cpp b/digikam/digikam/searchfolderview.cpp
index 63aee80e..b69f3e70 100644
--- a/digikam/digikam/searchfolderview.cpp
+++ b/digikam/digikam/searchfolderview.cpp
@@ -397,7 +397,7 @@ void SearchFolderView::slotContextMenu(TQListViewItem* item, const TQPoint&, int
 {
     if (!item)
     {
-        KPopupMenu popmenu(this);
+        TDEPopupMenu popmenu(this);
         popmenu.insertTitle(SmallIcon("digikam"), i18n("My Searches"));
         popmenu.insertItem(SmallIcon("filefind"), i18n("New Simple Search..."), 10);
         popmenu.insertItem(SmallIcon("find"),     i18n("New Advanced Search..."), 11);
@@ -422,7 +422,7 @@ void SearchFolderView::slotContextMenu(TQListViewItem* item, const TQPoint&, int
     {
         SearchFolderItem* sItem = dynamic_cast<SearchFolderItem*>(item);
 
-        KPopupMenu popmenu(this);
+        TDEPopupMenu popmenu(this);
         popmenu.insertTitle(SmallIcon("digikam"), i18n("My Searches"));
         popmenu.insertItem(SmallIcon("filefind"), i18n("Edit Search..."), 10);
 
diff --git a/digikam/digikam/tageditdlg.cpp b/digikam/digikam/tageditdlg.cpp
index 88c80ca7..c99e2aad 100644
--- a/digikam/digikam/tageditdlg.cpp
+++ b/digikam/digikam/tageditdlg.cpp
@@ -387,7 +387,7 @@ TagsListCreationErrorDialog::TagsListCreationErrorDialog(TQWidget* parent, const
     TQVBoxLayout* vLay = new TQVBoxLayout(box);
 
     TQLabel *label       = new TQLabel(i18n("Error been occured during Tag creation:"), box);
-    KListView *listView = new KListView(box);
+    TDEListView *listView = new TDEListView(box);
     listView->addColumn(i18n("Tag Path"));
     listView->addColumn(i18n("Error"));
     listView->setResizeMode(TQListView::LastColumn);
@@ -398,7 +398,7 @@ TagsListCreationErrorDialog::TagsListCreationErrorDialog(TQWidget* parent, const
     vLay->setSpacing(0);
 
     for (TQMap<TQString, TQString>::const_iterator it = errMap.begin() ; it != errMap.end() ; ++it)
-        new KListViewItem(listView, it.key(), it.data());
+        new TDEListViewItem(listView, it.key(), it.data());
 
     adjustSize();
 }
diff --git a/digikam/digikam/tagfilterview.cpp b/digikam/digikam/tagfilterview.cpp
index 4a275092..a65ed943 100644
--- a/digikam/digikam/tagfilterview.cpp
+++ b/digikam/digikam/tagfilterview.cpp
@@ -553,7 +553,7 @@ void TagFilterView::contentsDropEvent(TQDropEvent *e)
         if (talbum == itemDrop->album())
             return;
 
-        KPopupMenu popMenu(this);
+        TDEPopupMenu popMenu(this);
         popMenu.insertTitle(SmallIcon("digikam"), i18n("Tag Filters"));
         popMenu.insertItem(SmallIcon("goto"), i18n("&Move Here"), 10);
         popMenu.insertSeparator(-1);
@@ -620,7 +620,7 @@ void TagFilterView::contentsDropEvent(TQDropEvent *e)
         }
         else
         {
-            KPopupMenu popMenu(this);
+            TDEPopupMenu popMenu(this);
             popMenu.insertTitle(SmallIcon("digikam"), i18n("Tag Filters"));
             popMenu.insertItem(SmallIcon("tag"), i18n("Assign Tag '%1' to Items")
                                 .arg(destAlbum->prettyURL()), 10) ;
@@ -876,7 +876,7 @@ void TagFilterView::slotContextMenu(TQListViewItem* it, const TQPoint&, int)
     connect(d->ABCMenu, TQT_SIGNAL( aboutToShow() ),
             this, TQT_SLOT( slotABCContextMenu() ));
 
-    KPopupMenu popmenu(this);
+    TDEPopupMenu popmenu(this);
     popmenu.insertTitle(SmallIcon("digikam"), i18n("Tag Filters"));
     popmenu.insertItem(SmallIcon("tag-new"), i18n("New Tag..."), 10);
     popmenu.insertItem(SmallIcon("tag-addressbook"), i18n("Create Tag From AddressBook"), d->ABCMenu);
diff --git a/digikam/digikam/tagfolderview.cpp b/digikam/digikam/tagfolderview.cpp
index 0576cf48..2e49b00f 100644
--- a/digikam/digikam/tagfolderview.cpp
+++ b/digikam/digikam/tagfolderview.cpp
@@ -538,7 +538,7 @@ void TagFolderView::slotContextMenu(TQListViewItem *item, const TQPoint &, int)
 
     TagFolderViewItem *tag = dynamic_cast<TagFolderViewItem*>(item);
 
-    KPopupMenu popmenu(this);
+    TDEPopupMenu popmenu(this);
     popmenu.insertTitle(SmallIcon("digikam"), i18n("My Tags"));
     popmenu.insertItem(SmallIcon("tag-new"), i18n("New Tag..."), 10);
     popmenu.insertItem(SmallIcon("tag-addressbook"), i18n("Create Tag From AddressBook"), d->ABCMenu);
@@ -835,7 +835,7 @@ void TagFolderView::contentsDropEvent(TQDropEvent *e)
         if (talbum == itemDrop->album())
             return;
 
-        KPopupMenu popMenu(this);
+        TDEPopupMenu popMenu(this);
         popMenu.insertTitle(SmallIcon("digikam"), i18n("My Tags"));
         popMenu.insertItem(SmallIcon("goto"), i18n("&Move Here"), 10);
         popMenu.insertSeparator(-1);
@@ -915,7 +915,7 @@ void TagFolderView::contentsDropEvent(TQDropEvent *e)
             }
             else
             {
-                KPopupMenu popMenu(this);
+                TDEPopupMenu popMenu(this);
                 popMenu.insertTitle(SmallIcon("digikam"), i18n("My Tags"));
                 popMenu.insertItem(i18n("Set as Tag Thumbnail"), 12);
                 popMenu.insertSeparator(-1);
@@ -943,7 +943,7 @@ void TagFolderView::contentsDropEvent(TQDropEvent *e)
         }
         else
         {
-            KPopupMenu popMenu(this);
+            TDEPopupMenu popMenu(this);
             popMenu.insertTitle(SmallIcon("digikam"), i18n("My Tags"));
             popMenu.insertItem( SmallIcon("tag"), i18n("Assign Tag '%1' to Items")
                                 .arg(destAlbum->prettyURL()), 10) ;
diff --git a/digikam/digikam/timelinefolderview.cpp b/digikam/digikam/timelinefolderview.cpp
index 23f07526..9cb5bf6c 100644
--- a/digikam/digikam/timelinefolderview.cpp
+++ b/digikam/digikam/timelinefolderview.cpp
@@ -269,7 +269,7 @@ void TimeLineFolderView::slotContextMenu(TQListViewItem* item, const TQPoint&, i
 
     TimeLineFolderItem* sItem = dynamic_cast<TimeLineFolderItem*>(item);
 
-    KPopupMenu popmenu(this);
+    TDEPopupMenu popmenu(this);
     popmenu.insertTitle(SmallIcon("digikam"), i18n("My Date Searches"));
     popmenu.insertItem(SmallIcon("pencil"), i18n("Rename..."), 10);
     popmenu.insertItem(SmallIcon("editdelete"), i18n("Delete"), 11);
diff --git a/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp b/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp
index 722e453c..e785fd59 100644
--- a/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp
+++ b/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.cpp
@@ -44,7 +44,7 @@ K_EXPORT_COMPONENT_FACTORY( digikamimageplugin_adjustcurves,
 ImagePlugin_AdjustCurves::ImagePlugin_AdjustCurves(TQObject *parent, const char*, const TQStringList&)
                         : Digikam::ImagePlugin(parent, "ImagePlugin_AdjustCurves")
 {
-    m_curvesAction = new KAction(i18n("Curves Adjust..."), "adjustcurves", 
+    m_curvesAction = new TDEAction(i18n("Curves Adjust..."), "adjustcurves", 
                                  CTRL+SHIFT+Key_M, // NOTE: Photoshop 7 use CTRL+M (but it's used in KDE to toogle menu bar).
                                  this, TQT_SLOT(slotCurvesAdjust()),
                                  actionCollection(), "imageplugin_adjustcurves");
diff --git a/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.h b/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.h
index 6858da7e..c726ec33 100644
--- a/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.h
+++ b/digikam/imageplugins/adjustcurves/imageplugin_adjustcurves.h
@@ -29,7 +29,7 @@
 #include "imageplugin.h"
 #include "digikam_export.h"
 
-class KAction;
+class TDEAction;
 
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_AdjustCurves : public Digikam::ImagePlugin
 {
@@ -50,7 +50,7 @@ private slots:
 
 private:
 
-    KAction *m_curvesAction;
+    TDEAction *m_curvesAction;
 };
 
 #endif /* IMAGEPLUGIN_ADJUSTCURVES_H */
diff --git a/digikam/imageplugins/adjustlevels/adjustlevels.cpp b/digikam/imageplugins/adjustlevels/adjustlevels.cpp
index 0ce36227..eef00629 100644
--- a/digikam/imageplugins/adjustlevels/adjustlevels.cpp
+++ b/digikam/imageplugins/adjustlevels/adjustlevels.cpp
@@ -188,7 +188,7 @@ AdjustLevelDialog::AdjustLevelDialog(TQWidget* parent)
 
     // -------------------------------------------------------------
     
-    m_hGradientMinInput = new KGradientSelector( KSelector::Horizontal, gboxSettings );
+    m_hGradientMinInput = new KGradientSelector( TDESelector::Horizontal, gboxSettings );
     m_hGradientMinInput->setFixedHeight( 20 );
     m_hGradientMinInput->setMinValue(0);
     m_hGradientMinInput->setMaxValue(m_histoSegments);
@@ -197,7 +197,7 @@ AdjustLevelDialog::AdjustLevelDialog(TQWidget* parent)
     m_hGradientMinInput->setColors( TQColor( "black" ), TQColor( "white" ) );
     m_hGradientMinInput->installEventFilter(this);
 
-    m_hGradientMaxInput = new KGradientSelector( KSelector::Horizontal, gboxSettings );
+    m_hGradientMaxInput = new KGradientSelector( TDESelector::Horizontal, gboxSettings );
     m_hGradientMaxInput->setFixedHeight( 20 );
     m_hGradientMaxInput->setMinValue(0);
     m_hGradientMaxInput->setMaxValue(m_histoSegments);
@@ -223,7 +223,7 @@ AdjustLevelDialog::AdjustLevelDialog(TQWidget* parent)
     TQToolTip::add( m_maxInput, i18n( "Maximal intensity input." ) );
     TQWhatsThis::add( m_maxInput, i18n("<p>Select the maximal intensity input value of the histogram."));
 
-    m_hGradientMinOutput = new KGradientSelector( KSelector::Horizontal, gboxSettings );
+    m_hGradientMinOutput = new KGradientSelector( TDESelector::Horizontal, gboxSettings );
     m_hGradientMinOutput->setColors( TQColor( "black" ), TQColor( "white" ) );
     TQWhatsThis::add( m_hGradientMinOutput, i18n("<p>Select the minimal intensity output value of the histogram."));    
     TQToolTip::add( m_hGradientMinOutput, i18n( "Minimal intensity output." ) );
@@ -232,7 +232,7 @@ AdjustLevelDialog::AdjustLevelDialog(TQWidget* parent)
     m_hGradientMinOutput->setMaxValue(m_histoSegments);
     m_hGradientMinOutput->installEventFilter(this);
     
-    m_hGradientMaxOutput = new KGradientSelector( KSelector::Horizontal, gboxSettings );
+    m_hGradientMaxOutput = new KGradientSelector( TDESelector::Horizontal, gboxSettings );
     m_hGradientMaxOutput->setColors( TQColor( "black" ), TQColor( "white" ) );
     TQWhatsThis::add( m_hGradientMaxOutput, i18n("<p>Select the maximal intensity output value of the histogram."));
     TQToolTip::add( m_hGradientMaxOutput, i18n( "Maximal intensity output." ) );
diff --git a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp
index d80a1537..65dac6d2 100644
--- a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp
+++ b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp
@@ -181,7 +181,7 @@ AdjustLevelsTool::AdjustLevelsTool(TQObject* parent)
 
     // -------------------------------------------------------------
 
-    m_hGradientMinInput = new KGradientSelector( KSelector::Horizontal, m_gboxSettings->plainPage() );
+    m_hGradientMinInput = new KGradientSelector( TDESelector::Horizontal, m_gboxSettings->plainPage() );
     m_hGradientMinInput->setFixedHeight( 20 );
     m_hGradientMinInput->setMinValue(0);
     m_hGradientMinInput->setMaxValue(m_histoSegments);
@@ -190,7 +190,7 @@ AdjustLevelsTool::AdjustLevelsTool(TQObject* parent)
     m_hGradientMinInput->setColors( TQColor( "black" ), TQColor( "white" ) );
     m_hGradientMinInput->installEventFilter(this);
 
-    m_hGradientMaxInput = new KGradientSelector( KSelector::Horizontal, m_gboxSettings->plainPage() );
+    m_hGradientMaxInput = new KGradientSelector( TDESelector::Horizontal, m_gboxSettings->plainPage() );
     m_hGradientMaxInput->setFixedHeight( 20 );
     m_hGradientMaxInput->setMinValue(0);
     m_hGradientMaxInput->setMaxValue(m_histoSegments);
@@ -218,7 +218,7 @@ AdjustLevelsTool::AdjustLevelsTool(TQObject* parent)
     TQToolTip::add( m_maxInput, i18n( "Maximal intensity input." ) );
     TQWhatsThis::add( m_maxInput, i18n("<p>Select the maximal intensity input value of the histogram."));
 
-    m_hGradientMinOutput = new KGradientSelector( KSelector::Horizontal, m_gboxSettings->plainPage() );
+    m_hGradientMinOutput = new KGradientSelector( TDESelector::Horizontal, m_gboxSettings->plainPage() );
     m_hGradientMinOutput->setColors( TQColor( "black" ), TQColor( "white" ) );
     TQWhatsThis::add( m_hGradientMinOutput, i18n("<p>Select the minimal intensity output value of the histogram."));
     TQToolTip::add( m_hGradientMinOutput, i18n( "Minimal intensity output." ) );
@@ -227,7 +227,7 @@ AdjustLevelsTool::AdjustLevelsTool(TQObject* parent)
     m_hGradientMinOutput->setMaxValue(m_histoSegments);
     m_hGradientMinOutput->installEventFilter(this);
 
-    m_hGradientMaxOutput = new KGradientSelector( KSelector::Horizontal, m_gboxSettings->plainPage() );
+    m_hGradientMaxOutput = new KGradientSelector( TDESelector::Horizontal, m_gboxSettings->plainPage() );
     m_hGradientMaxOutput->setColors( TQColor( "black" ), TQColor( "white" ) );
     TQWhatsThis::add( m_hGradientMaxOutput, i18n("<p>Select the maximal intensity output value of the histogram."));
     TQToolTip::add( m_hGradientMaxOutput, i18n( "Maximal intensity output." ) );
diff --git a/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp b/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp
index d9a4cae6..1e013dc2 100644
--- a/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp
+++ b/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.cpp
@@ -45,7 +45,7 @@ ImagePlugin_AdjustLevels::ImagePlugin_AdjustLevels(TQObject *parent, const char*
                                                    const TQStringList &)
                         : Digikam::ImagePlugin(parent, "ImagePlugin_AdjustLevels")
 {
-    m_levelsAction = new KAction(i18n("Levels Adjust..."), "adjustlevels", 
+    m_levelsAction = new TDEAction(i18n("Levels Adjust..."), "adjustlevels", 
                                  CTRL+Key_L,         // NOTE: Photoshop 7 use CTRL+L. 
                                  this, TQT_SLOT(slotLevelsAdjust()),
                                  actionCollection(), "imageplugin_adjustlevels");
diff --git a/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.h b/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.h
index 9be7fccb..62df0771 100644
--- a/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.h
+++ b/digikam/imageplugins/adjustlevels/imageplugin_adjustlevels.h
@@ -29,7 +29,7 @@
 #include "imageplugin.h"
 #include "digikam_export.h"
 
-class KAction;
+class TDEAction;
 
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_AdjustLevels : public Digikam::ImagePlugin
 {
@@ -50,7 +50,7 @@ private slots:
 
 private:
 
-    KAction *m_levelsAction;
+    TDEAction *m_levelsAction;
 };
     
 #endif /* IMAGEPLUGIN_ADJUSTLEVELS_H */
diff --git a/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp b/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp
index 2c3f6937..89e729d1 100644
--- a/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp
+++ b/digikam/imageplugins/antivignetting/imageplugin_antivignetting.cpp
@@ -45,7 +45,7 @@ K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_antivignetting,
 ImagePlugin_AntiVignetting::ImagePlugin_AntiVignetting(TQObject *parent, const char*, const TQStringList &)
                           : Digikam::ImagePlugin(parent, "ImagePlugin_AntiVignetting")
 {
-    m_antivignettingAction = new KAction(i18n("Vignetting Correction..."), "antivignetting", 0,
+    m_antivignettingAction = new TDEAction(i18n("Vignetting Correction..."), "antivignetting", 0,
                                  this, TQT_SLOT(slotAntiVignetting()),
                                  actionCollection(), "imageplugin_antivignetting");
 
diff --git a/digikam/imageplugins/antivignetting/imageplugin_antivignetting.h b/digikam/imageplugins/antivignetting/imageplugin_antivignetting.h
index 143ec0b5..f3b475c5 100644
--- a/digikam/imageplugins/antivignetting/imageplugin_antivignetting.h
+++ b/digikam/imageplugins/antivignetting/imageplugin_antivignetting.h
@@ -30,7 +30,7 @@
 #include "imageplugin.h"
 #include "digikam_export.h"
 
-class KAction;
+class TDEAction;
 
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_AntiVignetting : public Digikam::ImagePlugin
 {
@@ -51,7 +51,7 @@ private slots:
 
 private:
 
-    KAction *m_antivignettingAction;
+    TDEAction *m_antivignettingAction;
 };
 
 #endif /* IMAGEPLUGIN_ANTIVIGNETTING_H */
diff --git a/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp b/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp
index 5d8a1016..9245f7a4 100644
--- a/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp
+++ b/digikam/imageplugins/blurfx/imageplugin_blurfx.cpp
@@ -45,7 +45,7 @@ K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_blurfx,
 ImagePlugin_BlurFX::ImagePlugin_BlurFX(TQObject *parent, const char*, const TQStringList &)
                   : Digikam::ImagePlugin(parent, "ImagePlugin_BlurFX")
 {
-    m_blurfxAction = new KAction(i18n("Blur Effects..."), "blurfx", 0, 
+    m_blurfxAction = new TDEAction(i18n("Blur Effects..."), "blurfx", 0, 
                          this, TQT_SLOT(slotBlurFX()),
                          actionCollection(), "imageplugin_blurfx");
 
diff --git a/digikam/imageplugins/blurfx/imageplugin_blurfx.h b/digikam/imageplugins/blurfx/imageplugin_blurfx.h
index 71f9a7e3..f1b9e983 100644
--- a/digikam/imageplugins/blurfx/imageplugin_blurfx.h
+++ b/digikam/imageplugins/blurfx/imageplugin_blurfx.h
@@ -29,7 +29,7 @@
 #include "imageplugin.h"
 #include "digikam_export.h"
 
-class KAction;
+class TDEAction;
 
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_BlurFX : public Digikam::ImagePlugin
 {
@@ -50,7 +50,7 @@ private slots:
 
 private:
 
-    KAction *m_blurfxAction;
+    TDEAction *m_blurfxAction;
 };
 
 #endif /* IMAGEPLUGIN_BLURFX_H */
diff --git a/digikam/imageplugins/border/imageplugin_border.cpp b/digikam/imageplugins/border/imageplugin_border.cpp
index 0732b096..7a5ab868 100644
--- a/digikam/imageplugins/border/imageplugin_border.cpp
+++ b/digikam/imageplugins/border/imageplugin_border.cpp
@@ -45,7 +45,7 @@ K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_border,
 ImagePlugin_Border::ImagePlugin_Border(TQObject *parent, const char*, const TQStringList &)
                   : Digikam::ImagePlugin(parent, "ImagePlugin_Border")
 {
-    m_borderAction = new KAction(i18n("Add Border..."), "bordertool", 
+    m_borderAction = new TDEAction(i18n("Add Border..."), "bordertool", 
                          0, 
                          this, TQT_SLOT(slotBorder()),
                          actionCollection(), "imageplugin_border");
diff --git a/digikam/imageplugins/border/imageplugin_border.h b/digikam/imageplugins/border/imageplugin_border.h
index 6f6c392a..f50baff9 100644
--- a/digikam/imageplugins/border/imageplugin_border.h
+++ b/digikam/imageplugins/border/imageplugin_border.h
@@ -30,7 +30,7 @@
 #include "imageplugin.h"
 #include "digikam_export.h"
 
-class KAction;
+class TDEAction;
 
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Border : public Digikam::ImagePlugin
 {
@@ -51,7 +51,7 @@ private slots:
 
 private:
 
-    KAction *m_borderAction;
+    TDEAction *m_borderAction;
 };
 
 #endif /* IMAGEPLUGIN_BORDER_H */
diff --git a/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp b/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp
index 054437fa..3154c84d 100644
--- a/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp
+++ b/digikam/imageplugins/channelmixer/imageplugin_channelmixer.cpp
@@ -45,7 +45,7 @@ ImagePlugin_ChannelMixer::ImagePlugin_ChannelMixer(TQObject *parent, const char*
                                                    const TQStringList &)
                         : Digikam::ImagePlugin(parent, "ImagePlugin_ChannelMixer")
 {
-    m_channelMixerAction = new KAction(i18n("Channel Mixer..."), "channelmixer", 
+    m_channelMixerAction = new TDEAction(i18n("Channel Mixer..."), "channelmixer", 
                                CTRL+Key_H, 
                                this, TQT_SLOT(slotChannelMixer()),
                                actionCollection(), "imageplugin_channelmixer");
diff --git a/digikam/imageplugins/channelmixer/imageplugin_channelmixer.h b/digikam/imageplugins/channelmixer/imageplugin_channelmixer.h
index 59260cef..f87d482f 100644
--- a/digikam/imageplugins/channelmixer/imageplugin_channelmixer.h
+++ b/digikam/imageplugins/channelmixer/imageplugin_channelmixer.h
@@ -29,7 +29,7 @@
 #include "imageplugin.h"
 #include "digikam_export.h"
 
-class KAction;
+class TDEAction;
 
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_ChannelMixer : public Digikam::ImagePlugin
 {
@@ -50,7 +50,7 @@ private slots:
 
 private:
 
-    KAction *m_channelMixerAction;
+    TDEAction *m_channelMixerAction;
 };
 
 #endif /* IMAGEPLUGIN_CHANNELMIXER_H */
diff --git a/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp b/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp
index b2f637ba..4b09ef9f 100644
--- a/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp
+++ b/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp
@@ -47,7 +47,7 @@ ImagePlugin_Charcoal::ImagePlugin_Charcoal(TQObject *parent, const char*,
                                            const TQStringList &)
                     : Digikam::ImagePlugin(parent, "ImagePlugin_Charcoal")
 {
-    m_charcoalAction = new KAction(i18n("Charcoal Drawing..."), "charcoaltool", 0, 
+    m_charcoalAction = new TDEAction(i18n("Charcoal Drawing..."), "charcoaltool", 0, 
                            this, TQT_SLOT(slotCharcoal()),
                            actionCollection(), "imageplugin_charcoal");
 
diff --git a/digikam/imageplugins/charcoal/imageplugin_charcoal.h b/digikam/imageplugins/charcoal/imageplugin_charcoal.h
index 7d765fc6..7d25f380 100644
--- a/digikam/imageplugins/charcoal/imageplugin_charcoal.h
+++ b/digikam/imageplugins/charcoal/imageplugin_charcoal.h
@@ -30,7 +30,7 @@
 #include "imageplugin.h"
 #include "digikam_export.h"
 
-class KAction;
+class TDEAction;
 
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Charcoal : public Digikam::ImagePlugin
 {
@@ -51,7 +51,7 @@ private slots:
 
 private:
 
-    KAction *m_charcoalAction;
+    TDEAction *m_charcoalAction;
 };
 
 #endif /* IMAGEPLUGIN_CHARCOAL_H */
diff --git a/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp b/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp
index b45b41d5..2d5f0142 100644
--- a/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp
+++ b/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp
@@ -47,7 +47,7 @@ K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_colorfx,
 ImagePlugin_ColorFX::ImagePlugin_ColorFX(TQObject *parent, const char*, const TQStringList &)
                    : Digikam::ImagePlugin(parent, "ImagePlugin_ColorFX")
 {
-    m_solarizeAction = new KAction(i18n("Color Effects..."), "colorfx", 0,
+    m_solarizeAction = new TDEAction(i18n("Color Effects..."), "colorfx", 0,
                            this, TQT_SLOT(slotColorFX()),
                            actionCollection(), "imageplugin_colorfx");
 
diff --git a/digikam/imageplugins/colorfx/imageplugin_colorfx.h b/digikam/imageplugins/colorfx/imageplugin_colorfx.h
index 1ab219c1..b070eb09 100644
--- a/digikam/imageplugins/colorfx/imageplugin_colorfx.h
+++ b/digikam/imageplugins/colorfx/imageplugin_colorfx.h
@@ -31,7 +31,7 @@
 #include "imageplugin.h"
 #include "digikam_export.h"
 
-class KAction;
+class TDEAction;
 
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_ColorFX : public Digikam::ImagePlugin
 {
@@ -51,7 +51,7 @@ private slots:
 
 private:
 
-    KAction *m_solarizeAction;
+    TDEAction *m_solarizeAction;
 };
 
 #endif /* IMAGEPLUGIN_COLORFX_H */
diff --git a/digikam/imageplugins/coreplugin/imageplugin_core.cpp b/digikam/imageplugins/coreplugin/imageplugin_core.cpp
index ba131af7..e2623140 100644
--- a/digikam/imageplugins/coreplugin/imageplugin_core.cpp
+++ b/digikam/imageplugins/coreplugin/imageplugin_core.cpp
@@ -65,66 +65,66 @@ ImagePlugin_Core::ImagePlugin_Core(TQObject *parent, const char*, const TQString
     //-------------------------------
     // Fix and Colors menu actions
 
-    m_blurAction = new KAction(i18n("Blur..."), "blurimage", 0,
+    m_blurAction = new TDEAction(i18n("Blur..."), "blurimage", 0,
                        this, TQT_SLOT(slotBlur()),
                        actionCollection(), "implugcore_blur");
 
-    m_sharpenAction = new KAction(i18n("Sharpen..."), "sharpenimage", 0,
+    m_sharpenAction = new TDEAction(i18n("Sharpen..."), "sharpenimage", 0,
                           this, TQT_SLOT(slotSharpen()),
                           actionCollection(), "implugcore_sharpen");
 
-    m_redeyeAction = new KAction(i18n("Red Eye..."), "redeyes", 0,
+    m_redeyeAction = new TDEAction(i18n("Red Eye..."), "redeyes", 0,
                                  this, TQT_SLOT(slotRedEye()),
                                  actionCollection(), "implugcore_redeye");
     m_redeyeAction->setWhatsThis( i18n( "This filter can be used to correct red eyes in a photo. "
                                         "Select a region including the eyes to use this option.") );
 
-    m_BCGAction = new KAction(i18n("Brightness/Contrast/Gamma..."), "contrast", 0,
+    m_BCGAction = new TDEAction(i18n("Brightness/Contrast/Gamma..."), "contrast", 0,
                       this, TQT_SLOT(slotBCG()),
                       actionCollection(), "implugcore_bcg");
 
-    m_HSLAction = new KAction(i18n("Hue/Saturation/Lightness..."), "adjusthsl",
+    m_HSLAction = new TDEAction(i18n("Hue/Saturation/Lightness..."), "adjusthsl",
                       CTRL+Key_U,      // NOTE: Photoshop 7 use CTRL+U.
                       this, TQT_SLOT(slotHSL()),
                       actionCollection(), "implugcore_hsl");
 
-    m_RGBAction = new KAction(i18n("Color Balance..."), "adjustrgb",
+    m_RGBAction = new TDEAction(i18n("Color Balance..."), "adjustrgb",
                       CTRL+Key_B,      // NOTE: Photoshop 7 use CTRL+B.
                       this, TQT_SLOT(slotRGB()),
                       actionCollection(), "implugcore_rgb");
 
-    m_autoCorrectionAction = new KAction(i18n("Auto-Correction..."), "autocorrection",
+    m_autoCorrectionAction = new TDEAction(i18n("Auto-Correction..."), "autocorrection",
                                  CTRL+SHIFT+Key_B, // NOTE: Photoshop 7 use CTRL+SHIFT+B with 'Auto-Color' option.
                                  this, TQT_SLOT(slotAutoCorrection()),
                                  actionCollection(), "implugcore_autocorrection");
 
-    m_invertAction = new KAction(i18n("Invert"), "invertimage",
+    m_invertAction = new TDEAction(i18n("Invert"), "invertimage",
                          CTRL+Key_I,      // NOTE: Photoshop 7 use CTRL+I.
                          this, TQT_SLOT(slotInvert()),
                          actionCollection(), "implugcore_invert");
 
-    m_convertTo8Bits = new KAction(i18n("8 bits"), "depth16to8", 0,
+    m_convertTo8Bits = new TDEAction(i18n("8 bits"), "depth16to8", 0,
                            this, TQT_SLOT(slotConvertTo8Bits()),
                            actionCollection(), "implugcore_convertto8bits");
 
-    m_convertTo16Bits = new KAction(i18n("16 bits"), "depth8to16", 0,
+    m_convertTo16Bits = new TDEAction(i18n("16 bits"), "depth8to16", 0,
                             this, TQT_SLOT(slotConvertTo16Bits()),
                             actionCollection(), "implugcore_convertto16bits");
 
-    m_colorManagementAction = new KAction(i18n("Color Management..."), "colormanagement", 0,
+    m_colorManagementAction = new TDEAction(i18n("Color Management..."), "colormanagement", 0,
                                           this, TQT_SLOT(slotColorManagement()),
                                           actionCollection(), "implugcore_colormanagement");
     //-------------------------------
     // Filters menu actions.
 
-    m_BWAction = new KAction(i18n("Black && White..."), "bwtonal", 0,
+    m_BWAction = new TDEAction(i18n("Black && White..."), "bwtonal", 0,
                      this, TQT_SLOT(slotBW()),
                      actionCollection(), "implugcore_blackwhite");
 
     //-------------------------------
     // Transform menu actions.
 
-    m_aspectRatioCropAction = new KAction(i18n("Aspect Ratio Crop..."), "ratiocrop", 0,
+    m_aspectRatioCropAction = new TDEAction(i18n("Aspect Ratio Crop..."), "ratiocrop", 0,
                                   this, TQT_SLOT(slotRatioCrop()),
                                   actionCollection(), "implugcore_ratiocrop");
 
diff --git a/digikam/imageplugins/coreplugin/imageplugin_core.h b/digikam/imageplugins/coreplugin/imageplugin_core.h
index 2530b419..f7cc8d65 100644
--- a/digikam/imageplugins/coreplugin/imageplugin_core.h
+++ b/digikam/imageplugins/coreplugin/imageplugin_core.h
@@ -30,7 +30,7 @@
 #include "imageplugin.h"
 #include "digikam_export.h"
 
-class KAction;
+class TDEAction;
 
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Core : public Digikam::ImagePlugin
 {
@@ -67,19 +67,19 @@ private slots:
 
 private:
 
-    KAction *m_redeyeAction;
-    KAction *m_BCGAction;
-    KAction *m_HSLAction;
-    KAction *m_RGBAction;
-    KAction *m_autoCorrectionAction;
-    KAction *m_invertAction;
-    KAction *m_BWAction;
-    KAction *m_aspectRatioCropAction;
-    KAction *m_sharpenAction;
-    KAction *m_blurAction;
-    KAction *m_colorManagementAction;
-    KAction *m_convertTo8Bits;
-    KAction *m_convertTo16Bits;
+    TDEAction *m_redeyeAction;
+    TDEAction *m_BCGAction;
+    TDEAction *m_HSLAction;
+    TDEAction *m_RGBAction;
+    TDEAction *m_autoCorrectionAction;
+    TDEAction *m_invertAction;
+    TDEAction *m_BWAction;
+    TDEAction *m_aspectRatioCropAction;
+    TDEAction *m_sharpenAction;
+    TDEAction *m_blurAction;
+    TDEAction *m_colorManagementAction;
+    TDEAction *m_convertTo8Bits;
+    TDEAction *m_convertTo16Bits;
 };
 
 #endif /* IMAGEPLUGIN_CORE_H */
diff --git a/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp b/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp
index 87dd6d46..d107694a 100644
--- a/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp
+++ b/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp
@@ -47,7 +47,7 @@ K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_distortionfx,
 ImagePlugin_DistortionFX::ImagePlugin_DistortionFX(TQObject *parent, const char*, const TQStringList &)
                         : Digikam::ImagePlugin(parent, "ImagePlugin_DistortionFX")
 {
-    m_distortionfxAction = new KAction(i18n("Distortion Effects..."), "distortionfx", 0,
+    m_distortionfxAction = new TDEAction(i18n("Distortion Effects..."), "distortionfx", 0,
                                this, TQT_SLOT(slotDistortionFX()),
                                actionCollection(), "imageplugin_distortionfx");
 
diff --git a/digikam/imageplugins/distortionfx/imageplugin_distortionfx.h b/digikam/imageplugins/distortionfx/imageplugin_distortionfx.h
index 512b5e7b..975c0852 100644
--- a/digikam/imageplugins/distortionfx/imageplugin_distortionfx.h
+++ b/digikam/imageplugins/distortionfx/imageplugin_distortionfx.h
@@ -32,7 +32,7 @@
 #include "imageplugin.h"
 #include "digikam_export.h"
 
-class KAction;
+class TDEAction;
 
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_DistortionFX : public Digikam::ImagePlugin
 {
@@ -53,7 +53,7 @@ private slots:
 
 private:
 
-    KAction *m_distortionfxAction;
+    TDEAction *m_distortionfxAction;
 };
     
 #endif /* IMAGEPLUGIN_DISTORTIONFX_H */
diff --git a/digikam/imageplugins/emboss/imageplugin_emboss.cpp b/digikam/imageplugins/emboss/imageplugin_emboss.cpp
index 56932af3..27945057 100644
--- a/digikam/imageplugins/emboss/imageplugin_emboss.cpp
+++ b/digikam/imageplugins/emboss/imageplugin_emboss.cpp
@@ -47,7 +47,7 @@ ImagePlugin_Emboss::ImagePlugin_Emboss(TQObject *parent, const char*,
                                        const TQStringList &)
                   : Digikam::ImagePlugin(parent, "ImagePlugin_Emboss")
 {
-    m_embossAction = new KAction(i18n("Emboss..."), "embosstool", 0, 
+    m_embossAction = new TDEAction(i18n("Emboss..."), "embosstool", 0, 
                          this, TQT_SLOT(slotEmboss()),
                          actionCollection(), "imageplugin_emboss");
 
diff --git a/digikam/imageplugins/emboss/imageplugin_emboss.h b/digikam/imageplugins/emboss/imageplugin_emboss.h
index 4b208023..92a10181 100644
--- a/digikam/imageplugins/emboss/imageplugin_emboss.h
+++ b/digikam/imageplugins/emboss/imageplugin_emboss.h
@@ -30,7 +30,7 @@
 #include "imageplugin.h"
 #include "digikam_export.h"
 
-class KAction;
+class TDEAction;
 
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Emboss : public Digikam::ImagePlugin
 {
@@ -51,7 +51,7 @@ private slots:
 
 private:
 
-    KAction *m_embossAction;
+    TDEAction *m_embossAction;
 };
 
 #endif /* IMAGEPLUGIN_EMBOSS_H */
diff --git a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp b/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp
index 49631ad9..e6290592 100644
--- a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp
+++ b/digikam/imageplugins/filmgrain/imageplugin_filmgrain.cpp
@@ -46,7 +46,7 @@ K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_filmgrain,
 ImagePlugin_FilmGrain::ImagePlugin_FilmGrain(TQObject *parent, const char*, const TQStringList &)
                      : Digikam::ImagePlugin(parent, "ImagePlugin_FilmGrain")
 {
-    m_filmgrainAction = new KAction(i18n("Add Film Grain..."), "filmgrain", 0, 
+    m_filmgrainAction = new TDEAction(i18n("Add Film Grain..."), "filmgrain", 0, 
                             this, TQT_SLOT(slotFilmGrain()),
                             actionCollection(), "imageplugin_filmgrain");
 
diff --git a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.h b/digikam/imageplugins/filmgrain/imageplugin_filmgrain.h
index 093add47..457d80d4 100644
--- a/digikam/imageplugins/filmgrain/imageplugin_filmgrain.h
+++ b/digikam/imageplugins/filmgrain/imageplugin_filmgrain.h
@@ -30,7 +30,7 @@
 #include "imageplugin.h"
 #include "digikam_export.h"
 
-class KAction;
+class TDEAction;
 
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_FilmGrain : public Digikam::ImagePlugin
 {
@@ -51,7 +51,7 @@ private slots:
 
 private:
 
-    KAction *m_filmgrainAction;
+    TDEAction *m_filmgrainAction;
 };
 
 #endif /* IMAGEPLUGIN_FILMGRAIN_H */
diff --git a/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp b/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp
index 040d2ad5..de50824b 100644
--- a/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp
+++ b/digikam/imageplugins/freerotation/imageplugin_freerotation.cpp
@@ -45,7 +45,7 @@ K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_freerotation,
 ImagePlugin_FreeRotation::ImagePlugin_FreeRotation(TQObject *parent, const char*, const TQStringList &)
                         : Digikam::ImagePlugin(parent, "ImagePlugin_FreeRotation")
 {
-    m_freerotationAction = new KAction(i18n("Free Rotation..."), "freerotation", 0, 
+    m_freerotationAction = new TDEAction(i18n("Free Rotation..."), "freerotation", 0, 
                              this, TQT_SLOT(slotFreeRotation()),
                              actionCollection(), "imageplugin_freerotation");
 
diff --git a/digikam/imageplugins/freerotation/imageplugin_freerotation.h b/digikam/imageplugins/freerotation/imageplugin_freerotation.h
index 2ce3436b..e99ab741 100644
--- a/digikam/imageplugins/freerotation/imageplugin_freerotation.h
+++ b/digikam/imageplugins/freerotation/imageplugin_freerotation.h
@@ -30,7 +30,7 @@
 #include "imageplugin.h"
 #include "digikam_export.h"
 
-class KAction;
+class TDEAction;
 
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_FreeRotation : public Digikam::ImagePlugin
 {
@@ -51,7 +51,7 @@ private slots:
 
 private:
 
-    KAction *m_freerotationAction;
+    TDEAction *m_freerotationAction;
 };
 
 #endif /* IMAGEPLUGIN_FREEROTATION_H */
diff --git a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp b/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp
index feb30388..e2b0de9e 100644
--- a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp
+++ b/digikam/imageplugins/hotpixels/imageplugin_hotpixels.cpp
@@ -47,7 +47,7 @@ K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_hotpixels,
 ImagePlugin_HotPixels::ImagePlugin_HotPixels(TQObject *parent, const char*, const TQStringList &)
                      : Digikam::ImagePlugin(parent, "ImagePlugin_HotPixels")
 {
-    m_hotpixelsAction = new KAction(i18n("Hot Pixels..."), "hotpixels", 0, 
+    m_hotpixelsAction = new TDEAction(i18n("Hot Pixels..."), "hotpixels", 0, 
                             this, TQT_SLOT(slotHotPixels()),
                             actionCollection(), "imageplugin_hotpixels");
 
diff --git a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.h b/digikam/imageplugins/hotpixels/imageplugin_hotpixels.h
index 9823d008..686e618c 100644
--- a/digikam/imageplugins/hotpixels/imageplugin_hotpixels.h
+++ b/digikam/imageplugins/hotpixels/imageplugin_hotpixels.h
@@ -50,7 +50,7 @@ private slots:
 
 private:
 
-    KAction *m_hotpixelsAction;
+    TDEAction *m_hotpixelsAction;
 };
 
 #endif /* IMAGEPLUGIN_HOTPIXELS_H */
diff --git a/digikam/imageplugins/infrared/imageplugin_infrared.cpp b/digikam/imageplugins/infrared/imageplugin_infrared.cpp
index 5ec60b28..39b1364e 100644
--- a/digikam/imageplugins/infrared/imageplugin_infrared.cpp
+++ b/digikam/imageplugins/infrared/imageplugin_infrared.cpp
@@ -46,7 +46,7 @@ K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_infrared,
 ImagePlugin_Infrared::ImagePlugin_Infrared(TQObject *parent, const char*, const TQStringList &)
                     : Digikam::ImagePlugin(parent, "ImagePlugin_Infrared")
 {
-    m_infraredAction = new KAction(i18n("Infrared Film..."), "infrared", 0, 
+    m_infraredAction = new TDEAction(i18n("Infrared Film..."), "infrared", 0, 
                            this, TQT_SLOT(slotInfrared()),
                            actionCollection(), "imageplugin_infrared");
 
diff --git a/digikam/imageplugins/infrared/imageplugin_infrared.h b/digikam/imageplugins/infrared/imageplugin_infrared.h
index f66fca7f..7a6c8292 100644
--- a/digikam/imageplugins/infrared/imageplugin_infrared.h
+++ b/digikam/imageplugins/infrared/imageplugin_infrared.h
@@ -30,7 +30,7 @@
 #include "imageplugin.h"
 #include "digikam_export.h"
 
-class KAction;
+class TDEAction;
 
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Infrared : public Digikam::ImagePlugin
 {
@@ -51,7 +51,7 @@ private slots:
 
 private:
 
-    KAction *m_infraredAction;
+    TDEAction *m_infraredAction;
 };
 
 #endif /* IMAGEPLUGIN_INFRARED_H */
diff --git a/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp b/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp
index 61dc0486..cbabc0a7 100644
--- a/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp
+++ b/digikam/imageplugins/inpainting/imageplugin_inpainting.cpp
@@ -48,7 +48,7 @@ K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_inpainting,
 ImagePlugin_InPainting::ImagePlugin_InPainting(TQObject *parent, const char*, const TQStringList &)
                       : Digikam::ImagePlugin(parent, "ImagePlugin_InPainting")
 {
-    m_inPaintingAction = new KAction(i18n("Inpainting..."), "inpainting",
+    m_inPaintingAction = new TDEAction(i18n("Inpainting..."), "inpainting",
                              CTRL+Key_E, 
                              this, TQT_SLOT(slotInPainting()),
                              actionCollection(), "imageplugin_inpainting");
diff --git a/digikam/imageplugins/inpainting/imageplugin_inpainting.h b/digikam/imageplugins/inpainting/imageplugin_inpainting.h
index ad851520..d149a423 100644
--- a/digikam/imageplugins/inpainting/imageplugin_inpainting.h
+++ b/digikam/imageplugins/inpainting/imageplugin_inpainting.h
@@ -30,7 +30,7 @@
 #include "imageplugin.h"
 #include "digikam_export.h"
 
-class KAction;
+class TDEAction;
 
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_InPainting : public Digikam::ImagePlugin
 {
@@ -51,7 +51,7 @@ private slots:
 
 private:
 
-    KAction *m_inPaintingAction;
+    TDEAction *m_inPaintingAction;
 };
 
 #endif /* IMAGEPLUGIN_INPAINTING_H */
diff --git a/digikam/imageplugins/inserttext/fontchooserwidget.cpp b/digikam/imageplugins/inserttext/fontchooserwidget.cpp
index ddd8e854..3efdc702 100644
--- a/digikam/imageplugins/inserttext/fontchooserwidget.cpp
+++ b/digikam/imageplugins/inserttext/fontchooserwidget.cpp
@@ -186,7 +186,7 @@ FontChooserWidget::FontChooserWidget(TQWidget *parent, const char *name,
 
     // Now create the actual boxes that hold the info
 
-    familyListBox = new KListBox( page, "familyListBox");
+    familyListBox = new TDEListBox( page, "familyListBox");
     familyListBox->setEnabled( !diff );
     gridLayout->addWidget( familyListBox, row, 0 );
     TQString fontFamilyWhatsThisText = i18n("Here you can choose the font family to be used." );
@@ -207,7 +207,7 @@ FontChooserWidget::FontChooserWidget(TQWidget *parent, const char *name,
 
     familyListBox->setMinimumHeight( minimumListHeight( familyListBox, visibleListSize  ) );
 
-    styleListBox = new KListBox( page, "styleListBox");
+    styleListBox = new TDEListBox( page, "styleListBox");
     styleListBox->setEnabled( !diff );
     gridLayout->addWidget(styleListBox, row, 1);
     TQString fontStyleWhatsThisText = i18n("Here you can choose the font style to be used." );
@@ -223,7 +223,7 @@ FontChooserWidget::FontChooserWidget(TQWidget *parent, const char *name,
     connect(styleListBox, TQT_SIGNAL(highlighted(const TQString &)),
             this, TQT_SLOT(style_chosen_slot(const TQString &)));
 
-    sizeListBox = new KListBox( page, "sizeListBox");
+    sizeListBox = new TDEListBox( page, "sizeListBox");
     sizeOfFont = new KIntNumInput( page, "sizeOfFont");
     sizeOfFont->setMinValue(4);
 
diff --git a/digikam/imageplugins/inserttext/fontchooserwidget.h b/digikam/imageplugins/inserttext/fontchooserwidget.h
index 6f08b4d9..e1f85816 100644
--- a/digikam/imageplugins/inserttext/fontchooserwidget.h
+++ b/digikam/imageplugins/inserttext/fontchooserwidget.h
@@ -37,7 +37,7 @@ class TQGroupBox;
 class TQLabel;
 class TQStringList;
 
-class KListBox;
+class TDEListBox;
 class KIntNumInput;
 
 namespace DigikamInsertTextImagesPlugin
@@ -156,9 +156,9 @@ private:
 
     KIntNumInput           *sizeOfFont;
 
-    KListBox               *familyListBox;
-    KListBox               *styleListBox;
-    KListBox               *sizeListBox;
+    TDEListBox               *familyListBox;
+    TDEListBox               *styleListBox;
+    TDEListBox               *sizeListBox;
 
 private:
 
diff --git a/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp b/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp
index 0768e149..a9ac817f 100644
--- a/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp
+++ b/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp
@@ -44,7 +44,7 @@ K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_inserttext,
 ImagePlugin_InsertText::ImagePlugin_InsertText(TQObject *parent, const char*, const TQStringList &)
                       : Digikam::ImagePlugin(parent, "ImagePlugin_InsertText")
 {
-    m_insertTextAction = new KAction(i18n("Insert Text..."), "inserttext", 
+    m_insertTextAction = new TDEAction(i18n("Insert Text..."), "inserttext", 
                          SHIFT+CTRL+Key_T, 
                          this, TQT_SLOT(slotInsertText()),
                          actionCollection(), "imageplugin_inserttext");
diff --git a/digikam/imageplugins/inserttext/imageplugin_inserttext.h b/digikam/imageplugins/inserttext/imageplugin_inserttext.h
index 5d34a8e2..01f56e7c 100644
--- a/digikam/imageplugins/inserttext/imageplugin_inserttext.h
+++ b/digikam/imageplugins/inserttext/imageplugin_inserttext.h
@@ -29,7 +29,7 @@
 #include "imageplugin.h"
 #include "digikam_export.h"
 
-class KAction;
+class TDEAction;
 
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_InsertText : public Digikam::ImagePlugin
 {
@@ -50,7 +50,7 @@ private slots:
 
 private:
 
-    KAction *m_insertTextAction;
+    TDEAction *m_insertTextAction;
 };
 
 #endif /* IMAGEPLUGIN_INSERTTEXT_H */
diff --git a/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp b/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp
index 0db22289..a7eddd87 100644
--- a/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp
+++ b/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.cpp
@@ -44,7 +44,7 @@ K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_lensdistortion,
 ImagePlugin_LensDistortion::ImagePlugin_LensDistortion(TQObject *parent, const char*, const TQStringList &)
                           : Digikam::ImagePlugin(parent, "ImagePlugin_LensDistortion")
 {
-    m_lensdistortionAction = new KAction(i18n("Lens Distortion..."), "lensdistortion", 0, 
+    m_lensdistortionAction = new TDEAction(i18n("Lens Distortion..."), "lensdistortion", 0, 
                                  this, TQT_SLOT(slotLensDistortion()),
                                  actionCollection(), "imageplugin_lensdistortion");
 
diff --git a/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.h b/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.h
index 05cb563b..f07099da 100644
--- a/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.h
+++ b/digikam/imageplugins/lensdistortion/imageplugin_lensdistortion.h
@@ -29,7 +29,7 @@
 #include "imageplugin.h"
 #include "digikam_export.h"
 
-class KAction;
+class TDEAction;
 
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_LensDistortion : public Digikam::ImagePlugin
 {
@@ -50,7 +50,7 @@ private slots:
 
 private:
 
-    KAction *m_lensdistortionAction;
+    TDEAction *m_lensdistortionAction;
 };
 
 #endif /* IMAGEPLUGIN_LENSDISTORTION_H */
diff --git a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp b/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp
index 367571d4..3de48a17 100644
--- a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp
+++ b/digikam/imageplugins/noisereduction/imageplugin_noisereduction.cpp
@@ -45,7 +45,7 @@ K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_noisereduction,
 ImagePlugin_NoiseReduction::ImagePlugin_NoiseReduction(TQObject *parent, const char*, const TQStringList &)
                           : Digikam::ImagePlugin(parent, "ImagePlugin_NoiseReduction")
 {
-    m_noiseReductionAction = new KAction(i18n("Noise Reduction..."), "noisereduction", 0,
+    m_noiseReductionAction = new TDEAction(i18n("Noise Reduction..."), "noisereduction", 0,
                              this, TQT_SLOT(slotNoiseReduction()),
                              actionCollection(), "imageplugin_noisereduction");
 
diff --git a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.h b/digikam/imageplugins/noisereduction/imageplugin_noisereduction.h
index 844c12f6..6e2fcb0c 100644
--- a/digikam/imageplugins/noisereduction/imageplugin_noisereduction.h
+++ b/digikam/imageplugins/noisereduction/imageplugin_noisereduction.h
@@ -29,7 +29,7 @@
 #include "imageplugin.h"
 #include "digikam_export.h"
 
-class KAction;
+class TDEAction;
 
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_NoiseReduction : public Digikam::ImagePlugin
 {
@@ -50,7 +50,7 @@ private slots:
 
 private:
 
-    KAction *m_noiseReductionAction;
+    TDEAction *m_noiseReductionAction;
 };
 
 #endif /* IMAGEPLUGIN_NOISEREDUCTION_H */
diff --git a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp b/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp
index 22274a77..d49ce9e3 100644
--- a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp
+++ b/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp
@@ -45,7 +45,7 @@ K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_oilpaint,
 ImagePlugin_OilPaint::ImagePlugin_OilPaint(TQObject *parent, const char*, const TQStringList&)
                     : Digikam::ImagePlugin(parent, "ImagePlugin_OilPaint")
 {
-    m_oilpaintAction = new KAction(i18n("Oil Paint..."), "oilpaint", 0, 
+    m_oilpaintAction = new TDEAction(i18n("Oil Paint..."), "oilpaint", 0, 
                        this, TQT_SLOT(slotOilPaint()),
                        actionCollection(), "imageplugin_oilpaint");
 
diff --git a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.h b/digikam/imageplugins/oilpaint/imageplugin_oilpaint.h
index b5a0b193..d74613bc 100644
--- a/digikam/imageplugins/oilpaint/imageplugin_oilpaint.h
+++ b/digikam/imageplugins/oilpaint/imageplugin_oilpaint.h
@@ -29,7 +29,7 @@
 #include "imageplugin.h"
 #include "digikam_export.h"
 
-class KAction;
+class TDEAction;
 
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_OilPaint : public Digikam::ImagePlugin
 {
@@ -50,7 +50,7 @@ private slots:
 
 private:
 
-    KAction *m_oilpaintAction;
+    TDEAction *m_oilpaintAction;
 };
 
 #endif /* IMAGEPLUGIN_OILPAINT_H */
diff --git a/digikam/imageplugins/perspective/imageplugin_perspective.cpp b/digikam/imageplugins/perspective/imageplugin_perspective.cpp
index 30135b8a..cfa99ec7 100644
--- a/digikam/imageplugins/perspective/imageplugin_perspective.cpp
+++ b/digikam/imageplugins/perspective/imageplugin_perspective.cpp
@@ -44,7 +44,7 @@ K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_perspective,
 ImagePlugin_Perspective::ImagePlugin_Perspective(TQObject *parent, const char*, const TQStringList &)
                         : Digikam::ImagePlugin(parent, "ImagePlugin_Perspective")
 {
-    m_perspectiveAction = new KAction(i18n("Perspective Adjustment..."), "perspective", 0, 
+    m_perspectiveAction = new TDEAction(i18n("Perspective Adjustment..."), "perspective", 0, 
                               this, TQT_SLOT(slotPerspective()),
                               actionCollection(), "imageplugin_perspective");
 
diff --git a/digikam/imageplugins/perspective/imageplugin_perspective.h b/digikam/imageplugins/perspective/imageplugin_perspective.h
index 02194fab..44d9a3a3 100644
--- a/digikam/imageplugins/perspective/imageplugin_perspective.h
+++ b/digikam/imageplugins/perspective/imageplugin_perspective.h
@@ -29,7 +29,7 @@
 #include "imageplugin.h"
 #include "digikam_export.h"
 
-class KAction;
+class TDEAction;
 
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Perspective : public Digikam::ImagePlugin
 {
@@ -50,7 +50,7 @@ private slots:
 
 private:
 
-    KAction *m_perspectiveAction;
+    TDEAction *m_perspectiveAction;
 };
 
 #endif /* IMAGEPLUGIN_PERSPECTIVE_H */
diff --git a/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp b/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp
index dd5b87b3..db2f7b40 100644
--- a/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp
+++ b/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp
@@ -44,7 +44,7 @@ K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_raindrop,
 ImagePlugin_RainDrop::ImagePlugin_RainDrop(TQObject *parent, const char*, const TQStringList &)
                     : Digikam::ImagePlugin(parent, "ImagePlugin_RainDrop")
 {
-    m_raindropAction = new KAction(i18n("Raindrops..."), "raindrop", 0,
+    m_raindropAction = new TDEAction(i18n("Raindrops..."), "raindrop", 0,
                            this, TQT_SLOT(slotRainDrop()),
                            actionCollection(), "imageplugin_raindrop");
 
diff --git a/digikam/imageplugins/raindrop/imageplugin_raindrop.h b/digikam/imageplugins/raindrop/imageplugin_raindrop.h
index 365cd0c3..c5ba09b3 100644
--- a/digikam/imageplugins/raindrop/imageplugin_raindrop.h
+++ b/digikam/imageplugins/raindrop/imageplugin_raindrop.h
@@ -29,7 +29,7 @@
 #include "imageplugin.h"
 #include "digikam_export.h"
 
-class KAction;
+class TDEAction;
 
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_RainDrop : public Digikam::ImagePlugin
 {
@@ -50,7 +50,7 @@ private slots:
 
 private:
 
-    KAction *m_raindropAction;
+    TDEAction *m_raindropAction;
 };
 
 #endif /* IMAGEPLUGIN_RAINDROP_H */
diff --git a/digikam/imageplugins/restoration/imageplugin_restoration.cpp b/digikam/imageplugins/restoration/imageplugin_restoration.cpp
index 36ad4747..c6cdb1bc 100644
--- a/digikam/imageplugins/restoration/imageplugin_restoration.cpp
+++ b/digikam/imageplugins/restoration/imageplugin_restoration.cpp
@@ -46,7 +46,7 @@ K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_restoration,
 ImagePlugin_Restoration::ImagePlugin_Restoration(TQObject *parent, const char*, const TQStringList &)
                        : Digikam::ImagePlugin(parent, "ImagePlugin_Restoration")
 {
-    m_restorationAction = new KAction(i18n("Restoration..."), "restoration", 0, 
+    m_restorationAction = new TDEAction(i18n("Restoration..."), "restoration", 0, 
                               this, TQT_SLOT(slotRestoration()),
                               actionCollection(), "imageplugin_restoration");
 
diff --git a/digikam/imageplugins/restoration/imageplugin_restoration.h b/digikam/imageplugins/restoration/imageplugin_restoration.h
index 2474b9d4..588fac59 100644
--- a/digikam/imageplugins/restoration/imageplugin_restoration.h
+++ b/digikam/imageplugins/restoration/imageplugin_restoration.h
@@ -30,7 +30,7 @@
 #include "imageplugin.h"
 #include "digikam_export.h"
 
-class KAction;
+class TDEAction;
 
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Restoration : public Digikam::ImagePlugin
 {
@@ -51,7 +51,7 @@ private slots:
 
 private:
 
-    KAction *m_restorationAction;
+    TDEAction *m_restorationAction;
 };
 
 #endif /* IMAGEPLUGIN_RESTORATION_H */
diff --git a/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp b/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp
index 234ea3aa..522536cc 100644
--- a/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp
+++ b/digikam/imageplugins/sheartool/imageplugin_sheartool.cpp
@@ -44,7 +44,7 @@ K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_sheartool,
 ImagePlugin_ShearTool::ImagePlugin_ShearTool(TQObject *parent, const char*, const TQStringList &)
                      : Digikam::ImagePlugin(parent, "ImagePlugin_ShearTool")
 {
-    m_sheartoolAction = new KAction(i18n("Shear..."), "shear", 0, 
+    m_sheartoolAction = new TDEAction(i18n("Shear..."), "shear", 0, 
                             this, TQT_SLOT(slotShearTool()),
                             actionCollection(), "imageplugin_sheartool");
 
diff --git a/digikam/imageplugins/sheartool/imageplugin_sheartool.h b/digikam/imageplugins/sheartool/imageplugin_sheartool.h
index 6bde0042..9ded889b 100644
--- a/digikam/imageplugins/sheartool/imageplugin_sheartool.h
+++ b/digikam/imageplugins/sheartool/imageplugin_sheartool.h
@@ -29,7 +29,7 @@
 #include "imageplugin.h"
 #include "digikam_export.h"
 
-class KAction;
+class TDEAction;
 
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_ShearTool : public Digikam::ImagePlugin
 {
@@ -50,7 +50,7 @@ private slots:
 
 private:
 
-    KAction *m_sheartoolAction;
+    TDEAction *m_sheartoolAction;
 };
 
 #endif /* IMAGEPLUGIN_SHEARTOOL_H */
diff --git a/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp b/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp
index dc990ad9..5a10e7d4 100644
--- a/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp
+++ b/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp
@@ -46,7 +46,7 @@ K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_superimpose,
 ImagePlugin_SuperImpose::ImagePlugin_SuperImpose(TQObject *parent, const char*, const TQStringList &)
                         : Digikam::ImagePlugin(parent, "ImagePlugin_SuperImpose")
 {
-    m_superimposeAction = new KAction(i18n("Template Superimpose..."), "superimpose", 0, 
+    m_superimposeAction = new TDEAction(i18n("Template Superimpose..."), "superimpose", 0, 
                               this, TQT_SLOT(slotSuperImpose()),
                               actionCollection(), "imageplugin_superimpose");
 
diff --git a/digikam/imageplugins/superimpose/imageplugin_superimpose.h b/digikam/imageplugins/superimpose/imageplugin_superimpose.h
index 295075c7..5d3ec37f 100644
--- a/digikam/imageplugins/superimpose/imageplugin_superimpose.h
+++ b/digikam/imageplugins/superimpose/imageplugin_superimpose.h
@@ -31,7 +31,7 @@
 #include "imageplugin.h"
 #include "digikam_export.h"
 
-class KAction;
+class TDEAction;
 
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_SuperImpose : public Digikam::ImagePlugin
 {
@@ -52,7 +52,7 @@ private slots:
 
 private:
 
-    KAction *m_superimposeAction;
+    TDEAction *m_superimposeAction;
 };
 
 #endif /* IMAGEPLUGIN_SUPERIMPOSE_H */
diff --git a/digikam/imageplugins/texture/imageplugin_texture.cpp b/digikam/imageplugins/texture/imageplugin_texture.cpp
index 9a82b31e..26df17fd 100644
--- a/digikam/imageplugins/texture/imageplugin_texture.cpp
+++ b/digikam/imageplugins/texture/imageplugin_texture.cpp
@@ -45,7 +45,7 @@ K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_texture,
 ImagePlugin_Texture::ImagePlugin_Texture(TQObject *parent, const char*, const TQStringList &)
                    : Digikam::ImagePlugin(parent, "ImagePlugin_Texture")
 {
-    m_textureAction = new KAction(i18n("Apply Texture..."), "texture", 0, 
+    m_textureAction = new TDEAction(i18n("Apply Texture..."), "texture", 0, 
                           this, TQT_SLOT(slotTexture()),
                           actionCollection(), "imageplugin_texture");
 
diff --git a/digikam/imageplugins/texture/imageplugin_texture.h b/digikam/imageplugins/texture/imageplugin_texture.h
index 890ab6ef..f1219876 100644
--- a/digikam/imageplugins/texture/imageplugin_texture.h
+++ b/digikam/imageplugins/texture/imageplugin_texture.h
@@ -29,7 +29,7 @@
 #include "imageplugin.h"
 #include "digikam_export.h"
 
-class KAction;
+class TDEAction;
 
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Texture : public Digikam::ImagePlugin
 {
@@ -50,7 +50,7 @@ private slots:
 
 private:
 
-    KAction *m_textureAction;
+    TDEAction *m_textureAction;
 };
 
 #endif /* IMAGEPLUGIN_TEXTURE_H */
diff --git a/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp b/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp
index fd77b32c..cc83e5dd 100644
--- a/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp
+++ b/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp
@@ -45,7 +45,7 @@ K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_whitebalance,
 ImagePlugin_WhiteBalance::ImagePlugin_WhiteBalance(TQObject *parent, const char*, const TQStringList &)
                         : Digikam::ImagePlugin(parent, "ImagePlugin_WhiteBalance")
 {
-    m_whitebalanceAction = new KAction(i18n("White Balance..."), "whitebalance", 
+    m_whitebalanceAction = new TDEAction(i18n("White Balance..."), "whitebalance", 
                                CTRL+SHIFT+Key_W, 
                                this, TQT_SLOT(slotWhiteBalance()),
                                actionCollection(), "imageplugin_whitebalance");
diff --git a/digikam/imageplugins/whitebalance/imageplugin_whitebalance.h b/digikam/imageplugins/whitebalance/imageplugin_whitebalance.h
index 946c2ff2..c2462569 100644
--- a/digikam/imageplugins/whitebalance/imageplugin_whitebalance.h
+++ b/digikam/imageplugins/whitebalance/imageplugin_whitebalance.h
@@ -30,7 +30,7 @@
 #include "imageplugin.h"
 #include "digikam_export.h"
 
-class KAction;
+class TDEAction;
 
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_WhiteBalance : public Digikam::ImagePlugin
 {
@@ -51,7 +51,7 @@ private slots:
 
 private:
 
-    KAction *m_whitebalanceAction;
+    TDEAction *m_whitebalanceAction;
 };
 
 #endif /* IMAGEPLUGIN_WHITEBALANCE_H */
diff --git a/digikam/libs/dialogs/deletedialog.h b/digikam/libs/dialogs/deletedialog.h
index 7d38131e..9d1cbd6e 100644
--- a/digikam/libs/dialogs/deletedialog.h
+++ b/digikam/libs/dialogs/deletedialog.h
@@ -41,7 +41,7 @@
 #include "deletedialogbase.h"
 
 class TQStringList;
-class KListBox;
+class TDEListBox;
 class KGuiItem;
 class TQLabel;
 class TQWidgetStack;
diff --git a/digikam/libs/dialogs/deletedialogbase.ui b/digikam/libs/dialogs/deletedialogbase.ui
index 576e8366..129c719f 100644
--- a/digikam/libs/dialogs/deletedialogbase.ui
+++ b/digikam/libs/dialogs/deletedialogbase.ui
@@ -83,7 +83,7 @@
 					</widget>
 				</hbox>
 			</widget>
-			<widget class="KListBox">
+			<widget class="TDEListBox">
 				<property name="name">
 					<cstring>ddFileList</cstring>
 				</property>
diff --git a/digikam/libs/imageproperties/imagedescedittab.cpp b/digikam/libs/imageproperties/imagedescedittab.cpp
index aad6a4f8..3936140f 100644
--- a/digikam/libs/imageproperties/imagedescedittab.cpp
+++ b/digikam/libs/imageproperties/imagedescedittab.cpp
@@ -822,7 +822,7 @@ void ImageDescEditTab::slotRightButtonClicked(TQListViewItem *item, const TQPoin
     connect(d->ABCMenu, TQT_SIGNAL( aboutToShow() ),
             this, TQT_SLOT( slotABCContextMenu() ));
 
-    KPopupMenu popmenu(this);
+    TDEPopupMenu popmenu(this);
     popmenu.insertTitle(SmallIcon("digikam"), i18n("Tags"));
     popmenu.insertItem(SmallIcon("tag-new"),  i18n("New Tag..."), 10);
     popmenu.insertItem(SmallIcon("tag-addressbook"), i18n("Create Tag From AddressBook"), d->ABCMenu);
diff --git a/digikam/libs/imageproperties/talbumlistview.cpp b/digikam/libs/imageproperties/talbumlistview.cpp
index 932d3863..af0fde86 100644
--- a/digikam/libs/imageproperties/talbumlistview.cpp
+++ b/digikam/libs/imageproperties/talbumlistview.cpp
@@ -267,7 +267,7 @@ void TAlbumListView::contentsDropEvent(TQDropEvent *e)
         if (talbum == itemDrop->album())
             return;
 
-        KPopupMenu popMenu(this);
+        TDEPopupMenu popMenu(this);
         popMenu.insertTitle(SmallIcon("digikam"), i18n("Tags"));
         popMenu.insertItem(SmallIcon("goto"), i18n("&Move Here"), 10);
         popMenu.insertSeparator(-1);
@@ -347,7 +347,7 @@ void TAlbumListView::contentsDropEvent(TQDropEvent *e)
             }
             else
             {
-                KPopupMenu popMenu(this);
+                TDEPopupMenu popMenu(this);
                 popMenu.insertTitle(SmallIcon("digikam"), i18n("Tags"));
                 popMenu.insertItem(i18n("Set as Tag Thumbnail"), 12);
                 popMenu.insertSeparator(-1);
@@ -376,7 +376,7 @@ void TAlbumListView::contentsDropEvent(TQDropEvent *e)
         }
         else
         {
-            KPopupMenu popMenu(this);
+            TDEPopupMenu popMenu(this);
             popMenu.insertTitle(SmallIcon("digikam"), i18n("Tags"));
             popMenu.insertItem( SmallIcon("tag"), i18n("Assign Tag '%1' to Items")
                                 .arg(destAlbum->prettyURL()), 10) ;
diff --git a/digikam/libs/widgets/common/dlogoaction.cpp b/digikam/libs/widgets/common/dlogoaction.cpp
index 64ea1665..3e3c57b6 100644
--- a/digikam/libs/widgets/common/dlogoaction.cpp
+++ b/digikam/libs/widgets/common/dlogoaction.cpp
@@ -44,7 +44,7 @@ namespace Digikam
 {
 
 DLogoAction::DLogoAction(TQObject* parent, const char* name)
-           : KAction(parent, name)
+           : TDEAction(parent, name)
 {
     setText("digikam.org");
     setIcon("digikam");
@@ -52,12 +52,12 @@ DLogoAction::DLogoAction(TQObject* parent, const char* name)
 
 int DLogoAction::plug(TQWidget *widget, int index)
 {
-    if (kapp && !kapp->authorizeKAction(name()))
+    if (kapp && !kapp->authorizeTDEAction(name()))
         return -1;
 
-    if ( widget->inherits( "KToolBar" ) )
+    if ( widget->inherits( "TDEToolBar" ) )
     {
-        KToolBar *bar         = (KToolBar *)widget;
+        TDEToolBar *bar         = (TDEToolBar *)widget;
         int id                = getToolButtonID();
         KURLLabel *pixmapLogo = new KURLLabel(Digikam::webProjectUrl(), TQString(), bar);
         pixmapLogo->setMargin(0);
@@ -83,7 +83,7 @@ int DLogoAction::plug(TQWidget *widget, int index)
         return containerCount() - 1;
     }
 
-    int containerId = KAction::plug( widget, index );
+    int containerId = TDEAction::plug( widget, index );
 
     return containerId;
 }
diff --git a/digikam/libs/widgets/common/dlogoaction.h b/digikam/libs/widgets/common/dlogoaction.h
index 77322e2a..f716f748 100644
--- a/digikam/libs/widgets/common/dlogoaction.h
+++ b/digikam/libs/widgets/common/dlogoaction.h
@@ -35,7 +35,7 @@
 namespace Digikam 
 {
 
-class DIGIKAM_EXPORT DLogoAction : public KAction
+class DIGIKAM_EXPORT DLogoAction : public TDEAction
 {
   Q_OBJECT
   
diff --git a/digikam/libs/widgets/common/dpopupmenu.cpp b/digikam/libs/widgets/common/dpopupmenu.cpp
index a81eb02f..86b7af11 100644
--- a/digikam/libs/widgets/common/dpopupmenu.cpp
+++ b/digikam/libs/widgets/common/dpopupmenu.cpp
@@ -49,7 +49,7 @@ static TQImage s_dpopupmenu_sidePixmap;
 static TQColor s_dpopupmenu_sidePixmapColor;
 
 DPopupMenu::DPopupMenu(TQWidget* parent, const char* name)
-          : KPopupMenu(parent, name)
+          : TDEPopupMenu(parent, name)
 {
     // Must be initialized so that we know the size on first invocation
     if ( s_dpopupmenu_sidePixmap.isNull() )
@@ -131,27 +131,27 @@ TQColor DPopupMenu::calcPixmapColor()
 
 void DPopupMenu::setMinimumSize(const TQSize & s)
 {
-    KPopupMenu::setMinimumSize(s.width() + s_dpopupmenu_sidePixmap.width(), s.height());
+    TDEPopupMenu::setMinimumSize(s.width() + s_dpopupmenu_sidePixmap.width(), s.height());
 }
 
 void DPopupMenu::setMaximumSize(const TQSize & s)
 {
-    KPopupMenu::setMaximumSize(s.width() + s_dpopupmenu_sidePixmap.width(), s.height());
+    TDEPopupMenu::setMaximumSize(s.width() + s_dpopupmenu_sidePixmap.width(), s.height());
 }
 
 void DPopupMenu::setMinimumSize(int w, int h)
 {
-    KPopupMenu::setMinimumSize(w + s_dpopupmenu_sidePixmap.width(), h);
+    TDEPopupMenu::setMinimumSize(w + s_dpopupmenu_sidePixmap.width(), h);
 }
 
 void DPopupMenu::setMaximumSize(int w, int h)
 {
-  KPopupMenu::setMaximumSize(w + s_dpopupmenu_sidePixmap.width(), h);
+  TDEPopupMenu::setMaximumSize(w + s_dpopupmenu_sidePixmap.width(), h);
 }
 
 void DPopupMenu::resizeEvent(TQResizeEvent * e)
 {
-    KPopupMenu::resizeEvent(e);
+    TDEPopupMenu::resizeEvent(e);
 
     setFrameRect(TQStyle::visualRect(TQRect(s_dpopupmenu_sidePixmap.width(), 0,
                                           width() - s_dpopupmenu_sidePixmap.width(), height()), 
@@ -162,7 +162,7 @@ void DPopupMenu::resizeEvent(TQResizeEvent * e)
 void DPopupMenu::resize(int width, int height)
 {
     width = kMax(width, maximumSize().width());
-    KPopupMenu::resize(width, height);
+    TDEPopupMenu::resize(width, height);
 }
 
 void DPopupMenu::paintEvent(TQPaintEvent* e)
diff --git a/digikam/libs/widgets/common/dpopupmenu.h b/digikam/libs/widgets/common/dpopupmenu.h
index a9a55e57..2e3ed939 100644
--- a/digikam/libs/widgets/common/dpopupmenu.h
+++ b/digikam/libs/widgets/common/dpopupmenu.h
@@ -46,7 +46,7 @@ class TQSize;
 namespace Digikam
 {
 
-class DIGIKAM_EXPORT DPopupMenu : public KPopupMenu
+class DIGIKAM_EXPORT DPopupMenu : public TDEPopupMenu
 {
 
 public:
diff --git a/digikam/showfoto/showfoto.cpp b/digikam/showfoto/showfoto.cpp
index dc9c864b..2d5ee7a7 100644
--- a/digikam/showfoto/showfoto.cpp
+++ b/digikam/showfoto/showfoto.cpp
@@ -142,12 +142,12 @@ public:
 
     KURL                             lastOpenedDirectory;
 
-    KToggleAction                   *showBarAction;
+    TDEToggleAction                   *showBarAction;
 
-    KAction                         *openFilesInFolderAction;
-    KAction                         *fileOpenAction;
+    TDEAction                         *openFilesInFolderAction;
+    TDEAction                         *fileOpenAction;
 
-    KActionMenu                     *BCGAction;
+    TDEActionMenu                     *BCGAction;
 
     Digikam::ThumbBarView           *thumbBar;
     Digikam::ThumbBarItem           *currentItem;
@@ -211,25 +211,25 @@ ShowFoto::ShowFoto(const KURL::List& urlList)
 
     if ( !m_imagePluginLoader->pluginLibraryIsLoaded("digikamimageplugin_core") )
     {
-        d->BCGAction = new KActionMenu(i18n("Brightness/Contrast/Gamma"), 0, 0, "showfoto_bcg");
+        d->BCGAction = new TDEActionMenu(i18n("Brightness/Contrast/Gamma"), 0, 0, "showfoto_bcg");
         d->BCGAction->setDelayed(false);
 
-        KAction *incGammaAction = new KAction(i18n("Increase Gamma"), 0, ALT+Key_G,
+        TDEAction *incGammaAction = new TDEAction(i18n("Increase Gamma"), 0, ALT+Key_G,
                                             TQT_TQOBJECT(this), TQT_SLOT(slotChangeBCG()),
                                             actionCollection(), "gamma_plus");
-        KAction *decGammaAction = new KAction(i18n("Decrease Gamma"), 0, ALT+SHIFT+Key_G,
+        TDEAction *decGammaAction = new TDEAction(i18n("Decrease Gamma"), 0, ALT+SHIFT+Key_G,
                                             TQT_TQOBJECT(this), TQT_SLOT(slotChangeBCG()),
                                             actionCollection(), "gamma_minus");
-        KAction *incBrightAction = new KAction(i18n("Increase Brightness"), 0, ALT+Key_B,
+        TDEAction *incBrightAction = new TDEAction(i18n("Increase Brightness"), 0, ALT+Key_B,
                                             TQT_TQOBJECT(this), TQT_SLOT(slotChangeBCG()),
                                             actionCollection(), "brightness_plus");
-        KAction *decBrightAction = new KAction(i18n("Decrease Brightness"), 0, ALT+SHIFT+Key_B,
+        TDEAction *decBrightAction = new TDEAction(i18n("Decrease Brightness"), 0, ALT+SHIFT+Key_B,
                                             TQT_TQOBJECT(this), TQT_SLOT(slotChangeBCG()),
                                             actionCollection(), "brightness_minus");
-        KAction *incContrastAction = new KAction(i18n("Increase Contrast"), 0, ALT+Key_C,
+        TDEAction *incContrastAction = new TDEAction(i18n("Increase Contrast"), 0, ALT+Key_C,
                                             TQT_TQOBJECT(this), TQT_SLOT(slotChangeBCG()),
                                             actionCollection(), "contrast_plus");
-        KAction *decContrastAction = new KAction(i18n("Decrease Contrast"), 0, ALT+SHIFT+Key_C,
+        TDEAction *decContrastAction = new TDEAction(i18n("Decrease Contrast"), 0, ALT+SHIFT+Key_C,
                                             TQT_TQOBJECT(this), TQT_SLOT(slotChangeBCG()),
                                             actionCollection(), "contrast_minus");
 
@@ -240,7 +240,7 @@ ShowFoto::ShowFoto(const KURL::List& urlList)
         d->BCGAction->insert(incGammaAction);
         d->BCGAction->insert(decGammaAction);
 
-        TQPtrList<KAction> bcg_actions;
+        TQPtrList<TDEAction> bcg_actions;
         bcg_actions.append( d->BCGAction );
         unplugActionList( "showfoto_bcg" );
         plugActionList( "showfoto_bcg", bcg_actions );
@@ -352,7 +352,7 @@ void ShowFoto::show()
 
     // Display application window.
 
-    KMainWindow::show();
+    TDEMainWindow::show();
 
     // Report errors from ICC repository path.
 
@@ -481,7 +481,7 @@ void ShowFoto::setupActions()
     d->fileOpenAction = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotOpenFile()),
                         actionCollection(), "showfoto_open_file");
 
-    d->openFilesInFolderAction = new KAction(i18n("Open folder"),
+    d->openFilesInFolderAction = new TDEAction(i18n("Open folder"),
                                              "folder_image",
                                              CTRL+SHIFT+Key_O,
                                              TQT_TQOBJECT(this),
@@ -493,7 +493,7 @@ void ShowFoto::setupActions()
 
     // Extra 'View' menu actions ---------------------------------------------
 
-    d->showBarAction = new KToggleAction(i18n("Show Thumbnails"), 0,
+    d->showBarAction = new TDEToggleAction(i18n("Show Thumbnails"), 0,
                                          CTRL+Key_T,
                                          TQT_TQOBJECT(this), TQT_SLOT(slotToggleShowBar()),
                                          actionCollection(), "shofoto_showthumbs");
diff --git a/digikam/utilities/cameragui/albumselectdialog.cpp b/digikam/utilities/cameragui/albumselectdialog.cpp
index 5850d437..785b8bfd 100644
--- a/digikam/utilities/cameragui/albumselectdialog.cpp
+++ b/digikam/utilities/cameragui/albumselectdialog.cpp
@@ -275,7 +275,7 @@ void AlbumSelectDialog::slotSelectionChanged()
 void AlbumSelectDialog::slotContextMenu(TQListViewItem *, const TQPoint &, int)
 {
     TQPopupMenu popmenu(d->folderView);
-    KAction *action = new KAction(i18n( "Create New Album" ),
+    TDEAction *action = new TDEAction(i18n( "Create New Album" ),
                                   "albumfolder-new", 0, TQT_TQOBJECT(this),
                                   TQT_SLOT( slotUser1() ),
                                   TQT_TQOBJECT(&popmenu));
diff --git a/digikam/utilities/cameragui/cameraiconview.cpp b/digikam/utilities/cameragui/cameraiconview.cpp
index 81fee67f..18f1ea2e 100644
--- a/digikam/utilities/cameragui/cameraiconview.cpp
+++ b/digikam/utilities/cameragui/cameraiconview.cpp
@@ -750,7 +750,7 @@ void CameraIconView::slotRightButtonClicked(const TQPoint&)
 
 void CameraIconView::uploadItemPopupMenu(const KURL::List& srcURLs)
 {
-    KPopupMenu popMenu(this);
+    TDEPopupMenu popMenu(this);
     popMenu.insertTitle(SmallIcon("digikam"), d->cameraUI->cameraTitle());
     popMenu.insertItem( SmallIcon("goto"), i18n("&Upload to camera"), 10 );
     popMenu.insertSeparator(-1);
diff --git a/digikam/utilities/imageeditor/canvas/canvas.cpp b/digikam/utilities/imageeditor/canvas/canvas.cpp
index a4eae4a0..edda7174 100644
--- a/digikam/utilities/imageeditor/canvas/canvas.cpp
+++ b/digikam/utilities/imageeditor/canvas/canvas.cpp
@@ -139,7 +139,7 @@ public:
 
     TQWidget             *parent;
 
-    KPopupFrame         *panIconPopup;
+    TDEPopupFrame         *panIconPopup;
 
     DImgInterface       *im;
 
@@ -1340,7 +1340,7 @@ void Canvas::slotCornerButtonPressed()
         d->panIconPopup = 0;
     }
 
-    d->panIconPopup         = new KPopupFrame(this);
+    d->panIconPopup         = new TDEPopupFrame(this);
     ImagePanIconWidget *pan = new ImagePanIconWidget(180, 120, d->panIconPopup);
     d->panIconPopup->setMainWidget(pan);
 
diff --git a/digikam/utilities/imageeditor/editor/editorwindow.cpp b/digikam/utilities/imageeditor/editor/editorwindow.cpp
index f668ce9d..117bce33 100644
--- a/digikam/utilities/imageeditor/editor/editorwindow.cpp
+++ b/digikam/utilities/imageeditor/editor/editorwindow.cpp
@@ -113,7 +113,7 @@ namespace Digikam
 {
 
 EditorWindow::EditorWindow(const char *name)
-            : KMainWindow(0, name, WType_TopLevel)
+            : TDEMainWindow(0, name, WType_TopLevel)
 {
     d = new EditorWindowPriv;
 
@@ -167,7 +167,7 @@ EditorStackView* EditorWindow::editorStackView() const
 void EditorWindow::setupContextMenu()
 {
     m_contextMenu         = new DPopupMenu(this);
-    KActionCollection *ac = actionCollection();
+    TDEActionCollection *ac = actionCollection();
     if( ac->action("editorwindow_backward") ) ac->action("editorwindow_backward")->plug(m_contextMenu);
     if( ac->action("editorwindow_forward") ) ac->action("editorwindow_forward")->plug(m_contextMenu);
     m_contextMenu->insertSeparator();
@@ -264,13 +264,13 @@ void EditorWindow::setupStandardActions()
     m_forwardAction = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(slotForward()),
                                   actionCollection(), "editorwindow_forward");
 
-    m_firstAction = new KAction(i18n("&First"), "start",
-                                KStdAccel::shortcut( KStdAccel::Home),
+    m_firstAction = new TDEAction(i18n("&First"), "start",
+                                TDEStdAccel::shortcut( TDEStdAccel::Home),
                                 TQT_TQOBJECT(this), TQT_SLOT(slotFirst()),
                                 actionCollection(), "editorwindow_first");
 
-    m_lastAction = new KAction(i18n("&Last"), "finish",
-                               KStdAccel::shortcut( KStdAccel::End),
+    m_lastAction = new TDEAction(i18n("&Last"), "finish",
+                               TDEStdAccel::shortcut( TDEStdAccel::End),
                                TQT_TQOBJECT(this), TQT_SLOT(slotLast()),
                                actionCollection(), "editorwindow_last");
 
@@ -287,12 +287,12 @@ void EditorWindow::setupStandardActions()
     m_saveAsAction->setEnabled(false);
     m_revertAction->setEnabled(false);
 
-    d->filePrintAction = new KAction(i18n("Print Image..."), "fileprint",
+    d->filePrintAction = new TDEAction(i18n("Print Image..."), "fileprint",
                                      CTRL+Key_P,
                                      TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()),
                                      actionCollection(), "editorwindow_print");
 
-    m_fileDeleteAction = new KAction(i18n("Move to Trash"), "edittrash",
+    m_fileDeleteAction = new TDEAction(i18n("Move to Trash"), "edittrash",
                                      Key_Delete,
                                      TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCurrentItem()),
                                      actionCollection(), "editorwindow_delete");
@@ -306,8 +306,8 @@ void EditorWindow::setupStandardActions()
 
     d->copyAction->setEnabled(false);
 
-    m_undoAction = new KToolBarPopupAction(i18n("Undo"), "undo",
-                                           KStdAccel::shortcut(KStdAccel::Undo),
+    m_undoAction = new TDEToolBarPopupAction(i18n("Undo"), "undo",
+                                           TDEStdAccel::shortcut(TDEStdAccel::Undo),
                                            TQT_TQOBJECT(m_canvas), TQT_SLOT(slotUndo()),
                                            actionCollection(), "editorwindow_undo");
 
@@ -319,8 +319,8 @@ void EditorWindow::setupStandardActions()
 
     m_undoAction->setEnabled(false);
 
-    m_redoAction = new KToolBarPopupAction(i18n("Redo"), "redo",
-                                           KStdAccel::shortcut(KStdAccel::Redo),
+    m_redoAction = new TDEToolBarPopupAction(i18n("Redo"), "redo",
+                                           TDEStdAccel::shortcut(TDEStdAccel::Redo),
                                            TQT_TQOBJECT(m_canvas), TQT_SLOT(slotRedo()),
                                            actionCollection(), "editorwindow_redo");
 
@@ -332,7 +332,7 @@ void EditorWindow::setupStandardActions()
 
     m_redoAction->setEnabled(false);
 
-    d->selectAllAction = new KAction(i18n("Select All"),
+    d->selectAllAction = new TDEAction(i18n("Select All"),
                                      0,
                                      CTRL+Key_A,
                                      TQT_TQOBJECT(m_canvas),
@@ -340,7 +340,7 @@ void EditorWindow::setupStandardActions()
                                      actionCollection(),
                                      "editorwindow_selectAll");
 
-    d->selectNoneAction = new KAction(i18n("Select None"),
+    d->selectNoneAction = new TDEAction(i18n("Select None"),
                                      0,
                                      CTRL+SHIFT+Key_A,
                                      TQT_TQOBJECT(m_canvas),
@@ -356,18 +356,18 @@ void EditorWindow::setupStandardActions()
     d->zoomMinusAction = KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT(slotDecreaseZoom()),
                                              actionCollection(), "editorwindow_zoomminus");
 
-    d->zoomTo100percents = new KAction(i18n("Zoom to 100%"), "viewmag1",
+    d->zoomTo100percents = new TDEAction(i18n("Zoom to 100%"), "viewmag1",
                                        ALT+CTRL+Key_0,      // NOTE: Photoshop 7 use ALT+CTRL+0.
                                        TQT_TQOBJECT(this), TQT_SLOT(slotZoomTo100Percents()),
                                        actionCollection(), "editorwindow_zoomto100percents");
 
 
-    d->zoomFitToWindowAction = new KToggleAction(i18n("Fit to &Window"), "view_fit_window",
+    d->zoomFitToWindowAction = new TDEToggleAction(i18n("Fit to &Window"), "view_fit_window",
                                        CTRL+SHIFT+Key_E,    // NOTE: Gimp 2 use CTRL+SHIFT+E.
                                        TQT_TQOBJECT(this), TQT_SLOT(slotToggleFitToWindow()),
                                        actionCollection(), "editorwindow_zoomfit2window");
 
-    d->zoomFitToSelectAction = new KAction(i18n("Fit to &Selection"), "viewmagfit",
+    d->zoomFitToSelectAction = new TDEAction(i18n("Fit to &Selection"), "viewmagfit",
                                          ALT+CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotFitToSelect()),
                                          actionCollection(), "editorwindow_zoomfit2select");
     d->zoomFitToSelectAction->setEnabled(false);
@@ -401,38 +401,38 @@ void EditorWindow::setupStandardActions()
             TQT_TQOBJECT(this), TQT_SLOT(slotZoomTextChanged(const TQString &)) );
 
     // Do not use std KDE action for full screen because action text is too large for app. toolbar.
-    m_fullScreenAction = new KToggleAction(i18n("Full Screen"), "window_fullscreen",
+    m_fullScreenAction = new TDEToggleAction(i18n("Full Screen"), "window_fullscreen",
                                            CTRL+SHIFT+Key_F, TQT_TQOBJECT(this),
                                            TQT_SLOT(slotToggleFullScreen()),
                                            actionCollection(), "editorwindow_fullscreen");
     m_fullScreenAction->setWhatsThis(i18n("Toggle the window to full screen mode"));
 
-    d->slideShowAction = new KAction(i18n("Slideshow"), "slideshow", Key_F9,
+    d->slideShowAction = new TDEAction(i18n("Slideshow"), "slideshow", Key_F9,
                                      TQT_TQOBJECT(this), TQT_SLOT(slotToggleSlideShow()),
                                      actionCollection(),"editorwindow_slideshow");
 
-    d->viewUnderExpoAction = new KToggleAction(i18n("Under-Exposure Indicator"), "underexposure",
+    d->viewUnderExpoAction = new TDEToggleAction(i18n("Under-Exposure Indicator"), "underexposure",
                                             Key_F10, TQT_TQOBJECT(this),
                                             TQT_SLOT(slotToggleUnderExposureIndicator()),
                                             actionCollection(),"editorwindow_underexposure");
 
-    d->viewOverExpoAction = new KToggleAction(i18n("Over-Exposure Indicator"), "overexposure",
+    d->viewOverExpoAction = new TDEToggleAction(i18n("Over-Exposure Indicator"), "overexposure",
                                             Key_F11, TQT_TQOBJECT(this),
                                             TQT_SLOT(slotToggleOverExposureIndicator()),
                                             actionCollection(),"editorwindow_overexposure");
 
-    d->viewCMViewAction = new KToggleAction(i18n("Color Managed View"), "tv",
+    d->viewCMViewAction = new TDEToggleAction(i18n("Color Managed View"), "tv",
                                             Key_F12, TQT_TQOBJECT(this),
                                             TQT_SLOT(slotToggleColorManagedView()),
                                             actionCollection(),"editorwindow_cmview");
 
     // -- Standard 'Transform' menu actions ---------------------------------------------
 
-    d->resizeAction = new KAction(i18n("&Resize..."), "resize_image", 0,
+    d->resizeAction = new TDEAction(i18n("&Resize..."), "resize_image", 0,
                                   TQT_TQOBJECT(this), TQT_SLOT(slotResize()),
                                   actionCollection(), "editorwindow_resize");
 
-    d->cropAction = new KAction(i18n("Crop"), "crop",
+    d->cropAction = new TDEAction(i18n("Crop"), "crop",
                                 CTRL+Key_X,
                                 TQT_TQOBJECT(m_canvas), TQT_SLOT(slotCrop()),
                                 actionCollection(), "editorwindow_crop");
@@ -443,25 +443,25 @@ void EditorWindow::setupStandardActions()
 
     // -- Standard 'Flip' menu actions ---------------------------------------------
 
-    d->flipHorizAction = new KAction(i18n("FlipQt::Horizontally"), "mirror", CTRL+Key_Asterisk,
+    d->flipHorizAction = new TDEAction(i18n("FlipQt::Horizontally"), "mirror", CTRL+Key_Asterisk,
                                    TQT_TQOBJECT(m_canvas), TQT_SLOT(slotFlipHoriz()),
                                    actionCollection(), "editorwindow_flip_horiz");
     d->flipHorizAction->setEnabled(false);
 
-    d->flipVertAction = new KAction(i18n("FlipQt::Vertically"), "flip", CTRL+Key_Slash,
+    d->flipVertAction = new TDEAction(i18n("FlipQt::Vertically"), "flip", CTRL+Key_Slash,
                                    TQT_TQOBJECT(m_canvas), TQT_SLOT(slotFlipVert()),
                                    actionCollection(), "editorwindow_flip_vert");
     d->flipVertAction->setEnabled(false);
 
     // -- Standard 'Rotate' menu actions ----------------------------------------
 
-    d->rotateLeftAction = new KAction(i18n("Rotate Left"),
+    d->rotateLeftAction = new TDEAction(i18n("Rotate Left"),
                                      "rotate_ccw", SHIFT+CTRL+Key_Left,
                                      TQT_TQOBJECT(m_canvas), TQT_SLOT(slotRotate270()),
                                      actionCollection(),
                                      "editorwindow_rotate_left");
     d->rotateLeftAction->setEnabled(false);
-    d->rotateRightAction  = new KAction(i18n("Rotate Right"),
+    d->rotateRightAction  = new TDEAction(i18n("Rotate Right"),
                                      "rotate_cw", SHIFT+CTRL+Key_Right,
                                      TQT_TQOBJECT(m_canvas), TQT_SLOT(slotRotate90()),
                                      actionCollection(),
@@ -478,7 +478,7 @@ void EditorWindow::setupStandardActions()
 
     // -----------------------------------------------------------------------------------------
 
-    m_themeMenuAction = new KSelectAction(i18n("&Themes"), 0, actionCollection(), "theme_menu");
+    m_themeMenuAction = new TDESelectAction(i18n("&Themes"), 0, actionCollection(), "theme_menu");
     m_themeMenuAction->setItems(ThemeEngine::instance()->themeNames());
 
     connect(m_themeMenuAction, TQT_SIGNAL(activated(const TQString&)),
@@ -489,19 +489,19 @@ void EditorWindow::setupStandardActions()
 
     // -- Standard 'Help' menu actions ---------------------------------------------
 
-    d->donateMoneyAction = new KAction(i18n("Donate..."),
+    d->donateMoneyAction = new TDEAction(i18n("Donate..."),
                                        0, 0,
                                        TQT_TQOBJECT(this), TQT_SLOT(slotDonateMoney()),
                                        actionCollection(),
                                        "editorwindow_donatemoney");
 
-    d->contributeAction = new KAction(i18n("Contribute..."),
+    d->contributeAction = new TDEAction(i18n("Contribute..."),
                                       0, 0,
                                       TQT_TQOBJECT(this), TQT_SLOT(slotContribute()),
                                       actionCollection(),
                                       "editorwindow_contribute");
 
-    d->rawCameraListAction = new KAction(i18n("Supported RAW Cameras"),
+    d->rawCameraListAction = new TDEAction(i18n("Supported RAW Cameras"),
                                          "kdcraw",
                                          0,
                                          TQT_TQOBJECT(this),
@@ -512,7 +512,7 @@ void EditorWindow::setupStandardActions()
 
 void EditorWindow::setupStandardAccelerators()
 {
-    d->accelerators = new KAccel(this);
+    d->accelerators = new TDEAccel(this);
 
     d->accelerators->insert("Exit fullscreen", i18n("Exit Fullscreen mode"),
                     i18n("Exit out of the fullscreen mode"),
@@ -785,7 +785,7 @@ void EditorWindow::slotEscapePressed()
         m_fullScreenAction->activate();
 }
 
-void EditorWindow::plugActionAccel(KAction* action)
+void EditorWindow::plugActionAccel(TDEAction* action)
 {
     if (!action)
         return;
@@ -798,7 +798,7 @@ void EditorWindow::plugActionAccel(KAction* action)
                     TQT_SLOT(activate()));
 }
 
-void EditorWindow::unplugActionAccel(KAction* action)
+void EditorWindow::unplugActionAccel(TDEAction* action)
 {
     d->accelerators->remove(action->text());
 }
@@ -1050,11 +1050,11 @@ void EditorWindow::slotToggleFullScreen()
         topDock()->show();
         bottomDock()->show();
 
-        TQObject* obj = child("ToolBar","KToolBar");
+        TQObject* obj = child("ToolBar","TDEToolBar");
 
         if (obj)
         {
-            KToolBar* toolBar = static_cast<KToolBar*>(TQT_TQWIDGET(obj));
+            TDEToolBar* toolBar = static_cast<TDEToolBar*>(TQT_TQWIDGET(obj));
 
             if (m_fullScreenAction->isPlugged(toolBar) && d->removeFullScreenButton)
                 m_fullScreenAction->unplug(toolBar);
@@ -1096,11 +1096,11 @@ void EditorWindow::slotToggleFullScreen()
         rightDock()->hide();
         bottomDock()->hide();
 
-        TQObject* obj = child("ToolBar","KToolBar");
+        TQObject* obj = child("ToolBar","TDEToolBar");
 
         if (obj)
         {
-            KToolBar* toolBar = static_cast<KToolBar*>(TQT_TQWIDGET(obj));
+            TDEToolBar* toolBar = static_cast<TDEToolBar*>(TQT_TQWIDGET(obj));
 
             if (d->fullScreenHideToolBar)
             {
@@ -1290,8 +1290,8 @@ void EditorWindow::slotSelected(bool val)
 
 void EditorWindow::hideToolBars()
 {
-    TQPtrListIterator<KToolBar> it = toolBarIterator();
-    KToolBar* bar;
+    TQPtrListIterator<TDEToolBar> it = toolBarIterator();
+    TDEToolBar* bar;
 
     for(;it.current()!=0L; ++it)
     {
@@ -1306,8 +1306,8 @@ void EditorWindow::hideToolBars()
 
 void EditorWindow::showToolBars()
 {
-    TQPtrListIterator<KToolBar> it = toolBarIterator();
-    KToolBar* bar;
+    TQPtrListIterator<TDEToolBar> it = toolBarIterator();
+    TDEToolBar* bar;
 
     for( ; it.current()!=0L ; ++it)
     {
diff --git a/digikam/utilities/imageeditor/editor/editorwindow.h b/digikam/utilities/imageeditor/editor/editorwindow.h
index 7360e1b2..2faef0eb 100644
--- a/digikam/utilities/imageeditor/editor/editorwindow.h
+++ b/digikam/utilities/imageeditor/editor/editorwindow.h
@@ -44,10 +44,10 @@ class TQSplitter;
 class TQPopupMenu;
 class TQLabel;
 
-class KToolBarPopupAction;
-class KToggleAction;
-class KAction;
-class KSelectAction;
+class TDEToolBarPopupAction;
+class TDEToggleAction;
+class TDEAction;
+class TDESelectAction;
 
 namespace Digikam
 {
@@ -63,7 +63,7 @@ class SlideShowSettings;
 class EditorStackView;
 class EditorWindowPriv;
 
-class DIGIKAM_EXPORT EditorWindow : public KMainWindow
+class DIGIKAM_EXPORT EditorWindow : public TDEMainWindow
 {
     Q_OBJECT
   
@@ -94,21 +94,21 @@ protected:
 
     TQSplitter               *m_splitter;
 
-    KAction                 *m_saveAction;
-    KAction                 *m_saveAsAction;
-    KAction                 *m_revertAction;
-    KAction                 *m_fileDeleteAction;
-    KAction                 *m_forwardAction;
-    KAction                 *m_backwardAction;
-    KAction                 *m_firstAction;
-    KAction                 *m_lastAction;
+    TDEAction                 *m_saveAction;
+    TDEAction                 *m_saveAsAction;
+    TDEAction                 *m_revertAction;
+    TDEAction                 *m_fileDeleteAction;
+    TDEAction                 *m_forwardAction;
+    TDEAction                 *m_backwardAction;
+    TDEAction                 *m_firstAction;
+    TDEAction                 *m_lastAction;
 
-    KToggleAction           *m_fullScreenAction;
+    TDEToggleAction           *m_fullScreenAction;
 
-    KSelectAction           *m_themeMenuAction;
+    TDESelectAction           *m_themeMenuAction;
 
-    KToolBarPopupAction     *m_undoAction;
-    KToolBarPopupAction     *m_redoAction;
+    TDEToolBarPopupAction     *m_undoAction;
+    TDEToolBarPopupAction     *m_redoAction;
 
     DPopupMenu              *m_contextMenu;
     EditorStackView         *m_stackView;
@@ -134,8 +134,8 @@ protected:
 
     void printImage(KURL url);
 
-    void plugActionAccel(KAction* action);
-    void unplugActionAccel(KAction* action);
+    void plugActionAccel(TDEAction* action);
+    void unplugActionAccel(TDEAction* action);
 
     void unLoadImagePlugins();
     void loadImagePlugins();
diff --git a/digikam/utilities/imageeditor/editor/editorwindowprivate.h b/digikam/utilities/imageeditor/editor/editorwindowprivate.h
index 51265b94..df07d0bd 100644
--- a/digikam/utilities/imageeditor/editor/editorwindowprivate.h
+++ b/digikam/utilities/imageeditor/editor/editorwindowprivate.h
@@ -29,12 +29,12 @@ class TQToolButton;
 class TQLabel;
 
 class KComboBox;
-class KAction;
-class KToggleAction;
+class TDEAction;
+class TDEToggleAction;
 class KWidgetAction;
-class KSelectAction;
-class KActionMenu;
-class KAccel;
+class TDESelectAction;
+class TDEActionMenu;
+class TDEAccel;
 
 namespace Digikam
 {
@@ -100,36 +100,36 @@ public:
     TQToolButton               *underExposureIndicator; 
     TQToolButton               *overExposureIndicator; 
 
-    KAction                   *rawCameraListAction;
-    KAction                   *donateMoneyAction;
-    KAction                   *contributeAction;
-    KAction                   *filePrintAction;
-    KAction                   *copyAction;
-    KAction                   *resizeAction;
-    KAction                   *cropAction;
-    KAction                   *zoomPlusAction;
-    KAction                   *zoomMinusAction;
-    KAction                   *zoomTo100percents;
-    KAction                   *zoomFitToSelectAction;
-    KAction                   *rotateLeftAction;
-    KAction                   *rotateRightAction;
-    KAction                   *flipHorizAction;
-    KAction                   *flipVertAction;
-    KAction                   *slideShowAction;
-    KAction                   *selectAllAction;
-    KAction                   *selectNoneAction;
-
-    KToggleAction             *zoomFitToWindowAction;
-    KToggleAction             *viewCMViewAction;
-    KToggleAction             *viewUnderExpoAction;
-    KToggleAction             *viewOverExpoAction;
-    KToggleAction             *showMenuBarAction;
+    TDEAction                   *rawCameraListAction;
+    TDEAction                   *donateMoneyAction;
+    TDEAction                   *contributeAction;
+    TDEAction                   *filePrintAction;
+    TDEAction                   *copyAction;
+    TDEAction                   *resizeAction;
+    TDEAction                   *cropAction;
+    TDEAction                   *zoomPlusAction;
+    TDEAction                   *zoomMinusAction;
+    TDEAction                   *zoomTo100percents;
+    TDEAction                   *zoomFitToSelectAction;
+    TDEAction                   *rotateLeftAction;
+    TDEAction                   *rotateRightAction;
+    TDEAction                   *flipHorizAction;
+    TDEAction                   *flipVertAction;
+    TDEAction                   *slideShowAction;
+    TDEAction                   *selectAllAction;
+    TDEAction                   *selectNoneAction;
+
+    TDEToggleAction             *zoomFitToWindowAction;
+    TDEToggleAction             *viewCMViewAction;
+    TDEToggleAction             *viewUnderExpoAction;
+    TDEToggleAction             *viewOverExpoAction;
+    TDEToggleAction             *showMenuBarAction;
 
     KWidgetAction             *zoomComboAction;
 
     KComboBox                 *zoomCombo;
 
-    KAccel                    *accelerators;
+    TDEAccel                    *accelerators;
 
     ICCSettingsContainer      *ICCSettings;
 
diff --git a/digikam/utilities/imageeditor/editor/imagewindow.cpp b/digikam/utilities/imageeditor/editor/imagewindow.cpp
index 21ee9c64..43bad31e 100644
--- a/digikam/utilities/imageeditor/editor/imagewindow.cpp
+++ b/digikam/utilities/imageeditor/editor/imagewindow.cpp
@@ -129,17 +129,17 @@ public:
     KURL                      urlCurrent;
 
     // Rating actions.
-    KAction                  *star0;
-    KAction                  *star1;
-    KAction                  *star2;
-    KAction                  *star3;
-    KAction                  *star4;
-    KAction                  *star5;
+    TDEAction                  *star0;
+    TDEAction                  *star1;
+    TDEAction                  *star2;
+    TDEAction                  *star3;
+    TDEAction                  *star4;
+    TDEAction                  *star5;
 
     // Delete actions
-    KAction                  *fileDeletePermanentlyAction;
-    KAction                  *fileDeletePermanentlyDirectlyAction;
-    KAction                  *fileTrashDirectlyAction;
+    TDEAction                  *fileDeletePermanentlyAction;
+    TDEAction                  *fileDeletePermanentlyDirectlyAction;
+    TDEAction                  *fileTrashDirectlyAction;
 
     ImageInfoList             imageInfoList;
     ImageInfo                *imageInfoCurrent;
@@ -311,29 +311,29 @@ void ImageWindow::setupActions()
 
     // -- Rating actions ---------------------------------------------------------------
 
-    d->star0 = new KAction(i18n("Assign Rating \"No Stars\""), CTRL+Key_0,
+    d->star0 = new TDEAction(i18n("Assign Rating \"No Stars\""), CTRL+Key_0,
                           TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingNoStar()),
                           actionCollection(), "imageview_ratenostar");
-    d->star1 = new KAction(i18n("Assign Rating \"One Star\""), CTRL+Key_1,
+    d->star1 = new TDEAction(i18n("Assign Rating \"One Star\""), CTRL+Key_1,
                           TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingOneStar()),
                           actionCollection(), "imageview_rateonestar");
-    d->star2 = new KAction(i18n("Assign Rating \"Two Stars\""), CTRL+Key_2,
+    d->star2 = new TDEAction(i18n("Assign Rating \"Two Stars\""), CTRL+Key_2,
                           TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingTwoStar()),
                           actionCollection(), "imageview_ratetwostar");
-    d->star3 = new KAction(i18n("Assign Rating \"Three Stars\""), CTRL+Key_3,
+    d->star3 = new TDEAction(i18n("Assign Rating \"Three Stars\""), CTRL+Key_3,
                           TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingThreeStar()),
                           actionCollection(), "imageview_ratethreestar");
-    d->star4 = new KAction(i18n("Assign Rating \"Four Stars\""), CTRL+Key_4,
+    d->star4 = new TDEAction(i18n("Assign Rating \"Four Stars\""), CTRL+Key_4,
                           TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingFourStar()),
                           actionCollection(), "imageview_ratefourstar");
-    d->star5 = new KAction(i18n("Assign Rating \"Five Stars\""), CTRL+Key_5,
+    d->star5 = new TDEAction(i18n("Assign Rating \"Five Stars\""), CTRL+Key_5,
                           TQT_TQOBJECT(this), TQT_SLOT(slotAssignRatingFiveStar()),
                           actionCollection(), "imageview_ratefivestar");
 
     // -- Special Delete actions ---------------------------------------------------------------
 
     // Pop up dialog to ask user whether to permanently delete
-    d->fileDeletePermanentlyAction = new KAction(i18n("Delete File Permanently"),
+    d->fileDeletePermanentlyAction = new TDEAction(i18n("Delete File Permanently"),
             "editdelete",
             SHIFT+Key_Delete,
             TQT_TQOBJECT(this),
@@ -343,7 +343,7 @@ void ImageWindow::setupActions()
 
     // These two actions are hidden, no menu entry, no toolbar entry, no shortcut.
     // Power users may add them.
-    d->fileDeletePermanentlyDirectlyAction = new KAction(i18n("Delete Permanently without Confirmation"),
+    d->fileDeletePermanentlyDirectlyAction = new TDEAction(i18n("Delete Permanently without Confirmation"),
             "editdelete",
             0,
             TQT_TQOBJECT(this),
@@ -351,7 +351,7 @@ void ImageWindow::setupActions()
             actionCollection(),
             "image_delete_permanently_directly");
 
-    d->fileTrashDirectlyAction             = new KAction(i18n("Move to Trash without Confirmation"),
+    d->fileTrashDirectlyAction             = new TDEAction(i18n("Move to Trash without Confirmation"),
             "edittrash",
             0,
             TQT_TQOBJECT(this),
diff --git a/digikam/utilities/imageeditor/rawimport/rawpreview.cpp b/digikam/utilities/imageeditor/rawimport/rawpreview.cpp
index 3bdd5cc8..7b70f7d0 100644
--- a/digikam/utilities/imageeditor/rawimport/rawpreview.cpp
+++ b/digikam/utilities/imageeditor/rawimport/rawpreview.cpp
@@ -68,7 +68,7 @@ public:
 
     TQToolButton           *cornerButton;
 
-    KPopupFrame           *panIconPopup;
+    TDEPopupFrame           *panIconPopup;
 
     KURL                   url;
 
@@ -214,7 +214,7 @@ void RawPreview::slotCornerButtonPressed()
         d->panIconPopup = 0;
     }
 
-    d->panIconPopup    = new KPopupFrame(this);
+    d->panIconPopup    = new TDEPopupFrame(this);
     PanIconWidget *pan = new PanIconWidget(d->panIconPopup);
     pan->setImage(180, 120, postProcessedImage());
     d->panIconPopup->setMainWidget(pan);
diff --git a/digikam/utilities/lighttable/lighttablebar.cpp b/digikam/utilities/lighttable/lighttablebar.cpp
index e271781c..d09e4320 100644
--- a/digikam/utilities/lighttable/lighttablebar.cpp
+++ b/digikam/utilities/lighttable/lighttablebar.cpp
@@ -167,7 +167,7 @@ void LightTableBar::contentsMouseReleaseEvent(TQMouseEvent *e)
 
     if (e->button() == Qt::RightButton)
     {
-        KPopupMenu popmenu(this);
+        TDEPopupMenu popmenu(this);
 
         if (item)
         {
diff --git a/digikam/utilities/lighttable/lighttablepreview.cpp b/digikam/utilities/lighttable/lighttablepreview.cpp
index 8387fa3d..60a0f1d8 100644
--- a/digikam/utilities/lighttable/lighttablepreview.cpp
+++ b/digikam/utilities/lighttable/lighttablepreview.cpp
@@ -108,7 +108,7 @@ public:
 
     TQToolButton       *cornerButton;
 
-    KPopupFrame       *panIconPopup;
+    TDEPopupFrame       *panIconPopup;
 
     PanIconWidget     *panIconWidget;
 
@@ -537,7 +537,7 @@ void LightTablePreview::slotCornerButtonPressed()
         d->panIconPopup = 0;
     }
 
-    d->panIconPopup    = new KPopupFrame(this);
+    d->panIconPopup    = new TDEPopupFrame(this);
     PanIconWidget *pan = new PanIconWidget(d->panIconPopup);
     pan->setImage(180, 120, getImage());
     d->panIconPopup->setMainWidget(pan);
diff --git a/digikam/utilities/lighttable/lighttablewindow.cpp b/digikam/utilities/lighttable/lighttablewindow.cpp
index 761b1cf7..b4209eb5 100644
--- a/digikam/utilities/lighttable/lighttablewindow.cpp
+++ b/digikam/utilities/lighttable/lighttablewindow.cpp
@@ -87,7 +87,7 @@ bool LightTableWindow::lightTableWindowCreated()
 }
 
 LightTableWindow::LightTableWindow()
-                : KMainWindow(0, "lighttable", WType_TopLevel)
+                : TDEMainWindow(0, "lighttable", WType_TopLevel)
 {
     d = new LightTableWindowPriv;
     m_instance = this;
@@ -336,46 +336,46 @@ void LightTableWindow::setupActions()
                                    actionCollection(), "lighttable_forward");
     d->forwardAction->setEnabled(false);
 
-    d->firstAction = new KAction(i18n("&First"), "start",
-                                 KStdAccel::shortcut( KStdAccel::Home),
+    d->firstAction = new TDEAction(i18n("&First"), "start",
+                                 TDEStdAccel::shortcut( TDEStdAccel::Home),
                                  TQT_TQOBJECT(this), TQT_SLOT(slotFirst()),
                                  actionCollection(), "lighttable_first");
     d->firstAction->setEnabled(false);
 
-    d->lastAction = new KAction(i18n("&Last"), "finish",
-                                KStdAccel::shortcut( KStdAccel::End),
+    d->lastAction = new TDEAction(i18n("&Last"), "finish",
+                                TDEStdAccel::shortcut( TDEStdAccel::End),
                                 TQT_TQOBJECT(this), TQT_SLOT(slotLast()),
                                 actionCollection(), "lighttable_last");
     d->lastAction->setEnabled(false);
 
-    d->setItemLeftAction = new KAction(i18n("On Left"), "previous",
+    d->setItemLeftAction = new TDEAction(i18n("On Left"), "previous",
                                        CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotSetItemLeft()),
                                        actionCollection(), "lighttable_setitemleft");
     d->setItemLeftAction->setEnabled(false);
     d->setItemLeftAction->setWhatsThis(i18n("Show item on left panel"));
 
-    d->setItemRightAction = new KAction(i18n("On Right"), "next",
+    d->setItemRightAction = new TDEAction(i18n("On Right"), "next",
                                        CTRL+Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotSetItemRight()),
                                        actionCollection(), "lighttable_setitemright");
     d->setItemRightAction->setEnabled(false);
     d->setItemRightAction->setWhatsThis(i18n("Show item on right panel"));
 
-    d->editItemAction = new KAction(i18n("Edit"), "editimage",
+    d->editItemAction = new TDEAction(i18n("Edit"), "editimage",
                                        Key_F4, TQT_TQOBJECT(this), TQT_SLOT(slotEditItem()),
                                        actionCollection(), "lighttable_edititem");
     d->editItemAction->setEnabled(false);
 
-    d->removeItemAction = new KAction(i18n("Remove item from LightTable"), "fileclose",
+    d->removeItemAction = new TDEAction(i18n("Remove item from LightTable"), "fileclose",
                                        CTRL+Key_K, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()),
                                        actionCollection(), "lighttable_removeitem");
     d->removeItemAction->setEnabled(false);
 
-    d->clearListAction = new KAction(i18n("Remove all items from LightTable"), "editshred",
+    d->clearListAction = new TDEAction(i18n("Remove all items from LightTable"), "editshred",
                                      CTRL+SHIFT+Key_K, TQT_TQOBJECT(this), TQT_SLOT(slotClearItemsList()),
                                      actionCollection(), "lighttable_clearlist");
     d->clearListAction->setEnabled(false);
 
-    d->fileDeleteAction = new KAction(i18n("Move to Trash"), "edittrash",
+    d->fileDeleteAction = new TDEAction(i18n("Move to Trash"), "edittrash",
                                      Key_Delete,
                                      TQT_TQOBJECT(this), TQT_SLOT(slotDeleteItem()),
                                      actionCollection(), "lighttable_filedelete");
@@ -385,14 +385,14 @@ void LightTableWindow::setupActions()
 
     // -- Standard 'View' menu actions ---------------------------------------------
 
-    d->syncPreviewAction = new KToggleAction(i18n("Synchronize"), "goto",
+    d->syncPreviewAction = new TDEToggleAction(i18n("Synchronize"), "goto",
                                             CTRL+SHIFT+Key_Y, TQT_TQOBJECT(this),
                                             TQT_SLOT(slotToggleSyncPreview()),
                                             actionCollection(), "lighttable_syncpreview");
     d->syncPreviewAction->setEnabled(false);
     d->syncPreviewAction->setWhatsThis(i18n("Synchronize preview from left and right panels"));
 
-    d->navigateByPairAction = new KToggleAction(i18n("By Pair"), "kcmsystem",
+    d->navigateByPairAction = new TDEToggleAction(i18n("By Pair"), "kcmsystem",
                                             CTRL+SHIFT+Key_P, TQT_TQOBJECT(this),
                                             TQT_SLOT(slotToggleNavigateByPair()),
                                             actionCollection(), "lighttable_navigatebypair");
@@ -407,23 +407,23 @@ void LightTableWindow::setupActions()
                                              actionCollection(), "lighttable_zoomminus");
     d->zoomMinusAction->setEnabled(false);
 
-    d->zoomTo100percents = new KAction(i18n("Zoom to 100%"), "viewmag1",
+    d->zoomTo100percents = new TDEAction(i18n("Zoom to 100%"), "viewmag1",
                                        ALT+CTRL+Key_0,      // NOTE: Photoshop 7 use ALT+CTRL+0.
                                        TQT_TQOBJECT(this), TQT_SLOT(slotZoomTo100Percents()),
                                        actionCollection(), "lighttable_zoomto100percents");
 
-    d->zoomFitToWindowAction = new KAction(i18n("Fit to &Window"), "view_fit_window",
+    d->zoomFitToWindowAction = new TDEAction(i18n("Fit to &Window"), "view_fit_window",
                                            CTRL+SHIFT+Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotFitToWindow()),
                                            actionCollection(), "lighttable_zoomfit2window");
 
     // Do not use std KDE action for full screen because action text is too large for app. toolbar.
-    d->fullScreenAction = new KToggleAction(i18n("Full Screen"), "window_fullscreen",
+    d->fullScreenAction = new TDEToggleAction(i18n("Full Screen"), "window_fullscreen",
                                             CTRL+SHIFT+Key_F, TQT_TQOBJECT(this),
                                             TQT_SLOT(slotToggleFullScreen()),
                                             actionCollection(), "lighttable_fullscreen");
     d->fullScreenAction->setWhatsThis(i18n("Toggle the window to full screen mode"));
 
-    d->slideShowAction = new KAction(i18n("Slideshow"), "slideshow", Key_F9,
+    d->slideShowAction = new TDEAction(i18n("Slideshow"), "slideshow", Key_F9,
                                      TQT_TQOBJECT(this), TQT_SLOT(slotToggleSlideShow()),
                                      actionCollection(),"lighttable_slideshow");
 
@@ -437,7 +437,7 @@ void LightTableWindow::setupActions()
 
     // -----------------------------------------------------------------------------------------
 
-    d->themeMenuAction = new KSelectAction(i18n("&Themes"), 0, actionCollection(), "theme_menu");
+    d->themeMenuAction = new TDESelectAction(i18n("&Themes"), 0, actionCollection(), "theme_menu");
     connect(d->themeMenuAction, TQT_SIGNAL(activated(const TQString&)),
             TQT_TQOBJECT(this), TQT_SLOT(slotChangeTheme(const TQString&)));
 
@@ -447,19 +447,19 @@ void LightTableWindow::setupActions()
     // -- Standard 'Help' menu actions ---------------------------------------------
 
 
-    d->donateMoneyAction = new KAction(i18n("Donate..."),
+    d->donateMoneyAction = new TDEAction(i18n("Donate..."),
                                        0, 0,
                                        TQT_TQOBJECT(this), TQT_SLOT(slotDonateMoney()),
                                        actionCollection(),
                                        "lighttable_donatemoney");
 
-    d->contributeAction = new KAction(i18n("Contribute..."),
+    d->contributeAction = new TDEAction(i18n("Contribute..."),
                                       0, 0,
                                       TQT_TQOBJECT(this), TQT_SLOT(slotContribute()),
                                       actionCollection(),
                                       "lighttable_contribute");
 
-    d->rawCameraListAction = new KAction(i18n("Supported RAW Cameras"),
+    d->rawCameraListAction = new TDEAction(i18n("Supported RAW Cameras"),
                                          "kdcraw",
                                          0,
                                          TQT_TQOBJECT(this),
@@ -476,22 +476,22 @@ void LightTableWindow::setupActions()
 
     // -- Rating actions ---------------------------------------------------------------
 
-    d->star0 = new KAction(i18n("Assign Rating \"No Stars\""), CTRL+Key_0,
+    d->star0 = new TDEAction(i18n("Assign Rating \"No Stars\""), CTRL+Key_0,
                           TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingNoStar()),
                           actionCollection(), "lighttable_ratenostar");
-    d->star1 = new KAction(i18n("Assign Rating \"One Star\""), CTRL+Key_1,
+    d->star1 = new TDEAction(i18n("Assign Rating \"One Star\""), CTRL+Key_1,
                           TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingOneStar()),
                           actionCollection(), "lighttable_rateonestar");
-    d->star2 = new KAction(i18n("Assign Rating \"Two Stars\""), CTRL+Key_2,
+    d->star2 = new TDEAction(i18n("Assign Rating \"Two Stars\""), CTRL+Key_2,
                           TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingTwoStar()),
                           actionCollection(), "lighttable_ratetwostar");
-    d->star3 = new KAction(i18n("Assign Rating \"Three Stars\""), CTRL+Key_3,
+    d->star3 = new TDEAction(i18n("Assign Rating \"Three Stars\""), CTRL+Key_3,
                           TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingThreeStar()),
                           actionCollection(), "lighttable_ratethreestar");
-    d->star4 = new KAction(i18n("Assign Rating \"Four Stars\""), CTRL+Key_4,
+    d->star4 = new TDEAction(i18n("Assign Rating \"Four Stars\""), CTRL+Key_4,
                           TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingFourStar()),
                           actionCollection(), "lighttable_ratefourstar");
-    d->star5 = new KAction(i18n("Assign Rating \"Five Stars\""), CTRL+Key_5,
+    d->star5 = new TDEAction(i18n("Assign Rating \"Five Stars\""), CTRL+Key_5,
                           TQT_TQOBJECT(d->barView), TQT_SLOT(slotAssignRatingFiveStar()),
                           actionCollection(), "lighttable_ratefivestar");
 
@@ -504,7 +504,7 @@ void LightTableWindow::setupActions()
 
 void LightTableWindow::setupAccelerators()
 {
-    d->accelerators = new KAccel(this);
+    d->accelerators = new TDEAccel(this);
 
     d->accelerators->insert("Exit fullscreen", i18n("Exit Fullscreen mode"),
                     i18n("Exit fullscreen viewing mode"),
@@ -1345,11 +1345,11 @@ void LightTableWindow::slotToggleFullScreen()
         topDock()->show();
         bottomDock()->show();
 
-        TQObject* obj = child("ToolBar","KToolBar");
+        TQObject* obj = child("ToolBar","TDEToolBar");
 
         if (obj)
         {
-            KToolBar* toolBar = static_cast<KToolBar*>(TQT_TQWIDGET(obj));
+            TDEToolBar* toolBar = static_cast<TDEToolBar*>(TQT_TQWIDGET(obj));
 
             if (d->fullScreenAction->isPlugged(toolBar) && d->removeFullScreenButton)
                 d->fullScreenAction->unplug(toolBar);
@@ -1385,11 +1385,11 @@ void LightTableWindow::slotToggleFullScreen()
         rightDock()->hide();
         bottomDock()->hide();
 
-        TQObject* obj = child("ToolBar","KToolBar");
+        TQObject* obj = child("ToolBar","TDEToolBar");
 
         if (obj)
         {
-            KToolBar* toolBar = static_cast<KToolBar*>(TQT_TQWIDGET(obj));
+            TDEToolBar* toolBar = static_cast<TDEToolBar*>(TQT_TQWIDGET(obj));
 
             if (d->fullScreenHideToolBar)
             {
@@ -1441,8 +1441,8 @@ void LightTableWindow::slotEscapePressed()
 
 void LightTableWindow::showToolBars()
 {
-    TQPtrListIterator<KToolBar> it = toolBarIterator();
-    KToolBar* bar;
+    TQPtrListIterator<TDEToolBar> it = toolBarIterator();
+    TDEToolBar* bar;
 
     for( ; it.current()!=0L ; ++it)
     {
@@ -1457,8 +1457,8 @@ void LightTableWindow::showToolBars()
 
 void LightTableWindow::hideToolBars()
 {
-    TQPtrListIterator<KToolBar> it = toolBarIterator();
-    KToolBar* bar;
+    TQPtrListIterator<TDEToolBar> it = toolBarIterator();
+    TDEToolBar* bar;
 
     for( ; it.current()!=0L ; ++it)
     {
@@ -1471,7 +1471,7 @@ void LightTableWindow::hideToolBars()
     }
 }
 
-void LightTableWindow::plugActionAccel(KAction* action)
+void LightTableWindow::plugActionAccel(TDEAction* action)
 {
     if (!action)
         return;
@@ -1484,7 +1484,7 @@ void LightTableWindow::plugActionAccel(KAction* action)
                     TQT_SLOT(activate()));
 }
 
-void LightTableWindow::unplugActionAccel(KAction* action)
+void LightTableWindow::unplugActionAccel(TDEAction* action)
 {
     d->accelerators->remove(action->text());
 }
diff --git a/digikam/utilities/lighttable/lighttablewindow.h b/digikam/utilities/lighttable/lighttablewindow.h
index 255c41e0..cd879ec8 100644
--- a/digikam/utilities/lighttable/lighttablewindow.h
+++ b/digikam/utilities/lighttable/lighttablewindow.h
@@ -37,7 +37,7 @@
 
 #include "imageinfo.h"
 
-class KAction;
+class TDEAction;
 
 namespace Digikam
 {
@@ -46,7 +46,7 @@ class SlideShowSettings;
 class ThumbBarItem;
 class LightTableWindowPriv;
 
-class LightTableWindow : public KMainWindow
+class LightTableWindow : public TDEMainWindow
 {
     Q_OBJECT
   
@@ -82,8 +82,8 @@ private:
     void slideShow(bool startWithCurrent, SlideShowSettings& settings);
     void showToolBars();
     void hideToolBars();
-    void plugActionAccel(KAction* action);
-    void unplugActionAccel(KAction* action);
+    void plugActionAccel(TDEAction* action);
+    void unplugActionAccel(TDEAction* action);
     void readSettings();
     void writeSettings();
     void refreshStatusBar();
diff --git a/digikam/utilities/lighttable/lighttablewindowprivate.h b/digikam/utilities/lighttable/lighttablewindowprivate.h
index df69886a..aadf1d82 100644
--- a/digikam/utilities/lighttable/lighttablewindowprivate.h
+++ b/digikam/utilities/lighttable/lighttablewindowprivate.h
@@ -106,41 +106,41 @@ public:
     TQSplitter                *vSplitter;
 
     // Rating actions.
-    KAction                  *star0;
-    KAction                  *star1;
-    KAction                  *star2;
-    KAction                  *star3;
-    KAction                  *star4;
-    KAction                  *star5;
-
-    KAction                  *forwardAction;
-    KAction                  *backwardAction;
-    KAction                  *firstAction;
-    KAction                  *lastAction;
-
-    KAction                  *setItemLeftAction;
-    KAction                  *setItemRightAction;
-    KAction                  *clearListAction;
-    KAction                  *editItemAction;
-    KAction                  *removeItemAction;
-    KAction                  *fileDeleteAction;
-    KAction                  *slideShowAction;
-    KAction                  *donateMoneyAction;
-    KAction                  *contributeAction;
-    KAction                  *zoomPlusAction;
-    KAction                  *zoomMinusAction;
-    KAction                  *zoomTo100percents;
-    KAction                  *zoomFitToWindowAction;
-    KAction                  *rawCameraListAction;
-
-    KSelectAction            *themeMenuAction;
-
-    KToggleAction            *fullScreenAction;
-    KToggleAction            *syncPreviewAction;
-    KToggleAction            *navigateByPairAction;
-    KToggleAction            *showMenuBarAction;
-
-    KAccel                   *accelerators;
+    TDEAction                  *star0;
+    TDEAction                  *star1;
+    TDEAction                  *star2;
+    TDEAction                  *star3;
+    TDEAction                  *star4;
+    TDEAction                  *star5;
+
+    TDEAction                  *forwardAction;
+    TDEAction                  *backwardAction;
+    TDEAction                  *firstAction;
+    TDEAction                  *lastAction;
+
+    TDEAction                  *setItemLeftAction;
+    TDEAction                  *setItemRightAction;
+    TDEAction                  *clearListAction;
+    TDEAction                  *editItemAction;
+    TDEAction                  *removeItemAction;
+    TDEAction                  *fileDeleteAction;
+    TDEAction                  *slideShowAction;
+    TDEAction                  *donateMoneyAction;
+    TDEAction                  *contributeAction;
+    TDEAction                  *zoomPlusAction;
+    TDEAction                  *zoomMinusAction;
+    TDEAction                  *zoomTo100percents;
+    TDEAction                  *zoomFitToWindowAction;
+    TDEAction                  *rawCameraListAction;
+
+    TDESelectAction            *themeMenuAction;
+
+    TDEToggleAction            *fullScreenAction;
+    TDEToggleAction            *syncPreviewAction;
+    TDEToggleAction            *navigateByPairAction;
+    TDEToggleAction            *showMenuBarAction;
+
+    TDEAccel                   *accelerators;
 
     LightTableBar            *barView;
 
diff --git a/digikam/utilities/setup/setupcollections.cpp b/digikam/utilities/setup/setupcollections.cpp
index 9d99f87d..4ee7d5ae 100644
--- a/digikam/utilities/setup/setupcollections.cpp
+++ b/digikam/utilities/setup/setupcollections.cpp
@@ -90,7 +90,7 @@ SetupCollections::SetupCollections(TQWidget* parent )
 
     // --------------------------------------------------------
     
-    d->albumCollectionBox = new KListBox(this);
+    d->albumCollectionBox = new TDEListBox(this);
     TQWhatsThis::add( d->albumCollectionBox, i18n("<p>You can add or remove Album "
                                                  "collection types here to improve how "
                                                  "your Albums are sorted in digiKam."));