Rename obsolete tq methods to standard names

(cherry picked from commit 68de9c7a2183849c2a79e96c6b0f1ea4987e9474)

10 files changed, 27 insertions, 27 deletions

diff --git a/kscreensaver/kdesavers/banner.cpp b/kscreensaver/kdesavers/banner.cpp
index 67c88d3f..143c2aba 100644
--- a/kscreensaver/kdesavers/banner.cpp
+++ b/kscreensaver/kdesavers/banner.cpp
@@ -4,7 +4,7 @@
 //
 // Copyright (c)  Martin R. Jones 1996
 //
-// tqlayout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org>
+// layout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org>
 // clock function and color cycling added 2000/01/09 by Alexander Neundorf <alexander.neundorf@rz.tu-ilmenau.de>
 // 2001/03/04 Converted to use libkscreensaver by Martin R. Jones
 // 2002/04/07 Added random vertical position of text,
@@ -75,7 +75,7 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name )
 	tl1->addLayout(tl11);
 
 	TQGroupBox *group = new TQGroupBox( 0,Qt::Vertical, i18n("Font"), main );
-	TQGridLayout *gl = new TQGridLayout(group->tqlayout(), 6, 2, spacingHint() );
+	TQGridLayout *gl = new TQGridLayout(group->layout(), 6, 2, spacingHint() );
 
 	label = new TQLabel( i18n("Family:"), group );
 	gl->addWidget(label, 1, 0);
diff --git a/kscreensaver/kdesavers/firesaversetup.ui b/kscreensaver/kdesavers/firesaversetup.ui
index 7e4516fd..3a3f3536 100644
--- a/kscreensaver/kdesavers/firesaversetup.ui
+++ b/kscreensaver/kdesavers/firesaversetup.ui
@@ -155,7 +155,7 @@
                     </spacer>
                     <widget class="TQLayoutWidget" row="1" column="1">
                         <property name="name">
-                            <cstring>tqlayout118</cstring>
+                            <cstring>layout118</cstring>
                         </property>
                         <grid>
                             <property name="name">
diff --git a/kscreensaver/kdesavers/kclock.cpp b/kscreensaver/kdesavers/kclock.cpp
index cffa28e3..319ae822 100644
--- a/kscreensaver/kdesavers/kclock.cpp
+++ b/kscreensaver/kdesavers/kclock.cpp
@@ -85,7 +85,7 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name)
 
 	TQGroupBox *colgroup = new TQGroupBox(i18n("Colors"), main);
 	colgroup->setColumnLayout( 0,Qt::Horizontal );
