From 031ec4d824ca5cf10fec21baa3d33346eded3ca0 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Mon, 6 Jul 2015 15:01:46 +0200 Subject: [PATCH] Clang: Rename ok in applies Change-Id: I6509582616755b0821a00d264e5be657803a6962 Reviewed-by: Nikolai Kosjar --- .../clangcodemodel/clangassistproposalitem.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/plugins/clangcodemodel/clangassistproposalitem.cpp b/src/plugins/clangcodemodel/clangassistproposalitem.cpp index 3bfff0bf980..8c2ab1dc7ad 100644 --- a/src/plugins/clangcodemodel/clangassistproposalitem.cpp +++ b/src/plugins/clangcodemodel/clangassistproposalitem.cpp @@ -45,23 +45,23 @@ namespace Internal { bool ClangAssistProposalItem::prematurelyApplies(const QChar &typedChar) const { - bool ok = false; + bool applies = false; if (m_completionOperator == T_SIGNAL || m_completionOperator == T_SLOT) - ok = QString::fromLatin1("(,").contains(typedChar); + applies = QString::fromLatin1("(,").contains(typedChar); else if (m_completionOperator == T_STRING_LITERAL || m_completionOperator == T_ANGLE_STRING_LITERAL) - ok = (typedChar == QLatin1Char('/')) && text().endsWith(QLatin1Char('/')); + applies = (typedChar == QLatin1Char('/')) && text().endsWith(QLatin1Char('/')); else if (!isCodeCompletion()) - ok = (typedChar == QLatin1Char('(')); /* && data().canConvert()*/ //### + applies = (typedChar == QLatin1Char('(')); /* && data().canConvert()*/ //### else if (originalItem().completionKind() == CodeCompletion::ObjCMessageCompletionKind) - ok = QString::fromLatin1(";.,").contains(typedChar); + applies = QString::fromLatin1(";.,").contains(typedChar); else - ok = QString::fromLatin1(";.,:(").contains(typedChar); + applies = QString::fromLatin1(";.,:(").contains(typedChar); - if (ok) + if (applies) m_typedChar = typedChar; - return ok; + return applies; } void ClangAssistProposalItem::applyContextualContent(TextEditor::TextEditorWidget *editorWidget,