summaryrefslogtreecommitdiffstats
path: root/buildtools/qmake/scope.h
diff options
context:
space:
mode:
Diffstat (limited to 'buildtools/qmake/scope.h')
-rw-r--r--buildtools/qmake/scope.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/buildtools/qmake/scope.h b/buildtools/qmake/scope.h
index 8140b5e6..98519bdf 100644
--- a/buildtools/qmake/scope.h
+++ b/buildtools/qmake/scope.h
@@ -64,7 +64,7 @@ public:
TQStringList variableValuesForOp( const TQString& variable, const TQString& op ) const;
// Fetch the variable values by running over the statements and adding/removing/setting
- // as the encountered op's say, begin with the tqparent projects variableValues list
+ // as the encountered op's say, begin with the parent projects variableValues list
TQStringList variableValues( const TQString& variable, bool checkIncParent = true, bool fetchFromParent = true, bool evaluateSubScopes = false );
// Remove a variable+Op combination from the scope, if existant
@@ -86,8 +86,8 @@ public:
// Returns the absolute path of the dir containing the .pro file
TQString projectDir() const;
- // get the tqparent Scope
- Scope* tqparent() const { return m_parent; }
+ // get the parent Scope
+ Scope* parent() const { return m_parent; }
// Fetching sub-scopes
const TQValueList<Scope*> scopesInOrder() const { return m_scopes.values(); }
@@ -105,7 +105,7 @@ public:
* creates a new function scope at the end of this (Sub-)AST
* and a new include scope inside the new function scope.
* It returns the Scope wrapping the include-AST, the function scope AST
- * can be accessed easily using the tqparent() method.
+ * can be accessed easily using the parent() method.
*/
Scope* createIncludeScope( const TQString& includeFile, bool negate = false );
@@ -201,17 +201,17 @@ private:
/*
* just initializes the lists from the scope
*/
- Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqparent, TQMake::ProjectAST* root, TQMakeDefaultOpts*, TrollProjectPart* part );
+ Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, TQMake::ProjectAST* root, TQMakeDefaultOpts*, TrollProjectPart* part );
/*
* reads the given filename and parses it. If it doesn't exist creates an empty
* ProjectAST with the given filename
*/
- Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqparent, const TQString& filename, TrollProjectPart* part, bool isEnabled = true );
+ Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, const TQString& filename, TrollProjectPart* part, bool isEnabled = true );
/*
* Creates a scope for an include statement, parses the file and initializes the Scope
* Create an empty ProjectAST if the file cannot be found or parsed.
*/
- Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* tqparent, TQMake::IncludeAST* incast, const TQString& path, const TQString& incfile, TQMakeDefaultOpts*, TrollProjectPart* part );
+ Scope( const TQMap<TQString, TQString>& env, unsigned int num, Scope* parent, TQMake::IncludeAST* incast, const TQString& path, const TQString& incfile, TQMakeDefaultOpts*, TrollProjectPart* part );
// runs through the statements until stopHere is found (or the end is reached, if stopHere is 0),
@@ -256,7 +256,7 @@ private:
TQString replaceWs(TQString);
- // The "position" inside the tqparent scope that this scope starts at
+ // The "position" inside the parent scope that this scope starts at
unsigned int m_num;
bool m_isEnabled;
TrollProjectPart* m_part;