Rename old tq methods that no longer need a unique name

(cherry picked from commit 3ee504ecba6caf3c2609a8648fe3659f2b541544)

9 files changed, 40 insertions, 40 deletions

diff --git a/kweather/dockwidget.cpp b/kweather/dockwidget.cpp
index 04576b1..bfcc097 100644
--- a/kweather/dockwidget.cpp
+++ b/kweather/dockwidget.cpp
@@ -213,18 +213,18 @@ void dockwidget::resizeView( const TQSize &size )
             if ( h <= 128 )  // left to right tqlayout
             {
                 static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::LeftToRight);
-                m_lblTemp->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter);
-                m_lblWind->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter);
-                m_lblPres->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter);
+                m_lblTemp->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
+                m_lblWind->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
+                m_lblPres->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
             }
             else  // top to bottom
             {
                 static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::TopToBottom);
                 TQFontMetrics fm(m_font);
                 h = 128 - (3 * fm.height());  // 3 lines of text below the button
-                m_lblTemp->tqsetAlignment(TQt::AlignCenter);
-                m_lblWind->tqsetAlignment(TQt::AlignCenter);
-                m_lblPres->tqsetAlignment(TQt::AlignCenter);
+                m_lblTemp->setAlignment(TQt::AlignCenter);
+                m_lblWind->setAlignment(TQt::AlignCenter);
+                m_lblPres->setAlignment(TQt::AlignCenter);
             }
             m_button->setFixedSize(h, h);
         }
@@ -233,14 +233,14 @@ void dockwidget::resizeView( const TQSize &size )
             if ( h <= 32 )  // left to right
             {
                 static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::LeftToRight);
-                m_lblTemp->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter);
+                m_lblTemp->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
             }
             else  // top to bottom
             {
                 static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::TopToBottom);
                 TQFontMetrics fm(m_font);
                 h = TQMIN(128, h) - fm.height();
-                m_lblTemp->tqsetAlignment(TQt::AlignCenter);
+                m_lblTemp->setAlignment(TQt::AlignCenter);
             }
             m_button->setFixedSize(h, h);
         }
@@ -260,9 +260,9 @@ void dockwidget::resizeView( const TQSize &size )
             if ( w <= 128 )  // top to bottom
             {
                 static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::TopToBottom);
-                m_lblTemp->tqsetAlignment(TQt::AlignCenter);
-                m_lblWind->tqsetAlignment(TQt::AlignCenter);
-                m_lblPres->tqsetAlignment(TQt::AlignCenter);
+                m_lblTemp->setAlignment(TQt::AlignCenter);
+                m_lblWind->setAlignment(TQt::AlignCenter);
+                m_lblPres->setAlignment(TQt::AlignCenter);
 
                 TQFontMetrics fm(m_font);
                 h = h - (3 * fm.height());  // 3 lines of text below the button
@@ -271,9 +271,9 @@ void dockwidget::resizeView( const TQSize &size )
             else  // left to right tqlayout
             {
                 static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::LeftToRight);
-                m_lblTemp->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter);
-                m_lblWind->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter);
-                m_lblPres->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter);
+                m_lblTemp->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
+                m_lblWind->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
+                m_lblPres->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
             }
             m_button->setFixedSize(h, h);
         }
@@ -282,14 +282,14 @@ void dockwidget::resizeView( const TQSize &size )
             if ( w <= 128 )  // top to bottom
             {
                 static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::TopToBottom);
-                m_lblTemp->tqsetAlignment(TQt::AlignCenter);
+                m_lblTemp->setAlignment(TQt::AlignCenter);
 
                 h = w;
             }
             else  // left to right tqlayout
             {
                 static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::LeftToRight);
-                m_lblTemp->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter);
+                m_lblTemp->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
 
                 h = static_cast<int>(w * 0.33);
             }
diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp
index 9b8c481..324a610 100644
--- a/kweather/kweather.cpp
+++ b/kweather/kweather.cpp
@@ -171,7 +171,7 @@ void kweather::preferences()
 /** The help handler */
 void kweather::help()
 {
-    kapp->invokeHelp(TQString(), TQString::tqfromLatin1("kweather"));
+    kapp->invokeHelp(TQString(), TQString::fromLatin1("kweather"));
 }
 
 /** Display the current weather report. */
