Rename obsolete tq methods to standard names

(cherry picked from commit 251c4d87e52794911ea960530258703584dfd93a)

13 files changed, 38 insertions, 38 deletions

diff --git a/fifteenapplet/fifteenapplet.cpp b/fifteenapplet/fifteenapplet.cpp
index c173fc4..ca02fbb 100644
--- a/fifteenapplet/fifteenapplet.cpp
+++ b/fifteenapplet/fifteenapplet.cpp
@@ -54,7 +54,7 @@ FifteenApplet::FifteenApplet(const TQString& configFile, Type type, int actions,
     _table = new PiecesTable(this);
     setCustomMenu(_table->popup());
 
-    // setup tqlayout
+    // setup layout
     TQHBoxLayout *_layout = new TQHBoxLayout(this);
     _layout->add(_table);
 
diff --git a/kteatime/timeedit.cpp b/kteatime/timeedit.cpp
index 430e1b6..8cd3d60 100644
--- a/kteatime/timeedit.cpp
+++ b/kteatime/timeedit.cpp
@@ -52,7 +52,7 @@ void WrappingSpinBox::stepDown()
 TimeEdit::TimeEdit(TQWidget* parent, const char* name)
     : TQWidget(parent, name)
 {
-	tqlayout = new TQHBoxLayout(this);
+	layout = new TQHBoxLayout(this);
 	minuteBox = new TQSpinBox(0, 300, 1, this);
 //	minuteBox->setFixedSize(minuteBox->sizeHint());
 
@@ -65,11 +65,11 @@ TimeEdit::TimeEdit(TQWidget* parent, const char* name)
 	TQLabel* sec = new TQLabel(i18n(" sec"),this);
 	sec->setFixedSize(sec->sizeHint());
 
-	tqlayout->addWidget(minuteBox);
-	tqlayout->addWidget(min);
+	layout->addWidget(minuteBox);
+	layout->addWidget(min);
 
-	tqlayout->addWidget(secondBox);
-	tqlayout->addWidget(sec);
+	layout->addWidget(secondBox);
+	layout->addWidget(sec);
 
 	connect(minuteBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinBoxValueChanged(int)) );
 	connect(secondBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinBoxValueChanged(int)) );
diff --git a/kteatime/timeedit.h b/kteatime/timeedit.h
index c614f57..7ff162f 100644
--- a/kteatime/timeedit.h
+++ b/kteatime/timeedit.h
@@ -67,7 +67,7 @@ signals:
 protected:
 	TQSpinBox *minuteBox;
 	WrappingSpinBox *secondBox;
-	TQBoxLayout* tqlayout;
+	TQBoxLayout* layout;
 };
 
 #endif
diff --git a/ktux/sprite.cpp b/ktux/sprite.cpp
index a163e71..70ad751 100644
--- a/ktux/sprite.cpp
+++ b/ktux/sprite.cpp
@@ -85,7 +85,7 @@ KSpriteSetup::KSpriteSetup( TQWidget *parent, const char *name )
 
     button = bbox->addButton(KStdGuiItem::cancel());
     connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( reject() ) );
-    bbox->tqlayout();
+    bbox->layout();
     tl->addWidget(bbox);
 
     tl->freeze();
diff --git a/kweather/dockwidget.cpp b/kweather/dockwidget.cpp
index f5205d4..b8c5024 100644
--- a/kweather/dockwidget.cpp
+++ b/kweather/dockwidget.cpp
@@ -184,12 +184,12 @@ void dockwidget::initDock()
     mainLayout->setMargin(0);
     mainLayout->addWidget(m_button, 0, TQt::AlignCenter);
 
