From f53598a1aecd59d3a369eba96606093e6e0763fd Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Sun, 22 Dec 2013 08:15:01 +0200
Subject: [PATCH] CppTools: Braces cleanup in CppCompletionAssistant
Change-Id: I3dea8a8bdd4ae71b48926ec3332ef00cf5ad4303
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
---
src/plugins/cpptools/cppcompletionassist.cpp | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/plugins/cpptools/cppcompletionassist.cpp b/src/plugins/cpptools/cppcompletionassist.cpp
index 65194274882..7d80a73c16e 100644
--- a/src/plugins/cpptools/cppcompletionassist.cpp
+++ b/src/plugins/cpptools/cppcompletionassist.cpp
@@ -1362,17 +1362,14 @@ void CppCompletionAssistProcessor::globalCompletion(CPlusPlus::Scope *currentSco
for (Scope *scope = currentScope; scope; scope = scope->enclosingScope()) {
if (scope->isBlock()) {
- for (unsigned i = 0; i < scope->memberCount(); ++i) {
+ for (unsigned i = 0; i < scope->memberCount(); ++i)
addCompletionItem(scope->memberAt(i), FunctionLocalsOrder);
- }
} else if (Function *fun = scope->asFunction()) {
- for (unsigned i = 0, argc = fun->argumentCount(); i < argc; ++i) {
+ for (unsigned i = 0, argc = fun->argumentCount(); i < argc; ++i)
addCompletionItem(fun->argumentAt(i), FunctionArgumentsOrder);
- }
} else if (Template *templ = scope->asTemplate()) {
- for (unsigned i = 0, argc = templ->templateParameterCount(); i < argc; ++i) {
+ for (unsigned i = 0, argc = templ->templateParameterCount(); i < argc; ++i)
addCompletionItem(templ->templateParameterAt(i), FunctionArgumentsOrder);
- }
break;
}
}
@@ -1511,9 +1508,8 @@ void CppCompletionAssistProcessor::completeNamespace(CPlusPlus::ClassOrNamespace
scopesToVisit.append(scope);
}
- foreach (Enum *e, binding->unscopedEnums()) {
+ foreach (Enum *e, binding->unscopedEnums())
scopesToVisit.append(e);
- }
while (!scopesToVisit.isEmpty()) {
Scope *scope = scopesToVisit.takeFirst();
@@ -1727,9 +1723,8 @@ void CppCompletionAssistProcessor::addMacros_helper(const CPlusPlus::Snapshot &s
processed->insert(doc->fileName());
- foreach (const Document::Include &i, doc->resolvedIncludes()) {
+ foreach (const Document::Include &i, doc->resolvedIncludes())
addMacros_helper(snapshot, i.resolvedFileName(), processed, definedMacros);
- }
foreach (const Macro ¯o, doc->definedMacros()) {
const QString macroName = QString::fromUtf8(macro.name().constData(), macro.name().length());
--
GitLab