diff options
Diffstat (limited to 'ksim/monitors')
27 files changed, 134 insertions, 134 deletions
diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp index 39bbffd..dfbaf9b 100644 --- a/ksim/monitors/cpu/ksimcpu.cpp +++ b/ksim/monitors/cpu/ksimcpu.cpp @@ -20,9 +20,9 @@ #include "ksimcpu.h" #include "ksimcpu.moc" -#include <tqtextstream.h> +#include <textstream.h> #include <tqregexp.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> #include <tqfile.h> #include <tqgroupbox.h> @@ -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); } @@ -377,27 +377,27 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name) mainLayout->addWidget( m_listView ); - TQHBoxLayout * tqlayout = new TQHBoxLayout; - tqlayout->setSpacing( 6 ); + TQHBoxLayout * layout = new TQHBoxLayout; + layout->setSpacing( 6 ); TQSpacerItem * spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - tqlayout->addItem(spacer); + layout->addItem(spacer); m_modify = new TQPushButton( this ); m_modify->setText( i18n( "Modify..." ) ); connect( m_modify, TQT_SIGNAL( clicked() ), TQT_SLOT( modify() ) ); - tqlayout->addWidget( m_modify ); - mainLayout->addLayout( tqlayout ); + layout->addWidget( m_modify ); + mainLayout->addLayout( layout ); m_legendBox = new TQGroupBox(this); m_legendBox->setColumnLayout(0, Qt::Vertical); m_legendBox->setTitle(i18n("Chart Legend")); - m_legendBox->tqlayout()->setSpacing(0); - m_legendBox->tqlayout()->setMargin(0); + m_legendBox->layout()->setSpacing(0); + m_legendBox->layout()->setMargin(0); - m_legendLayout = new TQVBoxLayout(m_legendBox->tqlayout()); - m_legendLayout->tqsetAlignment(TQt::AlignTop); + m_legendLayout = new TQVBoxLayout(m_legendBox->layout()); + m_legendLayout->setAlignment(TQt::AlignTop); m_legendLayout->setSpacing(6); m_legendLayout->setMargin(11); @@ -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 c91f173..3a4e921 100644 --- a/ksim/monitors/disk/ksimdisk.cpp +++ b/ksim/monitors/disk/ksimdisk.cpp @@ -20,10 +20,10 @@ #include "ksimdisk.h" #include "ksimdisk.moc" -#include <tqtextstream.h> +#include <textstream.h> #include <tqregexp.h> #include <tqtimer.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqvbuttongroup.h> #include <tqpushbutton.h> @@ -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) @@ -414,23 +414,23 @@ TQString DiskView::diskName( int major, int minor ) const switch ( major ) { case IDE0_MAJOR: - returnValue.prepend(TQString::tqfromLatin1("hda")); + returnValue.prepend(TQString::fromLatin1("hda")); break; case IDE1_MAJOR: - returnValue.prepend(TQString::tqfromLatin1("hdc")); + returnValue.prepend(TQString::fromLatin1("hdc")); break; case IDE3_MAJOR: - returnValue.prepend(TQString::tqfromLatin1("hde")); + returnValue.prepend(TQString::fromLatin1("hde")); break; case SCSI_DISK0_MAJOR: - returnValue.prepend(TQString::tqfromLatin1("sda")); + returnValue.prepend(TQString::fromLatin1("sda")); break; case SCSI_GENERIC_MAJOR: - returnValue.prepend(TQString::tqfromLatin1("sg0")); + returnValue.prepend(TQString::fromLatin1("sg0")); break; } - returnValue.tqat(2) = returnValue.tqat(2).latin1() + minor; + returnValue.at(2) = returnValue.at(2).latin1() + minor; return returnValue; #else Q_UNUSED(major); @@ -482,23 +482,23 @@ DiskConfig::DiskConfig(KSim::PluginObject *parent, const char *name) m_listview->addColumn(i18n("Disks")); m_layout->addWidget(m_listview); - TQHBoxLayout *tqlayout = new TQHBoxLayout; - tqlayout->setSpacing(6); + TQHBoxLayout *layout = new TQHBoxLayout; + layout->setSpacing(6); TQSpacerItem *spacer = new TQSpacerItem(20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum); - tqlayout->addItem(spacer); + layout->addItem(spacer); m_add = new TQPushButton(this); m_add->setText(i18n("Add...")); connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(addItem())); - tqlayout->addWidget(m_add); + layout->addWidget(m_add); m_remove = new TQPushButton(this); m_remove->setText(i18n("Remove")); connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem())); - tqlayout->addWidget(m_remove); - m_layout->addLayout(tqlayout); + layout->addWidget(m_remove); + m_layout->addLayout(layout); m_buttonBox = new TQVButtonGroup(i18n("Disk Styles"), this); m_layout->addWidget(m_buttonBox); diff --git a/ksim/monitors/filesystem/filesystemstats.cpp b/ksim/monitors/filesystem/filesystemstats.cpp index fa215fc..1aa156d 100644 --- a/ksim/monitors/filesystem/filesystemstats.cpp +++ b/ksim/monitors/filesystem/filesystemstats.cpp @@ -184,7 +184,7 @@ FilesystemStats::List FilesystemStats::readEntries() #endif #ifdef USE_FAILSAFE - TQFile file( TQString::tqfromLatin1( _PATH_MOUNTED ) ); + TQFile file( TQString::fromLatin1( _PATH_MOUNTED ) ); if ( !file.open( IO_ReadOnly ) ) return list; diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp index fb04470..ac81156 100644 --- a/ksim/monitors/filesystem/filesystemwidget.cpp +++ b/ksim/monitors/filesystem/filesystemwidget.cpp @@ -21,7 +21,7 @@ #include <pluginmodule.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpopupmenu.h> #include <tqregexp.h> #include <tqcursor.h> @@ -188,11 +188,11 @@ void FilesystemWidget::processExited(KProcess *) TQStringList::Iterator it; for (it = errorList.begin(); it != errorList.end(); ++it) { - message += TQString::tqfromLatin1("<li>%1</li>") - .tqarg((*it).replace(TQRegExp("[u]?mount: "), TQString())); + message += TQString::fromLatin1("<li>%1</li>") + .arg((*it).replace(TQRegExp("[u]?mount: "), TQString())); } - message += TQString::tqfromLatin1("</ul></qt>"); + message += TQString::fromLatin1("</ul></qt>"); KMessageBox::sorry(0, message); } diff --git a/ksim/monitors/filesystem/fsystemconfig.cpp b/ksim/monitors/filesystem/fsystemconfig.cpp index 6b8c928..37646b7 100644 --- a/ksim/monitors/filesystem/fsystemconfig.cpp +++ b/ksim/monitors/filesystem/fsystemconfig.cpp @@ -29,7 +29,7 @@ #include <kdebug.h> #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqlabel.h> #include <tqwhatsthis.h> @@ -71,7 +71,7 @@ FsystemConfig::FsystemConfig(KSim::PluginObject *parent, const char *name) m_intervalLabel = new TQLabel(this); m_intervalLabel->setText( i18n("Update interval:")); - m_intervalLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, + m_intervalLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_mainLayout->addMultiCellWidget(m_intervalLabel, 3, 3, 0, 0); @@ -82,7 +82,7 @@ FsystemConfig::FsystemConfig(KSim::PluginObject *parent, const char *name) TQLabel *intervalLabel = new TQLabel(this); intervalLabel->setText(i18n("seconds")); - intervalLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, + intervalLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_mainLayout->addMultiCellWidget(intervalLabel, 3, 3, 2, 2); diff --git a/ksim/monitors/filesystem/ksimfsystem.cpp b/ksim/monitors/filesystem/ksimfsystem.cpp index 9b08da9..9af2b2d 100644 --- a/ksim/monitors/filesystem/ksimfsystem.cpp +++ b/ksim/monitors/filesystem/ksimfsystem.cpp @@ -21,7 +21,7 @@ #include <config.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvaluelist.h> #include <tqtimer.h> #include <tqfile.h> diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp index c265055..ecff93d 100644 --- a/ksim/monitors/i8k/ksimi8k.cpp +++ b/ksim/monitors/i8k/ksimi8k.cpp @@ -19,10 +19,10 @@ #include "ksimi8k.h" -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqregexp.h> #include <tqlabel.h> #include <tqcheckbox.h> @@ -151,15 +151,15 @@ void I8KView::closeStream() void I8KView::initGUI() { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); m_fan1Label = new KSim::Label( this ); m_fan2Label = new KSim::Label( this ); m_tempLabel = new KSim::Label( this ); - tqlayout->addWidget( m_fan1Label ); - tqlayout->addWidget( m_fan2Label ); - tqlayout->addWidget( m_tempLabel ); + layout->addWidget( m_fan1Label ); + layout->addWidget( m_fan2Label ); + layout->addWidget( m_tempLabel ); } void I8KView::updateView() @@ -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) @@ -218,14 +218,14 @@ I8KConfig::I8KConfig(KSim::PluginObject *parent, const char *name) m_interval->setRange( 2, 60, 1, true ); m_interval->setSuffix( i18n( " sec" ) ); - TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 0, + TQGridLayout *layout = new TQGridLayout( this, 3, 2, 0, KDialog::spacingHint() ); - tqlayout->addMultiCellWidget( m_unit, 0, 0, 0, 1 ); - tqlayout->addWidget( label, 1, 0 ); - tqlayout->addWidget( m_interval, 1, 1 ); - tqlayout->setColStretch( 1, 1 ); - tqlayout->setRowStretch( 2, 1 ); + layout->addMultiCellWidget( m_unit, 0, 0, 0, 1 ); + layout->addWidget( label, 1, 0 ); + layout->addWidget( m_interval, 1, 1 ); + layout->setColStretch( 1, 1 ); + layout->setRowStretch( 2, 1 ); } I8KConfig::~I8KConfig() diff --git a/ksim/monitors/lm_sensors/ksimsensors.cpp b/ksim/monitors/lm_sensors/ksimsensors.cpp index eb2614f..136d314 100644 --- a/ksim/monitors/lm_sensors/ksimsensors.cpp +++ b/ksim/monitors/lm_sensors/ksimsensors.cpp @@ -27,7 +27,7 @@ #include <kaboutdata.h> #include <kconfig.h> -#include <tqlayout.h> +#include <layout.h> #include <label.h> #include <themetypes.h> diff --git a/ksim/monitors/lm_sensors/sensorbase.cpp b/ksim/monitors/lm_sensors/sensorbase.cpp index cabbf5a..45251db 100644 --- a/ksim/monitors/lm_sensors/sensorbase.cpp +++ b/ksim/monitors/lm_sensors/sensorbase.cpp @@ -126,7 +126,7 @@ void SensorBase::update() m_sensorList.append(SensorInfo(currentSensor++, label, TQString::fromUtf8(name), TQString::fromUtf8(chip->prefix), - chipset, sensorType(TQString::tqfromLatin1(name)))); + chipset, sensorType(TQString::fromLatin1(name)))); } } } @@ -134,13 +134,13 @@ void SensorBase::update() if (m_hasNVControl) { int temp = 0; if (XNVCTRLQueryAttribute(qt_xdisplay(), qt_xscreen(), 0 /* not used? */, NV_CTRL_GPU_CORE_TEMPERATURE, &temp)) { - TQString name = TQString::tqfromLatin1("GPU Temp"); + TQString name = TQString::fromLatin1("GPU Temp"); m_sensorList.append(SensorInfo(currentSensor++, TQString::number(temp), name, TQString(), TQString(), sensorType(name))); } if (XNVCTRLQueryAttribute(qt_xdisplay(), qt_xscreen(), 0 /* not used? */, NV_CTRL_AMBIENT_TEMPERATURE, &temp)) { - TQString name = TQString::tqfromLatin1("GPU Ambient Temp"); + TQString name = TQString::fromLatin1("GPU Ambient Temp"); m_sensorList.append(SensorInfo(currentSensor++, TQString::number(temp), name, TQString(), TQString(), sensorType(name))); } @@ -217,9 +217,9 @@ TQString SensorBase::sensorType(const TQString &name) if (name.findRev("temp", -1, false) != -1) if (SensorBase::fahrenheit()) - return TQString::tqfromLatin1("°F"); + return TQString::fromLatin1("°F"); else - return TQString::tqfromLatin1("°C"); + return TQString::fromLatin1("°C"); if (name.findRev(TQRegExp("[^\\+]?[^\\-]?V$")) != -1) return i18n("Volt", "V"); diff --git a/ksim/monitors/lm_sensors/sensorsconfig.cpp b/ksim/monitors/lm_sensors/sensorsconfig.cpp index 1f1cf10..7406016 100644 --- a/ksim/monitors/lm_sensors/sensorsconfig.cpp +++ b/ksim/monitors/lm_sensors/sensorsconfig.cpp @@ -31,7 +31,7 @@ #include <tqtimer.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqcursor.h> #include <tqpopupmenu.h> @@ -86,7 +86,7 @@ SensorsConfig::SensorsConfig(KSim::PluginObject *parent, const char *name) m_updateLabel = new TQLabel(this); m_updateLabel->setText(i18n("Update interval:")); - m_updateLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, + m_updateLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_layout->addMultiCellWidget(m_updateLabel, 4, 4, 0, 0); @@ -95,7 +95,7 @@ SensorsConfig::SensorsConfig(KSim::PluginObject *parent, const char *name) TQLabel *intervalLabel = new TQLabel(this); intervalLabel->setText(i18n("seconds")); - intervalLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, + intervalLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_layout->addMultiCellWidget(intervalLabel, 4, 4, 2, 2); } diff --git a/ksim/monitors/mail/ksimmail.cpp b/ksim/monitors/mail/ksimmail.cpp index f6cbe4a..4e03a5c 100644 --- a/ksim/monitors/mail/ksimmail.cpp +++ b/ksim/monitors/mail/ksimmail.cpp @@ -20,7 +20,7 @@ // $Id$ #include <tqbitmap.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> #include <kaboutapplication.h> @@ -69,10 +69,10 @@ void MailPlugin::showAbout() MailView::MailView( KSim::PluginObject* parent, const char* name ) : KSim::PluginView( parent, name ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); MailLabel* label = new MailLabel( this ); - tqlayout->addWidget( label, 0, AlignHCenter ); + layout->addWidget( label, 0, AlignHCenter ); } MailView::~MailView() @@ -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..f97871a 100644 --- a/ksim/monitors/net/ksimnet.cpp +++ b/ksim/monitors/net/ksimnet.cpp @@ -34,10 +34,10 @@ static int mib[] = { CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST, 0 }; #endif #include <tqpushbutton.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqfile.h> #include <tqdatetime.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> #include <tqregexp.h> #include <tqcursor.h> @@ -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..ccb276f 100644 --- a/ksim/monitors/net/netconfig.cpp +++ b/ksim/monitors/net/netconfig.cpp @@ -18,7 +18,7 @@ */ #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcursor.h> #include <klistview.h> @@ -56,29 +56,29 @@ NetConfig::NetConfig(KSim::PluginObject *parent, const char *name) TQT_SLOT(modifyItem(TQListViewItem *))); mainLayout->addWidget(usingBox); - tqlayout = new TQHBoxLayout; - tqlayout->setSpacing(6); + layout = new TQHBoxLayout; + layout->setSpacing(6); TQSpacerItem *spacer = new TQSpacerItem(20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum); - tqlayout->addItem(spacer); + layout->addItem(spacer); insertButton = new TQPushButton(this); insertButton->setText(i18n("Add...")); connect(insertButton, TQT_SIGNAL(clicked()), TQT_SLOT(showNetDialog())); - tqlayout->addWidget(insertButton); + layout->addWidget(insertButton); modifyButton = new TQPushButton(this); modifyButton->setText(i18n("Modify...")); connect(modifyButton, TQT_SIGNAL(clicked()), TQT_SLOT(modifyCurrent())); - tqlayout->addWidget(modifyButton); + layout->addWidget(modifyButton); removeButton = new TQPushButton(this); removeButton->setText(i18n("Remove")); connect(removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeCurrent())); - tqlayout->addWidget(removeButton); + layout->addWidget(removeButton); - mainLayout->addLayout(tqlayout); + mainLayout->addLayout(layout); } NetConfig::~NetConfig() @@ -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/net/netconfig.h b/ksim/monitors/net/netconfig.h index 4d6de56..c2b5387 100644 --- a/ksim/monitors/net/netconfig.h +++ b/ksim/monitors/net/netconfig.h @@ -54,7 +54,7 @@ class NetConfig : public KSim::PluginPage // Couldnt think of a better name for this :) const TQString &boolToString(bool) const; - TQHBoxLayout *tqlayout; + TQHBoxLayout *layout; TQPushButton *insertButton; TQPushButton *removeButton; TQPushButton *modifyButton; diff --git a/ksim/monitors/net/netdialog.cpp b/ksim/monitors/net/netdialog.cpp index c470a2c..d16f117 100644 --- a/ksim/monitors/net/netdialog.cpp +++ b/ksim/monitors/net/netdialog.cpp @@ -26,7 +26,7 @@ #include <tqpushbutton.h> #include <tqtabwidget.h> #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqfile.h> #include <tqregexp.h> @@ -65,7 +65,7 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) m_generalLayout->addMultiCellWidget(m_deviceLabel, 0, 0, 0, 0); m_deviceCombo = new KComboBox(true, m_generalTab); - m_deviceCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, + m_deviceCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); m_deviceCombo->setFocus(); m_deviceCombo->setDuplicatesEnabled(false); @@ -86,10 +86,10 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) m_timerBox = new TQGroupBox(m_generalTab); m_timerBox->setTitle(i18n("Timer")); m_timerBox->setColumnLayout(0, Qt::Vertical); - m_timerBox->tqlayout()->setSpacing(0); - m_timerBox->tqlayout()->setMargin(0); - m_timerBoxLayout = new TQVBoxLayout(m_timerBox->tqlayout()); - m_timerBoxLayout->tqsetAlignment(TQt::AlignTop); + m_timerBox->layout()->setSpacing(0); + m_timerBox->layout()->setMargin(0); + m_timerBoxLayout = new TQVBoxLayout(m_timerBox->layout()); + m_timerBoxLayout->setAlignment(TQt::AlignTop); m_timerBoxLayout->setSpacing(6); m_timerBoxLayout->setMargin(11); diff --git a/ksim/monitors/snmp/browsedialogbase.ui b/ksim/monitors/snmp/browsedialogbase.ui index b79fc80..3dfc236 100644 --- a/ksim/monitors/snmp/browsedialogbase.ui +++ b/ksim/monitors/snmp/browsedialogbase.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -157,7 +157,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -205,7 +205,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>20</height> diff --git a/ksim/monitors/snmp/configpage.cpp b/ksim/monitors/snmp/configpage.cpp index ee50054..797e5ce 100644 --- a/ksim/monitors/snmp/configpage.cpp +++ b/ksim/monitors/snmp/configpage.cpp @@ -24,7 +24,7 @@ #include "hostdialog.h" #include "monitordialog.h" -#include <tqlayout.h> +#include <layout.h> #include <tqgroupbox.h> #include <tqpushbutton.h> diff --git a/ksim/monitors/snmp/configwidget.ui b/ksim/monitors/snmp/configwidget.ui index 608dc8f..69b94db 100644 --- a/ksim/monitors/snmp/configwidget.ui +++ b/ksim/monitors/snmp/configwidget.ui @@ -102,7 +102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>141</width> <height>20</height> @@ -156,7 +156,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>121</width> <height>20</height> diff --git a/ksim/monitors/snmp/hostdialogbase.ui b/ksim/monitors/snmp/hostdialogbase.ui index d3da054..f25aa12 100644 --- a/ksim/monitors/snmp/hostdialogbase.ui +++ b/ksim/monitors/snmp/hostdialogbase.ui @@ -78,7 +78,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>91</width> <height>20</height> @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>160</width> <height>20</height> @@ -253,7 +253,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>20</height> @@ -309,7 +309,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -359,7 +359,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>351</width> <height>20</height> @@ -384,7 +384,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="5"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -408,7 +408,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>220</width> <height>20</height> diff --git a/ksim/monitors/snmp/monitorconfig.cpp b/ksim/monitors/snmp/monitorconfig.cpp index 1bcbb0b..6ab85b6 100644 --- a/ksim/monitors/snmp/monitorconfig.cpp +++ b/ksim/monitors/snmp/monitorconfig.cpp @@ -117,8 +117,8 @@ TQString KSim::Snmp::monitorDisplayTypeToString( MonitorConfig::DisplayType type { switch ( type ) { - case MonitorConfig::Label: return TQString::tqfromLatin1( "Label" ); - case MonitorConfig::Chart: return TQString::tqfromLatin1( "Chart" ); + case MonitorConfig::Label: return TQString::fromLatin1( "Label" ); + case MonitorConfig::Chart: return TQString::fromLatin1( "Chart" ); default: assert( false ); }; return TQString(); diff --git a/ksim/monitors/snmp/monitordialogbase.ui b/ksim/monitors/snmp/monitordialogbase.ui index 5f9fb53..bb7f7cc 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> @@ -112,7 +112,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="1" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>141</width> <height>20</height> @@ -174,7 +174,7 @@ </widget> <widget class="TQLayoutWidget" row="4" column="1" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -205,7 +205,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>271</width> <height>20</height> @@ -224,7 +224,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>244</width> <height>20</height> @@ -246,7 +246,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>210</width> <height>20</height> @@ -282,7 +282,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -335,7 +335,7 @@ <cstring>status</cstring> </property> <property name="text"> - <string>blehtqStatus</string> + <string>blehStatus</string> </property> </widget> <widget class="TQGroupBox" row="6" column="0" rowspan="1" colspan="4"> 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/proberesultdialogbase.ui b/ksim/monitors/snmp/proberesultdialogbase.ui index c3df9bd..dcdbd2a 100644 --- a/ksim/monitors/snmp/proberesultdialogbase.ui +++ b/ksim/monitors/snmp/proberesultdialogbase.ui @@ -84,7 +84,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/ksim/monitors/snmp/session.cpp b/ksim/monitors/snmp/session.cpp index 2f16adc..6d63fab 100644 --- a/ksim/monitors/snmp/session.cpp +++ b/ksim/monitors/snmp/session.cpp @@ -54,7 +54,7 @@ Session::Session( const HostConfig &source ) d->source = source; - // tqunicode madness + // unicode madness d->host = source.name.ascii(); d->community = source.community.ascii(); d->securityName = source.securityName.ascii(); diff --git a/ksim/monitors/snmp/snmp.cpp b/ksim/monitors/snmp/snmp.cpp index d79c596..ae04b67 100644 --- a/ksim/monitors/snmp/snmp.cpp +++ b/ksim/monitors/snmp/snmp.cpp @@ -57,7 +57,7 @@ static TQStringList allStrings( const EnumStringMapInfo *array ) { TQStringList result; for ( uint i = 0; array[ i ].stringValue; ++i ) - result << TQString::tqfromLatin1( array[ i ].stringValue ); + result << TQString::fromLatin1( array[ i ].stringValue ); return result; } @@ -65,7 +65,7 @@ static TQString enumToString( const EnumStringMapInfo *array, int value ) { for ( uint i = 0; array[ i ].stringValue; ++i ) if ( array[ i ].enumValue == value ) - return TQString::tqfromLatin1( array[ i ].stringValue ); + return TQString::fromLatin1( array[ i ].stringValue ); assert( false ); return TQString(); @@ -76,7 +76,7 @@ static int stringToEnum( const EnumStringMapInfo *array, TQString string, bool * string = string.lower(); uint i; for ( i = 0; array[ i ].stringValue; ++i ) - if ( TQString::tqfromLatin1( array[ i ].stringValue ).lower() == string ) { + if ( TQString::fromLatin1( array[ i ].stringValue ).lower() == string ) { if ( ok ) *ok = true; return array[ i ].enumValue; } @@ -291,9 +291,9 @@ int KSim::Snmp::sessionErrorCode( netsnmp_session &session ) static TQString messageForErrorCode( int errorCode ) { if ( errorCode >= SNMPERR_MAX && errorCode <= SNMPERR_GENERR ) - return TQString::tqfromLatin1( SnmpLib::self()->snmp_api_errstring( errorCode ) ); + return TQString::fromLatin1( SnmpLib::self()->snmp_api_errstring( errorCode ) ); if ( errorCode >= SNMP_ERR_NOERROR && errorCode <= MAX_SNMP_ERR ) - return TQString::tqfromLatin1( SnmpLib::self()->snmp_errstring( errorCode ) ); + return TQString::fromLatin1( SnmpLib::self()->snmp_errstring( errorCode ) ); return TQString(); } diff --git a/ksim/monitors/snmp/value.cpp b/ksim/monitors/snmp/value.cpp index 2803aec..ad707b5 100644 --- a/ksim/monitors/snmp/value.cpp +++ b/ksim/monitors/snmp/value.cpp @@ -294,9 +294,9 @@ TQString Value::toString( int conversionFlags ) const case Value::TimeTicks: return formatTimeTicks( toTimeTicks(), conversionFlags ); // not using i18n here, because it may be called from within a worker thread, and I'm // not sure it makes sense to translate it anyway - case Value::NoSuchObject: return TQString::tqfromLatin1( "No Such Object" ); - case Value::NoSuchInstance: return TQString::tqfromLatin1( "No Such Instance" ); - case Value::EndOfMIBView: return TQString::tqfromLatin1( "End Of MIB View" ); + case Value::NoSuchObject: return TQString::fromLatin1( "No Such Object" ); + case Value::NoSuchInstance: return TQString::fromLatin1( "No Such Instance" ); + case Value::EndOfMIBView: return TQString::fromLatin1( "End Of MIB View" ); case Value::Invalid: case Value::Null: return TQString(); } @@ -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"; diff --git a/ksim/monitors/snmp/view.cpp b/ksim/monitors/snmp/view.cpp index 9515645..4b01203 100644 --- a/ksim/monitors/snmp/view.cpp +++ b/ksim/monitors/snmp/view.cpp @@ -23,7 +23,7 @@ #include <label.h> -#include <tqlayout.h> +#include <layout.h> #include <kconfig.h> |