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

9 files changed, 143 insertions, 143 deletions

diff --git a/buildtools/qmake/choosesubprojectdlgbase.ui b/buildtools/qmake/choosesubprojectdlgbase.ui
index df01a06c..f1e2e579 100644
--- a/buildtools/qmake/choosesubprojectdlgbase.ui
+++ b/buildtools/qmake/choosesubprojectdlgbase.ui
@@ -46,7 +46,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/buildtools/qmake/createscopedlgbase.ui b/buildtools/qmake/createscopedlgbase.ui
index 4ba7212e..d1550092 100644
--- a/buildtools/qmake/createscopedlgbase.ui
+++ b/buildtools/qmake/createscopedlgbase.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -68,7 +68,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>95</width>
                             <height>20</height>
@@ -232,7 +232,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -248,7 +248,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>150</width>
                             <height>20</height>
diff --git a/buildtools/qmake/disablesubprojectdlgbase.ui b/buildtools/qmake/disablesubprojectdlgbase.ui
index d7b78289..fadafc04 100644
--- a/buildtools/qmake/disablesubprojectdlgbase.ui
+++ b/buildtools/qmake/disablesubprojectdlgbase.ui
@@ -62,7 +62,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/buildtools/qmake/newwidgetdlgbase.ui b/buildtools/qmake/newwidgetdlgbase.ui
index 178fa761..243fbff3 100644
--- a/buildtools/qmake/newwidgetdlgbase.ui
+++ b/buildtools/qmake/newwidgetdlgbase.ui
@@ -95,7 +95,7 @@
                             <property name="name">
                                 <cstring>ui_classnameEd</cstring>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>120</width>
                                     <height>0</height>
@@ -124,7 +124,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>160</height>
@@ -159,7 +159,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>310</width>
                     <height>0</height>
diff --git a/buildtools/qmake/projectconfigurationdlgbase.ui b/buildtools/qmake/projectconfigurationdlgbase.ui
index 2df4d131..6c1006b3 100644
--- a/buildtools/qmake/projectconfigurationdlgbase.ui
+++ b/buildtools/qmake/projectconfigurationdlgbase.ui
@@ -57,7 +57,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>260</width>
                     <height>16</height>
@@ -150,7 +150,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>101</width>
                                         <height>20</height>
@@ -338,7 +338,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>120</height>
@@ -377,7 +377,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout147</cstring>
+                                    <cstring>layout147</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -426,7 +426,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout30</cstring>
+                                    <cstring>layout30</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -762,7 +762,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout69</cstring>
+                                    <cstring>layout69</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -816,7 +816,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>41</width>
                                         <height>20</height>
@@ -825,7 +825,7 @@
                             </spacer>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout68</cstring>
+                                    <cstring>layout68</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -855,7 +855,7 @@
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout67</cstring>
+                                            <cstring>layout67</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -893,7 +893,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>16</height>
@@ -950,7 +950,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -999,7 +999,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="3" column="1">
                         <property name="name">
-                            <cstring>tqlayout8</cstring>
+                            <cstring>layout8</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -1055,7 +1055,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>70</height>
@@ -1079,7 +1079,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="1" column="0">
                         <property name="name">
-                            <cstring>tqlayout12</cstring>
+                            <cstring>layout12</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1106,7 +1106,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout10</cstring>
+                                    <cstring>layout10</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -1162,7 +1162,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>70</height>
@@ -1175,7 +1175,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="1" column="1">
                         <property name="name">
-                            <cstring>tqlayout11</cstring>
+                            <cstring>layout11</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1202,7 +1202,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout9</cstring>
+                                    <cstring>layout9</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -1258,7 +1258,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>64</height>
@@ -1271,7 +1271,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>tqlayout10</cstring>
+                            <cstring>layout10</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1330,7 +1330,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -1356,7 +1356,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout26</cstring>
+                            <cstring>layout26</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1418,7 +1418,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -1431,7 +1431,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout27</cstring>
+                            <cstring>layout27</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1458,7 +1458,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout9_2</cstring>
+                                    <cstring>layout9_2</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -1514,7 +1514,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>64</height>
@@ -1527,7 +1527,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout28_2</cstring>
+                            <cstring>layout28_2</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1589,7 +1589,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -1634,7 +1634,7 @@
                             </property>
                             <widget class="TQLayoutWidget" row="0" column="0">
                                 <property name="name">
-                                    <cstring>tqlayout26</cstring>
+                                    <cstring>layout26</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1642,7 +1642,7 @@
                                     </property>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout23</cstring>
+                                            <cstring>layout23</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -1682,7 +1682,7 @@
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout24</cstring>
+                                            <cstring>layout24</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -1722,7 +1722,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout84</cstring>
+                                    <cstring>layout84</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -1776,7 +1776,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout85</cstring>
+                                    <cstring>layout85</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -1867,7 +1867,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>21</height>
@@ -1889,7 +1889,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout24</cstring>
+                            <cstring>layout24</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1952,7 +1952,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout23</cstring>
+                                    <cstring>layout23</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -1960,7 +1960,7 @@
                                     </property>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout22</cstring>
+                                            <cstring>layout22</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -2010,7 +2010,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>106</height>
@@ -2023,7 +2023,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout33</cstring>
+                            <cstring>layout33</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -2062,7 +2062,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout32</cstring>
+                            <cstring>layout32</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -2130,7 +2130,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>250</width>
                                         <height>20</height>
@@ -2141,7 +2141,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout34</cstring>
+                            <cstring>layout34</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -2162,7 +2162,7 @@
                                 <property name="text">
                                     <string>Value:</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignTop</set>
                                 </property>
                             </widget>
diff --git a/buildtools/qmake/qmakeoptionswidgetbase.ui b/buildtools/qmake/qmakeoptionswidgetbase.ui
index 312536bc..1ae7a808 100644
--- a/buildtools/qmake/qmakeoptionswidgetbase.ui
+++ b/buildtools/qmake/qmakeoptionswidgetbase.ui
@@ -31,7 +31,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -80,7 +80,7 @@ Leave this empty to automatically search for a .pro file in the project director
                     <property name="text">
                         <string>The following settings determine what the project configuration dialog should do when another subproject is selected while the dialog is still open.</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
