diff options
author | Marco Bubke <[email protected]> | 2015-06-17 17:15:06 +0200 |
---|---|---|
committer | Marco Bubke <[email protected]> | 2015-07-06 12:41:05 +0000 |
commit | 5467fc25ea9ceeff087b16307b0eda5846d8583e (patch) | |
tree | 8f5be0b2343c827db63a1d407de811f454354ea5 | |
parent | ed27414f48836b991ac2834e10ff52e673c0395c (diff) |
Clang: Make ClangAssistProposalModel members private
Change-Id: Ib8089f4afdb72840d97e5286d8be631387e4d2c5
Reviewed-by: Nikolai Kosjar <[email protected]>
-rw-r--r-- | src/plugins/clangcodemodel/clangassistproposal.cpp | 3 | ||||
-rw-r--r-- | src/plugins/clangcodemodel/clangassistproposalmodel.cpp | 7 | ||||
-rw-r--r-- | src/plugins/clangcodemodel/clangassistproposalmodel.h | 3 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/plugins/clangcodemodel/clangassistproposal.cpp b/src/plugins/clangcodemodel/clangassistproposal.cpp index 2df9aa84f30..4bb34a97c1d 100644 --- a/src/plugins/clangcodemodel/clangassistproposal.cpp +++ b/src/plugins/clangcodemodel/clangassistproposal.cpp @@ -37,13 +37,12 @@ namespace Internal { ClangAssistProposal::ClangAssistProposal(int cursorPos, TextEditor::GenericProposalModel *model) : GenericProposal(cursorPos, model) - , m_replaceDotForArrow(static_cast<ClangAssistProposalModel *>(model)->m_replaceDotForArrow) { } bool ClangAssistProposal::isCorrective() const { - return m_replaceDotForArrow; + return ClangAssistProposalModel::replaceDotForArrow(model()); } void ClangAssistProposal::makeCorrection(TextEditor::TextEditorWidget *editorWidget) diff --git a/src/plugins/clangcodemodel/clangassistproposalmodel.cpp b/src/plugins/clangcodemodel/clangassistproposalmodel.cpp index 90a2e76d2b1..df25309818c 100644 --- a/src/plugins/clangcodemodel/clangassistproposalmodel.cpp +++ b/src/plugins/clangcodemodel/clangassistproposalmodel.cpp @@ -44,6 +44,13 @@ const ClangAssistProposalItem &toClangAssistProposalItem(TextEditor::AssistPropo } +bool ClangAssistProposalModel::replaceDotForArrow(TextEditor::IAssistProposalModel *model) +{ + auto clangAssistProposalModel = static_cast<ClangAssistProposalModel*>(model); + + return clangAssistProposalModel->m_replaceDotForArrow; +} + bool ClangAssistProposalModel::isSortable(const QString &/*prefix*/) const { return true; diff --git a/src/plugins/clangcodemodel/clangassistproposalmodel.h b/src/plugins/clangcodemodel/clangassistproposalmodel.h index 8cab0dfaa89..a7bd21c3598 100644 --- a/src/plugins/clangcodemodel/clangassistproposalmodel.h +++ b/src/plugins/clangcodemodel/clangassistproposalmodel.h @@ -49,6 +49,9 @@ public: bool isSortable(const QString &prefix) const override; + static bool replaceDotForArrow(IAssistProposalModel *model); + +private: bool m_sortable; unsigned m_completionOperator; bool m_replaceDotForArrow; |