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

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

1 files changed, 19 insertions, 19 deletions

diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp
index a9dae3f06..bf4d452ad 100644
--- a/kontact/plugins/weather/summarywidget.cpp
+++ b/kontact/plugins/weather/summarywidget.cpp
@@ -22,7 +22,7 @@
 */
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 
 #include <dcopclient.h>
@@ -43,7 +43,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
     DCOPObject( "WeatherSummaryWidget" ), mProc( 0 )
 {
   mLayout = new TQVBoxLayout( this, 3, 3 );
-  mLayout->setAlignment( TQt::AlignTop );
+  mLayout->tqsetAlignment( TQt::AlignTop );
 
   TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kweather", KIcon::Desktop, KIcon::SizeMedium );
   TQWidget *header = createHeader( this, icon, i18n( "Weather Service" ) );
@@ -101,50 +101,50 @@ void SummaryWidget::updateView()
   for ( it = dataList.begin(); it != dataList.end(); ++it ) {
     TQString cover;
     for ( uint i = 0; i < (*it).cover().count(); ++i )
-      cover += TQString( "- %1\n" ).arg( (*it).cover()[ i ] );
+      cover += TQString( "- %1\n" ).tqarg( (*it).cover()[ i ] );
 
     TQImage img;
     img = (*it).icon();
 
-    TQGridLayout *layout = new TQGridLayout( mLayout, 3, 3, 3 );
-    mLayouts.append( layout );
+    TQGridLayout *tqlayout = new TQGridLayout( mLayout, 3, 3, 3 );
+    mLayouts.append( tqlayout );
 
     KURLLabel* urlLabel = new KURLLabel( this );
     urlLabel->installEventFilter( this );
     urlLabel->setURL( (*it).stationID() );
     urlLabel->setPixmap( img.smoothScale( 32, 32 ) );
-    urlLabel->setMaximumSize( urlLabel->sizeHint() );
-    urlLabel->setAlignment( AlignTop );
-    layout->addMultiCellWidget( urlLabel, 0, 1, 0, 0 );
+    urlLabel->setMaximumSize( urlLabel->tqsizeHint() );
+    urlLabel->tqsetAlignment( AlignTop );
+    tqlayout->addMultiCellWidget( urlLabel, 0, 1, 0, 0 );
     mLabels.append( urlLabel );
     connect ( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
               this, TQT_SLOT( showReport( const TQString& ) ) );
 
     TQLabel* label = new TQLabel( this );
-    label->setText( TQString( "%1 (%2)" ).arg( (*it).name() ).arg( (*it).temperature() ) );
+    label->setText( TQString( "%1 (%2)" ).tqarg( (*it).name() ).tqarg( (*it).temperature() ) );
     TQFont font = label->font();
     font.setBold( true );
     label->setFont( font );
-    label->setAlignment( AlignLeft );
-    layout->addMultiCellWidget( label, 0, 0, 1, 2 );
+    label->tqsetAlignment( AlignLeft );
+    tqlayout->addMultiCellWidget( label, 0, 0, 1, 2 );
     mLabels.append( label );
 
     TQString labelText;
     labelText = TQString( "<b>%1:</b> %2<br>"
                          "<b>%3:</b> %4<br>"
                          "<b>%5:</b> %6" )
-                         .arg( i18n( "Last updated on" ) )
-                         .arg( (*it).date() )
-                         .arg( i18n( "Wind Speed" ) )
-                         .arg( (*it).windSpeed() )
-                         .arg( i18n( "Rel. Humidity" ) )
-                         .arg( (*it).relativeHumidity() );
+                         .tqarg( i18n( "Last updated on" ) )
+                         .tqarg( (*it).date() )
+                         .tqarg( i18n( "Wind Speed" ) )
+                         .tqarg( (*it).windSpeed() )
+                         .tqarg( i18n( "Rel. Humidity" ) )
+                         .tqarg( (*it).relativeHumidity() );
 
     TQToolTip::add( label, labelText.replace( " ", "&nbsp;" ) );
 
     label = new TQLabel( cover, this );
-    label->setAlignment( AlignLeft );
-    layout->addMultiCellWidget( label, 1, 1, 1, 2 );
+    label->tqsetAlignment( AlignLeft );
+    tqlayout->addMultiCellWidget( label, 1, 1, 1, 2 );
     mLabels.append( label );
   }