@@ -199,7 +199,7 @@ This disables the reading of any .qmake.cache files or mkspecs.</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
diff --git a/buildtools/qmake/scope.cpp b/buildtools/qmake/scope.cpp
index b937287c..2c862fb3 100644
--- a/buildtools/qmake/scope.cpp
+++ b/buildtools/qmake/scope.cpp
@@ -158,7 +158,7 @@ bool Scope::loadFromFile( const TQString& filename )
         if( DomUtil::readBoolEntry( *m_part->projectDom(),
             "/kdevtrollproject/qmake/showParseErrors", true ) )
         {
-            KMessageBox::error( 0, i18n( "Could not parse project file: %1" ).tqarg( filename ),
+            KMessageBox::error( 0, i18n( "Could not parse project file: %1" ).arg( filename ),
                     i18n( "Could not parse project file" ) );
         }
         m_root = 0;
@@ -198,7 +198,7 @@ void Scope::saveToFile() const
         file.close();
     }else
     {
-        KMessageBox::error( 0, i18n( "Could not write project file: %1" ).tqarg( filename ),
+        KMessageBox::error( 0, i18n( "Could not write project file: %1" ).arg( filename ),
                 i18n( "Could not write project file" ) );
     }
 #ifdef DEBUG
@@ -292,7 +292,7 @@ TQStringList Scope::variableValuesForOp( const TQString& variable , const TQStri
         return result;
 
     TQValueList<TQMake::AST*>::const_iterator it;
-    for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end(); ++it )
+    for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it )
     {
         TQMake::AST* ast = *it;
         if ( ast->nodeType() == TQMake::AST::AssignmentAST )
@@ -352,7 +352,7 @@ void Scope::calcValuesFromStatements( const TQString& variable, TQStringList& re
     }
 
     TQValueList<TQMake::AST*>::const_iterator it;
-    for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end(); ++it )
+    for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it )
     {
         if ( stopHere && *it == stopHere )
             return ;
@@ -628,7 +628,7 @@ bool Scope::deleteFunctionScope( unsigned int num )
     Scope* funcScope = m_scopes[ num ];
     if ( funcScope )
     {
-        TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.findIndex( funcScope->m_root ) ];
+        TQMake::AST* ast = m_root->m_children[ m_root->m_children.findIndex( funcScope->m_root ) ];
         if( !ast )
             return false;
         m_scopes.remove( num );
@@ -648,7 +648,7 @@ bool Scope::deleteSimpleScope( unsigned int num )
     Scope* simpleScope = m_scopes[ num ];
     if ( simpleScope )
     {
-        TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.findIndex( simpleScope->m_root ) ];
+        TQMake::AST* ast = m_root->m_children[ m_root->m_children.findIndex( simpleScope->m_root ) ];
         if( !ast )
             return false;
         m_scopes.remove( num );
@@ -686,10 +686,10 @@ bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir )
         return false;
 
     TQValueList<TQMake::AST*>::iterator it = findExistingVariable( "TEMPLATE" );
-    if ( it != m_root->m_tqchildren.end() )
+    if ( it != m_root->m_children.end() )
     {
         TQMake::AssignmentAST * tempast = static_cast<TQMake::AssignmentAST*>( *it );
-        if ( tempast->values.findIndex( "subdirs" ) != -1 || findExistingVariable( "TEMPLATE" ) != m_root->m_tqchildren.end() )
+        if ( tempast->values.findIndex( "subdirs" ) != -1 || findExistingVariable( "TEMPLATE" ) != m_root->m_children.end() )
         {
             Scope* project = m_scopes[ num ];
             if( !project )
@@ -723,7 +723,7 @@ bool Scope::deleteSubProject( unsigned int num, bool deleteSubdir )
                 }
             }
             TQValueList<TQMake::AST*>::iterator foundit = findExistingVariable( "SUBDIRS" );
