rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 7 insertions, 7 deletions

diff --git a/buildtools/qmake/scope.cpp b/buildtools/qmake/scope.cpp
index 17c360dc..6018c392 100644
--- a/buildtools/qmake/scope.cpp
+++ b/buildtools/qmake/scope.cpp
@@ -80,18 +80,18 @@ Scope::~Scope()
 }
 
 // Simple/Function Scopes
-Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqparent, TQMake::ProjectAST* scope,
+Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, TQMake::ProjectAST* scope,
               TQMakeDefaultOpts* defaultopts, TrollProjectPart* part )
-    : m_root( scope ), m_incast( 0 ), m_parent( tqparent ), m_num(num), m_isEnabled( true ),
+    : m_root( scope ), m_incast( 0 ), m_parent( parent ), m_num(num), m_isEnabled( true ),
         m_part(part), m_defaultopts(defaultopts), m_environment( env )
 {
     init();
 }
 
 //Subdirs
-Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqparent, const TQString& filename,
+Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, const TQString& filename,
               TrollProjectPart* part, bool isEnabled )
-    : m_root( 0 ), m_incast( 0 ), m_parent( tqparent ), m_num(num), m_isEnabled( isEnabled ),
+    : m_root( 0 ), m_incast( 0 ), m_parent( parent ), m_num(num), m_isEnabled( isEnabled ),
     m_part(part), m_defaultopts(0), m_environment( env )
 {
     if ( !loadFromFile( filename ) )
@@ -114,9 +114,9 @@ Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqp
 }
 
 //Include Scope
-Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqparent, TQMake::IncludeAST* incast, const TQString& path,
+Scope::Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, TQMake::IncludeAST* incast, const TQString& path,
               const TQString& incfile, TQMakeDefaultOpts* defaultopts, TrollProjectPart* part )
-    : m_root( 0 ), m_incast( incast ), m_parent( tqparent ), m_num(num), m_isEnabled( true ),
+    : m_root( 0 ), m_incast( incast ), m_parent( parent ), m_num(num), m_isEnabled( true ),
     m_part(part), m_defaultopts(defaultopts), m_environment( env )
 {
     TQString absfilename;
@@ -1552,7 +1552,7 @@ TQString Scope::findCustomVarForPath( const TQString& path )
     }
     if( scopeType() != ProjectScope )
     {
-        return tqparent()->findCustomVarForPath( path );
+        return parent()->findCustomVarForPath( path );
     }
     return result;
 }