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

This reverts commit b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04.

41 files changed, 232 insertions, 232 deletions

diff --git a/buildtools/autotools/addapplicationdlg.cpp b/buildtools/autotools/addapplicationdlg.cpp
index f14ce964..e6bdc20d 100644
--- a/buildtools/autotools/addapplicationdlg.cpp
+++ b/buildtools/autotools/addapplicationdlg.cpp
@@ -16,7 +16,7 @@
 #include <tqfile.h>
 #include <tqheader.h>
 #include <tqlistview.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqapplication.h>
 #include <klineedit.h>
 #include <kdebug.h>
diff --git a/buildtools/autotools/addapplicationdlgbase.ui b/buildtools/autotools/addapplicationdlgbase.ui
index 9b357801..234fa8b3 100644
--- a/buildtools/autotools/addapplicationdlgbase.ui
+++ b/buildtools/autotools/addapplicationdlgbase.ui
@@ -66,7 +66,7 @@
                             <property name="name">
                                 <cstring>icon_button</cstring>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>24</width>
                                     <height>24</height>
@@ -89,7 +89,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -192,7 +192,7 @@
                     <property name="text">
                         <string>E&amp;xecutable:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -210,7 +210,7 @@
                     <property name="text">
                         <string>&amp;Icon:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -228,7 +228,7 @@
                     <property name="text">
                         <string>&amp;Section:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -246,7 +246,7 @@
                     <property name="text">
                         <string>&amp;File name:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -264,7 +264,7 @@
                     <property name="text">
                         <string>&amp;Name:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -282,7 +282,7 @@
                     <property name="text">
                         <string>Co&amp;mment:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -301,7 +301,7 @@
             <property name="sizeType">
                 <enum>Preferred</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -370,7 +370,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -403,7 +403,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -456,7 +456,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/buildtools/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp
index 927b32f1..341953e0 100644
--- a/buildtools/autotools/addexistingdirectoriesdlg.cpp
+++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp
@@ -15,7 +15,7 @@
  ***************************************************************************/
 
 #include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kprogress.h>
 #include <klocale.h>
@@ -229,7 +229,7 @@ void AddExistingDirectoriesDialog::slotOk()
             m_widget->getSubprojectView()->parse( newitem );
         } else {
             if (!f.open(IO_WriteOnly)) {
-//                KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").arg(name));
+//                KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").tqarg(name));
                 continue;
             }
             TQTextStream stream(&f);
diff --git a/buildtools/autotools/addexistingdlgbase.ui b/buildtools/autotools/addexistingdlgbase.ui
index 5223bd16..47c8dcef 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>layout10</cstring>
+                <cstring>tqlayout10</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -45,7 +45,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>317</width>
                             <height>20</height>
@@ -93,7 +93,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>32767</width>
                     <height>32767</height>
@@ -221,7 +221,7 @@
             </property>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>layout12</cstring>
+                    <cstring>tqlayout12</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -229,7 +229,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout10</cstring>
+                            <cstring>tqlayout10</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -245,7 +245,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>84</width>
                                         <height>20</height>
@@ -284,7 +284,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>84</width>
                                         <height>20</height>
@@ -297,13 +297,13 @@
                         <property name="name">
                             <cstring>sourceGroupBox</cstring>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>240</width>
                                 <height>250</height>
                             </size>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>32767</width>
                                 <height>32767</height>
@@ -325,7 +325,7 @@
             </widget>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>layout13</cstring>
+                    <cstring>tqlayout13</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -333,7 +333,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout11</cstring>
+                            <cstring>tqlayout11</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -349,7 +349,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>21</width>
                                         <height>20</height>
@@ -388,7 +388,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -401,13 +401,13 @@
                         <property name="name">
                             <cstring>destGroupBox</cstring>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>140</width>
                                 <height>100</height>
                             </size>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>32767</width>
                                 <height>32767</height>
diff --git a/buildtools/autotools/addexistingfilesdlg.cpp b/buildtools/autotools/addexistingfilesdlg.cpp
index 3faf3d1a..55533a3d 100644
--- a/buildtools/autotools/addexistingfilesdlg.cpp
+++ b/buildtools/autotools/addexistingfilesdlg.cpp
@@ -21,7 +21,7 @@
 #include <tqlabel.h>
 //#include <tqlistbox.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <tqpixmap.h>
diff --git a/buildtools/autotools/addfiledlg.cpp b/buildtools/autotools/addfiledlg.cpp
index 0471c230..34108fb3 100644
--- a/buildtools/autotools/addfiledlg.cpp
+++ b/buildtools/autotools/addfiledlg.cpp
@@ -15,10 +15,10 @@
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kbuttonbox.h>
 #include <kdebug.h>
diff --git a/buildtools/autotools/addfiledlgbase.ui b/buildtools/autotools/addfiledlgbase.ui
index 0d86b1a0..79029915 100644
--- a/buildtools/autotools/addfiledlgbase.ui
+++ b/buildtools/autotools/addfiledlgbase.ui
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="maximumSize">
+    <property name="tqmaximumSize">
         <size>
             <width>32767</width>
             <height>32767</height>
@@ -150,7 +150,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -188,7 +188,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -217,7 +217,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -245,7 +245,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/buildtools/autotools/addicondlg.cpp b/buildtools/autotools/addicondlg.cpp
index 639c04ce..81d0d859 100644
--- a/buildtools/autotools/addicondlg.cpp
+++ b/buildtools/autotools/addicondlg.cpp
@@ -105,7 +105,7 @@ void AddIconDialog::accept()
     m_target->sources.append(fitem);
     m_target->insertItem(fitem);
 
-    m_part->startMakeCommand(destdir, TQString::fromLatin1("force-reedit"));
+    m_part->startMakeCommand(destdir, TQString::tqfromLatin1("force-reedit"));
 	
 	m_widget->emitAddedFile(destpath);
 
diff --git a/buildtools/autotools/addicondlgbase.ui b/buildtools/autotools/addicondlgbase.ui
index 7a3336dc..14947fe2 100644
--- a/buildtools/autotools/addicondlgbase.ui
+++ b/buildtools/autotools/addicondlgbase.ui
@@ -34,7 +34,7 @@
             <property name="text">
                 <string>&amp;Type:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
             <property name="buddy" stdset="0">
@@ -52,7 +52,7 @@
             <property name="text">
                 <string>&amp;Size:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
             <property name="buddy" stdset="0">
@@ -75,7 +75,7 @@
             <property name="text">
                 <string>File name:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
             <property name="buddy" stdset="0">
@@ -93,7 +93,7 @@
             <property name="text">
                 <string>&amp;Name:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
             <property name="buddy" stdset="0">
@@ -136,7 +136,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -212,7 +212,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/autotools/addprefixdlg.cpp b/buildtools/autotools/addprefixdlg.cpp
index b4b642ac..4c2f1493 100644
--- a/buildtools/autotools/addprefixdlg.cpp
+++ b/buildtools/autotools/addprefixdlg.cpp
@@ -12,7 +12,7 @@
 #include "addprefixdlg.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <kbuttonbox.h>
 #include <kfiledialog.h>
@@ -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 *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(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);
-    layout->addWidget(frame, 0);
+    tqlayout->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->layout();
-    layout->addWidget(buttonbox, 0);
+    buttonbox->tqlayout();
+    tqlayout->addWidget(buttonbox, 0);
     slotPrefixChanged();
 }
 
