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

This reverts commit b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04.

8 files changed, 23 insertions, 23 deletions

diff --git a/buildtools/lib/widgets/addenvvardlg.cpp b/buildtools/lib/widgets/addenvvardlg.cpp
index 80ba96a0..f66bbe93 100644
--- a/buildtools/lib/widgets/addenvvardlg.cpp
+++ b/buildtools/lib/widgets/addenvvardlg.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <kbuttonbox.h>
 #include <klocale.h>
@@ -47,10 +47,10 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name)
     connect( value_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) );
 
 
-    TQVBoxLayout *layout = new TQVBoxLayout(this, 10);
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10);
 
     TQGridLayout *grid = new TQGridLayout(2, 2);
-    layout->addLayout(grid);
+    tqlayout->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);
-    layout->addWidget(frame, 0);
+    tqlayout->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->layout();
-    layout->addWidget(buttonbox, 0);
+    buttonbox->tqlayout();
+    tqlayout->addWidget(buttonbox, 0);
     slotTextChanged();
 }
 
diff --git a/buildtools/lib/widgets/environmentdisplaydialogbase.ui b/buildtools/lib/widgets/environmentdisplaydialogbase.ui
index 5388fe59..e19d27a0 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>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -77,7 +77,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>321</width>
                             <height>21</height>
diff --git a/buildtools/lib/widgets/environmentvariableswidgetbase.ui b/buildtools/lib/widgets/environmentvariableswidgetbase.ui
index e7246de3..c06239f7 100644
--- a/buildtools/lib/widgets/environmentvariableswidgetbase.ui
+++ b/buildtools/lib/widgets/environmentvariableswidgetbase.ui
@@ -121,7 +121,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>60</height>
@@ -146,7 +146,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>171</height>
diff --git a/buildtools/lib/widgets/envvartools.cpp b/buildtools/lib/widgets/envvartools.cpp
index 71c44377..13b1391a 100644
--- a/buildtools/lib/widgets/envvartools.cpp
+++ b/buildtools/lib/widgets/envvartools.cpp
@@ -23,7 +23,7 @@
 TQString EnvVarTools::quote( const TQString & arg )
 {
     TQString res = arg;
-    res.replace(TQRegExp(TQString::fromLatin1("'")), TQString::fromLatin1("'\\''"));
+    res.replace(TQRegExp(TQString::tqfromLatin1("'")), TQString::tqfromLatin1("'\\''"));
     res.prepend("\"");
     res.append("\"");
     return res;
diff --git a/buildtools/lib/widgets/makeoptionswidgetbase.ui b/buildtools/lib/widgets/makeoptionswidgetbase.ui
index 9caba3ee..4f0829ae 100644
--- a/buildtools/lib/widgets/makeoptionswidgetbase.ui
+++ b/buildtools/lib/widgets/makeoptionswidgetbase.ui
@@ -105,7 +105,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>121</width>
                     <height>20</height>
@@ -122,7 +122,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/buildtools/lib/widgets/removesubprojectdlgbase.ui b/buildtools/lib/widgets/removesubprojectdlgbase.ui
index d5206ac6..e891ff07 100644
--- a/buildtools/lib/widgets/removesubprojectdlgbase.ui
+++ b/buildtools/lib/widgets/removesubprojectdlgbase.ui
@@ -23,13 +23,13 @@
             <property name="name">
                 <cstring>fileGroupBox</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>0</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>32767</width>
                     <height>140</height>
@@ -65,7 +65,7 @@
                     <property name="name">
                         <cstring>noticeLabel</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>200</width>
                             <height>0</height>
@@ -98,7 +98,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>20</height>
diff --git a/buildtools/lib/widgets/runoptionswidgetbase.ui b/buildtools/lib/widgets/runoptionswidgetbase.ui
index 30f10e48..40d79634 100644
--- a/buildtools/lib/widgets/runoptionswidgetbase.ui
+++ b/buildtools/lib/widgets/runoptionswidgetbase.ui
@@ -51,7 +51,7 @@
                     <property name="text">
                         <string>Note: These options override target specific settings.</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter</set>
                     </property>
                     <property name="whatsThis" stdset="0">
diff --git a/buildtools/lib/widgets/subclassesdlgbase.ui b/buildtools/lib/widgets/subclassesdlgbase.ui
index e25d1a5d..100100cb 100644
--- a/buildtools/lib/widgets/subclassesdlgbase.ui
+++ b/buildtools/lib/widgets/subclassesdlgbase.ui
@@ -53,7 +53,7 @@
             <property name="name">
                 <cstring>subclass_url</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>24</height>
@@ -73,7 +73,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>90</height>
@@ -95,7 +95,7 @@
             <property name="text">
                 <string>Related subclass &amp;location:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
             <property name="buddy" stdset="0">
@@ -104,7 +104,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -120,7 +120,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>310</width>
                             <height>20</height>