diff --git a/amarok/src/actionclasses.cpp b/amarok/src/actionclasses.cpp
index d00d6928..5710fa44 100644
--- a/amarok/src/actionclasses.cpp
+++ b/amarok/src/actionclasses.cpp
@@ -244,7 +244,7 @@ PlayPauseAction::engineStateChanged( Engine::State state,  Engine::State /*oldSt
     //update menu texts for this special action
     for( int x = 0; x < containerCount(); ++x ) {
         TQWidget *w = container( x );
-        if( w->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) )
+        if( w->inherits( "TQPopupMenu" ) )
             static_cast<TQPopupMenu*>(w)->changeItem( itemId( x ), text );
         //TODO TDEToolBar sucks so much
 //         else if( w->inherits( "TDEToolBar" ) )
diff --git a/amarok/src/configdialog.cpp b/amarok/src/configdialog.cpp
index 8007fc74..b5de0987 100644
--- a/amarok/src/configdialog.cpp
+++ b/amarok/src/configdialog.cpp
@@ -184,14 +184,14 @@ AmarokConfigDialog::AmarokConfigDialog( TQWidget *parent, const char* name, TDEC
     addPage( opt9,   i18n( "Media Devices" ), Amarok::icon( "device" ), i18n( "Configure Portable Player Support" ) );
 
     // Show information labels (must be done after insertions)
-    TQObjectList *list = queryList( TQLABEL_OBJECT_NAME_STRING, "infoPixmap" );
+    TQObjectList *list = queryList( "TQLabel", "infoPixmap" );
     TQPixmap const info = TDEGlobal::iconLoader()->iconPath( "messagebox_info", -TDEIcon::SizeHuge );
     for( TQObject *label = list->first(); label; label = list->next() )
         static_cast<TQLabel*>(TQT_TQWIDGET(label))->setPixmap( info );
     delete list;
 
     //stop TDEFont Requesters getting stupidly large
-    list = queryList( TQLABEL_OBJECT_NAME_STRING, "m_sampleLabel" );
+    list = queryList( "TQLabel", "m_sampleLabel" );
     for( TQObject *label = list->first(); label; label = list->next() )
         static_cast<TQLabel*>(TQT_TQWIDGET(label))->setMaximumWidth( 250 );
     delete list;
diff --git a/amarok/src/playerwindow.cpp b/amarok/src/playerwindow.cpp
index 043877fc..1c278d70 100644
--- a/amarok/src/playerwindow.cpp
+++ b/amarok/src/playerwindow.cpp
@@ -557,7 +557,7 @@ bool PlayerWidget::event( TQEvent *e )
         return true;
 
     case 6/*TQEvent::KeyPress*/:
-        if (TQT_TQKEYEVENT(e)->key() == TQt::Key_D/* && (m_pAnalyzer->inherits(TQGLWIDGET_OBJECT_NAME_STRING)*/)
+        if (TQT_TQKEYEVENT(e)->key() == TQt::Key_D/* && (m_pAnalyzer->inherits("TQGLWidget")*/)
         {
             if( m_pAnalyzer->parent() )
             {
diff --git a/amarok/src/smartplaylisteditor.cpp b/amarok/src/smartplaylisteditor.cpp
index 5d478357..5052e3b7 100644
--- a/amarok/src/smartplaylisteditor.cpp
+++ b/amarok/src/smartplaylisteditor.cpp
@@ -862,7 +862,7 @@ void CriteriaEditor::loadEditWidgets()
     /* Store lastCriteria. This information is used above to decide whether it's necessary to change the Widgets */
     m_lastCriteria = m_criteriaCombo->currentText();
 
-    TQObjectList* list = m_editBox->queryList( TQWIDGET_OBJECT_NAME_STRING );
+    TQObjectList* list = m_editBox->queryList( "TQWidget" );
     for( TQObject *obj = list->first(); obj; obj = list->next()  )
         TQT_TQWIDGET(obj)->deleteLater();
 
diff --git a/amarok/src/statusbar/statusBarBase.cpp b/amarok/src/statusbar/statusBarBase.cpp
index 56e5c421..4056a547 100644
--- a/amarok/src/statusbar/statusBarBase.cpp
+++ b/amarok/src/statusbar/statusBarBase.cpp
@@ -74,7 +74,7 @@ namespace SingleShotPool
     {
         TQTimer *timer = static_cast<TQTimer*>( parent->child( slot ) );
 
-        return timer && timer->isA( TQTIMER_OBJECT_NAME_STRING ) && timer->isActive();
+        return timer && timer->isA( "TQTimer" ) && timer->isActive();
     }
 }
 
@@ -148,7 +148,7 @@ StatusBar::polish()
     TQWidget::polish();
 
     int h = 0;
-    TQObjectList *list = queryList( TQWIDGET_OBJECT_NAME_STRING, 0, false, false );
+    TQObjectList *list = queryList( "TQWidget", 0, false, false );
 
     for( TQObject * o = list->first(); o; o = list->next() ) {
         int _h = TQT_TQWIDGET( o ) ->minimumSizeHint().height();
@@ -157,7 +157,7 @@ StatusBar::polish()
 
 //         debug() << o->className() << ", " << o->name() << ": " << _h << ": " << TQT_TQWIDGET(o)->minimumHeight() << endl;
 
-        if ( o->inherits( TQLABEL_OBJECT_NAME_STRING ) )
+        if ( o->inherits( "TQLabel" ) )
             static_cast<TQLabel*>(TQT_TQWIDGET(o))->setIndent( 4 );
     }
 
@@ -172,7 +172,7 @@ StatusBar::polish()
 void
 StatusBar::paintEvent( TQPaintEvent* )
 {
-    TQObjectList *list = queryList( TQWIDGET_OBJECT_NAME_STRING, 0, false, false );
+    TQObjectList *list = queryList( "TQWidget", 0, false, false );
     TQPainter p( this );
 
     for( TQObject * o = list->first(); o; o = list->next() ) {