-	TQGridLayout *grid = new TQGridLayout( colgroup->tqlayout(),
+	TQGridLayout *grid = new TQGridLayout( colgroup->layout(),
 		5, 2, spacingHint() );
 
 	TQLabel *label = new TQLabel(i18n("&Hour-hand:"), colgroup);
diff --git a/kscreensaver/kdesavers/kvm.cpp b/kscreensaver/kdesavers/kvm.cpp
index 6e064e29..9019c165 100644
--- a/kscreensaver/kdesavers/kvm.cpp
+++ b/kscreensaver/kdesavers/kvm.cpp
@@ -21,7 +21,7 @@
  * implied warranty.
  *
  */
-// tqlayout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org>
+// layout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/kscreensaver/kdesavers/lines.cpp b/kscreensaver/kdesavers/lines.cpp
index 9ea6551b..94a42bc2 100644
--- a/kscreensaver/kdesavers/lines.cpp
+++ b/kscreensaver/kdesavers/lines.cpp
@@ -5,7 +5,7 @@
 // based on kpolygon from Martin R. Jones 1996
 // mailto:dirk.staneker@student.uni-tuebingen.de
 //
-// tqlayout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org>
+// layout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org>
 // 2001/03/04 Converted to libkscreensaver by Martin R. Jones
 
 #include <config.h>
diff --git a/kscreensaver/kdesavers/pendulumcfg.ui b/kscreensaver/kdesavers/pendulumcfg.ui
index 59470086..4fa13d4f 100644
--- a/kscreensaver/kdesavers/pendulumcfg.ui
+++ b/kscreensaver/kdesavers/pendulumcfg.ui
@@ -50,7 +50,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout18</cstring>
+                <cstring>layout18</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -58,7 +58,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout16</cstring>
+                        <cstring>layout16</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -66,7 +66,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout15</cstring>
+                                <cstring>layout15</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -116,7 +116,7 @@ m&lt;sub&gt;1&lt;/sub&gt;+m&lt;sub&gt;2&lt;/sub&gt;
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout14</cstring>
+                                <cstring>layout14</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -160,7 +160,7 @@ l&lt;sub&gt;1&lt;/sub&gt;+l&lt;sub&gt;2&lt;/sub&gt;
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout13</cstring>
+                                <cstring>layout13</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -203,7 +203,7 @@ l&lt;sub&gt;1&lt;/sub&gt;+l&lt;sub&gt;2&lt;/sub&gt;
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout13_2</cstring>
+                                <cstring>layout13_2</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -246,7 +246,7 @@ l&lt;sub&gt;1&lt;/sub&gt;+l&lt;sub&gt;2&lt;/sub&gt;
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout18</cstring>
+                                <cstring>layout18</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -293,7 +293,7 @@ Change [s]</string>
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout15</cstring>
+                                <cstring>layout15</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -385,7 +385,7 @@ Change [s]</string>
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout19</cstring>
+                <cstring>layout19</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kscreensaver/kdesavers/polygon.cpp b/kscreensaver/kdesavers/polygon.cpp
index d32a569b..5d3de767 100644
--- a/kscreensaver/kdesavers/polygon.cpp
+++ b/kscreensaver/kdesavers/polygon.cpp
@@ -4,7 +4,7 @@
 //
 // Copyright (c)  Martin R. Jones 1996
 //
-// tqlayout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org>
+// layout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org>
 // 2001/03/04 Converted to libkscreensaver by Martin R. Jones
 
 #include <config.h>
diff --git a/kscreensaver/kdesavers/rotationcfg.ui b/kscreensaver/kdesavers/rotationcfg.ui
index c3884b22..b9335f1e 100644
--- a/kscreensaver/kdesavers/rotationcfg.ui
+++ b/kscreensaver/kdesavers/rotationcfg.ui
@@ -50,7 +50,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout17</cstring>
+                <cstring>layout17</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -58,7 +58,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -85,7 +85,7 @@
                                 </property>
                                 <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                                     <property name="name">
-                                        <cstring>tqlayout5</cstring>
+                                        <cstring>layout5</cstring>
                                     </property>
                                     <grid>
                                         <property name="name">
@@ -168,7 +168,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout10</cstring>
+                                <cstring>layout10</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -286,7 +286,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout9</cstring>
+                <cstring>layout9</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -311,7 +311,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kscreensaver/kxsconfig/kxsconfig.cpp b/kscreensaver/kxsconfig/kxsconfig.cpp
index 23edc54d..aa01c97e 100644
--- a/kscreensaver/kxsconfig/kxsconfig.cpp
+++ b/kscreensaver/kxsconfig/kxsconfig.cpp
@@ -92,11 +92,11 @@ KXSConfigDialog::KXSConfigDialog(const TQString &filename, const TQString &name)
 bool KXSConfigDialog::create()
 {
     TQVBoxLayout *topLayout = new TQVBoxLayout(plainPage(), spacingHint());
-    TQHBoxLayout *tqlayout = new TQHBoxLayout(topLayout, spacingHint());
+    TQHBoxLayout *layout = new TQHBoxLayout(topLayout, spacingHint());
     TQVBox *controlLayout = new TQVBox(plainPage());
     controlLayout->setSpacing(spacingHint());
-    tqlayout->addWidget(controlLayout);
-    ((TQBoxLayout*)controlLayout->tqlayout())->addStrut(120);
+    layout->addWidget(controlLayout);
+    ((TQBoxLayout*)controlLayout->layout())->addStrut(120);
 
     KConfig config(mConfigFile);
 
@@ -177,7 +177,7 @@ bool KXSConfigDialog::create()
     //  mPreview->setBackgroundMode(TQWidget::NoBackground);
     mPreview->setBackgroundColor(TQt::black);
 
-    tqlayout->add(mPreview);
+    layout->add(mPreview);
     show();
 
     // So that hacks can XSelectInput ButtonPressMask
diff --git a/kscreensaver/xsavers/swarm.cpp b/kscreensaver/xsavers/swarm.cpp
index 5b2c8fae..76ba08db 100644
--- a/kscreensaver/xsavers/swarm.cpp
+++ b/kscreensaver/xsavers/swarm.cpp
@@ -12,7 +12,7 @@
    Contact me in case of problems, not the original author!
    Last revised: 10-Jul-97
 */
-// tqlayout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org>
+// layout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org>
 
 #define MAXSPEED 100
 #define MINSPEED 0