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 36c049e135b0cec7cf97b41888860186813df5f0)

9 files changed, 10 insertions, 10 deletions

diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp
index 44243715d..1fccd9f61 100644
--- a/tdeui/kbugreport.cpp
+++ b/tdeui/kbugreport.cpp
@@ -241,7 +241,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *abou
     lay->addWidget( label );
 
     // The multiline-edit
-    m_lineedit = new TQMultiLineEdit( parent, TQMULTILINEEDIT_OBJECT_NAME_STRING );
+    m_lineedit = new TQMultiLineEdit( parent, "TQMultiLineEdit" );
     m_lineedit->setMinimumHeight( 180 ); // make it big
     m_lineedit->setWordWrap(TQMultiLineEdit::WidgetWidth);
     lay->addWidget( m_lineedit, 10 /*stretch*/ );
diff --git a/tdeui/kcombobox.cpp b/tdeui/kcombobox.cpp
index 3b2b770ee..66146bad3 100644
--- a/tdeui/kcombobox.cpp
+++ b/tdeui/kcombobox.cpp
@@ -249,7 +249,7 @@ void KComboBox::wheelEvent( TQWheelEvent *ev )
 void KComboBox::setLineEdit( TQLineEdit *edit )
 {
     if ( !editable() && edit &&
-         !qstrcmp( edit->className(), TQLINEEDIT_OBJECT_NAME_STRING ) )
+         !qstrcmp( edit->className(), "TQLineEdit" ) )
     {
         // uic generates code that creates a read-only KComboBox and then
         // calls combo->setEditable( true ), which causes TQComboBox to set up
diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp
index bf99c6801..374d336fe 100644
--- a/tdeui/kdockwidget.cpp
+++ b/tdeui/kdockwidget.cpp
@@ -1699,7 +1699,7 @@ void KDockManager::activate()
         obj->show();
     }
   }
-  if ( !main->inherits(TQDIALOG_OBJECT_NAME_STRING) ) main->show();
+  if ( !main->inherits("TQDialog") ) main->show();
 }
 
 bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
@@ -3105,7 +3105,7 @@ void KDockArea::resizeEvent(TQResizeEvent *rsize)
 #ifndef NO_KDE2
 //    kdDebug(282)<<"KDockArea::resize"<<endl;
 #endif
-    TQObjectList *list=queryList(TQWIDGET_OBJECT_NAME_STRING,0,false);
+    TQObjectList *list=queryList("TQWidget",0,false);
 
     TQObjectListIt it( *list ); // iterate over the buttons
     TQObject *obj;
diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp
index 513ae2d8a..7330fa6e8 100644
--- a/tdeui/kjanuswidget.cpp
+++ b/tdeui/kjanuswidget.cpp
@@ -684,7 +684,7 @@ int KJanusWidget::pageIndex( TQWidget *widget ) const
     // and addGridPage() but not with addPage() which returns a child of
     // the toplevel page. addPage() returns a TQFrame so I check for that.
     //
-    if( widget->isA(TQFRAME_OBJECT_NAME_STRING) )
+    if( widget->isA("TQFrame") )
     {
       return d->mPageToInt[widget->parentWidget()];
     }
diff --git a/tdeui/tdeactionselector.cpp b/tdeui/tdeactionselector.cpp
index 9583775c4..23829597e 100644
--- a/tdeui/tdeactionselector.cpp
+++ b/tdeui/tdeactionselector.cpp
@@ -392,7 +392,7 @@ bool TDEActionSelector::eventFilter( TQObject *o, TQEvent *e )
       }
       return true;
     }
-    else if ( o->inherits( TQLISTBOX_OBJECT_NAME_STRING ) )
+    else if ( o->inherits( "TQListBox" ) )
     {
       switch ( ((TQKeyEvent*)e)->key() )
       {
diff --git a/tdeui/tdecompletionbox.cpp b/tdeui/tdecompletionbox.cpp
index a8a2bd237..f04a48e74 100644
--- a/tdeui/tdecompletionbox.cpp
+++ b/tdeui/tdecompletionbox.cpp
@@ -343,7 +343,7 @@ TQRect TDECompletionBox::calculateGeometry() const
     // to adjust it. Do that here as well, for consistency
     const TQObject* combo;
     if ( d->m_parent && (combo = d->m_parent->parent() ) &&
-        combo->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) )
+        combo->inherits("TQComboBox") )
     {
         const TQComboBox* cb = static_cast<const TQComboBox*>(TQT_TQWIDGET_CONST(combo));
 
diff --git a/tdeui/tdemainwindow.cpp b/tdeui/tdemainwindow.cpp
index 225b910e4..60607d870 100644
--- a/tdeui/tdemainwindow.cpp
+++ b/tdeui/tdemainwindow.cpp
@@ -403,7 +403,7 @@ void TDEMainWindow::hide()
 
         d->hiddenDockWindows.clear();
 
-        TQObjectList *list = queryList( TQDOCKWINDOW_OBJECT_NAME_STRING );
+        TQObjectList *list = queryList( "TQDockWindow" );
         for( TQObjectListIt it( *list ); it.current(); ++it ) {
             TQDockWindow *dw = (TQDockWindow*)it.current();
             if ( dw->isTopLevel() && dw->isVisible() ) {
diff --git a/tdeui/tdetoolbar.cpp b/tdeui/tdetoolbar.cpp
index 7c6902fed..5154c78f7 100644
--- a/tdeui/tdetoolbar.cpp
+++ b/tdeui/tdetoolbar.cpp
@@ -2237,7 +2237,7 @@ void TDEToolBar::slotContextAboutToHide()
   TQPtrListIterator<TQWidget> it( widgets );
   TQWidget *wdg;
   while ( ( wdg = it.current() ) != 0 ) {
-    if ( wdg->inherits( TQTOOLBUTTON_OBJECT_NAME_STRING ) )
+    if ( wdg->inherits( "TQToolButton" ) )
       static_cast<TQToolButton*>( wdg )->setDown( false );
     ++it;
   }
diff --git a/tdeui/twindowinfo.cpp b/tdeui/twindowinfo.cpp
index 436aa5227..41e5691ea 100644
--- a/tdeui/twindowinfo.cpp
+++ b/tdeui/twindowinfo.cpp
@@ -85,7 +85,7 @@ void KWindowInfo::permanent( const TQString &text )
 void KWindowInfo::permanent( const TQString &text, const TQPixmap &pix )
 {
     if ( !oldText.isNull() ) {
-	TQObjectList *l = queryList( TQTIMER_OBJECT_NAME_STRING );
+	TQObjectList *l = queryList( "TQTimer" );
 	TQObjectListIt it( *l );
 	TQObject *obj;