From e455f84895145c8d4f7151e432b38ea4c3655c24 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:56:24 -0600 Subject: [PATCH] Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 49fef1f635f094fd5082e2f2c4a93361d772239e. --- src/src/chart.cpp | 4 ++-- src/src/chart.h | 2 +- src/src/configurebase.ui | 32 ++++++++++++++++---------------- src/src/knetstats.cpp | 2 +- src/src/knetstatsview.cpp | 20 ++++++++++---------- src/src/statistics.cpp | 10 +++++----- src/src/statisticsbase.ui | 36 ++++++++++++++++++------------------ 7 files changed, 53 insertions(+), 53 deletions(-) diff --git a/src/src/chart.cpp b/src/src/chart.cpp index caf9440..5c1b0c2 100644 --- a/src/src/chart.cpp +++ b/src/src/chart.cpp @@ -20,11 +20,11 @@ #include "chart.h" #include -#include +#include 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*) { diff --git a/src/src/chart.h b/src/src/chart.h index 8bd8be8..3a17494 100644 --- a/src/src/chart.h +++ b/src/src/chart.h @@ -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 ); diff --git a/src/src/configurebase.ui b/src/src/configurebase.ui index 44f4685..5f6e0e5 100644 --- a/src/src/configurebase.ui +++ b/src/src/configurebase.ui @@ -32,7 +32,7 @@ - layout7 + tqlayout7 @@ -48,7 +48,7 @@ Expanding - + 120 20 @@ -136,7 +136,7 @@ - layout5 + tqlayout5 @@ -190,7 +190,7 @@ Expanding - + 21 20 @@ -201,7 +201,7 @@ - layout7_2 + tqlayout7_2 @@ -219,7 +219,7 @@ 0 - + 22 22 @@ -239,7 +239,7 @@ Expanding - + 20 20 @@ -258,7 +258,7 @@ 0 - + 22 22 @@ -278,7 +278,7 @@ Expanding - + 20 20 @@ -297,7 +297,7 @@ 0 - + 22 22 @@ -317,7 +317,7 @@ Expanding - + 20 20 @@ -336,7 +336,7 @@ 0 - + 22 22 @@ -356,7 +356,7 @@ Expanding - + 20 20 @@ -375,7 +375,7 @@ 0 - + 22 22 @@ -397,7 +397,7 @@ Expanding - + 20 20 @@ -596,7 +596,7 @@ Update interval: - + WordBreak|AlignVCenter diff --git a/src/src/knetstats.cpp b/src/src/knetstats.cpp index b223431..0ed3ee4 100644 --- a/src/src/knetstats.cpp +++ b/src/src/knetstats.cpp @@ -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(); } diff --git a/src/src/knetstatsview.cpp b/src/src/knetstatsview.cpp index e1eac4c..f236cf1 100644 --- a/src/src/knetstatsview.cpp +++ b/src/src/knetstatsview.cpp @@ -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"); diff --git a/src/src/statistics.cpp b/src/src/statistics.cpp index 0a7ae6a..8af07b4 100644 --- a/src/src/statistics.cpp +++ b/src/src/statistics.cpp @@ -25,21 +25,21 @@ #include #include #include -#include +#include 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 ); diff --git a/src/src/statisticsbase.ui b/src/src/statisticsbase.ui index f3e5180..cbb9417 100644 --- a/src/src/statisticsbase.ui +++ b/src/src/statisticsbase.ui @@ -32,7 +32,7 @@ - layout3 + tqlayout3 @@ -67,7 +67,7 @@ Expanding - + 20 41 @@ -86,7 +86,7 @@ ? KB/s - + AlignVCenter|AlignRight @@ -102,7 +102,7 @@ 0 KB/s - + AlignVCenter|AlignRight @@ -173,7 +173,7 @@ Expanding - + 71 20 @@ -184,7 +184,7 @@ mPktSpeedRx - + AlignVCenter|AlignRight @@ -200,7 +200,7 @@ mPRx - + AlignVCenter|AlignRight @@ -208,7 +208,7 @@ mByteSpeedTx - + AlignVCenter|AlignRight @@ -216,7 +216,7 @@ mBTx - + AlignVCenter|AlignRight @@ -224,7 +224,7 @@ mPTx - + AlignVCenter|AlignRight @@ -232,7 +232,7 @@ mPktSpeedTx - + AlignVCenter|AlignRight @@ -240,7 +240,7 @@ mBRx - + AlignVCenter|AlignRight @@ -248,7 +248,7 @@ mByteSpeedRx - + AlignVCenter|AlignRight @@ -315,7 +315,7 @@ Expanding - + 200 21 @@ -332,7 +332,7 @@ Expanding - + 51 80 @@ -403,7 +403,7 @@ - + AlignVCenter @@ -412,7 +412,7 @@ - layout2 + tqlayout2 @@ -428,7 +428,7 @@ Expanding - + 91 20