-            if ( foundit != m_root->m_tqchildren.end() )
+            if ( foundit != m_root->m_children.end() )
             {
                 TQMake::AssignmentAST * ast = static_cast<TQMake::AssignmentAST*>( *foundit );
                 updateValues( ast->values, TQStringList( projdir ), true, ast->indent );
@@ -804,11 +804,11 @@ void Scope::updateVariable( const TQString& variable, const TQString& op, const
     if( m_varCache.contains( variable ) )
         m_varCache.erase( variable );
 
-    for ( int i = m_root->m_tqchildren.count() - 1; i >= 0; --i )
+    for ( int i = m_root->m_children.count() - 1; i >= 0; --i )
     {
-        if ( m_root->m_tqchildren[ i ] ->nodeType() == TQMake::AST::AssignmentAST )
+        if ( m_root->m_children[ i ] ->nodeType() == TQMake::AST::AssignmentAST )
         {
-            TQMake::AssignmentAST * assignment = static_cast<TQMake::AssignmentAST*>( m_root->m_tqchildren[ i ] );
+            TQMake::AssignmentAST * assignment = static_cast<TQMake::AssignmentAST*>( m_root->m_children[ i ] );
             if ( assignment->scopedID == variable && Scope::isCompatible( assignment->op, op ) )
             {
                 updateValues( assignment->values, values, removeFromOp, assignment->indent );
@@ -898,7 +898,7 @@ TQValueList<TQMake::AST*>::iterator Scope::findExistingVariable( const TQString&
     TQStringList ops;
     ops << "=" << "+=";
 
-    for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end() ; ++it )
+    for ( it = m_root->m_children.begin(); it != m_root->m_children.end() ; ++it )
     {
         if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST )
         {
@@ -909,7 +909,7 @@ TQValueList<TQMake::AST*>::iterator Scope::findExistingVariable( const TQString&
             }
         }
     }
-    return m_root->m_tqchildren.end();
+    return m_root->m_children.end();
 }
 
 void Scope::init()
@@ -921,7 +921,7 @@ void Scope::init()
     m_maxCustomVarNum = 1;
 
     TQValueList<TQMake::AST*>::const_iterator it;
-    for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end(); ++it )
+    for ( it = m_root->m_children.begin(); it != m_root->m_children.end(); ++it )
     {
         if ( ( *it ) ->nodeType() == TQMake::AST::ProjectAST )
         {
@@ -1088,7 +1088,7 @@ void Scope::removeCustomVariable( unsigned int id )
     {
         TQMake::AssignmentAST* m = m_customVariables[id];
         m_customVariables.remove(id);
-        m_root->m_tqchildren.remove( m );
+        m_root->m_children.remove( m );
     }
 }
 
@@ -1097,8 +1097,8 @@ bool Scope::isVariableReset( const TQString& var )
     bool result = false;
     if( !m_root )
         return result;
-    TQValueList<TQMake::AST*>::const_iterator it = m_root->m_tqchildren.begin();
-    for ( ; it != m_root->m_tqchildren.end(); ++it )
+    TQValueList<TQMake::AST*>::const_iterator it = m_root->m_children.begin();
+    for ( ; it != m_root->m_children.end(); ++it )
     {
         if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST )
         {
@@ -1120,16 +1120,16 @@ void Scope::removeVariable( const TQString& var, const TQString& op )
 
     TQMake::AssignmentAST* ast = 0;
 
-    TQValueList<TQMake::AST*>::iterator it = m_root->m_tqchildren.begin();
-    for ( ; it != m_root->m_tqchildren.end(); ++it )
+    TQValueList<TQMake::AST*>::iterator it = m_root->m_children.begin();
+    for ( ; it != m_root->m_children.end(); ++it )
     {
         if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST )
         {
             ast = static_cast<TQMake::AssignmentAST*>( *it );
             if ( ast->scopedID == var && ast->op == op )
             {
-                m_root->m_tqchildren.remove( ast );
-                it = m_root->m_tqchildren.begin();
+                m_root->m_children.remove( ast );
+                it = m_root->m_children.begin();
             }
         }
     }
diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp
index abd26606..8e672b4e 100644
--- a/buildtools/qmake/trollprojectpart.cpp
+++ b/buildtools/qmake/trollprojectpart.cpp
@@ -710,7 +710,7 @@ void TrollProjectPart::startTQMakeCommand(const TQString &dir, bool recursive)
         cmdline += " -recursive ";
     }
 
-    //TQString cmdline = TQString::tqfromLatin1( isTMakeProject() ? "tmake " : "qmake " );
+    //TQString cmdline = TQString::fromLatin1( isTMakeProject() ? "tmake " : "qmake " );
 //    cmdline += fi.baseName() + ".pro";
     TQDir d(dir);
     TQStringList l = d.entryList("*.pro");
@@ -722,7 +722,7 @@ void TrollProjectPart::startTQMakeCommand(const TQString &dir, bool recursive)
     else
         cmdline += l[0];
 
-//    cmdline += TQString::tqfromLatin1( " -o Makefile" );
+//    cmdline += TQString::fromLatin1( " -o Makefile" );
 
     TQString dircmd = "cd ";
     dircmd += KProcess::quote(dir);
@@ -852,9 +852,9 @@ TQString TrollProjectPart::findTQtDir()
     TQStringList qtdirs;
     if( !isTQt4Project() )
         qtdirs.push_back( ::getenv("QTDIR") );
-    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
-    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").tqarg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
-    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").tqarg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
+    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
+    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
+    qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) );
     qtdirs.push_back( TQDir::rootDirPath()+"usr" );
     qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt" );
 
diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp
index f2aca642..d9706ad8 100644
--- a/buildtools/qmake/trollprojectwidget.cpp
+++ b/buildtools/qmake/trollprojectwidget.cpp
@@ -30,7 +30,7 @@
 #include <tqheader.h>
 #include <tqsplitter.h>
 #include <tqptrstack.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqcombobox.h>
 #include <kprocess.h>
 #include <tqtimer.h>
@@ -93,7 +93,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     overviewContainer = new TQVBox( splitter, "Projects" );
     overviewContainer->setMargin ( 2 );
     overviewContainer->setSpacing ( 2 );
-    //    overviewContainer->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
+    //    overviewContainer->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
     //    splitter->setResizeMode(overviewContainer, TQSplitter::FollowSizeHint);
 
     projectTools = new TQHBox( overviewContainer, "Project buttons" );
@@ -102,7 +102,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     // Add subdir
     addSubdirButton = new TQToolButton ( projectTools, "Add subproject button" );
     addSubdirButton->setPixmap ( SmallIcon ( "folder_new" ) );
-    addSubdirButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addSubdirButton->sizePolicy().hasHeightForWidth() ) );
+    addSubdirButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addSubdirButton->sizePolicy().hasHeightForWidth() ) );
     addSubdirButton->setEnabled ( true );
     TQToolTip::add( addSubdirButton, i18n( "Add subproject" ) );
     TQWhatsThis::add( addSubdirButton, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to a currently selected subproject. "
@@ -111,7 +111,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     // Create scope
     createScopeButton = new TQToolButton ( projectTools, "Create scope button" );
     createScopeButton->setPixmap ( SmallIcon ( "qmake_scopenew" ) );
-    createScopeButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, createScopeButton->sizePolicy().hasHeightForWidth() ) );
+    createScopeButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, createScopeButton->sizePolicy().hasHeightForWidth() ) );
     createScopeButton->setEnabled ( true );
     TQToolTip::add( createScopeButton, i18n( "Create scope" ) );
     TQWhatsThis::add( createScopeButton, i18n( "<b>Create scope</b><p>Creates TQMake scope in the project file in case the subproject is selected or creates nested scope in case the scope is selected." ) );
@@ -119,7 +119,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     // build
     buildProjectButton = new TQToolButton ( projectTools, "Make button" );
     buildProjectButton->setPixmap ( SmallIcon ( "make_tdevelop" ) );
