diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:59:52 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:59:52 -0600 |
commit | 7ea89afa119615e547323a7a482ea7fef8e67029 (patch) | |
tree | 7b28540e70b4be9a779347f70486d4937258a875 /ksim/monitors | |
parent | bcc684e28ad6f9ebeeae5d334a4dc297cef3e816 (diff) | |
download | tdeutils-7ea89afa119615e547323a7a482ea7fef8e67029.tar.gz tdeutils-7ea89afa119615e547323a7a482ea7fef8e67029.zip |
Remove additional unneeded tq method conversions
Diffstat (limited to 'ksim/monitors')
-rw-r--r-- | ksim/monitors/cpu/ksimcpu.cpp | 4 | ||||
-rw-r--r-- | ksim/monitors/disk/ksimdisk.cpp | 10 | ||||
-rw-r--r-- | ksim/monitors/filesystem/filesystemwidget.cpp | 2 | ||||
-rw-r--r-- | ksim/monitors/i8k/ksimi8k.cpp | 8 | ||||
-rw-r--r-- | ksim/monitors/mail/ksimmail.cpp | 4 | ||||
-rw-r--r-- | ksim/monitors/net/ksimnet.cpp | 10 | ||||
-rw-r--r-- | ksim/monitors/net/netconfig.cpp | 6 | ||||
-rw-r--r-- | ksim/monitors/snmp/monitordialogbase.ui | 2 | ||||
-rw-r--r-- | ksim/monitors/snmp/proberesultdialog.cpp | 2 | ||||
-rw-r--r-- | ksim/monitors/snmp/value.cpp | 2 |
10 files changed, 25 insertions, 25 deletions
diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp index 2f05e7c..9be4b15 100644 --- a/ksim/monitors/cpu/ksimcpu.cpp +++ b/ksim/monitors/cpu/ksimcpu.cpp @@ -201,7 +201,7 @@ void CpuView::updateView() cpuDiff = 100; } - current.chart()->setText(i18n("%1%").tqarg(cpuDiff)); + current.chart()->setText(i18n("%1%").arg(cpuDiff)); current.chart()->setValue(cpuDiff, 0); current.label()->setValue(cpuDiff); } @@ -420,7 +420,7 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name) for (uint i = 0; i < addCpus(); ++i) { - TQCheckListItem *item = new TQCheckListItem(m_listView, i18n("cpu %1").tqarg(i), TQCheckListItem::CheckBox); + TQCheckListItem *item = new TQCheckListItem(m_listView, i18n("cpu %1").arg(i), TQCheckListItem::CheckBox); item->setText(1, "%T"); } } diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp index 69c1219..c0123d4 100644 --- a/ksim/monitors/disk/ksimdisk.cpp +++ b/ksim/monitors/disk/ksimdisk.cpp @@ -216,13 +216,13 @@ void DiskView::updateDisplay() if (m_useSeperatly) { it.current()->first->setValue(diskData.readBlocks, diskData.writeBlocks); it.current()->first->setText(i18n("in: %1k") - .tqarg(KGlobal::locale()->formatNumber((float)diskData.readBlocks / 1024.0, 1)), - i18n("out: %1k").tqarg(KGlobal::locale()->formatNumber((float)diskData.writeBlocks / 1024.0, 1))); + .arg(KGlobal::locale()->formatNumber((float)diskData.readBlocks / 1024.0, 1)), + i18n("out: %1k").arg(KGlobal::locale()->formatNumber((float)diskData.writeBlocks / 1024.0, 1))); } else { it.current()->first->setValue(diff, 0); it.current()->first->setText(i18n("%1k") - .tqarg(KGlobal::locale()->formatNumber((float)diff / 1024.0, 1))); + .arg(KGlobal::locale()->formatNumber((float)diff / 1024.0, 1))); } it.current()->second->setMaxValue(it.current()->first->maxValue()); @@ -239,7 +239,7 @@ void DiskView::updateData(DiskList &disks) if (!m_procStream) return; - m_procStream->tqdevice()->reset(); + m_procStream->device()->reset(); fseek(m_procFile, 0L, SEEK_SET); if (m_bLinux24) @@ -430,7 +430,7 @@ TQString DiskView::diskName( int major, int minor ) const break; } - returnValue.tqat(2) = returnValue.tqat(2).latin1() + minor; + returnValue.at(2) = returnValue.at(2).latin1() + minor; return returnValue; #else Q_UNUSED(major); diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp index 3df1917..7286e0f 100644 --- a/ksim/monitors/filesystem/filesystemwidget.cpp +++ b/ksim/monitors/filesystem/filesystemwidget.cpp @@ -189,7 +189,7 @@ void FilesystemWidget::processExited(KProcess *) TQStringList::Iterator it; for (it = errorList.begin(); it != errorList.end(); ++it) { message += TQString::fromLatin1("<li>%1</li>") - .tqarg((*it).replace(TQRegExp("[u]?mount: "), TQString())); + .arg((*it).replace(TQRegExp("[u]?mount: "), TQString())); } message += TQString::fromLatin1("</ul></qt>"); diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp index c265055..66eadf2 100644 --- a/ksim/monitors/i8k/ksimi8k.cpp +++ b/ksim/monitors/i8k/ksimi8k.cpp @@ -195,17 +195,17 @@ void I8KView::updateView() } if ( rightspeed > 0 ) - m_fan1Label->setText( i18n( "Right fan: %1 RPM" ).tqarg( rightspeed ) ); + m_fan1Label->setText( i18n( "Right fan: %1 RPM" ).arg( rightspeed ) ); else m_fan1Label->setText( i18n( "Right fan: Off" ) ); if ( leftspeed > 0 ) - m_fan2Label->setText( i18n( "Left fan: %1 RPM" ).tqarg( leftspeed ) ); + m_fan2Label->setText( i18n( "Left fan: %1 RPM" ).arg( leftspeed ) ); else m_fan2Label->setText( i18n( "Left fan: Off" ) ); - m_tempLabel->setText( i18n( "CPU temp: %1°%2" ).tqarg( cputemp ) - .tqarg( m_unit ) ); + m_tempLabel->setText( i18n( "CPU temp: %1°%2" ).arg( cputemp ) + .arg( m_unit ) ); } I8KConfig::I8KConfig(KSim::PluginObject *parent, const char *name) diff --git a/ksim/monitors/mail/ksimmail.cpp b/ksim/monitors/mail/ksimmail.cpp index f6cbe4a..1f35224 100644 --- a/ksim/monitors/mail/ksimmail.cpp +++ b/ksim/monitors/mail/ksimmail.cpp @@ -101,7 +101,7 @@ MailLabel::~MailLabel() { } -void MailLabel::configureObject( bool tqrepaint ) +void MailLabel::configureObject( bool repaint ) { m_envelope.load( themeLoader().current().mailPixmap() ); m_frames = themeLoader().current().mailFrames(); @@ -112,7 +112,7 @@ void MailLabel::configureObject( bool tqrepaint ) setPixmap( frame( m_envelope, 1 ) ); - KSim::Label::configureObject( tqrepaint ); + KSim::Label::configureObject( repaint ); } void MailLabel::paintEvent( TQPaintEvent* e ) diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp index 42e0ffd..140d822 100644 --- a/ksim/monitors/net/ksimnet.cpp +++ b/ksim/monitors/net/ksimnet.cpp @@ -356,7 +356,7 @@ void NetView::updateGraph() if ( ( *it ).label() ) { timeDisplay = ( *it ).format(); - newPid = pid.tqarg( ( *it ).name() ); + newPid = pid.arg( ( *it ).name() ); if ( TQFile::exists( newPid ) && stat( TQFile::encodeName( newPid ).data(), &st ) == 0 ) { @@ -394,16 +394,16 @@ void NetView::updateGraph() TQString receiveString = KGlobal::locale()->formatNumber( ( float ) receiveDiff / 1024.0, 1 ); TQString sendString = KGlobal::locale()->formatNumber( ( float ) sendDiff / 1024.0, 1 ); - ( *it ).chart()->setText( i18n( "in: %1k" ).tqarg( receiveString ), - i18n( "out: %1k" ).tqarg( sendString ) ); + ( *it ).chart()->setText( i18n( "in: %1k" ).arg( receiveString ), + i18n( "out: %1k" ).arg( sendString ) ); } else { ( *it ).setData( NetData() ); ( *it ).chart()->setValue( 0, 0 ); - ( *it ).chart()->setText( i18n( "in: %1k" ).tqarg( KGlobal::locale()->formatNumber( 0.0, 1 ) ), - i18n( "out: %1k" ).tqarg( KGlobal::locale()->formatNumber( 0.0, 1 ) ) ); + ( *it ).chart()->setText( i18n( "in: %1k" ).arg( KGlobal::locale()->formatNumber( 0.0, 1 ) ), + i18n( "out: %1k" ).arg( KGlobal::locale()->formatNumber( 0.0, 1 ) ) ); if ( ( *it ).label() ) ( *it ).label()->setText( i18n( "offline" ) ); diff --git a/ksim/monitors/net/netconfig.cpp b/ksim/monitors/net/netconfig.cpp index f3e98b7..b376c24 100644 --- a/ksim/monitors/net/netconfig.cpp +++ b/ksim/monitors/net/netconfig.cpp @@ -144,8 +144,8 @@ void NetConfig::menu(KListView *, TQListViewItem *item, const TQPoint &) if (item) { aboutMenu->insertItem(i18n("&Add Net Device"), 3); - aboutMenu->insertItem(i18n("&Modify '%1'").tqarg(item->text(0)), 2); - aboutMenu->insertItem(i18n("&Remove '%1'").tqarg(item->text(0)), 1); + aboutMenu->insertItem(i18n("&Modify '%1'").arg(item->text(0)), 2); + aboutMenu->insertItem(i18n("&Remove '%1'").arg(item->text(0)), 1); } else { aboutMenu->insertItem(i18n("&Add Net Device"), 3); @@ -217,7 +217,7 @@ void NetConfig::removeItem(TQListViewItem *item) return; int result = KMessageBox::warningContinueCancel(0, i18n("Are you sure you " - "want to remove the net interface '%1'?").tqarg(item->text(0)), TQString(), KStdGuiItem::del()); + "want to remove the net interface '%1'?").arg(item->text(0)), TQString(), KStdGuiItem::del()); if (result == KMessageBox::Cancel) return; diff --git a/ksim/monitors/snmp/monitordialogbase.ui b/ksim/monitors/snmp/monitordialogbase.ui index e466c66..628c5dd 100644 --- a/ksim/monitors/snmp/monitordialogbase.ui +++ b/ksim/monitors/snmp/monitordialogbase.ui @@ -104,7 +104,7 @@ <property name="text"> <string>The text in the edit box is what is displayed except that any occurrence of <b>%s</b> will be replaced with the snmp object value and any occurrence of <b>%n</b> will be replaced with the name of this monitor (see Name input field) .</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/ksim/monitors/snmp/proberesultdialog.cpp b/ksim/monitors/snmp/proberesultdialog.cpp index 1c8033a..bed1e21 100644 --- a/ksim/monitors/snmp/proberesultdialog.cpp +++ b/ksim/monitors/snmp/proberesultdialog.cpp @@ -30,7 +30,7 @@ ProbeResultDialog::ProbeResultDialog( const HostConfig &hostConfig, const ProbeD TQWidget *parent, const char *name ) : ProbeResultDialogBase( parent, name ) { - info->setText( i18n( "Results of scanning host %1:" ).tqarg( hostConfig.name ) ); + info->setText( i18n( "Results of scanning host %1:" ).arg( hostConfig.name ) ); for ( ProbeDialog::ProbeResultList::ConstIterator it = probeResults.begin(); it != probeResults.end(); ++it ) diff --git a/ksim/monitors/snmp/value.cpp b/ksim/monitors/snmp/value.cpp index 667613a..ad707b5 100644 --- a/ksim/monitors/snmp/value.cpp +++ b/ksim/monitors/snmp/value.cpp @@ -321,7 +321,7 @@ TQString Value::formatTimeTicks( int ticks, int conversionFlags ) if ( days > 0 ) result += TQString::number( days ) + "d:"; - result += TQString(TQString::fromAscii( "%1h:%2m" )).tqarg( hours ).tqarg( minutes ); + result += TQString(TQString::fromAscii( "%1h:%2m" )).arg( hours ).arg( minutes ); if ( conversionFlags & TimeTicksWithSeconds ) result += ":" + TQString::number( seconds ) + "s"; |