diff --git a/kweather/metar_parser.cpp b/kweather/metar_parser.cpp
index 2d3eab9..d65d4da 100644
--- a/kweather/metar_parser.cpp
+++ b/kweather/metar_parser.cpp
@@ -147,7 +147,7 @@ bool MetarParser::parseCover(const TQString &s)
 {
 	if (CoverRegExp.search(s) > -1)
 	{
-		kdDebug(12006) << "Cover: " << TQString(CoverRegExp.tqcapturedTexts().join("-"))
+		kdDebug(12006) << "Cover: " << TQString(CoverRegExp.capturedTexts().join("-"))
 				<< endl;
 
 		TQString sCode = CoverRegExp.cap(1);
@@ -211,7 +211,7 @@ bool MetarParser::parseCurrent(const TQString &s)
 		TQString sCode = CurrentRegExp.cap(2);
 		TQString intensity, descriptor, phenomena, currentWeather;
 
-		kdDebug(12006) << "Current: " << TQString(CurrentRegExp.tqcapturedTexts().join("-")) << endl;
+		kdDebug(12006) << "Current: " << TQString(CurrentRegExp.capturedTexts().join("-")) << endl;
 
 		// Decode the intensity
 		if (sIntensity == "+")
@@ -358,7 +358,7 @@ bool MetarParser::parseTemperature(const TQString &s)
 {
 	if (TempRegExp.search(s) > -1)
 	{
-		kdDebug(12006) << "Temp: " << TQString(TempRegExp.tqcapturedTexts().join("-"))
+		kdDebug(12006) << "Temp: " << TQString(TempRegExp.capturedTexts().join("-"))
 				<< endl;
 
 		float fTemp = TempRegExp.cap(2).toFloat();
@@ -379,7 +379,7 @@ bool MetarParser::parseTemperatureTenths(const TQString &s)
 {
 	if (TempTenRegExp.search(s) > -1)
 	{
-		kdDebug(12006) << "Temp Tenths: " << TQString(TempTenRegExp.tqcapturedTexts().join("-"))
+		kdDebug(12006) << "Temp Tenths: " << TQString(TempTenRegExp.capturedTexts().join("-"))
 				<< endl;
 		
 		float temperature = TempTenRegExp.cap( 1 ).toFloat() / 10;
@@ -473,7 +473,7 @@ bool MetarParser::parseDate(const TQString &s)
 {
 	if (DateRegExp.search(s) > -1)
 	{
-		kdDebug(12006) << "Date: " << TQString(DateRegExp.tqcapturedTexts().join("-"))
+		kdDebug(12006) << "Date: " << TQString(DateRegExp.capturedTexts().join("-"))
 				<< endl;
 		TQString dateString = DateRegExp.cap(1);
 		TQString day, month, year;
@@ -496,7 +496,7 @@ bool MetarParser::parseTime(const TQString &s)
 {
 	if (TimeRegExp.search(s) > -1)
 	{
-		kdDebug(12006) << "Time: " << TQString(TimeRegExp.tqcapturedTexts().join("-"))
+		kdDebug(12006) << "Time: " << TQString(TimeRegExp.capturedTexts().join("-"))
 				<< endl;
 
 		TQString hour, minute, dateString;
@@ -521,7 +521,7 @@ bool MetarParser::parseVisibility(TQStringList::ConstIterator it)
 	{
 		fVisibility = VisRegExp.cap(1).toFloat();
 
-		kdDebug(12006) << "Visibility: " << TQString(VisRegExp.tqcapturedTexts().join("-"))
+		kdDebug(12006) << "Visibility: " << TQString(VisRegExp.capturedTexts().join("-"))
 				<< endl;
 
 	}
@@ -564,7 +564,7 @@ bool MetarParser::parsePressure( const TQString &s)
 		TQString type = PressRegExp.cap(1);
 		float fPressure = PressRegExp.cap(2).toFloat();
 
-		kdDebug(12006) << "Pressure: " << TQString(PressRegExp.tqcapturedTexts().join("-"))
+		kdDebug(12006) << "Pressure: " << TQString(PressRegExp.capturedTexts().join("-"))
 				<< endl;
 
 		if (m_units == KLocale::Metric)
@@ -643,7 +643,7 @@ bool MetarParser::parseWindSpeed(const TQString &s)
 		float gustSpeed = WindRegExp.cap(3).toFloat();
 		TQString sWindUnit = WindRegExp.cap(4);
 
-		kdDebug(12006) << "Wind: " << WindRegExp.tqcapturedTexts().join("-")
+		kdDebug(12006) << "Wind: " << WindRegExp.capturedTexts().join("-")
 				<< endl;
 
 		if (m_units == KLocale::Metric)
diff --git a/kweather/metar_parser.h b/kweather/metar_parser.h
index 7d94149..daeddad 100644
--- a/kweather/metar_parser.h
+++ b/kweather/metar_parser.h
@@ -60,7 +60,7 @@ class MetarParser
 	public:
 		MetarParser(StationDatabase *stationDB,
 			    KLocale::MeasureSystem units = KLocale::Imperial,
-			    TQDate date = TQDate::tqcurrentDate(),
+			    TQDate date = TQDate::currentDate(),
 			    TQTime time = TQTime::currentTime(), 
 			    unsigned int localUTCOffset = KRFCDate::localUTCOffset());
 
diff --git a/kweather/prefdialogdata.ui b/kweather/prefdialogdata.ui
index 590a2c2..596c54a 100644
--- a/kweather/prefdialogdata.ui
+++ b/kweather/prefdialogdata.ui
@@ -21,7 +21,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>0</width>
             <height>0</height>
@@ -85,7 +85,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -102,7 +102,7 @@
                     <property name="sizeType">
                         <enum>MinimumExpanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -228,7 +228,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>294</width>
                             <height>16</height>
@@ -256,7 +256,7 @@
                     <property name="enabled">
                         <bool>false</bool>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>252</width>
                             <height>0</height>
@@ -318,7 +318,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>170</width>
                             <height>20</height>
diff --git a/kweather/serviceconfigdata.ui b/kweather/serviceconfigdata.ui
index befdca2..2e8e9e1 100644
--- a/kweather/serviceconfigdata.ui
+++ b/kweather/serviceconfigdata.ui
@@ -60,7 +60,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>86</height>
@@ -121,7 +121,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>85</height>
diff --git a/kweather/sidebarwidgetbase.ui b/kweather/sidebarwidgetbase.ui
index 46eb042..6f1f50c 100644
--- a/kweather/sidebarwidgetbase.ui
+++ b/kweather/sidebarwidgetbase.ui
@@ -61,7 +61,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kweather/sun.h b/kweather/sun.h
index f56b513..fd407d7 100644
--- a/kweather/sun.h
+++ b/kweather/sun.h
@@ -37,7 +37,7 @@ class Sun
 		 */
 		Sun( const TQString &latitude, 
 		     const TQString &longitude,
-		     TQDate date = TQDate::tqcurrentDate(),
+		     TQDate date = TQDate::currentDate(),
 		     const int localUTCOffset = KRFCDate::localUTCOffset() );
 		
 		TQTime computeRiseTime();
diff --git a/kweather/weatherlib.cpp b/kweather/weatherlib.cpp
index 40eab31..ae40734 100644
--- a/kweather/weatherlib.cpp
+++ b/kweather/weatherlib.cpp
@@ -65,7 +65,7 @@ WeatherLib::Data::Data()
 
 void WeatherLib::Data::clear()
 {
-	age = TQDateTime::tqcurrentDateTime();
+	age = TQDateTime::currentDateTime();
 	downloading = false;
 	updated = false;
 	job = 0;
@@ -135,7 +135,7 @@ void WeatherLib::slotCopyDone(KIO::Job* job)
 						kdDebug( 12006 ) << "Parse: " << s << endl;
 						MetarParser parser(m_StationDb, KGlobal::locale()->measureSystem());
 						d->wi = parser.processData(d->wi.reportLocation, s);
-						d->age = TQDateTime::tqcurrentDateTime().addSecs(1800);
+						d->age = TQDateTime::currentDateTime().addSecs(1800);
 						emit fileUpdate(d->wi.reportLocation);
 						d->updated = true;
 					}
@@ -322,7 +322,7 @@ void WeatherLib::update(const TQString &stationID)
 	// Only grab new data if its more than 50 minutes old
 	Data *d = findData(stationID);
 
-	TQDateTime timeout = TQDateTime::tqcurrentDateTime();
+	TQDateTime timeout = TQDateTime::currentDateTime();
 
 	kdDebug (12006) << "Current Time: " << KGlobal::locale()->formatDateTime(timeout, false, false) <<
 			" Update at: " << KGlobal::locale()->formatDateTime(d->age, false, false) << endl;