diff --git a/buildtools/autotools/addservicedlg.cpp b/buildtools/autotools/addservicedlg.cpp
index 8147f55f..ccc10ec2 100644
--- a/buildtools/autotools/addservicedlg.cpp
+++ b/buildtools/autotools/addservicedlg.cpp
@@ -15,7 +15,7 @@
 #include <tqfile.h>
 #include <tqheader.h>
 #include <tqlistview.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <klineedit.h>
 #include <kdebug.h>
 #include <kicondialog.h>
@@ -136,7 +136,7 @@ void AddServiceDialog::propertyExecuted(TQListViewItem *item)
     TQString prop = item->text(0);
     TQString value = item->text(1);
     bool ok;
-    value = KInputDialog::getText(i18n("Enter Value"), i18n("Property %1:").arg(prop), value, &ok, this);
+    value = KInputDialog::getText(i18n("Enter Value"), i18n("Property %1:").tqarg(prop), value, &ok, this);
     if (!ok)
         return;
 
diff --git a/buildtools/autotools/addservicedlgbase.ui b/buildtools/autotools/addservicedlgbase.ui
index c1f52b22..82b7ee9d 100644
--- a/buildtools/autotools/addservicedlgbase.ui
+++ b/buildtools/autotools/addservicedlgbase.ui
@@ -54,7 +54,7 @@
                     <property name="text">
                         <string>&amp;Icon:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -77,7 +77,7 @@
                             <property name="name">
                                 <cstring>icon_button</cstring>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>24</width>
                                     <height>24</height>
@@ -100,7 +100,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -138,7 +138,7 @@
                     <property name="text">
                         <string>&amp;Library:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -156,7 +156,7 @@
                     <property name="text">
                         <string>&amp;File name:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -174,7 +174,7 @@
                     <property name="text">
                         <string>&amp;Name:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -192,7 +192,7 @@
                     <property name="text">
                         <string>Co&amp;mment:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -274,7 +274,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -307,7 +307,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -405,7 +405,7 @@
                     <property name="text">
                         <string>&amp;Properties:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignTop|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -436,7 +436,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/buildtools/autotools/addsubprojectdlg.cpp b/buildtools/autotools/addsubprojectdlg.cpp
index 274fa48b..f156a5e1 100644
--- a/buildtools/autotools/addsubprojectdlg.cpp
+++ b/buildtools/autotools/addsubprojectdlg.cpp
@@ -12,10 +12,10 @@
 #include "addsubprojectdlg.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqstringlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <kbuttonbox.h>
 #include <kdebug.h>
 #include <kfiledialog.h>
@@ -82,25 +82,25 @@ void AddSubprojectDialog::accept()
     TQFileInfo file( dir, name );
 
     if( file.exists() && !file.isDir() ) {
-        KMessageBox::sorry(this, i18n("A file named %1 already exists.").arg(name));
+        KMessageBox::sorry(this, i18n("A file named %1 already exists.").tqarg(name));
         TQDialog::accept();
         return;
     } else if( file.isDir() ) {
         if( KMessageBox::warningContinueCancel(this,
                i18n("A subdirectory %1 already exists. "
-                    "Do you wish to add it as a subproject?").arg(name))
+                    "Do you wish to add it as a subproject?").tqarg(name))
             == KMessageBox::Cancel ){
             TQDialog::accept();
             return;
 	}
     } else if (!dir.mkdir(name)) {
-        KMessageBox::sorry(this, i18n("Could not create subdirectory %1.").arg(name));
+        KMessageBox::sorry(this, i18n("Could not create subdirectory %1.").tqarg(name));
         TQDialog::accept();
         return;
     }
 
     if(!dir.cd(name)) {
-       KMessageBox::sorry(this, i18n("Could not access the subdirectory %1.").arg(name));
+       KMessageBox::sorry(this, i18n("Could not access the subdirectory %1.").tqarg(name));
        TQDialog::accept();
        return;
     }
@@ -148,7 +148,7 @@ void AddSubprojectDialog::accept()
         m_subprojectView->parse( newitem );
     } else {
         if (!f.open(IO_WriteOnly)) {
-            KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").arg(name));
+            KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").tqarg(name));
             return;
         }
         TQTextStream stream(&f);
diff --git a/buildtools/autotools/addsubprojectdlgbase.ui b/buildtools/autotools/addsubprojectdlgbase.ui
index 3c2e4828..7505f390 100644
--- a/buildtools/autotools/addsubprojectdlgbase.ui
+++ b/buildtools/autotools/addsubprojectdlgbase.ui
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="maximumSize">
+    <property name="tqmaximumSize">
         <size>
             <width>32767</width>
             <height>32767</height>
@@ -73,7 +73,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -102,7 +102,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -123,7 +123,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -151,7 +151,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/buildtools/autotools/addtargetdlg.cpp b/buildtools/autotools/addtargetdlg.cpp
index d2a832c1..868cc504 100644
--- a/buildtools/autotools/addtargetdlg.cpp
+++ b/buildtools/autotools/addtargetdlg.cpp
@@ -165,13 +165,13 @@ void AddTargetDialog::accept()
 #endif
 
 	if( primary.endsWith("LIBRARIES") && !name.startsWith("lib") && !module_box->isChecked() )
-	    name.prepend( TQString::fromLatin1("lib") );
+	    name.prepend( TQString::tqfromLatin1("lib") );
 
 	if( primary == "LTLIBRARIES" && !name.endsWith(".la") )
-	    name.append( TQString::fromLatin1(".la") );
+	    name.append( TQString::tqfromLatin1(".la") );
 
 	if ( primary == "LIBRARIES" && !name.endsWith(".a") )
-	    name.append ( TQString::fromLatin1(".a") );
+	    name.append ( TQString::tqfromLatin1(".a") );
 
 	TQPtrListIterator<TargetItem> it(m_subproject->targets);
 	for (; it.current(); ++it)
diff --git a/buildtools/autotools/addtargetdlgbase.ui b/buildtools/autotools/addtargetdlgbase.ui
index 9e8b561f..763d5984 100644
--- a/buildtools/autotools/addtargetdlgbase.ui
+++ b/buildtools/autotools/addtargetdlgbase.ui
@@ -44,7 +44,7 @@
                     <property name="text">
                         <string>&amp;Primary:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -67,7 +67,7 @@
                     <property name="text">
                         <string>Pre&amp;fix:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -90,7 +90,7 @@
                     <property name="text">
                         <string>File &amp;name:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -112,7 +112,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>246</width>
                             <height>20</height>
@@ -155,7 +155,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -261,7 +261,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/buildtools/autotools/addtranslationdlg.cpp b/buildtools/autotools/addtranslationdlg.cpp
index 0d395298..9962aeb2 100644
--- a/buildtools/autotools/addtranslationdlg.cpp
+++ b/buildtools/autotools/addtranslationdlg.cpp
@@ -16,7 +16,7 @@
 #include <tqfileinfo.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqstrlist.h>
@@ -42,12 +42,12 @@ AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, TQWidget *pare
     (void) new TQLabel(i18n("Language:"), hbox);
     lang_combo = new TQComboBox(hbox);
 
-    TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-    layout->addWidget(hbox);
+    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+    tqlayout->addWidget(hbox);
 
     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();
@@ -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->layout();
-    layout->addWidget(buttonbox, 0);
+    buttonbox->tqlayout();
+    tqlayout->addWidget(buttonbox, 0);
 
     TQStringList rawlist, list;
     rawlist << "af" << "ar" << "bg" << "bo" << "br" << "bs" << "ca" << "cs" << "cy" << "da"
@@ -101,7 +101,7 @@ void AddTranslationDialog::accept()
     f.close();
 
     dir = m_part->buildDirectory() + "/po";
-    m_part->startMakeCommand(dir, TQString::fromLatin1("force-reedit"));
+    m_part->startMakeCommand(dir, TQString::tqfromLatin1("force-reedit"));
 
     TQDialog::accept();
 }
diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp
index 478aa9e8..45d0886e 100644
--- a/buildtools/autotools/autodetailsview.cpp
+++ b/buildtools/autotools/autodetailsview.cpp
@@ -20,7 +20,7 @@
 #include <tqlistview.h>
 #include <tqwidget.h>
 #include <tqheader.h>
-#include <layout.h>
+#include <tqlayout.h>
 
  /** KDE Libs */
 #include <kxmlguiclient.h>
@@ -499,7 +499,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item,
 		else
 			caption = titem->name;
 
-		KPopupMenu popup( i18n( "Target: %1" ).arg( caption ), this );
+		KPopupMenu popup( i18n( "Target: %1" ).tqarg( caption ), this );
 
 		if ( titem->primary == "PROGRAMS" || titem->primary == "LIBRARIES"
 		        || titem->primary == "LTLIBRARIES" || titem->primary == "JAVA" )
@@ -554,7 +554,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item,
 			return;
 		}
 
-		KPopupMenu popup( i18n( "File: %1" ).arg( fitem->name ), this );
+		KPopupMenu popup( i18n( "File: %1" ).tqarg( fitem->name ), this );
 
 		removeDetailAction->plug( &popup );
 		KURL::List urls;
@@ -563,7 +563,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item,
 
 		int idSubclassWidget = popup.insertItem(SmallIconSet("qmake_subclass"),
 		                                        i18n("Subclassing Wizard...") );
