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

This reverts commit b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04.

1 files changed, 22 insertions, 22 deletions

diff --git a/buildtools/qmake/scope.cpp b/buildtools/qmake/scope.cpp
index 2c862fb3..b937287c 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" ).arg( filename ),
+            KMessageBox::error( 0, i18n( "Could not parse project file: %1" ).tqarg( 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" ).arg( filename ),
+        KMessageBox::error( 0, i18n( "Could not write project file: %1" ).tqarg( 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_children.begin(); it != m_root->m_children.end(); ++it )
+    for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.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_children.begin(); it != m_root->m_children.end(); ++it )
+    for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.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_children[ m_root->m_children.findIndex( funcScope->m_root ) ];
+        TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.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_children[ m_root->m_children.findIndex( simpleScope->m_root ) ];
+        TQMake::AST* ast = m_root->m_tqchildren[ m_root->m_tqchildren.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_children.end() )
+    if ( it != m_root->m_tqchildren.end() )
     {
         TQMake::AssignmentAST * tempast = static_cast<TQMake::AssignmentAST*>( *it );
-        if ( tempast->values.findIndex( "subdirs" ) != -1 || findExistingVariable( "TEMPLATE" ) != m_root->m_children.end() )
+        if ( tempast->values.findIndex( "subdirs" ) != -1 || findExistingVariable( "TEMPLATE" ) != m_root->m_tqchildren.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_children.end() )
+            if ( foundit != m_root->m_tqchildren.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_children.count() - 1; i >= 0; --i )
+    for ( int i = m_root->m_tqchildren.count() - 1; i >= 0; --i )
     {
-        if ( m_root->m_children[ i ] ->nodeType() == TQMake::AST::AssignmentAST )
+        if ( m_root->m_tqchildren[ i ] ->nodeType() == TQMake::AST::AssignmentAST )
         {
-            TQMake::AssignmentAST * assignment = static_cast<TQMake::AssignmentAST*>( m_root->m_children[ i ] );
+            TQMake::AssignmentAST * assignment = static_cast<TQMake::AssignmentAST*>( m_root->m_tqchildren[ 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_children.begin(); it != m_root->m_children.end() ; ++it )
+    for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.end() ; ++it )
     {
         if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST )
         {
@@ -909,7 +909,7 @@ TQValueList<TQMake::AST*>::iterator Scope::findExistingVariable( const TQString&
             }
         }
     }
-    return m_root->m_children.end();
+    return m_root->m_tqchildren.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_children.begin(); it != m_root->m_children.end(); ++it )
+    for ( it = m_root->m_tqchildren.begin(); it != m_root->m_tqchildren.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_children.remove( m );
+        m_root->m_tqchildren.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_children.begin();
-    for ( ; it != m_root->m_children.end(); ++it )
+    TQValueList<TQMake::AST*>::const_iterator it = m_root->m_tqchildren.begin();
+    for ( ; it != m_root->m_tqchildren.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_children.begin();
-    for ( ; it != m_root->m_children.end(); ++it )
+    TQValueList<TQMake::AST*>::iterator it = m_root->m_tqchildren.begin();
+    for ( ; it != m_root->m_tqchildren.end(); ++it )
     {
         if ( ( *it ) ->nodeType() == TQMake::AST::AssignmentAST )
         {
             ast = static_cast<TQMake::AssignmentAST*>( *it );
             if ( ast->scopedID == var && ast->op == op )
             {
-                m_root->m_children.remove( ast );
-                it = m_root->m_children.begin();
+                m_root->m_tqchildren.remove( ast );
+                it = m_root->m_tqchildren.begin();
             }
         }
     }