Rename a number of classes to enhance compatibility with KDE4

1 files changed, 6 insertions, 6 deletions

diff --git a/kword/KWMailMergeLabelAction.cpp b/kword/KWMailMergeLabelAction.cpp
index 1487da45..2ae12b61 100644
--- a/kword/KWMailMergeLabelAction.cpp
+++ b/kword/KWMailMergeLabelAction.cpp
@@ -104,7 +104,7 @@ private:
 
 KWMailMergeLabelAction::KWMailMergeLabelAction( const TQString &text, int accel,
                     TQObject* receiver, const char* slot, TQObject *parent, const char *name )
-    : KAction( text, accel, receiver, slot, parent, name ), m_label( 0L )
+    : TDEAction( text, accel, receiver, slot, parent, name ), m_label( 0L )
 {
 }
 
@@ -112,11 +112,11 @@ int KWMailMergeLabelAction::plug( TQWidget *widget, int index )
 {
   //do not call the previous implementation here
 
-  if ( widget->inherits( "KToolBar" ) )
+  if ( widget->inherits( "TDEToolBar" ) )
   {
-    KToolBar *tb = (KToolBar *)widget;
+    TDEToolBar *tb = (TDEToolBar *)widget;
 
-    int id = KAction::getToolButtonID();
+    int id = TDEAction::getToolButtonID();
 
     m_label = new MailMergeDraggableLabel( static_cast<KoMainWindow*>(tb->mainWindow()), text(), widget );
     tb->insertWidget( id, m_label->width(), m_label, index );
@@ -133,9 +133,9 @@ int KWMailMergeLabelAction::plug( TQWidget *widget, int index )
 
 void KWMailMergeLabelAction::unplug( TQWidget *widget )
 {
-  if ( widget->inherits( "KToolBar" ) )
+  if ( widget->inherits( "TDEToolBar" ) )
   {
-    KToolBar *bar = (KToolBar *)widget;
+    TDEToolBar *bar = (TDEToolBar *)widget;
 
     int idx = findContainer( bar );