From 55c69ffea48a1f81c1310efc4e6b58b4f72b078a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Tue, 19 May 2009 12:15:59 +0200
Subject: [PATCH] Do not expand the list of candidates when resolving fully
qualified ids
Still too unstable after all.
This reverts commit 6f3c9f7002f094bfe8212cf398f2de12e51d97bf.
---
src/libs/cplusplus/LookupContext.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp
index f77d9a0f3de..f5a0edd66bc 100644
--- a/src/libs/cplusplus/LookupContext.cpp
+++ b/src/libs/cplusplus/LookupContext.cpp
@@ -176,7 +176,7 @@ QList<Symbol *> LookupContext::resolve(Name *name, const QList<Scope *> &visible
scopes.clear();
foreach (Symbol *candidate, candidates) {
if (ScopedSymbol *scoped = candidate->asScopedSymbol()) {
- expand(scoped->members(), visibleScopes, &scopes);
+ scopes.append(scoped->members());
}
}
}
--
GitLab