diff options
| -rw-r--r-- | amarok/src/actionclasses.cpp | 2 | ||||
| -rw-r--r-- | amarok/src/configdialog.cpp | 4 | ||||
| -rw-r--r-- | amarok/src/playerwindow.cpp | 2 | ||||
| -rw-r--r-- | amarok/src/smartplaylisteditor.cpp | 2 | ||||
| -rw-r--r-- | amarok/src/statusbar/statusBarBase.cpp | 8 |
5 files changed, 9 insertions, 9 deletions
diff --git a/amarok/src/actionclasses.cpp b/amarok/src/actionclasses.cpp index 79ec38a1..614045cc 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" ) ) + if( w->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) static_cast<TQPopupMenu*>(w)->changeItem( itemId( x ), text ); //TODO KToolBar sucks so much // else if( w->inherits( "KToolBar" ) ) diff --git a/amarok/src/configdialog.cpp b/amarok/src/configdialog.cpp index 1ed07eb5..2a76839f 100644 --- a/amarok/src/configdialog.cpp +++ b/amarok/src/configdialog.cpp @@ -184,14 +184,14 @@ AmarokConfigDialog::AmarokConfigDialog( TQWidget *parent, const char* name, KCon 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", "infoPixmap" ); + TQObjectList *list = queryList( TQLABEL_OBJECT_NAME_STRING, "infoPixmap" ); TQPixmap const info = KGlobal::iconLoader()->iconPath( "messagebox_info", -KIcon::SizeHuge ); for( TQObject *label = list->first(); label; label = list->next() ) static_cast<TQLabel*>(label)->setPixmap( info ); delete list; //stop KFont Requesters getting stupidly large - list = queryList( "TQLabel", "m_sampleLabel" ); + list = queryList( TQLABEL_OBJECT_NAME_STRING, "m_sampleLabel" ); for( TQObject *label = list->first(); label; label = list->next() ) static_cast<TQLabel*>(label)->setMaximumWidth( 250 ); delete list; diff --git a/amarok/src/playerwindow.cpp b/amarok/src/playerwindow.cpp index f61e07a6..9d985d4b 100644 --- a/amarok/src/playerwindow.cpp +++ b/amarok/src/playerwindow.cpp @@ -547,7 +547,7 @@ bool PlayerWidget::event( TQEvent *e ) return true; case 6/*TQEvent::KeyPress*/: - if (static_cast<TQKeyEvent*>(e)->key() == Qt::Key_D/* && (m_pAnalyzer->inherits("TQGLWidget")*/) + if (static_cast<TQKeyEvent*>(e)->key() == Qt::Key_D/* && (m_pAnalyzer->inherits(TQGLWIDGET_OBJECT_NAME_STRING)*/) { if( m_pAnalyzer->parent() ) { diff --git a/amarok/src/smartplaylisteditor.cpp b/amarok/src/smartplaylisteditor.cpp index 3ff864ee..f4da79a9 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" ); + TQObjectList* list = m_editBox->queryList( TQWIDGET_OBJECT_NAME_STRING ); for( TQObject *obj = list->first(); obj; obj = list->next() ) static_cast<TQWidget*>(obj)->deleteLater(); diff --git a/amarok/src/statusbar/statusBarBase.cpp b/amarok/src/statusbar/statusBarBase.cpp index 78c8bd4a..9e10d6db 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" ) && timer->isActive(); + return timer && timer->isA( TQTIMER_OBJECT_NAME_STRING ) && timer->isActive(); } } @@ -148,7 +148,7 @@ StatusBar::polish() TQWidget::polish(); int h = 0; - TQObjectList *list = queryList( "TQWidget", 0, false, false ); + TQObjectList *list = queryList( TQWIDGET_OBJECT_NAME_STRING, 0, false, false ); for( TQObject * o = list->first(); o; o = list->next() ) { int _h = static_cast<TQWidget*>( o ) ->minimumSizeHint().height(); @@ -157,7 +157,7 @@ StatusBar::polish() // debug() << o->className() << ", " << o->name() << ": " << _h << ": " << static_cast<TQWidget*>(o)->minimumHeight() << endl; - if ( o->inherits( "TQLabel" ) ) + if ( o->inherits( TQLABEL_OBJECT_NAME_STRING ) ) static_cast<TQLabel*>(o)->setIndent( 4 ); } @@ -172,7 +172,7 @@ StatusBar::polish() void StatusBar::paintEvent( TQPaintEvent* ) { - TQObjectList *list = queryList( "TQWidget", 0, false, false ); + TQObjectList *list = queryList( TQWIDGET_OBJECT_NAME_STRING, 0, false, false ); TQPainter p( this ); for( TQObject * o = list->first(); o; o = list->next() ) { |