diff options
author | Roberto Raggi <roberto.raggi@nokia.com> | 2010-08-26 16:16:22 +0200 |
---|---|---|
committer | Roberto Raggi <roberto.raggi@nokia.com> | 2010-08-26 16:16:22 +0200 |
commit | 05f2fd666902e7246b7110187d4964644291e26f (patch) | |
tree | 26184894891d998e8e88e8826e3c3425ec7a9244 /src/libs/cplusplus/LookupContext.cpp | |
parent | 688d382ad947df8f4406d10846da0751839d61d1 (diff) | |
download | qt-creator-05f2fd666902e7246b7110187d4964644291e26f.tar.gz |
Renamed Symbol::scope() to Symbol::enclosingScope().
Diffstat (limited to 'src/libs/cplusplus/LookupContext.cpp')
-rw-r--r-- | src/libs/cplusplus/LookupContext.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp index e788c529d7..68522a74a0 100644 --- a/src/libs/cplusplus/LookupContext.cpp +++ b/src/libs/cplusplus/LookupContext.cpp @@ -68,7 +68,7 @@ static void path_helper(Symbol *symbol, QList<const Name *> *names) if (! symbol) return; - path_helper(symbol->scope(), names); + path_helper(symbol->enclosingScope(), names); if (symbol->name()) { if (symbol->isClass() || symbol->isNamespace()) { @@ -142,7 +142,7 @@ LookupContext &LookupContext::operator = (const LookupContext &other) QList<const Name *> LookupContext::fullyQualifiedName(Symbol *symbol) { - QList<const Name *> qualifiedName = path(symbol->scope()); + QList<const Name *> qualifiedName = path(symbol->enclosingScope()); addNames(symbol->name(), &qualifiedName, /*add all names*/ true); return qualifiedName; } @@ -256,7 +256,7 @@ QList<LookupItem> LookupContext::lookup(const Name *name, Scope *scope) const if (! name) return candidates; - for (; scope; scope = scope->scope()) { + for (; scope; scope = scope->enclosingScope()) { if ((name->isNameId() || name->isTemplateNameId()) && scope->isBlock()) { bindings()->lookupInScope(name, scope, &candidates, /*templateId = */ 0, /*binding=*/ 0); |