Rename obsolete tq methods to standard names

(cherry picked from commit abcbb684982167791304dc2fe0bc979489506b43)

19 files changed, 75 insertions, 75 deletions

diff --git a/buildtools/autotools/addexistingdlgbase.ui b/buildtools/autotools/addexistingdlgbase.ui
index 61b34640..5223bd16 100644
--- a/buildtools/autotools/addexistingdlgbase.ui
+++ b/buildtools/autotools/addexistingdlgbase.ui
@@ -29,7 +29,7 @@
         </property>
         <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>tqlayout10</cstring>
+                <cstring>layout10</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -221,7 +221,7 @@
             </property>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout12</cstring>
+                    <cstring>layout12</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -229,7 +229,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout10</cstring>
+                            <cstring>layout10</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -325,7 +325,7 @@
             </widget>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout13</cstring>
+                    <cstring>layout13</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -333,7 +333,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout11</cstring>
+                            <cstring>layout11</cstring>
                         </property>
                         <hbox>
                             <property name="name">
diff --git a/buildtools/autotools/addprefixdlg.cpp b/buildtools/autotools/addprefixdlg.cpp
index e4fc3cf1..c4570d8f 100644
--- a/buildtools/autotools/addprefixdlg.cpp
+++ b/buildtools/autotools/addprefixdlg.cpp
@@ -39,10 +39,10 @@ AddPrefixDialog::AddPrefixDialog( const TQString& nameEdit, const TQString& path
     path_edit->setMinimumWidth(fm.width('X')*35);
     connect( path_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), TQT_SLOT( slotPrefixChanged() ) );
 
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10);
+    TQVBoxLayout *layout = new TQVBoxLayout(this, 10);
 
     TQGridLayout *grid = new TQGridLayout(2, 2);
-    tqlayout->addLayout(grid);
+    layout->addLayout(grid);
     grid->addWidget(name_label, 0, 0);
     grid->addWidget(name_edit, 0, 1);
     grid->addWidget(path_label, 1, 0);
@@ -50,7 +50,7 @@ AddPrefixDialog::AddPrefixDialog( const TQString& nameEdit, const TQString& path
 
     TQFrame *frame = new TQFrame(this);
     frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
-    tqlayout->addWidget(frame, 0);
+    layout->addWidget(frame, 0);
 
     KButtonBox *buttonbox = new KButtonBox(this);
     buttonbox->addStretch();
@@ -59,8 +59,8 @@ AddPrefixDialog::AddPrefixDialog( const TQString& nameEdit, const TQString& path
     m_pOk->setDefault(true);
     connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
     connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) );
-    buttonbox->tqlayout();
-    tqlayout->addWidget(buttonbox, 0);
+    buttonbox->layout();
+    layout->addWidget(buttonbox, 0);
     slotPrefixChanged();
 }
 
diff --git a/buildtools/autotools/addtranslationdlg.cpp b/buildtools/autotools/addtranslationdlg.cpp
index 6712e280..559e1369 100644
--- a/buildtools/autotools/addtranslationdlg.cpp
+++ b/buildtools/autotools/addtranslationdlg.cpp
@@ -42,12 +42,12 @@ AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, TQWidget *pare
     (void) new TQLabel(i18n("Language:"), hbox);
     lang_combo = new TQComboBox(hbox);
 
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    tqlayout->addWidget(hbox);
+    TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    layout->addWidget(hbox);
 
     TQFrame *frame = new TQFrame(this);
     frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
-    tqlayout->addWidget(frame, 0);
+    layout->addWidget(frame, 0);
 
     KButtonBox *buttonbox = new KButtonBox(this);
     buttonbox->addStretch();
@@ -56,8 +56,8 @@ AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, TQWidget *pare
     ok_button->setDefault(true);
     connect( ok_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
     connect( cancel_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) );
-    buttonbox->tqlayout();
-    tqlayout->addWidget(buttonbox, 0);
+    buttonbox->layout();
+    layout->addWidget(buttonbox, 0);
 
     TQStringList rawlist, list;
     rawlist << "af" << "ar" << "bg" << "bo" << "br" << "bs" << "ca" << "cs" << "cy" << "da"
