Rename a number of classes to enhance compatibility with KDE4

1 files changed, 19 insertions, 19 deletions

diff --git a/kdict/actions.cpp b/kdict/actions.cpp
index 5acf3c3c..9587d9cc 100644
--- a/kdict/actions.cpp
+++ b/kdict/actions.cpp
@@ -9,7 +9,7 @@
 
    -------------------------------------------------------------
 
-   DictComboAction,            special KAction subclasses used
+   DictComboAction,            special TDEAction subclasses used
    DictLabelAction,            in the toolbar
    DictButtonAction
 
@@ -26,7 +26,7 @@
 
 DictComboAction::DictComboAction( const TQString &text, TQObject *parent, const char *name,
                                   bool editable, bool autoSized )
-  : KAction( text, 0, parent, name ), m_editable(editable), m_autoSized(autoSized), m_compMode(TDEGlobalSettings::completionMode())
+  : TDEAction( text, 0, parent, name ), m_editable(editable), m_autoSized(autoSized), m_compMode(TDEGlobalSettings::completionMode())
 {
 }
 
@@ -38,10 +38,10 @@ DictComboAction::~DictComboAction()
 
 int DictComboAction::plug( TQWidget *widget, int index )
 {
-  if ( widget->inherits( "KToolBar" ) )
+  if ( widget->inherits( "TDEToolBar" ) )
   {
-    KToolBar* bar = static_cast<KToolBar*>( widget );
-    int id_ = KAction::getToolButtonID();
+    TDEToolBar* bar = static_cast<TDEToolBar*>( widget );
+    int id_ = TDEAction::getToolButtonID();
 
     m_combo = new KComboBox(m_editable,bar);
     m_combo->setCompletionMode(m_compMode);
@@ -68,9 +68,9 @@ int DictComboAction::plug( TQWidget *widget, int index )
 
 void DictComboAction::unplug( TQWidget *widget )
 {
-  if ( widget->inherits( "KToolBar" ) )
+  if ( widget->inherits( "TDEToolBar" ) )
   {
-    KToolBar *bar = (KToolBar *)widget;
+    TDEToolBar *bar = (TDEToolBar *)widget;
 
     int idx = findContainer( bar );
 
@@ -194,7 +194,7 @@ void DictComboAction::slotComboActivated(const TQString &s)
 
 
 DictLabelAction::DictLabelAction( const TQString &text, TQObject *parent, const char *name )
-  : KAction( text, 0, parent, name )
+  : TDEAction( text, 0, parent, name )
 {
 }
 
@@ -206,11 +206,11 @@ DictLabelAction::~DictLabelAction()
 
 int DictLabelAction::plug( TQWidget *widget, int index )
 {
-  if ( widget->inherits( "KToolBar" ) )
+  if ( widget->inherits( "TDEToolBar" ) )
   {
-    KToolBar *tb = (KToolBar *)widget;
+    TDEToolBar *tb = (TDEToolBar *)widget;
 
-    int id = KAction::getToolButtonID();
+    int id = TDEAction::getToolButtonID();
 
     TQLabel *label = new TQLabel( text(), widget,  "kde toolbar widget" );
     label->setMinimumWidth(label->sizeHint().width());
@@ -235,9 +235,9 @@ int DictLabelAction::plug( TQWidget *widget, int index )
 
 void DictLabelAction::unplug( TQWidget *widget )
 {
-  if ( widget->inherits( "KToolBar" ) )
+  if ( widget->inherits( "TDEToolBar" ) )
   {
-    KToolBar *bar = (KToolBar *)widget;
+    TDEToolBar *bar = (TDEToolBar *)widget;
 
     int idx = findContainer( bar );
 
@@ -264,7 +264,7 @@ void DictLabelAction::setBuddy(TQWidget *buddy)
 
 DictButtonAction::DictButtonAction( const TQString& text, TQObject* receiver,
                                     const char* slot, TQObject* parent, const char* name )
-  : KAction( text, 0, receiver, slot, parent, name )
+  : TDEAction( text, 0, receiver, slot, parent, name )
 {
 }
 
@@ -276,11 +276,11 @@ DictButtonAction::~DictButtonAction()
 
 int DictButtonAction::plug( TQWidget *widget, int index )
 {
-  if ( widget->inherits( "KToolBar" ) )
+  if ( widget->inherits( "TDEToolBar" ) )
   {
-    KToolBar *tb = (KToolBar *)widget;
+    TDEToolBar *tb = (TDEToolBar *)widget;
 
-    int id = KAction::getToolButtonID();
+    int id = TDEAction::getToolButtonID();
 
     TQPushButton *button = new TQPushButton( text(), widget );
     button->adjustSize();
@@ -302,9 +302,9 @@ int DictButtonAction::plug( TQWidget *widget, int index )
 
 void DictButtonAction::unplug( TQWidget *widget )
 {
-  if ( widget->inherits( "KToolBar" ) )
+  if ( widget->inherits( "TDEToolBar" ) )
   {
-    KToolBar *bar = (KToolBar *)widget;
+    TDEToolBar *bar = (TDEToolBar *)widget;
 
     int idx = findContainer( bar );