-    buildProjectButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildProjectButton->sizePolicy().hasHeightForWidth() ) );
+    buildProjectButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildProjectButton->sizePolicy().hasHeightForWidth() ) );
     buildProjectButton->setEnabled ( true );
     TQToolTip::add( buildProjectButton, i18n( "Build project" ) );
     TQWhatsThis::add( buildProjectButton, i18n( "<b>Build project</b><p>Runs <b>make</b> from the project directory.<br>"
@@ -128,7 +128,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     // rebuild
     rebuildProjectButton = new TQToolButton ( projectTools, "Rebuild button" );
     rebuildProjectButton->setPixmap ( SmallIcon ( "rebuild" ) );
-    rebuildProjectButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, rebuildProjectButton->sizePolicy().hasHeightForWidth() ) );
+    rebuildProjectButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, rebuildProjectButton->sizePolicy().hasHeightForWidth() ) );
     rebuildProjectButton->setEnabled ( true );
     TQToolTip::add( rebuildProjectButton, i18n( "Rebuild project" ) );
     TQWhatsThis::add( rebuildProjectButton, i18n( "<b>Rebuild project</b><p>Runs <b>make clean</b> and then <b>make</b> from the project directory.<br>"
@@ -138,7 +138,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     // run
     executeProjectButton = new TQToolButton ( projectTools, "Run button" );
     executeProjectButton->setPixmap ( SmallIcon ( "exec" ) );
-    executeProjectButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeProjectButton->sizePolicy().hasHeightForWidth() ) );
+    executeProjectButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeProjectButton->sizePolicy().hasHeightForWidth() ) );
     executeProjectButton->setEnabled ( true );
     TQToolTip::add( executeProjectButton, i18n( "Execute main program" ) );
     TQWhatsThis::add( executeProjectButton, i18n( "<b>Execute main program</b><p>Executes the main program specified in project settings, <b>Run Options</b> tab." ) );
@@ -148,7 +148,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     // Project configuration
     projectconfButton = new TQToolButton ( projectTools, "Project configuration button" );
     projectconfButton->setPixmap ( SmallIcon ( "configure" ) );
-    projectconfButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, projectconfButton->sizePolicy().hasHeightForWidth() ) );
+    projectconfButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, projectconfButton->sizePolicy().hasHeightForWidth() ) );
     projectconfButton->setEnabled ( true );
     TQToolTip::add( projectconfButton, i18n( "Subproject settings" ) );
     TQWhatsThis::add( projectconfButton, i18n( "<b>Subproject settings</b><p>Opens <b>TQMake Subproject Configuration</b> dialog for the currently selected subproject. "
@@ -189,7 +189,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     detailContainer = new TQVBox( splitter, "Details" );
     detailContainer->setMargin ( 2 );
     detailContainer->setSpacing ( 2 );
-    //    detailContainer->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
+    //    detailContainer->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
 
     // Details Toolbar
     fileTools = new TQHBox( detailContainer, "Detail buttons" );
@@ -199,7 +199,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     // Add new file button
     newfileButton = new TQToolButton ( fileTools, "Create new file" );
     newfileButton->setPixmap ( SmallIcon ( "filenew" ) );
-    newfileButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, newfileButton->sizePolicy().hasHeightForWidth() ) );
+    newfileButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, newfileButton->sizePolicy().hasHeightForWidth() ) );
     newfileButton->setEnabled ( true );
     TQToolTip::add( newfileButton, i18n( "Create new file" ) );
     TQWhatsThis::add( newfileButton, i18n( "<b>Create new file</b><p>Creates a new file and adds it to a currently selected group." ) );
@@ -207,7 +207,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     // Add existing files button
     addfilesButton = new TQToolButton ( fileTools, "Add existing files" );
     addfilesButton->setPixmap ( SmallIcon ( "fileimport" ) );
-    addfilesButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addfilesButton->sizePolicy().hasHeightForWidth() ) );
+    addfilesButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, addfilesButton->sizePolicy().hasHeightForWidth() ) );
     addfilesButton->setEnabled ( true );
     TQToolTip::add( addfilesButton, i18n( "Add existing files" ) );
     TQWhatsThis::add( addfilesButton, i18n( "<b>Add existing files</b><p>Adds existing files to a currently selected group. It is "
@@ -217,7 +217,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     // remove file button
     removefileButton = new TQToolButton ( fileTools, "Remove file" );
     removefileButton->setPixmap ( SmallIcon ( "button_cancel" ) );
-    removefileButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, removefileButton->sizePolicy().hasHeightForWidth() ) );
+    removefileButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, removefileButton->sizePolicy().hasHeightForWidth() ) );
     removefileButton->setEnabled ( true );
     TQToolTip::add( removefileButton, i18n( "Remove file" ) );
     TQWhatsThis::add( removefileButton, i18n( "<b>Remove file</b><p>Removes file from a current group. Does not remove file from disk." ) );
@@ -225,7 +225,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     // build selected file
     buildFileButton = new TQToolButton ( fileTools, "Make file button" );
     buildFileButton->setPixmap ( SmallIcon ( "compfile" ) );
-    buildFileButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildFileButton->sizePolicy().hasHeightForWidth() ) );
+    buildFileButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildFileButton->sizePolicy().hasHeightForWidth() ) );
     buildFileButton->setEnabled ( true );
     TQToolTip::add( buildFileButton, i18n( "Compile file" ) );
     TQWhatsThis::add( buildFileButton, i18n( "<b>Compile file</b><p>Runs <b>make filename.o</b> command from the directory where 'filename' is the name of currently opened file.<br>"
@@ -235,7 +235,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     // build
     buildTargetButton = new TQToolButton ( fileTools, "Make sp button" );
     buildTargetButton->setPixmap ( SmallIcon ( "make_tdevelop" ) );
-    buildTargetButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildTargetButton->sizePolicy().hasHeightForWidth() ) );
+    buildTargetButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, buildTargetButton->sizePolicy().hasHeightForWidth() ) );
     buildTargetButton->setEnabled ( true );
     TQToolTip::add( buildTargetButton, i18n( "Build subproject" ) );
     TQWhatsThis::add( buildTargetButton, i18n( "<b>Build subproject</b><p>Runs <b>make</b> from the current subproject directory. "
@@ -245,7 +245,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     // rebuild
     rebuildTargetButton = new TQToolButton ( fileTools, "Rebuild sp button" );
     rebuildTargetButton->setPixmap ( SmallIcon ( "rebuild" ) );
-    rebuildTargetButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, rebuildTargetButton->sizePolicy().hasHeightForWidth() ) );
+    rebuildTargetButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, rebuildTargetButton->sizePolicy().hasHeightForWidth() ) );
     rebuildTargetButton->setEnabled ( true );
     TQToolTip::add( rebuildTargetButton, i18n( "Rebuild subproject" ) );
     TQWhatsThis::add( rebuildTargetButton, i18n( "<b>Rebuild subproject</b><p>Runs <b>make clean</b> and then <b>make</b> from the current subproject directory. "
@@ -256,7 +256,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     // run
     executeTargetButton = new TQToolButton ( fileTools, "Run sp button" );
     executeTargetButton->setPixmap ( SmallIcon ( "exec" ) );
-    executeTargetButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeTargetButton->sizePolicy().hasHeightForWidth() ) );
+    executeTargetButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeTargetButton->sizePolicy().hasHeightForWidth() ) );
     executeTargetButton->setEnabled ( true );
     TQToolTip::add( executeTargetButton, i18n( "Execute subproject" ) );
     TQWhatsThis::add( executeTargetButton, i18n( "<b>Execute subproject</b><p>Executes the target program for the currently selected subproject. "
@@ -271,7 +271,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
     // Configure file button
     excludeFileFromScopeButton = new TQToolButton ( fileTools, "Exclude file" );
     excludeFileFromScopeButton->setPixmap ( SmallIcon ( "configure_file" ) );
-    excludeFileFromScopeButton->tqsetSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, excludeFileFromScopeButton->sizePolicy().hasHeightForWidth() ) );
+    excludeFileFromScopeButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, excludeFileFromScopeButton->sizePolicy().hasHeightForWidth() ) );
     excludeFileFromScopeButton->setEnabled ( true );
     TQToolTip::add( excludeFileFromScopeButton , i18n( "Exclude file" ) );
     TQWhatsThis::add( excludeFileFromScopeButton , i18n( "<b>Exclude file</b><p>Exclude the selected file from this scope." ) );
