From 04ce0d30b53bc0dbb4bcaeac49a076bab47cfda4 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 18 Dec 2011 18:10:51 -0600
Subject: [PATCH] Rename old tq methods that no longer need a unique name
 (cherry picked from commit deb642e11a1e24891aab7b7841278f71044caafd)

---
 src/src/chart.cpp         |  2 +-
 src/src/chart.h           |  2 +-
 src/src/configurebase.ui  | 24 ++++++++++++------------
 src/src/knetstatsview.cpp | 10 +++++-----
 src/src/statistics.cpp    |  6 +++---
 src/src/statisticsbase.ui | 10 +++++-----
 6 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/src/chart.cpp b/src/src/chart.cpp
index 5c1b0c2..a807b6f 100644
--- a/src/src/chart.cpp
+++ b/src/src/chart.cpp
@@ -24,7 +24,7 @@
 
 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);
-	tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 }
 
 void Chart::paintEvent(TQPaintEvent*) {
diff --git a/src/src/chart.h b/src/src/chart.h
index 3a17494..8bd8be8 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 tqsizeHint() { return TQSize(200, 100); }
+	TQSize sizeHint() { return TQSize(200, 100); }
 protected:	
 	void paintEvent( TQPaintEvent* ev );
 
diff --git a/src/src/configurebase.ui b/src/src/configurebase.ui
index 5f6e0e5..ff2b962 100644
--- a/src/src/configurebase.ui
+++ b/src/src/configurebase.ui
@@ -48,7 +48,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>120</width>
                             <height>20</height>
@@ -190,7 +190,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -219,7 +219,7 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>22</width>
                                                 <height>22</height>
@@ -239,7 +239,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -258,7 +258,7 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>22</width>
                                                 <height>22</height>
@@ -278,7 +278,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -297,7 +297,7 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>22</width>
                                                 <height>22</height>
@@ -317,7 +317,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -336,7 +336,7 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>22</width>
                                                 <height>22</height>
@@ -356,7 +356,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -375,7 +375,7 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>22</width>
                                                 <height>22</height>
@@ -397,7 +397,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
diff --git a/src/src/knetstatsview.cpp b/src/src/knetstatsview.cpp
index f236cf1..8db7154 100644
--- a/src/src/knetstatsview.cpp
+++ b/src/src/knetstatsview.cpp
@@ -135,22 +135,22 @@ void KNetStatsView::updateViewOptions() {
 
 void KNetStatsView::updateStats() {
 	FILE* flags_fp = fopen((mSysDevPath+"flags").latin1(), "r");
-	bool currenttqStatus;
+	bool currentStatus;
 	if (!flags_fp)
-		currenttqStatus = false;
+		currentStatus = false;
 	else {
 		int flags;
 		fscanf(flags_fp, "%Xu", &flags);
 		fclose(flags_fp);
-		currenttqStatus = IFF_UP & flags;
+		currentStatus = IFF_UP & flags;
 	}
 
-	if (!currenttqStatus && mConnected) { // interface down...
+	if (!currentStatus && mConnected) { // interface down...
 		mConnected = false;
 		resetBuffers();
 		TQWidget::update();
 		say(i18n("%1 is inactive").tqarg(mInterface));
-	} else if (currenttqStatus && !mConnected) {
+	} else if (currentStatus && !mConnected) {
 		mConnected = true;
 		say(i18n("%1 is active").tqarg(mInterface));
 	}
diff --git a/src/src/statistics.cpp b/src/src/statistics.cpp
index 8af07b4..9ac7875 100644
--- a/src/src/statistics.cpp
+++ b/src/src/statistics.cpp
@@ -37,9 +37,9 @@ Statistics::Statistics( KNetStatsView* parent, const char *name )
 	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->tqsetAlignment(TQt::AlignRight);
-	mMAC->tqsetAlignment(TQt::AlignRight);
-	mNetmask->tqsetAlignment(TQt::AlignRight);
+	mIP->setAlignment(TQt::AlignRight);
+	mMAC->setAlignment(TQt::AlignRight);
+	mNetmask->setAlignment(TQt::AlignRight);
 	update();
 
 	mTimer = new TQTimer( this );
diff --git a/src/src/statisticsbase.ui b/src/src/statisticsbase.ui
index cbb9417..2aea1dc 100644
--- a/src/src/statisticsbase.ui
+++ b/src/src/statisticsbase.ui
@@ -67,7 +67,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>41</height>
@@ -173,7 +173,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>71</width>
                                 <height>20</height>
@@ -315,7 +315,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>200</width>
                                 <height>21</height>
@@ -332,7 +332,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>51</width>
                                 <height>80</height>
@@ -428,7 +428,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>91</width>
                             <height>20</height>