From ffa66f4fb5a33747ce8460e428a33d3c31ab626b Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Wed, 2 Jun 2010 13:59:01 +0200
Subject: [PATCH] Fixed the global completion to include the injected class
name and user types.
---
src/plugins/cpptools/cppcodecompletion.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index 997707edf71..635bf9e7b01 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/src/plugins/cpptools/cppcodecompletion.cpp
@@ -941,7 +941,7 @@ void CppCodeCompletion::globalCompletion(Scope *currentScope)
if (symbols.first()->isNamespace())
completeNamespace(currentBinding);
else
- completeClass(currentBinding, false);
+ completeClass(currentBinding);
}
}
@@ -1440,6 +1440,8 @@ void CppCodeCompletion::completeClass(ClassOrNamespace *b, bool staticLookup)
scopesVisited.insert(scope);
+ addCompletionItem(scope->owner()); // add a completion item for the injected class name.
+
for (Scope::iterator it = scope->firstSymbol(); it != scope->lastSymbol(); ++it) {
Symbol *member = *it;
if (member->isFriend())
--
GitLab