Rename a number of classes to enhance compatibility with KDE4

4 files changed, 13 insertions, 13 deletions

diff --git a/src/newui/button.cpp b/src/newui/button.cpp
index fc6720f9..3ccefc94 100644
--- a/src/newui/button.cpp
+++ b/src/newui/button.cpp
@@ -55,9 +55,9 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon,
 
     TQToolTip::add(this, m_realText);
 
-    m_assignAccelAction = new KAction(i18n("Assign Accelerator..."), 0,
+    m_assignAccelAction = new TDEAction(i18n("Assign Accelerator..."), 0,
         TQT_TQOBJECT(this), TQT_SLOT(assignAccel()), TQT_TQOBJECT(this));
-    m_clearAccelAction = new KAction(i18n("Clear Accelerator"), 0,
+    m_clearAccelAction = new TDEAction(i18n("Clear Accelerator"), 0,
         TQT_TQOBJECT(this), TQT_SLOT(clearAccel()), TQT_TQOBJECT(this));
 
     TDEConfig *config = kapp->config();
diff --git a/src/newui/button.h b/src/newui/button.h
index 82dc6ee9..4d816788 100644
--- a/src/newui/button.h
+++ b/src/newui/button.h
@@ -25,7 +25,7 @@
 
 #include "comdefs.h"
 
-class KAction;
+class TDEAction;
 
 namespace Ideal {
 
@@ -98,8 +98,8 @@ private:
     TQString m_realText;
     TQIconSet m_realIconSet;
 
-    KAction *m_assignAccelAction;
-    KAction *m_clearAccelAction;
+    TDEAction *m_assignAccelAction;
+    TDEAction *m_clearAccelAction;
 
 friend class ButtonBar;
 };
diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp
index 091ad1c0..2b046b14 100644
--- a/src/newui/ddockwindow.cpp
+++ b/src/newui/ddockwindow.cpp
@@ -85,9 +85,9 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position)
     m_widgetStack = new TQWidgetStack(this);
     m_internalLayout->addWidget(m_widgetStack);
 
-    m_moveToDockLeft = new KAction( i18n("Move to left dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockLeft()), TQT_TQOBJECT(this) );
-    m_moveToDockRight = new KAction( i18n("Move to right dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockRight()), TQT_TQOBJECT(this) );
-    m_moveToDockBottom = new KAction( i18n("Move to bottom dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockBottom()), TQT_TQOBJECT(this) );
+    m_moveToDockLeft = new TDEAction( i18n("Move to left dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockLeft()), TQT_TQOBJECT(this) );
+    m_moveToDockRight = new TDEAction( i18n("Move to right dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockRight()), TQT_TQOBJECT(this) );
+    m_moveToDockBottom = new TDEAction( i18n("Move to bottom dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockBottom()), TQT_TQOBJECT(this) );
 
     setVisible(m_visible);
 
@@ -320,7 +320,7 @@ void DDockWindow::showWidget(TQWidget *widget)
 
 void DDockWindow::setMovingEnabled(bool)
 {
-    //some operations on KMainWindow cause moving to be enabled
+    //some operations on TDEMainWindow cause moving to be enabled
     //but we always don't want DDockWindow instances to be movable
     TQDockWindow::setMovingEnabled(false);
 }
diff --git a/src/newui/ddockwindow.h b/src/newui/ddockwindow.h
index fb6b0976..10727f22 100644
--- a/src/newui/ddockwindow.h
+++ b/src/newui/ddockwindow.h
@@ -29,7 +29,7 @@ class TQWidgetStack;
 class TQPopupMenu;
 
 class KComboBox;
-class KAction;
+class TDEAction;
 
 class DMainWindow;
 
@@ -107,9 +107,9 @@ private:
     TQBoxLayout *m_internalLayout;
 
 
-    KAction * m_moveToDockLeft;
-    KAction * m_moveToDockRight;
-    KAction * m_moveToDockBottom;
+    TDEAction * m_moveToDockLeft;
+    TDEAction * m_moveToDockRight;
+    TDEAction * m_moveToDockBottom;
 };
 
 #endif