diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2010-05-25 15:55:12 +0200 |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2010-05-25 17:15:23 +0200 |
| commit | 405353ab2344dec850b410ed48fff66790f4db0e (patch) | |
| tree | 26f2d50aa228a893d4cb8fdd164c8af89d8a7185 /src/libs/cplusplus/LookupContext.cpp | |
| parent | b68a16f1b5d69d63e7adaa67810b99c73bcfb979 (diff) | |
| download | qt-creator-405353ab2344dec850b410ed48fff66790f4db0e.tar.gz | |
Removed the CppBindings.
Diffstat (limited to 'src/libs/cplusplus/LookupContext.cpp')
| -rw-r--r-- | src/libs/cplusplus/LookupContext.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp index ed61e1f8da..4aada73f93 100644 --- a/src/libs/cplusplus/LookupContext.cpp +++ b/src/libs/cplusplus/LookupContext.cpp @@ -30,7 +30,6 @@ #include "LookupContext.h" #include "ResolveExpression.h" #include "Overview.h" -#include "CppBindings.h" #include "DeprecatedGenTemplateInstance.h" #include <CoreTypes.h> @@ -186,10 +185,8 @@ QList<Symbol *> LookupContext::lookup(const Name *name, Scope *scope) const if (! name) return candidates; - const Identifier *id = name->identifier(); - for (; scope; scope = scope->enclosingScope()) { - if (id && scope->isBlockScope()) { + if ((name->isNameId() || name->isTemplateNameId()) && scope->isBlockScope()) { bindings()->lookupInScope(name, scope, &candidates, /*templateId = */ 0); if (! candidates.isEmpty()) |