summaryrefslogtreecommitdiffstats
path: root/ksim/monitors/net
diff options
context:
space:
mode:
Diffstat (limited to 'ksim/monitors/net')
-rw-r--r--ksim/monitors/net/ksimnet.cpp14
-rw-r--r--ksim/monitors/net/netconfig.cpp22
-rw-r--r--ksim/monitors/net/netconfig.h2
-rw-r--r--ksim/monitors/net/netdialog.cpp12
4 files changed, 25 insertions, 25 deletions
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);