From cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 15 Feb 2011 19:15:16 +0000 Subject: Allow kdebase to (mostly) function correctly with TQt for Qt4 Fix kicker tackbar handling under Classic mode (thanks to Ilya Chernykh for the patch) Fix a newly invalidated section of code under GCC 4.5.2 (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47723#c6) git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1220927 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ksysguard/gui/SensorDisplayLib/DancingBars.cc | 28 +++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'ksysguard/gui/SensorDisplayLib/DancingBars.cc') diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.cc b/ksysguard/gui/SensorDisplayLib/DancingBars.cc index e2b3917f5..7163f9b99 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBars.cc +++ b/ksysguard/gui/SensorDisplayLib/DancingBars.cc @@ -94,11 +94,11 @@ void DancingBars::configureSettings() TQValueList< TQStringList > list; for ( uint i = mBars - 1; i < mBars; i-- ) { TQStringList entry; - entry << sensors().at( i )->hostName(); - entry << KSGRD::SensorMgr->translateSensor( sensors().at( i )->name() ); + entry << sensors().tqat( i )->hostName(); + entry << KSGRD::SensorMgr->translateSensor( sensors().tqat( i )->name() ); entry << mPlotter->footers[ i ]; - entry << KSGRD::SensorMgr->translateUnit( sensors().at( i )->unit() ); - entry << ( sensors().at( i )->isOk() ? i18n( "OK" ) : i18n( "Error" ) ); + entry << KSGRD::SensorMgr->translateUnit( sensors().tqat( i )->unit() ); + entry << ( sensors().tqat( i )->isOk() ? i18n( "OK" ) : i18n( "Error" ) ); list.append( entry ); } @@ -135,8 +135,8 @@ void DancingBars::applySettings() for ( uint i = 0; i < sensors().count(); i++ ) { bool found = false; for ( it = list.begin(); it != list.end(); ++it ) { - if ( (*it)[ 0 ] == sensors().at( i )->hostName() && - (*it)[ 1 ] == KSGRD::SensorMgr->translateSensor( sensors().at( i )->name() ) ) { + if ( (*it)[ 0 ] == sensors().tqat( i )->hostName() && + (*it)[ 1 ] == KSGRD::SensorMgr->translateSensor( sensors().tqat( i )->name() ) ) { mPlotter->footers[ i ] = (*it)[ 2 ]; found = true; break; @@ -185,8 +185,8 @@ bool DancingBars::addSensor( const TQString &hostName, const TQString &name, TQString tooltip; for ( uint i = 0; i < mBars; ++i ) { tooltip += TQString( "%1%2:%3" ).arg( i != 0 ? "\n" : "" ) - .arg( sensors().at( i )->hostName() ) - .arg( sensors().at( i )->name() ); + .arg( sensors().tqat( i )->hostName() ) + .arg( sensors().tqat( i )->name() ); } TQToolTip::remove( mPlotter ); TQToolTip::add( mPlotter, tooltip ); @@ -209,8 +209,8 @@ bool DancingBars::removeSensor( uint pos ) TQString tooltip; for ( uint i = 0; i < mBars; ++i ) { tooltip += TQString( "%1%2:%3" ).arg( i != 0 ? "\n" : "" ) - .arg( sensors().at( i )->hostName() ) - .arg( sensors().at( i )->name() ); + .arg( sensors().tqat( i )->hostName() ) + .arg( sensors().tqat( i )->name() ); } TQToolTip::remove( mPlotter ); TQToolTip::add( mPlotter, tooltip ); @@ -272,7 +272,7 @@ void DancingBars::answerReceived( int id, const TQString &answer ) mPlotter->changeRange( info.min(), info.max() ); } - sensors().at( id - 100 )->setUnit( info.unit() ); + sensors().tqat( id - 100 )->setUnit( info.unit() ); } } @@ -331,9 +331,9 @@ bool DancingBars::saveSettings( TQDomDocument &doc, TQDomElement &element, for ( uint i = 0; i < mBars; ++i ) { TQDomElement beam = doc.createElement( "beam" ); element.appendChild( beam ); - beam.setAttribute( "hostName", sensors().at( i )->hostName() ); - beam.setAttribute( "sensorName", sensors().at( i )->name() ); - beam.setAttribute( "sensorType", sensors().at( i )->type() ); + beam.setAttribute( "hostName", sensors().tqat( i )->hostName() ); + beam.setAttribute( "sensorName", sensors().tqat( i )->name() ); + beam.setAttribute( "sensorType", sensors().tqat( i )->type() ); beam.setAttribute( "sensorDescr", mPlotter->footers[ i ] ); } -- cgit v1.2.1