Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 49fef1f635.
pull/1/head
Timothy Pearson 13 years ago
parent 49fef1f635
commit e455f84895

@ -20,11 +20,11 @@
#include "chart.h"
#include <tqpainter.h>
#include <brush.h>
#include <tqbrush.h>
Chart::Chart(TQWidget* parent, const double* uploadBuffer, const double* downloadBuffer, int bufferSize, const int* ptr, const double* maxspeed) : TQWidget(parent), mUplBuffer(uploadBuffer), mDldBuffer(downloadBuffer), mBufferSize(bufferSize), mPtr(ptr), mMaxSpeed(maxspeed) {
setWFlags(TQt::WNoAutoErase);
setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
}
void Chart::paintEvent(TQPaintEvent*) {

@ -28,7 +28,7 @@ class TQPaintEvent;
class Chart : public TQWidget {
public:
Chart(TQWidget* parent, const double* uploadBuffer, const double* downloadBuffer, int bufferSize, const int* ptr, const double* maxspeed);
TQSize sizeHint() { return TQSize(200, 100); }
TQSize tqsizeHint() { return TQSize(200, 100); }
protected:
void paintEvent( TQPaintEvent* ev );

@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>layout7</cstring>
<cstring>tqlayout7</cstring>
</property>
<hbox>
<property name="name">
@ -48,7 +48,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>120</width>
<height>20</height>
@ -136,7 +136,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout5</cstring>
<cstring>tqlayout5</cstring>
</property>
<hbox>
<property name="name">
@ -190,7 +190,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>21</width>
<height>20</height>
@ -201,7 +201,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout7_2</cstring>
<cstring>tqlayout7_2</cstring>
</property>
<hbox>
<property name="name">
@ -219,7 +219,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>22</width>
<height>22</height>
@ -239,7 +239,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@ -258,7 +258,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>22</width>
<height>22</height>
@ -278,7 +278,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@ -297,7 +297,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>22</width>
<height>22</height>
@ -317,7 +317,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@ -336,7 +336,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>22</width>
<height>22</height>
@ -356,7 +356,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@ -375,7 +375,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>22</width>
<height>22</height>
@ -397,7 +397,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@ -596,7 +596,7 @@
<property name="text">
<string>Update interval:</string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>

@ -184,7 +184,7 @@ bool KNetStats::createInterface(const TQString& name) {
Interface* interface = new Interface(this, name);
mInterfaces.insert(name, interface);
if (!mBoot)
interface->say(i18n("New interface detected: %1").arg(name));
interface->say(i18n("New interface detected: %1").tqarg(name));
return interface->isVisible();
}

@ -89,7 +89,7 @@ KNetStatsView::KNetStatsView(KNetStats* parent, const TQString& interface)
mTimer = new TQTimer(this, "timer");
connect(mTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateStats(void)));
TQToolTip::add(this, i18n("Monitoring %1").arg(mInterface));
TQToolTip::add(this, i18n("Monitoring %1").tqarg(mInterface));
setup();
mStatistics = new Statistics(this);
}
@ -135,24 +135,24 @@ void KNetStatsView::updateViewOptions() {
void KNetStatsView::updateStats() {
FILE* flags_fp = fopen((mSysDevPath+"flags").latin1(), "r");
bool currentStatus;
bool currenttqStatus;
if (!flags_fp)
currentStatus = false;
currenttqStatus = false;
else {
int flags;
fscanf(flags_fp, "%Xu", &flags);
fclose(flags_fp);
currentStatus = IFF_UP & flags;
currenttqStatus = IFF_UP & flags;
}
if (!currentStatus && mConnected) { // interface down...
if (!currenttqStatus && mConnected) { // interface down...
mConnected = false;
resetBuffers();
TQWidget::update();
say(i18n("%1 is inactive").arg(mInterface));
} else if (currentStatus && !mConnected) {
say(i18n("%1 is inactive").tqarg(mInterface));
} else if (currenttqStatus && !mConnected) {
mConnected = true;
say(i18n("%1 is active").arg(mInterface));
say(i18n("%1 is active").tqarg(mInterface));
}
// kernel < 2.6.9 (I think) does not have carrier info, considering carrier ever on.
@ -169,12 +169,12 @@ void KNetStatsView::updateStats() {
if (mCarrier) {
mCarrier = false;
TQWidget::update();
say(i18n("%1 is disconnected").arg(mInterface));
say(i18n("%1 is disconnected").tqarg(mInterface));
}
return;
} else if (!mCarrier) { // carrier up
mCarrier = true;
say(i18n("%1 is connected").arg(mInterface));
say(i18n("%1 is connected").tqarg(mInterface));
}
unsigned int brx = readInterfaceNumValue("rx_bytes");

@ -25,21 +25,21 @@
#include <kapplication.h>
#include <kactivelabel.h>
#include <tqtimer.h>
#include <layout.h>
#include <tqlayout.h>
Statistics::Statistics( KNetStatsView* parent, const char *name )
: StatisticsBase( parent, name ), mInterface(parent->interface()), mParent(parent) {
setCaption( i18n( "Details of %1" ).arg( mInterface ) );
setCaption( i18n( "Details of %1" ).tqarg( mInterface ) );
TQBoxLayout* l = new TQHBoxLayout( mChart );
l->setAutoAdd( true );
Chart* chart = new Chart(mChart, parent->speedHistoryTx(), parent->speedHistoryRx(), parent->historyBufferSize(), parent->historyPointer(), parent->maxSpeed());
mMAC->setText(mParent->readInterfaceStringValue("address", 18));
mIP->setAlignment(TQt::AlignRight);
mMAC->setAlignment(TQt::AlignRight);
mNetmask->setAlignment(TQt::AlignRight);
mIP->tqsetAlignment(TQt::AlignRight);
mMAC->tqsetAlignment(TQt::AlignRight);
mNetmask->tqsetAlignment(TQt::AlignRight);
update();
mTimer = new TQTimer( this );

@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout3</cstring>
<cstring>tqlayout3</cstring>
</property>
<grid>
<property name="name">
@ -67,7 +67,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>41</height>
@ -86,7 +86,7 @@
<property name="text">
<string>? KB/s</string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -102,7 +102,7 @@
<property name="text">
<string>0 KB/s</string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -173,7 +173,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>71</width>
<height>20</height>
@ -184,7 +184,7 @@
<property name="name">
<cstring>mPktSpeedRx</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -200,7 +200,7 @@
<property name="name">
<cstring>mPRx</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -208,7 +208,7 @@
<property name="name">
<cstring>mByteSpeedTx</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -216,7 +216,7 @@
<property name="name">
<cstring>mBTx</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -224,7 +224,7 @@
<property name="name">
<cstring>mPTx</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -232,7 +232,7 @@
<property name="name">
<cstring>mPktSpeedTx</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -240,7 +240,7 @@
<property name="name">
<cstring>mBRx</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -248,7 +248,7 @@
<property name="name">
<cstring>mByteSpeedRx</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -315,7 +315,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>200</width>
<height>21</height>
@ -332,7 +332,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>51</width>
<height>80</height>
@ -403,7 +403,7 @@
<property name="text">
<string></string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter</set>
</property>
</widget>
@ -412,7 +412,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout2</cstring>
<cstring>tqlayout2</cstring>
</property>
<hbox>
<property name="name">
@ -428,7 +428,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>91</width>
<height>20</height>

Loading…
Cancel
Save