Browse Source

Fix a number of runtime object identification problems which led to an even larger array of minor glitches

NOTE: kdevelop and kdewebdev still need to be fully repaired


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/amarok@1222475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 11 years ago
parent
commit
147b8fea24
  1. 2
      amarok/src/actionclasses.cpp
  2. 4
      amarok/src/configdialog.cpp
  3. 2
      amarok/src/playerwindow.cpp
  4. 2
      amarok/src/smartplaylisteditor.cpp
  5. 8
      amarok/src/statusbar/statusBarBase.cpp

2
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" ) )

4
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;

2
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() )
{

2
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();

8
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() ) {

Loading…
Cancel
Save