@@ -529,7 +529,7 @@ TQString TrollProjectWidget::getCurrentOutputFilename()
 
 void TrollProjectWidget::cleanDetailView( QMakeScopeItem *item )
 {
-    // If no tqchildren in detailview
+    // If no children in detailview
     // it is a subdir template
     if ( item && details->childCount() )
     {
@@ -556,7 +556,7 @@ void TrollProjectWidget::cleanDetailView( QMakeScopeItem *item )
 void TrollProjectWidget::buildProjectDetailTree( QMakeScopeItem *item, KListView *listviewControl )
 {
 
-    // Insert all GroupItems and all of their tqchildren into the view
+    // Insert all GroupItems and all of their children into the view
     if ( !listviewControl || item->scope->variableValues( "TEMPLATE" ).findIndex("subdirs") != -1 )
         return ;
 
@@ -974,7 +974,7 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i
     QMakeScopeItem *spitem = static_cast<QMakeScopeItem*>( item );
 
     KPopupMenu popup( this );
-    popup.insertTitle( i18n( "Subproject %1" ).tqarg( item->text( 0 ) ) );
+    popup.insertTitle( i18n( "Subproject %1" ).arg( item->text( 0 ) ) );
 
     int idBuild = -2;
     int idRebuild = -2;
@@ -994,72 +994,72 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i
     if ( spitem->scope->scopeType() == Scope::ProjectScope && ( !spitem->scope->parent() || spitem->scope->parent()->scopeType() == Scope::ProjectScope ) )
     {
         idBuild = popup.insertItem( SmallIcon( "make_tdevelop" ), i18n( "Build" ) );
-        popup.tqsetWhatsThis( idBuild, i18n( "<b>Build</b><p>Runs <b>make</b> from the selected subproject directory.<br>"
+        popup.setWhatsThis( idBuild, i18n( "<b>Build</b><p>Runs <b>make</b> from the selected subproject directory.<br>"
                                            "Environment variables and make arguments can be specified "
                                            "in the project settings dialog, <b>Make Options</b> tab." ) );
         idInstall = popup.insertItem( i18n( "Install" ) );
-        popup.tqsetWhatsThis( idBuild, i18n( "<b>Install</b><p>Runs <b>make install</b> from the selected subproject directory.<br>"
+        popup.setWhatsThis( idBuild, i18n( "<b>Install</b><p>Runs <b>make install</b> from the selected subproject directory.<br>"
                                            "Environment variables and make arguments can be specified "
                                            "in the project settings dialog, <b>Make Options</b> tab." ) );
         idClean = popup.insertItem( i18n( "Clean" ) );
-        popup.tqsetWhatsThis( idBuild, i18n( "<b>Clean project</b><p>Runs <b>make clean</b> command from the project "
+        popup.setWhatsThis( idBuild, i18n( "<b>Clean project</b><p>Runs <b>make clean</b> command from the project "
                                            "directory.<br> Environment variables and make arguments can be specified "
                                            "in the project settings dialog, <b>Make Options</b> tab." ) );
         idDistClean = popup.insertItem( i18n( "Dist-Clean" ) );
-        popup.tqsetWhatsThis( idBuild, i18n( "<b>Dist-Clean project</b><p>Runs <b>make distclean</b> command from the project "
+        popup.setWhatsThis( idBuild, i18n( "<b>Dist-Clean project</b><p>Runs <b>make distclean</b> command from the project "
                                            "directory.<br> Environment variables and make arguments can be specified "
                                            "in the project settings dialog, <b>Make Options</b> tab." ) );
 
         idRebuild = popup.insertItem( SmallIcon( "rebuild" ), i18n( "Rebuild" ) );
-        popup.tqsetWhatsThis( idRebuild, i18n( "<b>Rebuild project</b><p>Runs <b>make clean</b> and then <b>make</b> from "
+        popup.setWhatsThis( idRebuild, i18n( "<b>Rebuild project</b><p>Runs <b>make clean</b> and then <b>make</b> from "
                                              "the project directory.<br>Environment variables and make arguments can be "
                                              "specified in the project settings dialog, <b>Make Options</b> tab." ) );
         idQmake = popup.insertItem( SmallIcon( "qmakerun" ), i18n( "Run qmake" ) );
-        popup.tqsetWhatsThis( idQmake, i18n( "<b>Run qmake</b><p>Runs <b>qmake</b> from the selected subproject directory. This creates or regenerates Makefile." ) );
+        popup.setWhatsThis( idQmake, i18n( "<b>Run qmake</b><p>Runs <b>qmake</b> from the selected subproject directory. This creates or regenerates Makefile." ) );
         idQmakeRecursive = popup.insertItem( SmallIcon( "qmakerun" ), i18n( "Run qmake recursively" ) );
-        popup.tqsetWhatsThis( idQmakeRecursive, i18n( "<b>Run qmake recursively</b><p>Runs <b>qmake</b> from the selected "
+        popup.setWhatsThis( idQmakeRecursive, i18n( "<b>Run qmake recursively</b><p>Runs <b>qmake</b> from the selected "
                             "subproject directory and recurses into all subproject directories. "
                             "This creates or regenerates Makefile." ) );
 
         popup.insertSeparator();
         idAddSubproject = popup.insertItem( SmallIcon( "folder_new" ), i18n( "Add Subproject..." ) );
-        popup.tqsetWhatsThis( idAddSubproject, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to a currently selected subproject. "
+        popup.setWhatsThis( idAddSubproject, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to a currently selected subproject. "
                             "This action is allowed only if a type of the subproject is 'subdirectories'. The type of the subproject can be "
                             "defined in <b>Subproject Settings</b> dialog (open it from the subproject context menu)." ) );
         if ( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 )
             popup.setItemEnabled( idAddSubproject, false );
         idRemoveSubproject = popup.insertItem( SmallIcon( "remove_subdir" ), i18n( "Remove Subproject..." ) );
-        popup.tqsetWhatsThis( idRemoveSubproject, i18n( "<b>Remove subproject</b><p>Removes currently selected subproject. Does not delete any file from disk. Deleted subproject can be later added by calling 'Add Subproject' action." ) );
+        popup.setWhatsThis( idRemoveSubproject, i18n( "<b>Remove subproject</b><p>Removes currently selected subproject. Does not delete any file from disk. Deleted subproject can be later added by calling 'Add Subproject' action." ) );
         if ( spitem->parent() == NULL )
             popup.setItemEnabled( idRemoveSubproject, false );
         idAddScope = popup.insertItem( SmallIcon( "qmake_scopenew" ), i18n( "Create Scope..." ) );
-        popup.tqsetWhatsThis( idAddScope, i18n( "<b>Create scope</b><p>Creates TQMake scope in the project file of the currently selected subproject." ) );
+        popup.setWhatsThis( idAddScope, i18n( "<b>Create scope</b><p>Creates TQMake scope in the project file of the currently selected subproject." ) );
         popup.insertSeparator();
         idProjectConfiguration = popup.insertItem( SmallIcon( "configure" ), i18n( "Subproject Settings" ) );
-        popup.tqsetWhatsThis( idProjectConfiguration, i18n( "<b>Subproject settings</b><p>Opens <b>TQMake Subproject Configuration</b> dialog. "
+        popup.setWhatsThis( idProjectConfiguration, i18n( "<b>Subproject settings</b><p>Opens <b>TQMake Subproject Configuration</b> dialog. "
                             "It provides settings for:<br>subproject type and configuration,<br>include and library paths,<br>lists of dependencies and "
                             "external libraries,<br>build order,<br>intermediate files locations,<br>compiler options." ) );
     }
     else
     {
         idAddScope = popup.insertItem( SmallIcon( "qmake_scopenew" ), i18n( "Create Scope..." ) );
-        popup.tqsetWhatsThis( idAddScope, i18n( "<b>Create Scope</b><p>Creates TQMake scope in the currently selected scope." ) );
+        popup.setWhatsThis( idAddScope, i18n( "<b>Create Scope</b><p>Creates TQMake scope in the currently selected scope." ) );
         idRemoveScope = popup.insertItem( SmallIcon( "editdelete" ), i18n( "Remove Scope" ) );
-        popup.tqsetWhatsThis( idRemoveScope, i18n( "<b>Remove Scope</b><p>Removes currently selected scope." ) );
+        popup.setWhatsThis( idRemoveScope, i18n( "<b>Remove Scope</b><p>Removes currently selected scope." ) );
         popup.insertSeparator();
         idAddSubproject = popup.insertItem( SmallIcon( "folder_new" ), i18n( "Add Subproject..." ) );
-        popup.tqsetWhatsThis( idAddSubproject, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to the currently selected scope. "
+        popup.setWhatsThis( idAddSubproject, i18n( "<b>Add subproject</b><p>Creates a <i>new</i> or adds an <i>existing</i> subproject to the currently selected scope. "
                             "This action is allowed only if the type of the subproject is 'subdirectories'. The type of the subproject can be "
                             "defined in the <b>Subproject Settings</b> dialog (open it from the subproject context menu)." ) );
         if ( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 )
             popup.setItemEnabled( idAddSubproject, false );
         idDisableSubproject = popup.insertItem( SmallIcon( "remove_subdir" ), i18n( "Disable Subproject..." ) );
-        popup.tqsetWhatsThis( idRemoveSubproject, i18n( "<b>Disable subproject</b><p>Disables the currently selected subproject when this scope is active. Does not delete the directory from disk. The deleted subproject can be later added by using the 'Add Subproject' action." ) );
+        popup.setWhatsThis( idRemoveSubproject, i18n( "<b>Disable subproject</b><p>Disables the currently selected subproject when this scope is active. Does not delete the directory from disk. The deleted subproject can be later added by using the 'Add Subproject' action." ) );
         if( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 && spitem->scope->parent()->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 )
             popup.setItemEnabled( idDisableSubproject, false );
         popup.insertSeparator();
         idProjectConfiguration = popup.insertItem( SmallIcon( "configure" ), i18n( "Scope Settings" ) );
-        popup.tqsetWhatsThis( idProjectConfiguration, i18n( "<b>Scope settings</b><p>Opens <b>TQMake Subproject Configuration</b> dialog. "
+        popup.setWhatsThis( idProjectConfiguration, i18n( "<b>Scope settings</b><p>Opens <b>TQMake Subproject Configuration</b> dialog. "
                             "It provides settings for:<br>subproject type and configuration,<br>include and library paths,<br>lists of dependencies and "
                             "external libraries,<br>build order,<br>intermediate files locations,<br>compiler options." ) );
     }
@@ -1090,12 +1090,12 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i
     else if ( r == idBuild )
     {
         slotBuildTarget();
-        //        m_part->startMakeCommand(projectDirectory() + relpath, TQString::tqfromLatin1(""));
+        //        m_part->startMakeCommand(projectDirectory() + relpath, TQString::fromLatin1(""));
     }
     else if ( r == idInstall )
     {
         slotInstallTarget();
-        //        m_part->startMakeCommand(projectDirectory() + relpath, TQString::tqfromLatin1(""));
+        //        m_part->startMakeCommand(projectDirectory() + relpath, TQString::fromLatin1(""));
     }
     else if ( r == idRebuild )
     {
@@ -1544,41 +1544,41 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
         if ( titem->groupType == GroupItem::InstallRoot )
         {
             idInsInstallObject = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Add Install Object..." ) );
-            popup.tqsetWhatsThis( idInsInstallObject, i18n( "<b>Add install object</b><p>Creates TQMake install object. "
+            popup.setWhatsThis( idInsInstallObject, i18n( "<b>Add install object</b><p>Creates TQMake install object. "
                                 "It is possible to define a list of files to install and installation locations for each object. Warning! "
                                 "Install objects without path specified will not be saved to a project file." ) );
         }
         else if ( titem->groupType == GroupItem::InstallObject )
         {
             idSetInstObjPath = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Install Path..." ) );
-            popup.tqsetWhatsThis( idSetInstObjPath, i18n( "<b>Install path</b><p>Allows to choose the installation path for the current install object." ) );
+            popup.setWhatsThis( idSetInstObjPath, i18n( "<b>Install path</b><p>Allows to choose the installation path for the current install object." ) );
             idInsNewFilepatternItem = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Add Pattern of Files to Install..." ) );
-            popup.tqsetWhatsThis( idInsNewFilepatternItem, i18n( "<b>Add pattern of files to install</b><p>Defines the pattern to match files which will be installed. "
+            popup.setWhatsThis( idInsNewFilepatternItem, i18n( "<b>Add pattern of files to install</b><p>Defines the pattern to match files which will be installed. "
                                 "It is possible to use wildcards and relative paths like <i>docs/*</i>." ) );
             idRemoveFile = popup.insertItem( SmallIconSet( "editdelete" ), i18n( "Remove Install Object" ) );
-            popup.tqsetWhatsThis( idRemoveFile, i18n( "<b>Remove install object</b><p>Removes the install object the current group." ) );
+            popup.setWhatsThis( idRemoveFile, i18n( "<b>Remove install object</b><p>Removes the install object the current group." ) );
         }
         else if ( titem->groupType == GroupItem::Translations )
         {
             idInsNewFile = popup.insertItem( SmallIconSet( "filenew" ), i18n( "Create New File..." ) );
-            popup.tqsetWhatsThis( idInsNewFile, i18n( "<b>Create new file</b><p>Creates a new translation file and adds it to a currently selected TRANSLATIONS group." ) );
+            popup.setWhatsThis( idInsNewFile, i18n( "<b>Create new file</b><p>Creates a new translation file and adds it to a currently selected TRANSLATIONS group." ) );
             idInsExistingFile = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Add Existing Files..." ) );
-            popup.tqsetWhatsThis( idInsExistingFile, i18n( "<b>Add existing files</b><p>Adds existing translation (*.ts) files to a currently selected TRANSLATIONS group. It is "
+            popup.setWhatsThis( idInsExistingFile, i18n( "<b>Add existing files</b><p>Adds existing translation (*.ts) files to a currently selected TRANSLATIONS group. It is "
                                 "possible to copy files to a current subproject directory, create symbolic links or "
                                 "add them with the relative path." ) );
             idLUpdate = popup.insertItem( SmallIconSet( "konsole" ), i18n( "Update Translation Files" ) );
-            popup.tqsetWhatsThis( idLUpdate, i18n( "<b>Update Translation Files</b><p>Runs <b>lupdate</b> command from the current subproject directory. It collects translatable "
+            popup.setWhatsThis( idLUpdate, i18n( "<b>Update Translation Files</b><p>Runs <b>lupdate</b> command from the current subproject directory. It collects translatable "
                                                  "messages and saves them into translation files." ) );
             idLRelease = popup.insertItem( SmallIconSet( "konsole" ), i18n( "Release Binary Translations" ) );
-            popup.tqsetWhatsThis( idLRelease, i18n( "<b>Release Binary Translations</b><p>Runs <b>lrelease</b> command from the current subproject directory. It creates binary "
+            popup.setWhatsThis( idLRelease, i18n( "<b>Release Binary Translations</b><p>Runs <b>lrelease</b> command from the current subproject directory. It creates binary "
                                                   "translation files that are ready to be loaded at program execution." ) );
         }
         else // File group containing files
         {
             idInsNewFile = popup.insertItem( SmallIconSet( "filenew" ), i18n( "Create New File..." ) );
-            popup.tqsetWhatsThis( idInsNewFile, i18n( "<b>Create new file</b><p>Creates a new file and adds it to a currently selected group." ) );
+            popup.setWhatsThis( idInsNewFile, i18n( "<b>Create new file</b><p>Creates a new file and adds it to a currently selected group." ) );
             idInsExistingFile = popup.insertItem( SmallIconSet( "fileopen" ), i18n( "Add Existing Files..." ) );
-            popup.tqsetWhatsThis( idInsExistingFile, i18n( "<b>Add existing files</b><p>Adds existing files to a currently selected group. It is "
+            popup.setWhatsThis( idInsExistingFile, i18n( "<b>Add existing files</b><p>Adds existing files to a currently selected group. It is "
                                 "possible to copy files to a current subproject directory, create symbolic links or "
                                 "add them with the relative path." ) );
         }
@@ -1757,9 +1757,9 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
 
         KPopupMenu popup( this );
         if ( !( gitem->groupType == GroupItem::InstallObject ) )
-            popup.insertTitle( i18n( "File: %1" ).tqarg( fitem->text( 0 ) ) );
+            popup.insertTitle( i18n( "File: %1" ).arg( fitem->text( 0 ) ) );
         else
-            popup.insertTitle( i18n( "Pattern: %1" ).tqarg( fitem->text( 0 ) ) );
+            popup.insertTitle( i18n( "Pattern: %1" ).arg( fitem->text( 0 ) ) );
 
         int idRemoveFile = -2;
         int idSubclassWidget = -2;
@@ -1773,37 +1773,37 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
         if ( !fitem->uiFileLink.isEmpty() )
         {
             idUpdateWidgetclass = popup.insertItem( SmallIconSet( "qmake_subclass" ), i18n( "Edit ui-Subclass..." ) );
-            popup.tqsetWhatsThis( idUpdateWidgetclass, i18n( "<b>Edit ui-subclass</b><p>Launches <b>Subclassing</b> wizard "
+            popup.setWhatsThis( idUpdateWidgetclass, i18n( "<b>Edit ui-subclass</b><p>Launches <b>Subclassing</b> wizard "
                                 "and prompts to implement missing in childclass slots and functions." ) );
         }
         if ( fitem->text( 0 ).contains( ".ui" ) )
         {
             idSubclassWidget = popup.insertItem( SmallIconSet( "qmake_subclass" ), i18n( "Subclassing Wizard..." ) );
-            popup.tqsetWhatsThis( idSubclassWidget, i18n( "<b>Subclass widget</b><p>Launches <b>Subclassing</b> wizard. "
+            popup.setWhatsThis( 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. "
                                 "There is also possibility to implement slots and functions defined in the base class." ) );
             if ( !m_part->isTQt4Project() )
             {
                 idViewUIH = popup.insertItem( SmallIconSet( "qmake_ui_h" ), i18n( "Open ui.h File" ) );
-                popup.tqsetWhatsThis( idViewUIH, i18n( "<b>Open ui.h file</b><p>Opens .ui.h file associated with the selected .ui." ) );
+                popup.setWhatsThis( idViewUIH, i18n( "<b>Open ui.h file</b><p>Opens .ui.h file associated with the selected .ui." ) );
             }
             idUISubclasses = popup.insertItem( SmallIconSet( "qmake_subclass" ), i18n( "List of Subclasses..." ) );
-            popup.tqsetWhatsThis( idUISubclasses, i18n( "<b>List of subclasses</b><p>Shows subclasses list editor. "
+            popup.setWhatsThis( idUISubclasses, i18n( "<b>List of subclasses</b><p>Shows subclasses list editor. "
                                 "There is possibility to add or remove subclasses from the list." ) );
         }
         if ( !( gitem->groupType == GroupItem::InstallObject ) )
         {
             idRemoveFile = popup.insertItem( SmallIconSet( "editdelete" ), i18n( "Remove File" ) );
-            popup.tqsetWhatsThis( idRemoveFile, i18n( "<b>Remove file</b><p>Removes file from a current group. For sources, this also removes the subclassing information." ) );
+            popup.setWhatsThis( idRemoveFile, i18n( "<b>Remove file</b><p>Removes file from a current group. For sources, this also removes the subclassing information." ) );
             idFileProperties = popup.insertItem( SmallIconSet( "configure_file" ), i18n( "Exclude File" ) );
-            popup.tqsetWhatsThis( idFileProperties, i18n( "<b>Exclude File</b><p>Excludes the file from this Scope. Does not touch subclassing information" ) );
+            popup.setWhatsThis( idFileProperties, i18n( "<b>Exclude File</b><p>Excludes the file from this Scope. Does not touch subclassing information" ) );
         }
         else
         {
             idEditInstallPattern = popup.insertItem( SmallIconSet( "configure_file" ), i18n( "Edit Pattern" ) );
-            popup.tqsetWhatsThis( idEditInstallPattern, i18n( "<b>Edit pattern</b><p>Allows to edit install files pattern." ) );
+            popup.setWhatsThis( idEditInstallPattern, i18n( "<b>Edit pattern</b><p>Allows to edit install files pattern." ) );
             idRemoveFile = popup.insertItem( SmallIconSet( "editdelete" ), i18n( "Remove Pattern" ) );
-            popup.tqsetWhatsThis( idRemoveFile, i18n( "<b>Remove pattern</b><p>Removes install files pattern from the current install object." ) );
+            popup.setWhatsThis( idRemoveFile, i18n( "<b>Remove pattern</b><p>Removes install files pattern from the current install object." ) );
         }
         if ( !( gitem->groupType == GroupItem::InstallObject ) )
         {
@@ -1815,7 +1815,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
         if ( gitem->groupType == GroupItem::Sources )
         {
             idBuildFile = popup.insertItem( SmallIconSet( "make_tdevelop" ), i18n( "Build File" ) );
-            popup.tqsetWhatsThis( idBuildFile, i18n( "<b>Build File</b><p>Builds the object file for this source file." ) );
+            popup.setWhatsThis( idBuildFile, i18n( "<b>Build File</b><p>Builds the object file for this source file." ) );
         }
 
         int r = popup.exec( p );
@@ -1932,7 +1932,7 @@ void TrollProjectWidget::removeFile( QMakeScopeItem *spitem, FileItem *fitem )
     if ( KMessageBox::warningYesNo( this,
                                     "<qt>" +
                                     i18n( "Do you want to delete the file <strong>%1</strong> from the project and your disk?" )
-                                    .tqarg( fitem->text( 0 ) ) +
+                                    .arg( fitem->text( 0 ) ) +
                                     "</qt>",
                                     i18n( "Remove File" ),
                                     KStdGuiItem::remove(),
@@ -2459,7 +2459,7 @@ void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem )
 void TrollProjectWidget::slotProjectDirty(const TQString& path)
 {
     kdDebug(9024) << "File is dirty:" << path << " using method " << endl;
-    if( KMessageBox::warningYesNo(this, i18n("The project file \"%1\" has changed on disk\n(Or you have \"%2\" opened in the editor, which also triggers a reload when you change something in the TQMake Manager).\n\nDo you want to reload it?").tqarg(path).tqarg(path), i18n("Project File Changed"), i18n("Reload"), i18n("Do Not Reload"), "trollproject_reload_project_file" ) != KMessageBox::No )
+    if( KMessageBox::warningYesNo(this, i18n("The project file \"%1\" has changed on disk\n(Or you have \"%2\" opened in the editor, which also triggers a reload when you change something in the TQMake Manager).\n\nDo you want to reload it?").arg(path).arg(path), i18n("Project File Changed"), i18n("Reload"), i18n("Do Not Reload"), "trollproject_reload_project_file" ) != KMessageBox::No )
     {
         m_part->dirWatch()->stopScan();
         TQListViewItemIterator it(m_rootSubproject);