From f02a852f21713f743528d8ba4aa82a85a21c968a Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Fri, 7 Jan 2011 09:22:54 +0100
Subject: [PATCH] C++ completion: Skip Q_PROPERTY and Q_ENUMS symbols.
Reviewed-by: Erik Verbruggen
---
src/plugins/cpptools/cppcodecompletion.cpp | 9 ++++++---
src/shared/cplusplus/Symbol.cpp | 6 ++++++
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index c777141dd81..6923a24471f 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/src/plugins/cpptools/cppcodecompletion.cpp
@@ -1675,12 +1675,15 @@ void CppCodeCompletion::completeClass(ClassOrNamespace *b, bool staticLookup)
for (Scope::iterator it = scope->firstMember(); it != scope->lastMember(); ++it) {
Symbol *member = *it;
- if (member->isFriend())
+ if (member->isFriend()
+ || member->isQtPropertyDeclaration()
+ || member->isQtEnum()) {
continue;
- else if (! staticLookup && (member->isTypedef() ||
+ } else if (! staticLookup && (member->isTypedef() ||
member->isEnum() ||
- member->isClass()))
+ member->isClass())) {
continue;
+ }
addCompletionItem(member);
}
diff --git a/src/shared/cplusplus/Symbol.cpp b/src/shared/cplusplus/Symbol.cpp
index 285a9185bb0..7a8cbcdc100 100644
--- a/src/shared/cplusplus/Symbol.cpp
+++ b/src/shared/cplusplus/Symbol.cpp
@@ -373,6 +373,12 @@ bool Symbol::isClass() const
bool Symbol::isForwardClassDeclaration() const
{ return asForwardClassDeclaration() != 0; }
+bool Symbol::isQtPropertyDeclaration() const
+{ return asQtPropertyDeclaration() != 0; }
+
+bool Symbol::isQtEnum() const
+{ return asQtEnum() != 0; }
+
bool Symbol::isBlock() const
{ return asBlock() != 0; }
--
GitLab