-    TQBoxLayout *tqlayout = new TQBoxLayout(mainLayout, TQBoxLayout::TopToBottom);
-    tqlayout->setSpacing(0);
-    tqlayout->setMargin(0);
-    tqlayout->addWidget(m_lblTemp);
-    tqlayout->addWidget(m_lblWind);
-    tqlayout->addWidget(m_lblPres);
+    TQBoxLayout *layout = new TQBoxLayout(mainLayout, TQBoxLayout::TopToBottom);
+    layout->setSpacing(0);
+    layout->setMargin(0);
+    layout->addWidget(m_lblTemp);
+    layout->addWidget(m_lblWind);
+    layout->addWidget(m_lblPres);
 
     mainLayout->addSpacing(8);
 
@@ -210,16 +210,16 @@ void dockwidget::resizeView( const TQSize &size )
 
         if ( m_mode == ShowAll )
         {
-            if ( h <= 128 )  // left to right tqlayout
+            if ( h <= 128 )  // left to right layout
             {
-                static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::LeftToRight);
+                static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::LeftToRight);
                 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);
+                static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::TopToBottom);
                 TQFontMetrics fm(m_font);
                 h = 128 - (3 * fm.height());  // 3 lines of text below the button
                 m_lblTemp->setAlignment(TQt::AlignCenter);
@@ -232,12 +232,12 @@ void dockwidget::resizeView( const TQSize &size )
         {
             if ( h <= 32 )  // left to right
             {
-                static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::LeftToRight);
+                static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::LeftToRight);
                 m_lblTemp->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
             }
             else  // top to bottom
             {
-                static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::TopToBottom);
+                static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::TopToBottom);
                 TQFontMetrics fm(m_font);
                 h = TQMIN(128, h) - fm.height();
                 m_lblTemp->setAlignment(TQt::AlignCenter);
@@ -259,7 +259,7 @@ void dockwidget::resizeView( const TQSize &size )
         {
             if ( w <= 128 )  // top to bottom
             {
-                static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::TopToBottom);
+                static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::TopToBottom);
                 m_lblTemp->setAlignment(TQt::AlignCenter);
                 m_lblWind->setAlignment(TQt::AlignCenter);
                 m_lblPres->setAlignment(TQt::AlignCenter);
@@ -268,9 +268,9 @@ void dockwidget::resizeView( const TQSize &size )
                 h = h - (3 * fm.height());  // 3 lines of text below the button
                 h = TQMIN(w, h);
             }
-            else  // left to right tqlayout
+            else  // left to right layout
             {
-                static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::LeftToRight);
+                static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::LeftToRight);
                 m_lblTemp->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
                 m_lblWind->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
                 m_lblPres->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
@@ -281,14 +281,14 @@ void dockwidget::resizeView( const TQSize &size )
         {
             if ( w <= 128 )  // top to bottom
             {
-                static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::TopToBottom);
+                static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::TopToBottom);
                 m_lblTemp->setAlignment(TQt::AlignCenter);
 
                 h = w;
             }
-            else  // left to right tqlayout
+            else  // left to right layout
             {
-                static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::LeftToRight);
+                static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::LeftToRight);
                 m_lblTemp->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
 
                 h = static_cast<int>(w * 0.33);