-		popup.setWhatsThis(idSubclassWidget, i18n("<b>Subclass widget</b><p>Launches "
+		popup.tqsetWhatsThis(idSubclassWidget, i18n("<b>Subclass widget</b><p>Launches "
 		                                          "<b>Subclassing</b> wizard. "
 		                                          "It allows to create a subclass from the "
 		                                          "class defined in .ui file. "
@@ -572,19 +572,19 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item,
 		                                          "class."));
 		int idUISubclasses = popup.insertItem(SmallIconSet("qmake_subclass"),
 		                                      i18n("List of Subclasses..."));
-		popup.setWhatsThis(idUISubclasses, i18n("<b>List of subclasses</b><p>Shows "
+		popup.tqsetWhatsThis(idUISubclasses, i18n("<b>List of subclasses</b><p>Shows "
 		                                        "subclasses list editor. "
 		                                        "There is possibility to add or remove "
 		                                        "subclasses from the list."));
 		int idUpdateWidgetclass = popup.insertItem(SmallIconSet("qmake_subclass"),
 		                                           i18n("Edit ui-Subclass..."));
-		popup.setWhatsThis(idUpdateWidgetclass, i18n("<b>Edit ui-subclass</b><p>Launches "
+		popup.tqsetWhatsThis(idUpdateWidgetclass, i18n("<b>Edit ui-subclass</b><p>Launches "
 		                                             "<b>Subclassing</b> wizard and prompts "
 		                                             "to implement missing in childclass "
 		                                             "slots and functions."));
 		int idViewUIH = popup.insertItem(SmallIconSet("qmake_ui_h"),
 		                                 i18n("Open ui.h File"));
-		popup.setWhatsThis(idViewUIH, i18n("<b>Open ui.h file</b><p>Opens .ui.h file "
+		popup.tqsetWhatsThis(idViewUIH, i18n("<b>Open ui.h file</b><p>Opens .ui.h file "
 		                                   "associated with the selected .ui."));
 
 		if (!fitem->name.contains(TQRegExp("ui$")) || fitem->is_subst == true)
diff --git a/buildtools/autotools/autolistviewitems.cpp b/buildtools/autotools/autolistviewitems.cpp
index e77aa84b..6ffa69a0 100644
--- a/buildtools/autotools/autolistviewitems.cpp
+++ b/buildtools/autotools/autolistviewitems.cpp
@@ -42,7 +42,7 @@ ProjectItem::ProjectItem( Type type, ProjectItem *parent, const TQString &text )
 
 
 void ProjectItem::paintCell( TQPainter *p, const TQColorGroup &cg,
-                             int column, int width, int alignment )
+                             int column, int width, int tqalignment )
 {
 	if ( isBold() )
 	{
@@ -50,7 +50,7 @@ void ProjectItem::paintCell( TQPainter *p, const TQColorGroup &cg,
 		font.setBold( true );
 		p->setFont( font );
 	}
-	TQListViewItem::paintCell( p, cg, column, width, alignment );
+	TQListViewItem::paintCell( p, cg, column, width, tqalignment );
 }
 
 
diff --git a/buildtools/autotools/autolistviewitems.h b/buildtools/autotools/autolistviewitems.h
index 162d8467..0dc28dc5 100644
--- a/buildtools/autotools/autolistviewitems.h
+++ b/buildtools/autotools/autolistviewitems.h
@@ -35,7 +35,7 @@ public:
 	ProjectItem( Type type, ProjectItem *parent, const TQString &text );
 
 	void paintCell( TQPainter *p, const TQColorGroup &cg,
-	                int column, int width, int alignment );
+	                int column, int width, int tqalignment );
 	void setBold( bool b )
 	{
 		bld = b;
diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp
index 5e282acf..7f17cb6d 100644
--- a/buildtools/autotools/autoprojectpart.cpp
+++ b/buildtools/autotools/autoprojectpart.cpp
@@ -414,7 +414,7 @@ TQString AutoProjectPart::mainProgram() const
             KMessageBox::error( m_widget, i18n("Active target \"%1\" is not binary ( %2 ).\n"
                                 "Unable to determine the main program.  If you want this\n"
                                 "to be the active target, set a main program under\n"
-                                "Project -> Project Options -> Run Options").arg(titem->name).arg(titem->primary), i18n("Active target is not a library") );
+                                "Project -> Project Options -> Run Options").tqarg(titem->name).tqarg(titem->primary), i18n("Active target is not a library") );
             kdDebug ( 9020 ) << k_funcinfo << "Error! : Active target isn't binary (" << titem->primary << ") ! -> Unable to determine the main program in AutoProjectPart::mainProgram()" << endl;
             return TQString();
         }
@@ -643,7 +643,7 @@ TQString AutoProjectPart::constructMakeCommandLine(const TQString &dir, const TQ
         {
             int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory\n"
                                                "and no configure script for this project.\n"
-                                               "Run automake & friends and configure first?").arg(buildDirectory()), TQString(), i18n("Run Them"), i18n("Do Not Run"));
+                                               "Run automake & friends and configure first?").tqarg(buildDirectory()), TQString(), i18n("Run Them"), i18n("Do Not Run"));
             if (r == KMessageBox::No)
                 return TQString();
             preCommand = makefileCvsCommand();
@@ -654,7 +654,7 @@ TQString AutoProjectPart::constructMakeCommandLine(const TQString &dir, const TQ
         }
         else
         {
-            int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory. Run 'configure' first?").arg(dir), TQString(), i18n("Run configure"), i18n("Do Not Run"));
+            int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory. Run 'configure' first?").tqarg(dir), TQString(), i18n("Run configure"), i18n("Do Not Run"));
             if (r == KMessageBox::No)
                 return TQString();
             preCommand = configureCommand() + " && ";
@@ -668,7 +668,7 @@ TQString AutoProjectPart::constructMakeCommandLine(const TQString &dir, const TQ
     kdDebug(9020) << k_funcinfo << "nice = " << prio<< endl;
     if (prio != 0)
     {
-        nice = TQString("nice -n%1 ").arg(prio);
+        nice = TQString("nice -n%1 ").tqarg(prio);
     }
 
     if (cmdline.isEmpty())
@@ -792,7 +792,7 @@ bool AutoProjectPart::queueInternalLibDependenciesBuild(TargetItem* titem, TQStr
                     tdir += dependency.left(pos+1);
                     tname = dependency.mid(pos+1);
                 }
-                KMessageBox::error( 0, i18n("Found a circular dependency in the project, between this target and %1.\nCannot build this project until this is resolved.").arg(tname), i18n("Circular Dependency found") );
+                KMessageBox::error( 0, i18n("Found a circular dependency in the project, between this target and %1.\nCannot build this project until this is resolved.").tqarg(tname), i18n("Circular Dependency found") );
                 return false;
             }
         }
@@ -812,7 +812,7 @@ void AutoProjectPart::slotBuild()
         m_needMakefileCvs = false;
     }
 
-    startMakeCommand(buildDirectory(), TQString::fromLatin1(""));
+    startMakeCommand(buildDirectory(), TQString::tqfromLatin1(""));
 }
 
 
@@ -912,28 +912,28 @@ TQString AutoProjectPart::configureCommand() const
     cmdline += "/configure\"";
     TQString cc = DomUtil::readEntry(dom, prefix + "ccompilerbinary");
     if (!cc.isEmpty())
-        cmdline.prepend(TQString("CC=%1 ").arg(cc));
+        cmdline.prepend(TQString("CC=%1 ").tqarg(cc));
     TQString cflags = DomUtil::readEntry(dom, prefix + "cflags");
     if (!cflags.isEmpty())
-        cmdline.prepend(TQString("CFLAGS=\"%1\" ").arg(cflags));
+        cmdline.prepend(TQString("CFLAGS=\"%1\" ").tqarg(cflags));
     TQString cxx = DomUtil::readEntry(dom, prefix + "cxxcompilerbinary");
     if (!cxx.isEmpty())
-        cmdline.prepend(TQString("CXX=%1 ").arg(cxx));
+        cmdline.prepend(TQString("CXX=%1 ").tqarg(cxx));
     TQString cxxflags = DomUtil::readEntry(dom, prefix + "cxxflags");
     if (!cxxflags.isEmpty())
-        cmdline.prepend(TQString("CXXFLAGS=\"%1\" ").arg(cxxflags));
+        cmdline.prepend(TQString("CXXFLAGS=\"%1\" ").tqarg(cxxflags));
     TQString f77 = DomUtil::readEntry(dom, prefix + "f77compilerbinary");
     if (!f77.isEmpty())
-        cmdline.prepend(TQString("F77=%1 ").arg(f77));
+        cmdline.prepend(TQString("F77=%1 ").tqarg(f77));
     TQString fflags = DomUtil::readEntry(dom, prefix + "f77flags");
     if (!fflags.isEmpty())
-        cmdline.prepend(TQString("FFLAGS=\"%1\" ").arg(fflags));
+        cmdline.prepend(TQString("FFLAGS=\"%1\" ").tqarg(fflags));
     TQString cppflags = DomUtil::readEntry(dom, prefix + "cppflags");
     if (!cppflags.isEmpty())
-        cmdline.prepend(TQString("CPPFLAGS=\"%1\" ").arg(cppflags));
+        cmdline.prepend(TQString("CPPFLAGS=\"%1\" ").tqarg(cppflags));
     TQString ldflags = DomUtil::readEntry(dom, prefix + "ldflags");
     if (!ldflags.isEmpty())
-        cmdline.prepend(TQString("LDFLAGS=\"%1\" ").arg(ldflags));
+        cmdline.prepend(TQString("LDFLAGS=\"%1\" ").tqarg(ldflags));
 
     TQString configargs = DomUtil::readEntry(dom, prefix + "configargs");
     if (!configargs.isEmpty()) {
@@ -997,7 +997,7 @@ TQString AutoProjectPart::makefileCvsCommand() const
     TQString nice;
     kdDebug(9020) << "makefileCvsCommand() nice = " << prio<< endl;
     if (prio != 0) {
-        nice = TQString("nice -n%1 ").arg(prio);
+        nice = TQString("nice -n%1 ").tqarg(prio);
     }
 
     if (TQFile::exists(topsourceDirectory() + "/Makefile.cvs"))
@@ -1034,7 +1034,7 @@ void AutoProjectPart::slotMakefilecvs()
 
 void AutoProjectPart::slotInstall()
 {
-    startMakeCommand(buildDirectory(), TQString::fromLatin1("install"));
+    startMakeCommand(buildDirectory(), TQString::tqfromLatin1("install"));
 }
 
 
@@ -1045,25 +1045,25 @@ void AutoProjectPart::slotInstallWithKdesu()
     slotBuild();
 
     // After that issue "make install" with the root user
-    startMakeCommand(buildDirectory(), TQString::fromLatin1("install"), true);
+    startMakeCommand(buildDirectory(), TQString::tqfromLatin1("install"), true);
 }
 
 
 void AutoProjectPart::slotClean()
 {
-    startMakeCommand(buildDirectory(), TQString::fromLatin1("clean"));
+    startMakeCommand(buildDirectory(), TQString::tqfromLatin1("clean"));
 }
 
 
 void AutoProjectPart::slotDistClean()
 {
-    startMakeCommand(buildDirectory(), TQString::fromLatin1("distclean"));
+    startMakeCommand(buildDirectory(), TQString::tqfromLatin1("distclean"));
 }
 
 
 void AutoProjectPart::slotMakeMessages()
 {
-    startMakeCommand(buildDirectory(), TQString::fromLatin1("package-messages"));
+    startMakeCommand(buildDirectory(), TQString::tqfromLatin1("package-messages"));
 }
 
 
@@ -1103,7 +1103,7 @@ void AutoProjectPart::slotExecute()
         if( DomUtil::readBoolEntry(dom, "/kdevautoproject/run/autotdesu", false) ){
             //slotInstallWithKdesu assumes that it hasn't just been build...
             kdDebug(9020) << "slotExecute: before startMakeCommand" << endl;
-            _auto ? slotInstallWithKdesu() : startMakeCommand(buildDirectory(), TQString::fromLatin1("install"), true);
+            _auto ? slotInstallWithKdesu() : startMakeCommand(buildDirectory(), TQString::tqfromLatin1("install"), true);
         }
         else{
             kdDebug(9020) << "slotExecute: before slotInstall" << endl;
@@ -1171,7 +1171,7 @@ void AutoProjectPart::executeTarget(const TQDir& dir, const TargetItem* titem)
         KMessageBox::error( m_widget, i18n("Active target \"%1\" is not binary ( %2 ).\n"
                                 "Unable to determine the main program. If you want this\n"
                                 "to be the active target, set a main program under\n"
-                                "Project -> Project Options -> Run Options").arg(titem->name).arg(titem->primary), i18n("Active target is not a library") );
+                                "Project -> Project Options -> Run Options").tqarg(titem->name).tqarg(titem->primary), i18n("Active target is not a library") );
         kdDebug ( 9020 ) << k_funcinfo << "Error! : Active target isn't binary (" << titem->primary << ") ! -> Unable to determine the main program in AutoProjectPart::mainProgram()" << endl;
         program += titem->name;
     }else