diff --git a/buildtools/autotools/autoprojectviewbase.ui b/buildtools/autotools/autoprojectviewbase.ui
index 7056c640..3e33fb41 100644
--- a/buildtools/autotools/autoprojectviewbase.ui
+++ b/buildtools/autotools/autoprojectviewbase.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/buildtools/autotools/fileselectorwidget.cpp b/buildtools/autotools/fileselectorwidget.cpp
index 7173d711..2235f357 100644
--- a/buildtools/autotools/fileselectorwidget.cpp
+++ b/buildtools/autotools/fileselectorwidget.cpp
@@ -73,7 +73,7 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode,
 {
     m_part = part;
 
-	// widgets and tqlayout
+	// widgets and layout
 	TQVBoxLayout* lo = new TQVBoxLayout(this);
 
 	TQHBox *hlow = new TQHBox (this);
diff --git a/buildtools/autotools/removefiledlgbase.ui b/buildtools/autotools/removefiledlgbase.ui
index 5dbd03cd..7befbc0d 100644
--- a/buildtools/autotools/removefiledlgbase.ui
+++ b/buildtools/autotools/removefiledlgbase.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/buildtools/autotools/subprojectoptionsdlgbase.ui b/buildtools/autotools/subprojectoptionsdlgbase.ui
index 2960dc4b..6c069718 100644
--- a/buildtools/autotools/subprojectoptionsdlgbase.ui
+++ b/buildtools/autotools/subprojectoptionsdlgbase.ui
@@ -282,7 +282,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout11</cstring>
+                            <cstring>layout11</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -298,7 +298,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout9</cstring>
+                                    <cstring>layout9</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -405,7 +405,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout10</cstring>
+                                    <cstring>layout10</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
diff --git a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui
index 904205eb..df063672 100644
--- a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui
+++ b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui
@@ -98,7 +98,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/buildtools/custommakefiles/custommakeconfigwidgetbase.ui b/buildtools/custommakefiles/custommakeconfigwidgetbase.ui
index b4a3485a..62d74ec6 100644
--- a/buildtools/custommakefiles/custommakeconfigwidgetbase.ui
+++ b/buildtools/custommakefiles/custommakeconfigwidgetbase.ui
@@ -37,7 +37,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -95,7 +95,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -166,7 +166,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -226,7 +226,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/buildtools/custommakefiles/customotherconfigwidgetbase.ui b/buildtools/custommakefiles/customotherconfigwidgetbase.ui
index 62c72ad2..86917b10 100644
--- a/buildtools/custommakefiles/customotherconfigwidgetbase.ui
+++ b/buildtools/custommakefiles/customotherconfigwidgetbase.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -79,7 +79,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -139,7 +139,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/buildtools/lib/parsers/autotools/tests/viewerbase.ui b/buildtools/lib/parsers/autotools/tests/viewerbase.ui
index 1c71c94b..7a00a47a 100644
--- a/buildtools/lib/parsers/autotools/tests/viewerbase.ui
+++ b/buildtools/lib/parsers/autotools/tests/viewerbase.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="1" rowspan="4" colspan="1">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/buildtools/lib/parsers/qmake/tests/viewerbase.ui b/buildtools/lib/parsers/qmake/tests/viewerbase.ui
index 3093e298..c76abc20 100644
--- a/buildtools/lib/parsers/qmake/tests/viewerbase.ui
+++ b/buildtools/lib/parsers/qmake/tests/viewerbase.ui
@@ -28,7 +28,7 @@
             </property>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout4</cstring>
+                    <cstring>layout4</cstring>
                 </property>
                 <vbox>
                     <property name="name">
diff --git a/buildtools/lib/widgets/addenvvardlg.cpp b/buildtools/lib/widgets/addenvvardlg.cpp
index 43033d97..89d7f655 100644
--- a/buildtools/lib/widgets/addenvvardlg.cpp
+++ b/buildtools/lib/widgets/addenvvardlg.cpp
@@ -47,10 +47,10 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name)
     connect( value_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) );
 
 
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10);
+    TQVBoxLayout *layout = new TQVBoxLayout(this, 10);
 
     TQGridLayout *grid = new TQGridLayout(2, 2);
-    tqlayout->addLayout(grid);
+    layout->addLayout(grid);
     grid->addWidget(varname_label, 0, 0);
     grid->addWidget(varname_edit, 0, 1);
     grid->addWidget(value_label, 1, 0);
@@ -58,7 +58,7 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name)
 
     TQFrame *frame = new TQFrame(this);
     frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
-    tqlayout->addWidget(frame, 0);
+    layout->addWidget(frame, 0);
 
     KButtonBox *buttonbox = new KButtonBox(this);
     buttonbox->addStretch();
@@ -67,8 +67,8 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name)
     m_pOk->setDefault(true);
     connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
     connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) );
-    buttonbox->tqlayout();
-    tqlayout->addWidget(buttonbox, 0);
+    buttonbox->layout();
+    layout->addWidget(buttonbox, 0);
     slotTextChanged();
 }
 