@@ -310,7 +310,7 @@ int dockwidget::widthForHeight(int h)
 
     if ( m_mode == ShowAll )
     {
-        if ( h <= 128 )  // left to right tqlayout
+        if ( h <= 128 )  // left to right layout
         {
             int pixelSize = h/3 - 3;
             pixelSize = TQMIN(pixelSize, fi.pixelSize());  // don't make it too large
@@ -337,7 +337,7 @@ int dockwidget::widthForHeight(int h)
     }
     else if ( m_mode == ShowTempOnly )
     {
-        if ( h <= 32 )  // left to right tqlayout
+        if ( h <= 32 )  // left to right layout
         {
             int pixelSize = h - 3;
             pixelSize = TQMIN(pixelSize, fi.pixelSize());  // don't make it too large
diff --git a/kweather/kcmweather.cpp b/kweather/kcmweather.cpp
index d49d3a0..528b26b 100644
--- a/kweather/kcmweather.cpp
+++ b/kweather/kcmweather.cpp
@@ -54,12 +54,12 @@ KCMWeather::KCMWeather( TQWidget *parent, const char *name )
 {
   mWeatherService = new WeatherService_stub( "KWeatherService",
       "WeatherService" );
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+  TQVBoxLayout *layout = new TQVBoxLayout( this );
   mWidget = new prefsDialogData( this );
 
   mWidget->m_reportLocation->setFocus();
-  tqlayout->addWidget( mWidget );
-  tqlayout->addStretch();
+  layout->addWidget( mWidget );
+  layout->addStretch();
 
   fillStationList();
   load();
diff --git a/kweather/kcmweatherservice.cpp b/kweather/kcmweatherservice.cpp
index db8325d..49bf792 100644
--- a/kweather/kcmweatherservice.cpp
+++ b/kweather/kcmweatherservice.cpp
@@ -41,13 +41,13 @@ extern "C"
 KCMWeatherService::KCMWeatherService( TQWidget *parent, const char *name )
   : KCModule( parent, name )
 {
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+  TQVBoxLayout *layout = new TQVBoxLayout( this );
   mWidget = new ServiceConfigWidget( this );
 
   // not needed, as a change immediately changes the service
   //connect(mWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
 
-  tqlayout->addWidget( mWidget );
+  layout->addWidget( mWidget );
   KAboutData *about = new KAboutData( "kcmweatherservice",
                                       I18N_NOOP( "KWeather Configure Dialog" ),
                                       0, 0, KAboutData::License_GPL,
diff --git a/kweather/prefdialogdata.ui b/kweather/prefdialogdata.ui
index 7b61ead..c0878ce 100644
--- a/kweather/prefdialogdata.ui
+++ b/kweather/prefdialogdata.ui
@@ -284,7 +284,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kweather/reportview.cpp b/kweather/reportview.cpp
index 3ef28b4..39b5536 100644
--- a/kweather/reportview.cpp
+++ b/kweather/reportview.cpp
@@ -72,7 +72,7 @@ void reportView::render(){
 
     TQString textColor = KGlobalSettings::textColor().name();
     TQString baseColor = KGlobalSettings::baseColor().name();
-    TQColorGroup cg = tqpalette().active();
+    TQColorGroup cg = palette().active();
     TQString bgColor = cg.background().name();
     TQString hlColor = cg.highlight().name();
     TQString hlTextColor = cg.highlightedText().name();
diff --git a/kweather/serviceconfigdata.ui b/kweather/serviceconfigdata.ui
index 2e8e9e1..71f6099 100644
--- a/kweather/serviceconfigdata.ui
+++ b/kweather/serviceconfigdata.ui
@@ -169,7 +169,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kworldwatch/flow.cpp b/kworldwatch/flow.cpp
index cb35521..519ed85 100644
--- a/kworldwatch/flow.cpp
+++ b/kworldwatch/flow.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** $Id$
 **
-** Implementing your own tqlayout: flow example
+** Implementing your own layout: flow example
 **
 ** Copyright (C) 1996 by Trolltech AS.  All rights reserved.
 **
diff --git a/kworldwatch/flow.h b/kworldwatch/flow.h
index ed13ad4..e027e64 100644
--- a/kworldwatch/flow.h
+++ b/kworldwatch/flow.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** $Id$
 **
-** Definition of simple flow tqlayout for custom tqlayout example
+** Definition of simple flow layout for custom layout example
 **
 ** Created : 979899
 **
diff --git a/kworldwatch/zoneclock.cpp b/kworldwatch/zoneclock.cpp
index 9f1c953..5e50100 100644
--- a/kworldwatch/zoneclock.cpp
+++ b/kworldwatch/zoneclock.cpp
@@ -122,7 +122,7 @@ void ZoneClock::editClock()
       _name = _dlg->ClockCaption->text().append(":");
       _nameLabel->setText(_dlg->ClockCaption->text().append(":"));
       updateTime();
-      tqlayout()->invalidate();
+      layout()->invalidate();
       emit changed();
     }