From f64397c82fa94371ab4a64af28c4d0029f4cd93f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:53:50 -0600 Subject: Remove additional unneeded tq method conversions --- ksysguard/gui/SensorDisplayLib/BarGraph.cc | 4 +-- ksysguard/gui/SensorDisplayLib/DancingBars.cc | 32 +++++++++++----------- ksysguard/gui/SensorDisplayLib/FancyPlotter.cc | 28 +++++++++---------- ksysguard/gui/SensorDisplayLib/ListView.cc | 8 +++--- ksysguard/gui/SensorDisplayLib/ListView.h | 4 +-- .../gui/SensorDisplayLib/ListViewSettingsWidget.ui | 2 +- ksysguard/gui/SensorDisplayLib/LogFile.cc | 16 +++++------ ksysguard/gui/SensorDisplayLib/MultiMeter.cc | 10 +++---- .../SensorDisplayLib/MultiMeterSettingsWidget.ui | 16 +++++------ .../gui/SensorDisplayLib/ProcessController.cc | 28 +++++++++---------- ksysguard/gui/SensorDisplayLib/ProcessList.cc | 6 ++-- ksysguard/gui/SensorDisplayLib/SensorDisplay.cc | 8 +++--- ksysguard/gui/SensorDisplayLib/SensorLogger.cc | 6 ++-- ksysguard/gui/SensorDisplayLib/SensorLogger.h | 4 +-- .../SensorDisplayLib/SensorLoggerSettingsWidget.ui | 2 +- ksysguard/gui/SensorDisplayLib/SignalPlotter.cc | 10 +++---- ksysguard/gui/WorkSheet.cc | 2 +- ksysguard/gui/ksgrd/StyleEngine.cc | 2 +- ksysguard/gui/ksgrd/StyleSettings.cc | 2 +- 19 files changed, 95 insertions(+), 95 deletions(-) (limited to 'ksysguard/gui') diff --git a/ksysguard/gui/SensorDisplayLib/BarGraph.cc b/ksysguard/gui/SensorDisplayLib/BarGraph.cc index cf0c1ee0a..8d2b5e302 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.tqat( idx ) ); + footers.remove( footers.at( idx ) ); update(); return true; @@ -103,7 +103,7 @@ void BarGraph::paintEvent( TQPaintEvent* ) TQPixmap pm( w, h ); TQPainter p; - p.tqbegin( &pm, this ); + p.begin( &pm, this ); p.setFont( TQFont( p.font().family(), fontSize ) ); TQFontMetrics fm( p.font() ); diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.cc b/ksysguard/gui/SensorDisplayLib/DancingBars.cc index 3d513ace3..3917fc86b 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().tqat( i )->hostName(); - entry << KSGRD::SensorMgr->translateSensor( sensors().tqat( i )->name() ); + entry << sensors().at( i )->hostName(); + entry << KSGRD::SensorMgr->translateSensor( sensors().at( i )->name() ); entry << mPlotter->footers[ i ]; - entry << KSGRD::SensorMgr->translateUnit( sensors().tqat( i )->unit() ); - entry << ( sensors().tqat( i )->isOk() ? i18n( "OK" ) : i18n( "Error" ) ); + entry << KSGRD::SensorMgr->translateUnit( sensors().at( i )->unit() ); + entry << ( sensors().at( 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().tqat( i )->hostName() && - (*it)[ 1 ] == KSGRD::SensorMgr->translateSensor( sensors().tqat( i )->name() ) ) { + if ( (*it)[ 0 ] == sensors().at( i )->hostName() && + (*it)[ 1 ] == KSGRD::SensorMgr->translateSensor( sensors().at( i )->name() ) ) { mPlotter->footers[ i ] = (*it)[ 2 ]; found = true; break; @@ -147,7 +147,7 @@ void DancingBars::applySettings() removeSensor( i ); } - tqrepaint(); + repaint(); setModified( true ); } @@ -158,7 +158,7 @@ void DancingBars::applyStyle() mPlotter->backgroundColor = KSGRD::Style->backgroundColor(); mPlotter->fontSize = KSGRD::Style->fontSize(); - tqrepaint(); + repaint(); setModified( true ); } @@ -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().tqat( i )->hostName() ) - .arg( sensors().tqat( i )->name() ); + .arg( sensors().at( i )->hostName() ) + .arg( sensors().at( 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().tqat( i )->hostName() ) - .arg( sensors().tqat( i )->name() ); + .arg( sensors().at( i )->hostName() ) + .arg( sensors().at( 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().tqat( id - 100 )->setUnit( info.unit() ); + sensors().at( 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().tqat( i )->hostName() ); - beam.setAttribute( "sensorName", sensors().tqat( i )->name() ); - beam.setAttribute( "sensorType", sensors().tqat( i )->type() ); + beam.setAttribute( "hostName", sensors().at( i )->hostName() ); + beam.setAttribute( "sensorName", sensors().at( i )->name() ); + beam.setAttribute( "sensorType", sensors().at( i )->type() ); beam.setAttribute( "sensorDescr", mPlotter->footers[ i ] ); } diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc index 89c12a30c..220df65b9 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().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 << 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 << ( 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().tqat( 0 )->hostName() ) { + if ( mBeams > 0 && hostName != sensors().at( 0 )->hostName() ) { KMessageBox::sorry( this, TQString( "All sensors of this display need " "to be from the host %1!" ) - .arg( sensors().tqat( 0 )->hostName() ) ); + .arg( sensors().at( 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().tqat( mBeams - i - 1 )->hostName() ) - .arg( sensors().tqat( mBeams - i - 1 )->name() ); + .arg( sensors().at( mBeams - i - 1 )->hostName() ) + .arg( sensors().at( 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().tqat( mBeams - i - 1 )->hostName() ) - .arg( sensors().tqat( mBeams - i - 1 )->name() ); + .arg( sensors().at( mBeams - i - 1 )->hostName() ) + .arg( sensors().at( 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().tqat( id - 100 )->setUnit( info.unit() ); + sensors().at( 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().tqat( i )->hostName() ); - beam.setAttribute( "sensorName", sensors().tqat( i )->name() ); - beam.setAttribute( "sensorType", sensors().tqat( i )->type() ); + beam.setAttribute( "hostName", sensors().at( i )->hostName() ); + beam.setAttribute( "sensorName", sensors().at( i )->name() ); + beam.setAttribute( "sensorType", sensors().at( i )->type() ); saveColor( beam, "color", mPlotter->beamColors()[ i ] ); } diff --git a/ksysguard/gui/SensorDisplayLib/ListView.cc b/ksysguard/gui/SensorDisplayLib/ListView.cc index c4daee1b6..c980196e6 100644 --- a/ksysguard/gui/SensorDisplayLib/ListView.cc +++ b/ksysguard/gui/SensorDisplayLib/ListView.cc @@ -239,7 +239,7 @@ ListView::addSensor(const TQString& hostName, const TQString& sensorName, const void ListView::updateList() { - sendRequest(sensors().tqat(0)->hostName(), sensors().tqat(0)->name(), 19); + sendRequest(sensors().at(0)->hostName(), sensors().at(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().tqat(0)->hostName()); - element.setAttribute("sensorName", sensors().tqat(0)->name()); - element.setAttribute("sensorType", sensors().tqat(0)->type()); + element.setAttribute("hostName", sensors().at(0)->hostName()); + element.setAttribute("sensorName", sensors().at(0)->name()); + element.setAttribute("sensorType", sensors().at(0)->type()); TQColorGroup colorGroup = monitor->colorGroup(); saveColor(element, "gridColor", colorGroup.color(TQColorGroup::Link)); diff --git a/ksysguard/gui/SensorDisplayLib/ListView.h b/ksysguard/gui/SensorDisplayLib/ListView.h index d26852230..643df8747 100644 --- a/ksysguard/gui/SensorDisplayLib/ListView.h +++ b/ksysguard/gui/SensorDisplayLib/ListView.h @@ -57,9 +57,9 @@ class PrivateListViewItem : public TQListViewItem public: PrivateListViewItem(PrivateListView *parent = 0); - void paintCell(TQPainter *p, const TQColorGroup &, int column, int width, int tqalignment) { + void paintCell(TQPainter *p, const TQColorGroup &, int column, int width, int alignment) { TQColorGroup cgroup = _parent->colorGroup(); - TQListViewItem::paintCell(p, cgroup, column, width, tqalignment); + TQListViewItem::paintCell(p, cgroup, column, width, alignment); p->setPen(cgroup.color(TQColorGroup::Link)); p->drawLine(0, height() - 1, width - 1, height() - 1); } diff --git a/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui index 53124ca65..98bf0e207 100644 --- a/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui +++ b/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui @@ -55,7 +55,7 @@ Colors - + WordBreak|AlignVCenter|AlignLeft diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cc b/ksysguard/gui/SensorDisplayLib/LogFile.cc index 9089b3b7a..7de7899ab 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().tqat(0)->hostName(), TQString("logfile_unregister %1" ).arg(logFileID), 43); + sendRequest(sensors().at(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.findRev("/") + 1)); - sendRequest(sensors().tqat(0)->hostName(), TQString("logfile_register %1" ).arg(sensorID), 42); + sendRequest(sensors().at(0)->hostName(), TQString("logfile_register %1" ).arg(sensorID), 42); if (title.isEmpty()) - setTitle(sensors().tqat(0)->hostName() + ":" + sensorID); + setTitle(sensors().at(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().tqat(0)->hostName()); - element.setAttribute("sensorName", sensors().tqat(0)->name()); - element.setAttribute("sensorType", sensors().tqat(0)->type()); + element.setAttribute("hostName", sensors().at(0)->hostName()); + element.setAttribute("sensorName", sensors().at(0)->name()); + element.setAttribute("sensorType", sensors().at(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().tqat(0)->hostName(), - TQString("%1 %2" ).arg(sensors().tqat(0)->name()).arg(logFileID), 19); + sendRequest(sensors().at(0)->hostName(), + TQString("%1 %2" ).arg(sensors().at(0)->name()).arg(logFileID), 19); } void diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc b/ksysguard/gui/SensorDisplayLib/MultiMeter.cc index 9a81582e0..8a9cc9b60 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().tqat(0)->hostName()); - element.setAttribute("sensorName", sensors().tqat(0)->name()); - element.setAttribute("sensorType", sensors().tqat(0)->type()); + element.setAttribute("hostName", sensors().at(0)->hostName()); + element.setAttribute("sensorName", sensors().at(0)->name()); + element.setAttribute("sensorType", sensors().at(0)->type()); element.setAttribute("showUnit", showUnit()); element.setAttribute("lowerLimitActive", (int) lowerLimitActive); element.setAttribute("lowerLimit", (int) lowerLimit); @@ -225,7 +225,7 @@ MultiMeter::applySettings() alarmDigitColor = mms->alarmDigitColor(); setBackgroundColor(mms->meterBackgroundColor()); - tqrepaint(); + repaint(); setModified(true); } @@ -234,7 +234,7 @@ MultiMeter::applyStyle() { normalDigitColor = KSGRD::Style->firstForegroundColor(); setBackgroundColor(KSGRD::Style->backgroundColor()); - tqrepaint(); + repaint(); setModified(true); } diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui index 16abc45c1..a04dcbb6b 100644 --- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui +++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui @@ -334,14 +334,14 @@ update() update(int,int,int,int) update(const QRect&) - tqrepaint() - tqrepaint(bool) - tqrepaint(int,int,int,int) - tqrepaint(int,int,int,int,bool) - tqrepaint(const QRect&) - tqrepaint(const QRect&,bool) - tqrepaint(const QRegion&) - tqrepaint(const QRegion&,bool) + repaint() + repaint(bool) + repaint(int,int,int,int) + repaint(int,int,int,int,bool) + repaint(const QRect&) + repaint(const QRect&,bool) + repaint(const QRegion&) + repaint(const QRegion&,bool) show() hide() setShown(bool) diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cc b/ksysguard/gui/SensorDisplayLib/ProcessController.cc index 6c99f9d1d..f02b02af9 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().tqat(0)->hostName(), "ps", 2); + sendRequest(sensors().at(0)->hostName(), "ps", 2); } void ProcessController::killProcess(int pid, int sig) { - sendRequest(sensors().tqat(0)->hostName(), + sendRequest(sensors().at(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().tqat(0)->hostName(), TQString("kill %1 %2" ).arg(*it) + sendRequest(sensors().at(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().tqat(0)->hostName(), + sendRequest(sensors().at(0)->hostName(), TQString("setpriority %1 %2" ).arg(*it).arg(niceValue), 5); - sendRequest(sensors().tqat(0)->hostName(), "ps", 2); //update the display afterwards + sendRequest(sensors().at(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().tqat(0)->isOk()) + if (err == sensors().at(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().tqat(0)->hostName(), "test kill", 4); - sendRequest(sensors().tqat(0)->hostName(), "ps?", 1); - sendRequest(sensors().tqat(0)->hostName(), "ps", 2); + sendRequest(sensors().at(0)->hostName(), "test kill", 4); + sendRequest(sensors().at(0)->hostName(), "ps?", 1); + sendRequest(sensors().at(0)->hostName(), "ps", 2); } /* This happens only when the sensorOk status needs to be changed. */ - sensors().tqat(0)->setIsOk( !err ); + sensors().at(0)->setIsOk( !err ); } - setSensorOk(sensors().tqat(0)->isOk()); + setSensorOk(sensors().at(0)->isOk()); } bool @@ -452,9 +452,9 @@ ProcessController::restoreSettings(TQDomElement& element) bool ProcessController::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) { - element.setAttribute("hostName", sensors().tqat(0)->hostName()); - element.setAttribute("sensorName", sensors().tqat(0)->name()); - element.setAttribute("sensorType", sensors().tqat(0)->type()); + element.setAttribute("hostName", sensors().at(0)->hostName()); + element.setAttribute("sensorName", sensors().at(0)->name()); + element.setAttribute("sensorType", sensors().at(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 0fc037bca..d1cff84d1 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cc @@ -532,8 +532,8 @@ ProcessList::deleteLeaves(void) { unsigned int i; for (i = 0; i < pl.count() && - (!isLeafProcess(pl.tqat(i)->pid()) || - matchesFilter(pl.tqat(i))); i++) + (!isLeafProcess(pl.at(i)->pid()) || + matchesFilter(pl.at(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.tqat(i)->ppid() == pid) + if (pl.at(i)->ppid() == pid) return (false); return (true); diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc index c4ff6a649..03ee4b991 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.tqat( sensorId )->isOk() ) { + if ( err == mSensors.at( sensorId )->isOk() ) { // this happens only when the sensorOk status needs to be changed. - mSensors.tqat( sensorId )->setIsOk( !err ); + mSensors.at( sensorId )->setIsOk( !err ); } bool ok = true; for ( uint i = 0; i < mSensors.count(); ++i ) - if ( !mSensors.tqat( i )->isOk() ) { + if ( !mSensors.at( 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.tqat(orderOfSensors[i] )); + newSensors.append( mSensors.at(orderOfSensors[i] )); } mSensors.setAutoDelete( false ); diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc b/ksysguard/gui/SensorDisplayLib/SensorLogger.cc index 0e30136bf..939b66d6d 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc +++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.cc @@ -73,7 +73,7 @@ LogSensor::stopLogging(void) { lvi->setPixmap(0, pixmap_waiting); lvi->setTextColor(monitor->colorGroup().text()); - lvi->tqrepaint(); + lvi->repaint(); timerOff(); } @@ -105,7 +105,7 @@ LogSensor::answerReceived(int id, const TQString& answer) timerOff(); lowerLimitActive = false; lvi->setTextColor(monitor->colorGroup().foreground()); - lvi->tqrepaint(); + lvi->repaint(); KNotifyClient::event(monitor->winId(), "sensor_alarm", TQString("sensor '%1' at '%2' reached lower limit").arg(sensorName).arg(hostName)); timerOn(); } else if (upperLimitActive && value > upperLimit) @@ -113,7 +113,7 @@ LogSensor::answerReceived(int id, const TQString& answer) timerOff(); upperLimitActive = false; lvi->setTextColor(monitor->colorGroup().foreground()); - lvi->tqrepaint(); + lvi->repaint(); KNotifyClient::event(monitor->winId(), "sensor_alarm", TQString("sensor '%1' at '%2' reached upper limit").arg(sensorName).arg(hostName)); timerOn(); } diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.h b/ksysguard/gui/SensorDisplayLib/SensorLogger.h index db247238b..6630d57e1 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLogger.h +++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.h @@ -44,10 +44,10 @@ public: void setTextColor(const TQColor& color) { textColor = color; } - void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) { + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { TQColorGroup cgroup(cg); cgroup.setColor(TQColorGroup::Text, textColor); - TQListViewItem::paintCell(p, cgroup, column, width, tqalignment); + TQListViewItem::paintCell(p, cgroup, column, width, alignment); } diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui index f253e3ecc..7a546e7b6 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui +++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui @@ -61,7 +61,7 @@ Colors - + WordBreak|AlignVCenter|AlignLeft diff --git a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc index 04e9e6541..3d4d9c6f6 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.tqat(newIndex)); - newBeamColor.append(*mBeamColor.tqat(newIndex)); + newBeamData.append(mBeamData.at(newIndex)); + newBeamColor.append(*mBeamColor.at(newIndex)); } mBeamData = newBeamData; mBeamColor = newBeamColor; @@ -159,7 +159,7 @@ TQValueList &SignalPlotter::beamColors() void SignalPlotter::removeBeam( uint pos ) { - mBeamColor.remove( mBeamColor.tqat( pos ) ); + mBeamColor.remove( mBeamColor.at( 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.tqat( i ) + + memcpy( nd + ( newSampleNum - overlap ), mBeamData.at( i ) + ( mSamples - overlap ), overlap * sizeof( double ) ); double *p = mBeamData.take( i ); @@ -396,7 +396,7 @@ void SignalPlotter::paintEvent( TQPaintEvent* ) TQPixmap pm( w, h ); TQPainter p; - p.tqbegin( &pm, this ); + p.begin( &pm, this ); pm.fill( mBackgroundColor ); /* Draw white line along the bottom and the right side of the diff --git a/ksysguard/gui/WorkSheet.cc b/ksysguard/gui/WorkSheet.cc index 377cc4783..119705a70 100644 --- a/ksysguard/gui/WorkSheet.cc +++ b/ksysguard/gui/WorkSheet.cc @@ -450,7 +450,7 @@ void WorkSheet::dropEvent( TQDropEvent *e ) * event and replace or add sensor. */ for ( uint r = 0; r < mRows; ++r ) for ( uint c = 0; c < mColumns; ++c ) - if ( mDisplayList[ r ][ c ]->tqgeometry().contains( e->pos() ) ) { + if ( mDisplayList[ r ][ c ]->geometry().contains( e->pos() ) ) { addDisplay( hostName, sensorName, sensorType, sensorDescr, r, c ); return; } diff --git a/ksysguard/gui/ksgrd/StyleEngine.cc b/ksysguard/gui/ksgrd/StyleEngine.cc index 67a0ccbee..d05af4ec8 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.tqat( pos ); + return *mSensorColors.at( pos ); else return dummy; } diff --git a/ksysguard/gui/ksgrd/StyleSettings.cc b/ksysguard/gui/ksgrd/StyleSettings.cc index 34f33a43d..6c7faf771 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.tqat( i ) ); + pm.fill( *list.at( i ) ); mColorListBox->insertItem( pm, i18n( "Color %1" ).arg( i ) ); } } -- cgit v1.2.1