diff options
| author | Marco Bubke <marco.bubke@theqtcompany.com> | 2015-07-06 14:44:25 +0200 |
|---|---|---|
| committer | Marco Bubke <marco.bubke@theqtcompany.com> | 2015-07-06 14:28:55 +0000 |
| commit | 90500b0225bde1dfd33f4888314adaae28a8b267 (patch) | |
| tree | 347e4cf6d01202b5d2df9db3d01a65a16acd31c6 | |
| parent | 031ec4d824ca5cf10fec21baa3d33346eded3ca0 (diff) | |
Clang: Rename originalItem in codeCompletion
Actually it is quite slow anyway to cast the variant to the value.
Change-Id: Ied18208455adf9d7d5eb500e139170ced597dc1c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
| -rw-r--r-- | src/plugins/clangcodemodel/clangassistproposalitem.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/clangcodemodel/clangassistproposalitem.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/clangcodemodel/clangassistproposalitem.cpp b/src/plugins/clangcodemodel/clangassistproposalitem.cpp index 8c2ab1dc7a..697e5453bb 100644 --- a/src/plugins/clangcodemodel/clangassistproposalitem.cpp +++ b/src/plugins/clangcodemodel/clangassistproposalitem.cpp @@ -53,7 +53,7 @@ bool ClangAssistProposalItem::prematurelyApplies(const QChar &typedChar) const applies = (typedChar == QLatin1Char('/')) && text().endsWith(QLatin1Char('/')); else if (!isCodeCompletion()) applies = (typedChar == QLatin1Char('(')); /* && data().canConvert<CompleteFunctionDeclaration>()*/ //### - else if (originalItem().completionKind() == CodeCompletion::ObjCMessageCompletionKind) + else if (codeCompletion().completionKind() == CodeCompletion::ObjCMessageCompletionKind) applies = QString::fromLatin1(";.,").contains(typedChar); else applies = QString::fromLatin1(";.,:(").contains(typedChar); @@ -67,7 +67,7 @@ bool ClangAssistProposalItem::prematurelyApplies(const QChar &typedChar) const void ClangAssistProposalItem::applyContextualContent(TextEditor::TextEditorWidget *editorWidget, int basePosition) const { - const CodeCompletion ccr = originalItem(); + const CodeCompletion ccr = codeCompletion(); QString toInsert = text(); QString extraChars; @@ -206,7 +206,7 @@ void ClangAssistProposalItem::addOverload(const CodeCompletion &ccr) m_overloads.append(ccr); } -CodeCompletion ClangAssistProposalItem::originalItem() const +CodeCompletion ClangAssistProposalItem::codeCompletion() const { const QVariant &value = data(); if (value.canConvert<CodeCompletion>()) diff --git a/src/plugins/clangcodemodel/clangassistproposalitem.h b/src/plugins/clangcodemodel/clangassistproposalitem.h index 45cdd64652..b636f6d81b 100644 --- a/src/plugins/clangcodemodel/clangassistproposalitem.h +++ b/src/plugins/clangcodemodel/clangassistproposalitem.h @@ -52,7 +52,7 @@ public: bool isOverloaded() const; void addOverload(const ClangBackEnd::CodeCompletion &ccr); - ClangBackEnd::CodeCompletion originalItem() const; + ClangBackEnd::CodeCompletion codeCompletion() const; bool isCodeCompletion() const; private: |