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/BarGraph.cc | 2 +- ksysguard/gui/SensorDisplayLib/DancingBars.cc | 28 +++++++++++----------- .../gui/SensorDisplayLib/DancingBarsSettings.cc | 8 +++---- ksysguard/gui/SensorDisplayLib/FancyPlotter.cc | 28 +++++++++++----------- .../gui/SensorDisplayLib/FancyPlotterSettings.cc | 10 ++++---- ksysguard/gui/SensorDisplayLib/ListView.cc | 16 ++++++------- ksysguard/gui/SensorDisplayLib/LogFile.cc | 16 ++++++------- ksysguard/gui/SensorDisplayLib/MultiMeter.cc | 6 ++--- .../gui/SensorDisplayLib/ProcessController.cc | 28 +++++++++++----------- ksysguard/gui/SensorDisplayLib/ProcessList.cc | 14 +++++------ ksysguard/gui/SensorDisplayLib/SensorDisplay.cc | 8 +++---- ksysguard/gui/SensorDisplayLib/SignalPlotter.cc | 8 +++---- ksysguard/gui/WorkSheet.cc | 6 ++--- ksysguard/gui/WorkSheetSettings.cc | 12 +++++----- ksysguard/gui/ksgrd/HostConnector.cc | 2 +- ksysguard/gui/ksgrd/StyleEngine.cc | 2 +- ksysguard/gui/ksgrd/StyleSettings.cc | 2 +- 17 files changed, 98 insertions(+), 98 deletions(-) (limited to 'ksysguard') diff --git a/ksysguard/gui/SensorDisplayLib/BarGraph.cc b/ksysguard/gui/SensorDisplayLib/BarGraph.cc index 79d8f5961..1980c3762 100644 --- a/ksysguard/gui/SensorDisplayLib/BarGraph.cc +++ b/ksysguard/gui/SensorDisplayLib/BarGraph.cc @@ -78,7 +78,7 @@ bool BarGraph::removeBar( uint idx ) } samples.resize( --bars ); - footers.remove( footers.at( idx ) ); + footers.remove( footers.tqat( idx ) ); update(); return true; 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 ] ); } diff --git a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc index 1b97cc25f..b1e6fc0d5 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc +++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc @@ -48,7 +48,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) TQGridLayout *pageLayout = new TQGridLayout( page, 3, 1, 0, spacingHint() ); TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page ); - TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 1, 1 ); + TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 1, 1 ); mTitle = new KLineEdit( groupBox ); TQWhatsThis::add( mTitle, i18n( "Enter the title of the display here." ) ); @@ -57,7 +57,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) pageLayout->addWidget( groupBox, 0, 0 ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Display Range" ), page ); - boxLayout = new TQGridLayout( groupBox->layout(), 1, 5 ); + boxLayout = new TQGridLayout( groupBox->tqlayout(), 1, 5 ); boxLayout->setColStretch( 2, 1 ); TQLabel *label = new TQLabel( i18n( "Minimum value:" ), groupBox ); @@ -85,7 +85,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) pageLayout = new TQGridLayout( page, 3, 1, 0, spacingHint() ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Alarm for Minimum Value" ), page ); - boxLayout = new TQGridLayout( groupBox->layout(), 1, 4 ); + boxLayout = new TQGridLayout( groupBox->tqlayout(), 1, 4 ); boxLayout->setColStretch( 1, 1 ); mUseLowerLimit = new TQCheckBox( i18n( "Enable alarm" ), groupBox ); @@ -103,7 +103,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) pageLayout->addWidget( groupBox, 0, 0 ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Alarm for Maximum Value" ), page ); - boxLayout = new TQGridLayout( groupBox->layout(), 1, 4 ); + boxLayout = new TQGridLayout( groupBox->tqlayout(), 1, 4 ); boxLayout->setColStretch( 1, 1 ); mUseUpperLimit = new TQCheckBox( i18n( "Enable alarm" ), groupBox ); diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc index 65a9ec809..09a6e7a94 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc @@ -101,10 +101,10 @@ void FancyPlotter::configureSettings() for ( uint i = 0; i < mBeams; ++i ) { TQStringList entry; entry << TQString::number(i); - entry << sensors().at( i )->hostName(); - entry << KSGRD::SensorMgr->translateSensor( sensors().at( i )->name() ); - entry << KSGRD::SensorMgr->translateUnit( sensors().at( i )->unit() ); - entry << ( sensors().at( i )->isOk() ? i18n( "OK" ) : i18n( "Error" ) ); + entry << sensors().tqat( i )->hostName(); + entry << KSGRD::SensorMgr->translateSensor( sensors().tqat( i )->name() ); + entry << KSGRD::SensorMgr->translateUnit( sensors().tqat( i )->unit() ); + entry << ( sensors().tqat( i )->isOk() ? i18n( "OK" ) : i18n( "Error" ) ); entry << ( mPlotter->beamColors()[ i ].name() ); list.append( entry ); @@ -214,10 +214,10 @@ bool FancyPlotter::addSensor( const TQString &hostName, const TQString &name, if ( type != "integer" && type != "float" ) return false; - if ( mBeams > 0 && hostName != sensors().at( 0 )->hostName() ) { + if ( mBeams > 0 && hostName != sensors().tqat( 0 )->hostName() ) { KMessageBox::sorry( this, TQString( "All sensors of this display need " "to be from the host %1!" ) - .arg( sensors().at( 0 )->hostName() ) ); + .arg( sensors().tqat( 0 )->hostName() ) ); /* We have to enforce this since the answers to value requests * need to be received in order. */ @@ -238,8 +238,8 @@ bool FancyPlotter::addSensor( const TQString &hostName, const TQString &name, TQString tooltip; for ( uint i = 0; i < mBeams; ++i ) { tooltip += TQString( "%1%2:%3" ).arg( i != 0 ? "\n" : "" ) - .arg( sensors().at( mBeams - i - 1 )->hostName() ) - .arg( sensors().at( mBeams - i - 1 )->name() ); + .arg( sensors().tqat( mBeams - i - 1 )->hostName() ) + .arg( sensors().tqat( mBeams - i - 1 )->name() ); } TQToolTip::remove( TQT_TQWIDGET(mPlotter) ); @@ -263,8 +263,8 @@ bool FancyPlotter::removeSensor( uint pos ) TQString tooltip; for ( uint i = 0; i < mBeams; ++i ) { tooltip += TQString( "%1%2:%3" ).arg( i != 0 ? "\n" : "" ) - .arg( sensors().at( mBeams - i - 1 )->hostName() ) - .arg( sensors().at( mBeams - i - 1 )->name() ); + .arg( sensors().tqat( mBeams - i - 1 )->hostName() ) + .arg( sensors().tqat( mBeams - i - 1 )->name() ); } TQToolTip::remove( TQT_TQWIDGET(mPlotter) ); @@ -319,7 +319,7 @@ void FancyPlotter::answerReceived( int id, const TQString &answer ) if ( info.min() == 0.0 && info.max() == 0.0 ) mPlotter->setUseAutoRange( true ); } - sensors().at( id - 100 )->setUnit( info.unit() ); + sensors().tqat( id - 100 )->setUnit( info.unit() ); } } @@ -405,9 +405,9 @@ bool FancyPlotter::saveSettings( TQDomDocument &doc, TQDomElement &element, for ( uint i = 0; i < mBeams; ++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() ); saveColor( beam, "color", mPlotter->beamColors()[ i ] ); } diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc index 95587dde6..ad5687144 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc @@ -79,7 +79,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) pageLayout = new TQGridLayout( page, 2, 1, 0, spacingHint() ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Vertical Scale" ), page ); - boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() ); + boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, 5, spacingHint() ); boxLayout->setColStretch( 2, 1 ); mUseAutoRange = new TQCheckBox( i18n( "Automatic range detection" ), groupBox ); @@ -109,7 +109,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) pageLayout->addWidget( groupBox, 0, 0 ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Horizontal Scale" ), page ); - boxLayout = new TQGridLayout( groupBox->layout(), 2, 2, spacingHint() ); + boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, 2, spacingHint() ); boxLayout->setRowStretch( 1, 1 ); mHorizontalScale = new KIntNumInput( 1, groupBox ); @@ -127,7 +127,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) pageLayout = new TQGridLayout( page, 3, 2, 0, spacingHint() ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Lines" ), page ); - boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() ); + boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, 5, spacingHint() ); boxLayout->setColStretch( 1, 1 ); mShowVerticalLines = new TQCheckBox( i18n( "Vertical lines" ), groupBox ); @@ -166,7 +166,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) pageLayout->addMultiCellWidget( groupBox, 0, 0, 0, 1 ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Text" ), page ); - boxLayout = new TQGridLayout( groupBox->layout(), 3, 4, spacingHint() ); + boxLayout = new TQGridLayout( groupBox->tqlayout(), 3, 4, spacingHint() ); boxLayout->setColStretch( 1, 1 ); mShowLabels = new TQCheckBox( i18n( "Labels" ), groupBox ); @@ -191,7 +191,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) pageLayout->addWidget( groupBox, 1, 0 ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Colors" ), page ); - boxLayout = new TQGridLayout( groupBox->layout(), 4, 2, spacingHint() ); + boxLayout = new TQGridLayout( groupBox->tqlayout(), 4, 2, spacingHint() ); label = new TQLabel( i18n( "Vertical lines:" ), groupBox ); boxLayout->addWidget( label, 0, 0 ); diff --git a/ksysguard/gui/SensorDisplayLib/ListView.cc b/ksysguard/gui/SensorDisplayLib/ListView.cc index dbd11a7b5..e9fc17c24 100644 --- a/ksysguard/gui/SensorDisplayLib/ListView.cc +++ b/ksysguard/gui/SensorDisplayLib/ListView.cc @@ -116,8 +116,8 @@ PrivateListView::PrivateListView(TQWidget *parent, const char *name) void PrivateListView::update(const TQString& answer) { - setUpdatesEnabled(false); - viewport()->setUpdatesEnabled(false); + tqsetUpdatesEnabled(false); + viewport()->tqsetUpdatesEnabled(false); int vpos = verticalScrollBar()->value(); int hpos = horizontalScrollBar()->value(); @@ -143,8 +143,8 @@ void PrivateListView::update(const TQString& answer) verticalScrollBar()->setValue(vpos); horizontalScrollBar()->setValue(hpos); - viewport()->setUpdatesEnabled(true); - setUpdatesEnabled(true); + viewport()->tqsetUpdatesEnabled(true); + tqsetUpdatesEnabled(true); triggerUpdate(); } @@ -239,7 +239,7 @@ ListView::addSensor(const TQString& hostName, const TQString& sensorName, const void ListView::updateList() { - sendRequest(sensors().at(0)->hostName(), sensors().at(0)->name(), 19); + sendRequest(sensors().tqat(0)->hostName(), sensors().tqat(0)->name(), 19); } void @@ -307,9 +307,9 @@ ListView::restoreSettings(TQDomElement& element) bool ListView::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) { - element.setAttribute("hostName", sensors().at(0)->hostName()); - element.setAttribute("sensorName", sensors().at(0)->name()); - element.setAttribute("sensorType", sensors().at(0)->type()); + element.setAttribute("hostName", sensors().tqat(0)->hostName()); + element.setAttribute("sensorName", sensors().tqat(0)->name()); + element.setAttribute("sensorType", sensors().tqat(0)->type()); TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); saveColor(element, "gridColor", tqcolorGroup.color(TQColorGroup::Link)); diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cc b/ksysguard/gui/SensorDisplayLib/LogFile.cc index 575ca6919..bd74ff2c0 100644 --- a/ksysguard/gui/SensorDisplayLib/LogFile.cc +++ b/ksysguard/gui/SensorDisplayLib/LogFile.cc @@ -51,7 +51,7 @@ LogFile::LogFile(TQWidget *parent, const char *name, const TQString& title) LogFile::~LogFile(void) { - sendRequest(sensors().at(0)->hostName(), TQString("logfile_unregister %1" ).arg(logFileID), 43); + sendRequest(sensors().tqat(0)->hostName(), TQString("logfile_unregister %1" ).arg(logFileID), 43); } bool @@ -64,10 +64,10 @@ LogFile::addSensor(const TQString& hostName, const TQString& sensorName, const T TQString sensorID = sensorName.right(sensorName.length() - (sensorName.tqfindRev("/") + 1)); - sendRequest(sensors().at(0)->hostName(), TQString("logfile_register %1" ).arg(sensorID), 42); + sendRequest(sensors().tqat(0)->hostName(), TQString("logfile_register %1" ).arg(sensorID), 42); if (title.isEmpty()) - setTitle(sensors().at(0)->hostName() + ":" + sensorID); + setTitle(sensors().tqat(0)->hostName() + ":" + sensorID); else setTitle(title); @@ -206,9 +206,9 @@ LogFile::restoreSettings(TQDomElement& element) bool LogFile::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) { - element.setAttribute("hostName", sensors().at(0)->hostName()); - element.setAttribute("sensorName", sensors().at(0)->name()); - element.setAttribute("sensorType", sensors().at(0)->type()); + element.setAttribute("hostName", sensors().tqat(0)->hostName()); + element.setAttribute("sensorName", sensors().tqat(0)->name()); + element.setAttribute("sensorType", sensors().tqat(0)->type()); element.setAttribute("font", monitor->font().toString()); @@ -234,8 +234,8 @@ LogFile::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) void LogFile::updateMonitor() { - sendRequest(sensors().at(0)->hostName(), - TQString("%1 %2" ).arg(sensors().at(0)->name()).arg(logFileID), 19); + sendRequest(sensors().tqat(0)->hostName(), + TQString("%1 %2" ).arg(sensors().tqat(0)->name()).arg(logFileID), 19); } void diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc b/ksysguard/gui/SensorDisplayLib/MultiMeter.cc index 3a54aefd3..7050decde 100644 --- a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc +++ b/ksysguard/gui/SensorDisplayLib/MultiMeter.cc @@ -166,9 +166,9 @@ MultiMeter::restoreSettings(TQDomElement& element) bool MultiMeter::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) { - element.setAttribute("hostName", sensors().at(0)->hostName()); - element.setAttribute("sensorName", sensors().at(0)->name()); - element.setAttribute("sensorType", sensors().at(0)->type()); + element.setAttribute("hostName", sensors().tqat(0)->hostName()); + element.setAttribute("sensorName", sensors().tqat(0)->name()); + element.setAttribute("sensorType", sensors().tqat(0)->type()); element.setAttribute("showUnit", showUnit()); element.setAttribute("lowerLimitActive", (int) lowerLimitActive); element.setAttribute("lowerLimit", (int) lowerLimit); diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cc b/ksysguard/gui/SensorDisplayLib/ProcessController.cc index 90f86a0e8..0438c0eb8 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessController.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessController.cc @@ -213,13 +213,13 @@ ProcessController::addSensor(const TQString& hostName, void ProcessController::updateList() { - sendRequest(sensors().at(0)->hostName(), "ps", 2); + sendRequest(sensors().tqat(0)->hostName(), "ps", 2); } void ProcessController::killProcess(int pid, int sig) { - sendRequest(sensors().at(0)->hostName(), + sendRequest(sensors().tqat(0)->hostName(), TQString("kill %1 %2" ).arg(pid).arg(sig), 3); if ( !timerOn() ) @@ -269,7 +269,7 @@ ProcessController::killProcess() // send kill signal to all seleted processes TQValueListConstIterator it; for (it = selectedPIds.begin(); it != selectedPIds.end(); ++it) - sendRequest(sensors().at(0)->hostName(), TQString("kill %1 %2" ).arg(*it) + sendRequest(sensors().tqat(0)->hostName(), TQString("kill %1 %2" ).arg(*it) .arg(MENU_ID_SIGKILL), 3); if ( !timerOn()) @@ -283,9 +283,9 @@ void ProcessController::reniceProcess(const TQValueList &pids, int niceValue) { for( TQValueList::ConstIterator it = pids.constBegin(), end = pids.constEnd(); it != end; ++it ) - sendRequest(sensors().at(0)->hostName(), + sendRequest(sensors().tqat(0)->hostName(), TQString("setpriority %1 %2" ).arg(*it).arg(niceValue), 5); - sendRequest(sensors().at(0)->hostName(), "ps", 2); //update the display afterwards + sendRequest(sensors().tqat(0)->hostName(), "ps", 2); //update the display afterwards } void @@ -401,7 +401,7 @@ ProcessController::answerReceived(int id, const TQString& answer) void ProcessController::sensorError(int, bool err) { - if (err == sensors().at(0)->isOk()) + if (err == sensors().tqat(0)->isOk()) { if (!err) { @@ -409,15 +409,15 @@ ProcessController::sensorError(int, bool err) * (re-)established we need to requests the full set of * properties again, since the back-end might be a new * one. */ - sendRequest(sensors().at(0)->hostName(), "test kill", 4); - sendRequest(sensors().at(0)->hostName(), "ps?", 1); - sendRequest(sensors().at(0)->hostName(), "ps", 2); + sendRequest(sensors().tqat(0)->hostName(), "test kill", 4); + sendRequest(sensors().tqat(0)->hostName(), "ps?", 1); + sendRequest(sensors().tqat(0)->hostName(), "ps", 2); } /* This happens only when the sensorOk status needs to be changed. */ - sensors().at(0)->setIsOk( !err ); + sensors().tqat(0)->setIsOk( !err ); } - setSensorOk(sensors().at(0)->isOk()); + setSensorOk(sensors().tqat(0)->isOk()); } bool @@ -452,9 +452,9 @@ ProcessController::restoreSettings(TQDomElement& element) bool ProcessController::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) { - element.setAttribute("hostName", sensors().at(0)->hostName()); - element.setAttribute("sensorName", sensors().at(0)->name()); - element.setAttribute("sensorType", sensors().at(0)->type()); + element.setAttribute("hostName", sensors().tqat(0)->hostName()); + element.setAttribute("sensorName", sensors().tqat(0)->name()); + element.setAttribute("sensorType", sensors().tqat(0)->type()); element.setAttribute("tree", (uint) xbTreeView->isChecked()); element.setAttribute("filter", cbFilter->currentItem()); element.setAttribute("sortColumn", pList->getSortColumn()); diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cc index cc5ca3266..278e837c8 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cc @@ -297,8 +297,8 @@ ProcessList::update(const TQString& list) /* Disable painting to avoid flickering effects, * especially when in tree view mode. * Ditto for the scrollbar. */ - setUpdatesEnabled(false); - viewport()->setUpdatesEnabled(false); + tqsetUpdatesEnabled(false); + viewport()->tqsetUpdatesEnabled(false); pl.clear(); @@ -349,8 +349,8 @@ ProcessList::update(const TQString& list) horizontalScrollBar()->setValue(hpos); // Re-enable painting, and force an update. - setUpdatesEnabled(true); - viewport()->setUpdatesEnabled(true); + tqsetUpdatesEnabled(true); + viewport()->tqsetUpdatesEnabled(true); triggerUpdate(); @@ -532,8 +532,8 @@ ProcessList::deleteLeaves(void) { unsigned int i; for (i = 0; i < pl.count() && - (!isLeafProcess(pl.at(i)->pid()) || - matchesFilter(pl.at(i))); i++) + (!isLeafProcess(pl.tqat(i)->pid()) || + matchesFilter(pl.tqat(i))); i++) ; if (i == pl.count()) return; @@ -546,7 +546,7 @@ bool ProcessList::isLeafProcess(int pid) { for (unsigned int i = 0; i < pl.count(); i++) - if (pl.at(i)->ppid() == pid) + if (pl.tqat(i)->ppid() == pid) return (false); return (true); diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc index dca7163b8..0348abfe1 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc +++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc @@ -219,14 +219,14 @@ void SensorDisplay::sensorError( int sensorId, bool err ) if ( sensorId >= (int)mSensors.count() || sensorId < 0 ) return; - if ( err == mSensors.at( sensorId )->isOk() ) { + if ( err == mSensors.tqat( sensorId )->isOk() ) { // this happens only when the sensorOk status needs to be changed. - mSensors.at( sensorId )->setIsOk( !err ); + mSensors.tqat( sensorId )->setIsOk( !err ); } bool ok = true; for ( uint i = 0; i < mSensors.count(); ++i ) - if ( !mSensors.at( i )->isOk() ) { + if ( !mSensors.tqat( i )->isOk() ) { ok = false; break; } @@ -524,7 +524,7 @@ void SensorDisplay::reorderSensors(const TQValueList &orderOfSensors) { TQPtrList newSensors; for ( uint i = 0; i < orderOfSensors.count(); ++i ) { - newSensors.append( mSensors.at(orderOfSensors[i] )); + newSensors.append( mSensors.tqat(orderOfSensors[i] )); } mSensors.setAutoDelete( false ); diff --git a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc index 70d4d1900..48cc5489d 100644 --- a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc +++ b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc @@ -134,8 +134,8 @@ void SignalPlotter::reorderBeams( const TQValueList& newOrder ) for(uint i = 0; i < newOrder.count(); i++) { int newIndex = newOrder[i]; - newBeamData.append(mBeamData.at(newIndex)); - newBeamColor.append(*mBeamColor.at(newIndex)); + newBeamData.append(mBeamData.tqat(newIndex)); + newBeamColor.append(*mBeamColor.tqat(newIndex)); } mBeamData = newBeamData; mBeamColor = newBeamColor; @@ -159,7 +159,7 @@ TQValueList &SignalPlotter::beamColors() void SignalPlotter::removeBeam( uint pos ) { - mBeamColor.remove( mBeamColor.at( pos ) ); + mBeamColor.remove( mBeamColor.tqat( pos ) ); double *p = mBeamData.take( pos ); delete [] p; } @@ -374,7 +374,7 @@ void SignalPlotter::updateDataBuffers() memset( nd, 0, sizeof( double ) * ( newSampleNum - overlap ) ); // copy overlap from old buffer to new buffer - memcpy( nd + ( newSampleNum - overlap ), mBeamData.at( i ) + + memcpy( nd + ( newSampleNum - overlap ), mBeamData.tqat( i ) + ( mSamples - overlap ), overlap * sizeof( double ) ); double *p = mBeamData.take( i ); diff --git a/ksysguard/gui/WorkSheet.cc b/ksysguard/gui/WorkSheet.cc index f3d9e240e..53737fdaa 100644 --- a/ksysguard/gui/WorkSheet.cc +++ b/ksysguard/gui/WorkSheet.cc @@ -241,7 +241,7 @@ void WorkSheet::cut() if ( !currentDisplay() || currentDisplay()->isA( "DummyDisplay" ) ) return; - QClipboard* clip = TQApplication::clipboard(); + TQClipboard* clip = TQApplication::tqclipboard(); clip->setText( currentDisplayAsXML() ); @@ -253,7 +253,7 @@ void WorkSheet::copy() if ( !currentDisplay() || currentDisplay()->isA( "DummyDisplay" ) ) return; - QClipboard* clip = TQApplication::clipboard(); + TQClipboard* clip = TQApplication::tqclipboard(); clip->setText( currentDisplayAsXML() ); } @@ -264,7 +264,7 @@ void WorkSheet::paste() if ( !currentDisplay( &row, &column ) ) return; - QClipboard* clip = TQApplication::clipboard(); + TQClipboard* clip = TQApplication::tqclipboard(); TQDomDocument doc; /* Get text from clipboard and check for a valid XML header and diff --git a/ksysguard/gui/WorkSheetSettings.cc b/ksysguard/gui/WorkSheetSettings.cc index f14e462a2..aaa0c77b2 100644 --- a/ksysguard/gui/WorkSheetSettings.cc +++ b/ksysguard/gui/WorkSheetSettings.cc @@ -46,10 +46,10 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name ) TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page ); - group->layout()->setMargin( marginHint() ); - group->layout()->setSpacing( spacingHint() ); + group->tqlayout()->setMargin( marginHint() ); + group->tqlayout()->setSpacing( spacingHint() ); - TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 1, 1 ); + TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 1, 1 ); groupLayout->tqsetAlignment( Qt::AlignTop ); mSheetTitle = new KLineEdit( group ); @@ -58,10 +58,10 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name ) topLayout->addWidget( group ); group = new TQGroupBox( 0, Qt::Vertical, i18n( "Properties" ), page ); - group->layout()->setMargin( marginHint() ); - group->layout()->setSpacing( spacingHint() ); + group->tqlayout()->setMargin( marginHint() ); + group->tqlayout()->setSpacing( spacingHint() ); - groupLayout = new TQGridLayout( group->layout(), 3, 2 ); + groupLayout = new TQGridLayout( group->tqlayout(), 3, 2 ); groupLayout->tqsetAlignment( Qt::AlignTop ); TQLabel *label = new TQLabel( i18n( "Rows:" ), group ); diff --git a/ksysguard/gui/ksgrd/HostConnector.cc b/ksysguard/gui/ksgrd/HostConnector.cc index c5250a3cb..0f87323d4 100644 --- a/ksysguard/gui/ksgrd/HostConnector.cc +++ b/ksysguard/gui/ksgrd/HostConnector.cc @@ -59,7 +59,7 @@ HostConnector::HostConnector( TQWidget *parent, const char *name ) TQButtonGroup *group = new TQButtonGroup( 0, Qt::Vertical, i18n( "Connection Type" ), page ); - TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 4, 4, + TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 4, 4, spacingHint() ); groupLayout->tqsetAlignment( Qt::AlignTop ); diff --git a/ksysguard/gui/ksgrd/StyleEngine.cc b/ksysguard/gui/ksgrd/StyleEngine.cc index d05af4ec8..67a0ccbee 100644 --- a/ksysguard/gui/ksgrd/StyleEngine.cc +++ b/ksysguard/gui/ksgrd/StyleEngine.cc @@ -122,7 +122,7 @@ const TQColor& StyleEngine::sensorColor( uint pos ) static TQColor dummy; if ( pos < mSensorColors.count() ) - return *mSensorColors.at( pos ); + return *mSensorColors.tqat( pos ); else return dummy; } diff --git a/ksysguard/gui/ksgrd/StyleSettings.cc b/ksysguard/gui/ksgrd/StyleSettings.cc index 6c7faf771..34f33a43d 100644 --- a/ksysguard/gui/ksgrd/StyleSettings.cc +++ b/ksysguard/gui/ksgrd/StyleSettings.cc @@ -162,7 +162,7 @@ void StyleSettings::setSensorColors( const TQValueList &list ) for ( uint i = 0; i < list.count(); ++i ) { TQPixmap pm( 12, 12 ); - pm.fill( *list.at( i ) ); + pm.fill( *list.tqat( i ) ); mColorListBox->insertItem( pm, i18n( "Color %1" ).arg( i ) ); } } -- cgit v1.2.1