Rename a number of classes to enhance compatibility with KDE4

4 files changed, 14 insertions, 14 deletions

diff --git a/digikam/libs/widgets/common/dlogoaction.cpp b/digikam/libs/widgets/common/dlogoaction.cpp
index 64ea166..3e3c57b 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 77322e2..f716f74 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 a81eb02..86b7af1 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 a9a55e5..2e3ed93 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: