Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 20e4a19b0d7cc800d57be50c56d69023adae4046)

5 files changed, 7 insertions, 7 deletions

diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp
index 952387647..0558c512c 100644
--- a/lib/kofficeui/KoSelectAction.cpp
+++ b/lib/kofficeui/KoSelectAction.cpp
@@ -90,7 +90,7 @@ int KoSelectAction::plug(TQWidget* widget, int index)
   if (kapp && !kapp->authorizeTDEAction(name()))
     return -1;
   kdDebug(129) << "TDEAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
-  if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) )
+  if ( widget->inherits("TQPopupMenu") )
   {
     TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget );
     int id;
@@ -144,7 +144,7 @@ int KoSelectAction::plug(TQWidget* widget, int index)
 
     return containerCount() - 1;
   }
-  else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) )
+  else if ( widget->inherits( "TQMenuBar" ) )
   {
     TQMenuBar *bar = static_cast<TQMenuBar *>( widget );
 
diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp
index 044df16ac..c42ff0010 100644
--- a/lib/kofficeui/KoTemplateChooseDia.cpp
+++ b/lib/kofficeui/KoTemplateChooseDia.cpp
@@ -357,7 +357,7 @@ void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout *
     d->m_filedialog->reparent( widgetbase , point );
     //d->m_filedialog->setOperationMode( KFileDialog::Opening);
 
-    TQObjectList *l = d->m_filedialog->queryList( TQPUSHBUTTON_OBJECT_NAME_STRING );
+    TQObjectList *l = d->m_filedialog->queryList( "TQPushButton" );
     TQObjectListIt childit( *l );
     TQObject *obj;
     while ( (obj = childit.current()) != 0 ) {
diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp
index 1cd5e1c61..0d24cd161 100644
--- a/lib/kofficeui/KoTooluButton.cpp
+++ b/lib/kofficeui/KoTooluButton.cpp
@@ -309,7 +309,7 @@ void KoColorPanel::mousePressEvent( TQMouseEvent* e )
 
 void KoColorPanel::mouseReleaseEvent( TQMouseEvent* )
 {
-    if ( isVisible() && parentWidget() && parentWidget()->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) )
+    if ( isVisible() && parentWidget() && parentWidget()->inherits( "TQPopupMenu" ) )
         parentWidget()->close();
     emit colorSelected( mapToColor( m_pressedPos ) );
 }
@@ -425,7 +425,7 @@ void KoColorPanel::keyPressEvent( TQKeyEvent* e )
             e->ignore();
     }
     else if ( e->key() == TQt::Key_Return ) {
-        if ( isVisible() && parentWidget() && parentWidget()->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) )
+        if ( isVisible() && parentWidget() && parentWidget()->inherits( "TQPopupMenu" ) )
             parentWidget()->close();
         emit colorSelected( mapToColor( m_focusPosition ) );
     }
diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp
index aec1aab28..d34c23923 100644
--- a/lib/kofficeui/kcoloractions.cpp
+++ b/lib/kofficeui/kcoloractions.cpp
@@ -237,7 +237,7 @@ int TDESelectColorAction::plug( TQWidget* w, int index )
     if (kapp && !kapp->authorizeTDEAction(name()))
         return -1;
 
-    if ( w->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) )
+    if ( w->inherits("TQPopupMenu") )
     {
         TQPopupMenu* menu = static_cast<TQPopupMenu*>( w );
         int id;
diff --git a/lib/kofficeui/tkcoloractions.cpp b/lib/kofficeui/tkcoloractions.cpp
index d2476d62b..cf55a84ae 100644
--- a/lib/kofficeui/tkcoloractions.cpp
+++ b/lib/kofficeui/tkcoloractions.cpp
@@ -165,7 +165,7 @@ void TTDESelectColorAction::updatePixmap()
         updatePixmap(static_cast<TTDEToolBarButton*>(r));
       }
     }
-    else if(w->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) {
+    else if(w->inherits("TQPopupMenu") ) {
         TQPixmap pix =iconSet(TDEIcon::Small).pixmap(TQIconSet::Automatic,TQIconSet::Active);
   if ( pix.isNull() )
       return;