diff --git a/buildtools/lib/widgets/environmentdisplaydialogbase.ui b/buildtools/lib/widgets/environmentdisplaydialogbase.ui
index 1f15b75a..5388fe59 100644
--- a/buildtools/lib/widgets/environmentdisplaydialogbase.ui
+++ b/buildtools/lib/widgets/environmentdisplaydialogbase.ui
@@ -61,7 +61,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/buildtools/lib/widgets/subclassesdlgbase.ui b/buildtools/lib/widgets/subclassesdlgbase.ui
index 51d0e5b3..e25d1a5d 100644
--- a/buildtools/lib/widgets/subclassesdlgbase.ui
+++ b/buildtools/lib/widgets/subclassesdlgbase.ui
@@ -104,7 +104,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/buildtools/qmake/createscopedlgbase.ui b/buildtools/qmake/createscopedlgbase.ui
index bb1257b7..d1550092 100644
--- a/buildtools/qmake/createscopedlgbase.ui
+++ b/buildtools/qmake/createscopedlgbase.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -232,7 +232,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/buildtools/qmake/projectconfigurationdlgbase.ui b/buildtools/qmake/projectconfigurationdlgbase.ui
index a952d6f8..6c1006b3 100644
--- a/buildtools/qmake/projectconfigurationdlgbase.ui
+++ b/buildtools/qmake/projectconfigurationdlgbase.ui
@@ -377,7 +377,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout147</cstring>
+                                    <cstring>layout147</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -426,7 +426,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout30</cstring>
+                                    <cstring>layout30</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -762,7 +762,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout69</cstring>
+                                    <cstring>layout69</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -825,7 +825,7 @@
                             </spacer>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout68</cstring>
+                                    <cstring>layout68</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -855,7 +855,7 @@
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout67</cstring>
+                                            <cstring>layout67</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -999,7 +999,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="3" column="1">
                         <property name="name">
-                            <cstring>tqlayout8</cstring>
+                            <cstring>layout8</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -1079,7 +1079,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="1" column="0">
                         <property name="name">
-                            <cstring>tqlayout12</cstring>
+                            <cstring>layout12</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1106,7 +1106,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout10</cstring>
+                                    <cstring>layout10</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -1175,7 +1175,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="1" column="1">
                         <property name="name">
-                            <cstring>tqlayout11</cstring>
+                            <cstring>layout11</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1202,7 +1202,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout9</cstring>
+                                    <cstring>layout9</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -1271,7 +1271,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>tqlayout10</cstring>
+                            <cstring>layout10</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1356,7 +1356,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout26</cstring>
+                            <cstring>layout26</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1431,7 +1431,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout27</cstring>
+                            <cstring>layout27</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1458,7 +1458,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout9_2</cstring>
+                                    <cstring>layout9_2</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -1527,7 +1527,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout28_2</cstring>
+                            <cstring>layout28_2</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1634,7 +1634,7 @@
                             </property>
                             <widget class="TQLayoutWidget" row="0" column="0">
                                 <property name="name">
-                                    <cstring>tqlayout26</cstring>
+                                    <cstring>layout26</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1642,7 +1642,7 @@
                                     </property>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout23</cstring>
+                                            <cstring>layout23</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -1682,7 +1682,7 @@
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout24</cstring>
+                                            <cstring>layout24</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -1722,7 +1722,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout84</cstring>
+                                    <cstring>layout84</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -1776,7 +1776,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout85</cstring>
+                                    <cstring>layout85</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -1889,7 +1889,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout24</cstring>
+                            <cstring>layout24</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1952,7 +1952,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout23</cstring>
+                                    <cstring>layout23</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -1960,7 +1960,7 @@
                                     </property>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout22</cstring>
+                                            <cstring>layout22</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -2023,7 +2023,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout33</cstring>
+                            <cstring>layout33</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -2062,7 +2062,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout32</cstring>
+                            <cstring>layout32</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -2141,7 +2141,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout34</cstring>
+                            <cstring>layout34</cstring>
                         </property>
                         <hbox>
                             <property name="name">
diff --git a/buildtools/qmake/qmakeoptionswidgetbase.ui b/buildtools/qmake/qmakeoptionswidgetbase.ui
index b70e6af1..1ae7a808 100644
--- a/buildtools/qmake/qmakeoptionswidgetbase.ui
+++ b/buildtools/qmake/qmakeoptionswidgetbase.ui
@@ -31,7 +31,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/buildtools/script/scriptnewfiledlg.cpp b/buildtools/script/scriptnewfiledlg.cpp
index 0e838612..3bfeeee7 100644
--- a/buildtools/script/scriptnewfiledlg.cpp
+++ b/buildtools/script/scriptnewfiledlg.cpp
@@ -56,14 +56,14 @@ ScriptNewFileDialog::ScriptNewFileDialog(ScriptProjectPart *part,
     ok_button->setDefault(true);
     connect( ok_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
     connect( cancel_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) );
-    buttonbox->tqlayout();
-
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10, 4);
-    tqlayout->addWidget(filename_label);
-    tqlayout->addWidget(filename_edit);
-    tqlayout->addWidget(usetemplate_box);
-    tqlayout->addWidget(frame, 0);
-    tqlayout->addWidget(buttonbox, 0);
+    buttonbox->layout();
+
+    TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4);
+    layout->addWidget(filename_label);
+    layout->addWidget(filename_edit);
+    layout->addWidget(usetemplate_box);
+    layout->addWidget(frame, 0);
+    layout->addWidget(buttonbox, 0);
 
     m_part = part;
 }