diff --git a/buildtools/autotools/autoprojectviewbase.ui b/buildtools/autotools/autoprojectviewbase.ui
index 3e33fb41..625ab370 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>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -80,7 +80,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp
index 12a28ee5..86adb657 100644
--- a/buildtools/autotools/autoprojectwidget.cpp
+++ b/buildtools/autotools/autoprojectwidget.cpp
@@ -26,7 +26,7 @@
 #include <tqregexp.h>
 #include <tqsplitter.h>
 #include <tqstringlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqtoolbutton.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
@@ -557,7 +557,7 @@ void AutoProjectWidget::slotOverviewSelectionChanged( TQListViewItem *item )
 	// Delete the items from the details view first.
 	if ( m_shownSubproject )
 	{
-		// Remove all TargetItems and all of their children from the view
+		// Remove all TargetItems and all of their tqchildren from the view
 		kdDebug ( 9020 ) << "m_shownSubproject (before takeItem()): " << m_shownSubproject->subdir << endl;
 
 		TQListViewItem* i = m_detailView->listView()->firstChild();
@@ -575,7 +575,7 @@ void AutoProjectWidget::slotOverviewSelectionChanged( TQListViewItem *item )
 	if ( !m_shownSubproject) return;
 	kdDebug ( 9020 ) << "m_shownSubproject (after takeItem()):  " << selectedSubproject()->subdir << endl;
 
-	// Insert all TargetItems and all of their children into the view
+	// Insert all TargetItems and all of their tqchildren into the view
 	TQPtrListIterator<TargetItem> it2( selectedSubproject()->targets );
 	for ( ; it2.current(); ++it2 )
 	{
@@ -632,9 +632,9 @@ TargetItem *AutoProjectWidget::createTargetItem( const TQString &name,
 	if ( docgroup )
 		text = i18n( "Documentation data" );
 	else if ( icongroup )
-		text = i18n( "KDE Icon data" ).arg( prefix );
+		text = i18n( "KDE Icon data" ).tqarg( prefix );
 	else
-		text = i18n( "%1 (%2 in %3)" ).arg( name ).arg( nicePrimary( primary ) ).arg( prefix );
+		text = i18n( "%1 (%2 in %3)" ).tqarg( name ).tqarg( nicePrimary( primary ) ).tqarg( prefix );
 
 	// Workaround because of TQListView not being able to create
 	// items without actually inserting them
diff --git a/buildtools/autotools/autoprojectwidget.h b/buildtools/autotools/autoprojectwidget.h
index b7b2db15..74c960fb 100644
--- a/buildtools/autotools/autoprojectwidget.h
+++ b/buildtools/autotools/autoprojectwidget.h
@@ -22,7 +22,7 @@
 #include <tqmap.h>
 #include <tqvbox.h>
 #include <tqhbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtoolbutton.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp
index 4c6f87a9..5916b332 100644
--- a/buildtools/autotools/autosubprojectview.cpp
+++ b/buildtools/autotools/autosubprojectview.cpp
@@ -18,7 +18,7 @@
 #include <tqcheckbox.h>
 #include <tqstringlist.h>
 #include <tqtable.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 /** KDE Libs */
 #include <kxmlguiclient.h>
@@ -280,7 +280,7 @@ void AutoSubprojectView::slotContextMenu( KListView *, TQListViewItem *item, con
 	if ( !item )
 		return ;
 
-	KPopupMenu popup( i18n( "Subproject: %1" ).arg( item->text( 0 ) ), this );
+	KPopupMenu popup( i18n( "Subproject: %1" ).tqarg( item->text( 0 ) ), this );
 
 	subProjectOptionsAction->plug( &popup );
 	popup.insertSeparator();
@@ -422,7 +422,7 @@ void AutoSubprojectView::slotBuildSubproject()
 
 	TQString relpath = "/" + URLUtil::getRelativePath( m_part->topsourceDirectory(), m_part->projectDirectory() ) + "/" + spitem->path.mid( m_part->projectDirectory().length() );
 
-	m_part->startMakeCommand( m_part->buildDirectory() + relpath, TQString::fromLatin1( "" ) );
+	m_part->startMakeCommand( m_part->buildDirectory() + relpath, TQString::tqfromLatin1( "" ) );
 }
 
 void AutoSubprojectView::slotRemoveSubproject()
@@ -448,13 +448,13 @@ void AutoSubprojectView::slotRemoveSubproject()
     {
         topsubdirs = false;
         if( it == list.end() ){
-            KMessageBox::sorry(this, i18n("There is no subproject %1 in SUBDIRS").arg(spitem->subdir));
+            KMessageBox::sorry(this, i18n("There is no subproject %1 in SUBDIRS").tqarg(spitem->subdir));
             return;
         }
     }
 
-    RemoveSubprojectDialog dlg(i18n("Remove Subproject %1").arg(spitem->text(0)),
-        i18n("Do you really want to remove subproject %1 with all targets and files?").arg(spitem->text(0)));
+    RemoveSubprojectDialog dlg(i18n("Remove Subproject %1").tqarg(spitem->text(0)),
+        i18n("Do you really want to remove subproject %1 with all targets and files?").tqarg(spitem->text(0)));
     if( dlg.exec() ){
 
     bool removeSources = dlg.removeFromDisk();
@@ -466,7 +466,7 @@ void AutoSubprojectView::slotRemoveSubproject()
     }
 
     parent->listView()->setSelected( parent, true );
-    kapp->processEvents( 500 );
+    kapp->tqprocessEvents( 500 );
 
 
     if( removeSources ){
@@ -1045,7 +1045,7 @@ void AutoSubprojectView::slotManageBuildCommands( )
 		{
 			config->writeEntry(widget->commandsTable->text(i, 0),
 				widget->commandsTable->text(i, 1)+":::"+
-				TQString("%1").arg(static_cast<TQComboTableItem*>(widget->
+				TQString("%1").tqarg(static_cast<TQComboTableItem*>(widget->
 				commandsTable->item(i, 2))->currentItem()));
 		}
 		config->sync();
diff --git a/buildtools/autotools/choosetargetdlgbase.ui b/buildtools/autotools/choosetargetdlgbase.ui
index f98c9145..b754d1f7 100644
--- a/buildtools/autotools/choosetargetdlgbase.ui
+++ b/buildtools/autotools/choosetargetdlgbase.ui
@@ -12,7 +12,7 @@
             <height>306</height>
         </rect>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>444</width>
             <height>306</height>
@@ -158,7 +158,7 @@
                     <property name="text">
                         <string>&lt;qt&gt;&lt;b&gt;Note:&lt;/b&gt; If you cancel, your files will be created but will &lt;b&gt;not&lt;/b&gt; be added to the project.&lt;/qt&gt;</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter</set>
                     </property>
                 </widget>
diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp
index 8ff8d36c..d847a559 100644
--- a/buildtools/autotools/configureoptionswidget.cpp
+++ b/buildtools/autotools/configureoptionswidget.cpp
@@ -111,15 +111,15 @@ ConfigureOptionsWidget::~ConfigureOptionsWidget()
 
 void ConfigureOptionsWidget::fixLayout()
 {
-    int w1 = ccompiler_label->sizeHint().width();
-    int w2 = cbinary_label->sizeHint().width();
-    int w3 = cflags_label->sizeHint().width();
-    int w4 = cxxcompiler_label->sizeHint().width();
-    int w5 = cxxbinary_label->sizeHint().width();
-    int w6 = cxxflags_label->sizeHint().width();
-    int w7 = f77compiler_label->sizeHint().width();
-    int w8 = f77binary_label->sizeHint().width();
-    int w9 = f77flags_label->sizeHint().width();
+    int w1 = ccompiler_label->tqsizeHint().width();
+    int w2 = cbinary_label->tqsizeHint().width();
+    int w3 = cflags_label->tqsizeHint().width();
+    int w4 = cxxcompiler_label->tqsizeHint().width();
+    int w5 = cxxbinary_label->tqsizeHint().width();
+    int w6 = cxxflags_label->tqsizeHint().width();
+    int w7 = f77compiler_label->tqsizeHint().width();
+    int w8 = f77binary_label->tqsizeHint().width();
+    int w9 = f77flags_label->tqsizeHint().width();
 
     int w = TQMAX(w1, TQMAX(w2, w3));
     w = TQMAX(w, TQMAX(w4, w5));
@@ -236,7 +236,7 @@ void ConfigureOptionsWidget::saveSettings(const TQString &config)
     DomUtil::writeEntry(dom, prefix + "cxxflags", cxxflags_edit->text());
     DomUtil::writeEntry(dom, prefix + "f77flags", f77flags_edit->text());
 
-    if (KMessageBox::questionYesNo(this, i18n("Re-run configure for %1 now?").arg(config), TQString(), i18n("Rerun"), i18n("Do Not Run")) == KMessageBox::Yes)
+    if (KMessageBox::questionYesNo(this, i18n("Re-run configure for %1 now?").tqarg(config), TQString(), i18n("Rerun"), i18n("Do Not Run")) == KMessageBox::Yes)
         TQTimer::singleShot(0, m_part, TQT_SLOT(slotConfigure()));
 
 }
@@ -396,7 +396,7 @@ KDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQStrin
     if (!factory) {
         TQString errorMessage = KLibLoader::self()->lastErrorMessage();
         KMessageBox::error(0, i18n("There was an error loading the module %1.\n"
-                                   "The diagnostics is:\n%2").arg(service->name()).arg(errorMessage));
+                                   "The diagnostics is:\n%2").tqarg(service->name()).tqarg(errorMessage));
         exit(1);
     }
 
diff --git a/buildtools/autotools/configureoptionswidgetbase.ui b/buildtools/autotools/configureoptionswidgetbase.ui
index 9090f705..35315f76 100644
--- a/buildtools/autotools/configureoptionswidgetbase.ui
+++ b/buildtools/autotools/configureoptionswidgetbase.ui
@@ -81,7 +81,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>8</height>
@@ -120,7 +120,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -176,7 +176,7 @@
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -233,13 +233,13 @@ probably want this to be blank.</string>
                         <property name="name">
                             <cstring>builddir_button</cstring>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>30</width>
                                 <height>0</height>
                             </size>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>30</width>
                                 <height>32767</height>
@@ -259,7 +259,7 @@ probably want this to be blank.</string>
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -270,13 +270,13 @@ probably want this to be blank.</string>
                         <property name="name">
                             <cstring>topsourcedir_button</cstring>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>30</width>
                                 <height>0</height>
                             </size>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>30</width>
                                 <height>32767</height>
@@ -313,7 +313,7 @@ then it is relative to the project directory.
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -345,7 +345,7 @@ nonstandard directory &lt;lib dir&gt;</string>
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -388,7 +388,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -481,7 +481,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -516,7 +516,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>30</width>
                                 <height>32767</height>
@@ -536,7 +536,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>168</height>
@@ -569,7 +569,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -615,7 +615,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -648,7 +648,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -683,7 +683,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>30</width>
                                 <height>32767</height>
@@ -703,7 +703,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -749,7 +749,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -782,7 +782,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -817,7 +817,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>30</width>
                                 <height>32767</height>
@@ -837,7 +837,7 @@ headers in a nonstandard directory &lt;include dir&gt;</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
diff --git a/buildtools/autotools/fileselectorwidget.cpp b/buildtools/autotools/fileselectorwidget.cpp
index 3e73da6f..a403337d 100644
--- a/buildtools/autotools/fileselectorwidget.cpp
+++ b/buildtools/autotools/fileselectorwidget.cpp
@@ -14,7 +14,7 @@
  *																			*
  ***************************************************************************/
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
@@ -73,7 +73,7 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode,
 {
     m_part = part;
 
-	// widgets and layout
+	// widgets and tqlayout
 	TQVBoxLayout* lo = new TQVBoxLayout(this);
 
 	TQHBox *hlow = new TQHBox (this);
@@ -98,7 +98,7 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode,
 	hlow->setMaximumHeight(up->height());
 
 	cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" );
-	cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+	cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
 	KURLCompletion* cmpl = new KURLCompletion();
 	cmbPath->setCompletionObject( cmpl );
 	lo->addWidget(cmbPath);
@@ -114,7 +114,7 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode,
 	filterIcon = new TQLabel(filterBox);
 	filterIcon->setPixmap( BarIcon("filter") );
 	filter = new KHistoryCombo(filterBox, "filter");
-	filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+	filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
 	filterBox->setStretchFactor(filter, 2);
 	lo->addWidget(filterBox);
 
diff --git a/buildtools/autotools/fileselectorwidget.h b/buildtools/autotools/fileselectorwidget.h
index 1a5e4419..96b5c79c 100644
--- a/buildtools/autotools/fileselectorwidget.h
+++ b/buildtools/autotools/fileselectorwidget.h
@@ -12,7 +12,7 @@
 #ifndef _FILESELECTORWIDGET_H_
 #define _FILESELECTORWIDGET_H_
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
diff --git a/buildtools/autotools/makefilehandler.cpp b/buildtools/autotools/makefilehandler.cpp
index db30508d..7e19dd56 100644
--- a/buildtools/autotools/makefilehandler.cpp
+++ b/buildtools/autotools/makefilehandler.cpp
@@ -81,7 +81,7 @@ void MakefileHandler::parse( const TQString& folder, bool recursive )
 
     if ( recursive && ast && ast->hasChildren() )
     {
-        TQValueList<AutoTools::AST*> astChildList = ast->children();
+        TQValueList<AutoTools::AST*> astChildList = ast->tqchildren();
         TQValueList<AutoTools::AST*>::iterator it(astChildList.begin()), clEnd(astChildList.end());
         for ( ; it != clEnd; ++it )
         {
@@ -145,7 +145,7 @@ TQString MakefileHandler::resolveVariable( const TQString& variable, AutoTools::
         return variable;
 
     kdDebug(9020) << k_funcinfo << "attempting to resolve '" << variable << "'"<< endl;
-    ASTList childList = ast->children();
+    ASTList childList = ast->tqchildren();
     ASTList::iterator it( childList.begin() ), clEnd( childList.end() );
     for ( ; it != clEnd; ++it )
     {
diff --git a/buildtools/autotools/managecustomcommandsbase.ui b/buildtools/autotools/managecustomcommandsbase.ui
index eab430e9..3690fa32 100644
--- a/buildtools/autotools/managecustomcommandsbase.ui
+++ b/buildtools/autotools/managecustomcommandsbase.ui
@@ -89,7 +89,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/buildtools/autotools/misc.cpp b/buildtools/autotools/misc.cpp
index e2bdbb04..cbe4d24c 100644
--- a/buildtools/autotools/misc.cpp
+++ b/buildtools/autotools/misc.cpp
@@ -12,7 +12,7 @@
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqdict.h>
 
 #include <kdebug.h>
diff --git a/buildtools/autotools/removefiledlg.cpp b/buildtools/autotools/removefiledlg.cpp
index f5901395..95447092 100644
--- a/buildtools/autotools/removefiledlg.cpp
+++ b/buildtools/autotools/removefiledlg.cpp
@@ -15,7 +15,7 @@
 #include <tqgroupbox.h>
 #include <tqfile.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqregexp.h>
 
@@ -63,7 +63,7 @@ RemoveFileDialog::RemoveFileDialog(AutoProjectWidget *widget, AutoProjectPart* p
 
 		TQString joinedtargets = "    *" + targets.join("\n    *");
 		removeFromTargetsCheckBox->setText ( i18n ( "The file %1 is still used by the following targets:\n%2\n"
-												"Remove it from all of them?").arg(filename).arg(joinedtargets) );
+												"Remove it from all of them?").tqarg(filename).tqarg(joinedtargets) );
         setMinimumSize(TQSize(size().width(), size().height() + removeFromTargetsCheckBox->size().height()*2) );
 	}
 
diff --git a/buildtools/autotools/removefiledlgbase.ui b/buildtools/autotools/removefiledlgbase.ui
index 7befbc0d..606d7e0f 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>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -37,7 +37,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>247</width>
                             <height>20</height>
@@ -69,7 +69,7 @@
             <property name="name">
                 <cstring>fileGroupBox</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>0</height>
@@ -110,7 +110,7 @@
                             <property name="name">
                                 <cstring>noticeLabel</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>200</width>
                                     <height>0</height>
diff --git a/buildtools/autotools/removetargetdlg.cpp b/buildtools/autotools/removetargetdlg.cpp
index 2e694491..10dc1f06 100644
--- a/buildtools/autotools/removetargetdlg.cpp
+++ b/buildtools/autotools/removetargetdlg.cpp
@@ -21,7 +21,7 @@
 #include <tqgroupbox.h>
 #include <tqfile.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqregexp.h>
 
diff --git a/buildtools/autotools/removetargetdlgbase.ui b/buildtools/autotools/removetargetdlgbase.ui
index 514bdbaa..4f8fb286 100644
--- a/buildtools/autotools/removetargetdlgbase.ui
+++ b/buildtools/autotools/removetargetdlgbase.ui
@@ -100,13 +100,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>
@@ -139,7 +139,7 @@
                     <property name="name">
                         <cstring>textLabel</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>200</width>
                             <height>0</height>
@@ -193,7 +193,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -221,7 +221,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/autotools/subprojectoptionsdlg.cpp b/buildtools/autotools/subprojectoptionsdlg.cpp
index 4c61077d..139193b4 100644
--- a/buildtools/autotools/subprojectoptionsdlg.cpp
+++ b/buildtools/autotools/subprojectoptionsdlg.cpp
@@ -14,7 +14,7 @@
 #include <tqdom.h>
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
@@ -45,7 +45,7 @@ SubprojectOptionsDialog::SubprojectOptionsDialog(AutoProjectPart *part, AutoProj
                                                  SubprojectItem *item, TQWidget *parent, const char *name)
     : SubprojectOptionsDialogBase(parent, name, true)
 {
-    setCaption(i18n("Subproject Options for '%1'").arg(item->subdir));
+    setCaption(i18n("Subproject Options for '%1'").tqarg(item->subdir));
 
     subProject = item;
     m_part = part;
@@ -90,7 +90,7 @@ SubprojectOptionsDialog::SubprojectOptionsDialog(AutoProjectPart *part, AutoProj
 	TQString subProjectName = *it;
 
 	if( subProjectName.isEmpty() ){
-	    subProjectName = TQString::fromLatin1( "." );
+	    subProjectName = TQString::tqfromLatin1( "." );
 	}
         TQCheckListItem *clitem = new TQCheckListItem(insideinc_listview, subProjectName, TQCheckListItem::CheckBox);
         if (lastItem)
@@ -182,7 +182,7 @@ void SubprojectOptionsDialog::storeConfig()
     }
 
     TQString old_metasources = subProject->variables["METASOURCES"];
-    TQString new_metasources = metasources_checkbox->isChecked() ? TQString::fromLatin1("AUTO") : TQString();
+    TQString new_metasources = metasources_checkbox->isChecked() ? TQString::tqfromLatin1("AUTO") : TQString();
     if (new_metasources != old_metasources) {
         subProject->variables["METASOURCES"] = new_metasources;
         replaceMap.insert("METASOURCES", new_metasources);
diff --git a/buildtools/autotools/subprojectoptionsdlgbase.ui b/buildtools/autotools/subprojectoptionsdlgbase.ui
index 6c069718..be60569f 100644
--- a/buildtools/autotools/subprojectoptionsdlgbase.ui
+++ b/buildtools/autotools/subprojectoptionsdlgbase.ui
@@ -85,7 +85,7 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>30</width>
                                         <height>25</height>
@@ -110,7 +110,7 @@
                         <property name="sizeType">
                             <enum>Preferred</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -160,7 +160,7 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>30</width>
                                         <height>25</height>
@@ -185,7 +185,7 @@
                         <property name="sizeType">
                             <enum>Preferred</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -235,7 +235,7 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>30</width>
                                         <height>25</height>
@@ -260,7 +260,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -282,7 +282,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout11</cstring>
+                            <cstring>tqlayout11</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -298,7 +298,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout9</cstring>
+                                    <cstring>tqlayout9</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -325,7 +325,7 @@
                                                 <property name="sizeType">
                                                     <enum>Expanding</enum>
                                                 </property>
-                                                <property name="sizeHint">
+                                                <property name="tqsizeHint">
                                                     <size>
                                                         <width>20</width>
                                                         <height>16</height>
@@ -358,7 +358,7 @@
                                                 <property name="sizeType">
                                                     <enum>Expanding</enum>
                                                 </property>
-                                                <property name="sizeHint">
+                                                <property name="tqsizeHint">
                                                     <size>
                                                         <width>20</width>
                                                         <height>16</height>
@@ -405,7 +405,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout10</cstring>
+                                    <cstring>tqlayout10</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -432,7 +432,7 @@
                                                 <property name="sizeType">
                                                     <enum>Expanding</enum>
                                                 </property>
-                                                <property name="sizeHint">
+                                                <property name="tqsizeHint">
                                                     <size>
                                                         <width>20</width>
                                                         <height>20</height>
@@ -489,7 +489,7 @@
                                                 <property name="sizeType">
                                                     <enum>Expanding</enum>
                                                 </property>
-                                                <property name="sizeHint">
+                                                <property name="tqsizeHint">
                                                     <size>
                                                         <width>20</width>
                                                         <height>20</height>
@@ -618,7 +618,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -659,7 +659,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -702,7 +702,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -735,7 +735,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -802,7 +802,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/buildtools/autotools/targetoptionsdlg.cpp b/buildtools/autotools/targetoptionsdlg.cpp
index 9e10873c..7c40fbfc 100644
--- a/buildtools/autotools/targetoptionsdlg.cpp
+++ b/buildtools/autotools/targetoptionsdlg.cpp
@@ -14,7 +14,7 @@
 #include <tqcheckbox.h>
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqregexp.h>
 #include <klineedit.h>
 #include <kbuttonbox.h>
@@ -37,7 +37,7 @@ TargetOptionsDialog::TargetOptionsDialog(AutoProjectWidget *widget, TargetItem *
                                          TQWidget *parent, const char *name)
     : TargetOptionsDialogBase(parent, name, true)
 {
-    setCaption( i18n("Target Options for '%1'").arg(item->name) );
+    setCaption( i18n("Target Options for '%1'").tqarg(item->name) );
     setIcon( SmallIcon("configure") );
 
     target = item;
diff --git a/buildtools/autotools/targetoptionsdlgbase.ui b/buildtools/autotools/targetoptionsdlgbase.ui
index 7e721a42..4b883535 100644
--- a/buildtools/autotools/targetoptionsdlgbase.ui
+++ b/buildtools/autotools/targetoptionsdlgbase.ui
@@ -140,7 +140,7 @@
                         <property name="sizeType">
                             <enum>Preferred</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -157,7 +157,7 @@
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -194,7 +194,7 @@
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -211,7 +211,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -256,7 +256,7 @@
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>7</height>
@@ -318,7 +318,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -351,7 +351,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -400,7 +400,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -457,7 +457,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -555,7 +555,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>120</height>
@@ -586,7 +586,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>