Commit f53598a1 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh
Browse files

CppTools: Braces cleanup in CppCompletionAssistant



Change-Id: I3dea8a8bdd4ae71b48926ec3332ef00cf5ad4303
Reviewed-by: default avatarNikolai Kosjar <nikolai.kosjar@digia.com>
parent be31d8d0
...@@ -1362,17 +1362,14 @@ void CppCompletionAssistProcessor::globalCompletion(CPlusPlus::Scope *currentSco ...@@ -1362,17 +1362,14 @@ void CppCompletionAssistProcessor::globalCompletion(CPlusPlus::Scope *currentSco
for (Scope *scope = currentScope; scope; scope = scope->enclosingScope()) { for (Scope *scope = currentScope; scope; scope = scope->enclosingScope()) {
if (scope->isBlock()) { if (scope->isBlock()) {
for (unsigned i = 0; i < scope->memberCount(); ++i) { for (unsigned i = 0; i < scope->memberCount(); ++i)
addCompletionItem(scope->memberAt(i), FunctionLocalsOrder); addCompletionItem(scope->memberAt(i), FunctionLocalsOrder);
}
} else if (Function *fun = scope->asFunction()) { } 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); addCompletionItem(fun->argumentAt(i), FunctionArgumentsOrder);
}
} else if (Template *templ = scope->asTemplate()) { } 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); addCompletionItem(templ->templateParameterAt(i), FunctionArgumentsOrder);
}
break; break;
} }
} }
...@@ -1511,9 +1508,8 @@ void CppCompletionAssistProcessor::completeNamespace(CPlusPlus::ClassOrNamespace ...@@ -1511,9 +1508,8 @@ void CppCompletionAssistProcessor::completeNamespace(CPlusPlus::ClassOrNamespace
scopesToVisit.append(scope); scopesToVisit.append(scope);
} }
foreach (Enum *e, binding->unscopedEnums()) { foreach (Enum *e, binding->unscopedEnums())
scopesToVisit.append(e); scopesToVisit.append(e);
}
while (!scopesToVisit.isEmpty()) { while (!scopesToVisit.isEmpty()) {
Scope *scope = scopesToVisit.takeFirst(); Scope *scope = scopesToVisit.takeFirst();
...@@ -1727,9 +1723,8 @@ void CppCompletionAssistProcessor::addMacros_helper(const CPlusPlus::Snapshot &s ...@@ -1727,9 +1723,8 @@ void CppCompletionAssistProcessor::addMacros_helper(const CPlusPlus::Snapshot &s
processed->insert(doc->fileName()); 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); addMacros_helper(snapshot, i.resolvedFileName(), processed, definedMacros);
}
foreach (const Macro &macro, doc->definedMacros()) { foreach (const Macro &macro, doc->definedMacros()) {
const QString macroName = QString::fromUtf8(macro.name().constData(), macro.name().length()); const QString macroName = QString::fromUtf8(macro.name().constData(), macro.name().length());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment