diff --git a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp index 74444e0e793..e2e3accffe3 100644 --- a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp +++ b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp @@ -106,9 +106,9 @@ public: bool openInSplit) : GenericProposal(cursorPos, items) , m_openInSplit(openInSplit) - {} - - bool isFragile() const override { return true; } + { + setFragile(true); + } IAssistProposalWidget *createWidget() const override { return new VirtualFunctionProposalWidget(m_openInSplit); } diff --git a/src/plugins/texteditor/codeassist/functionhintproposal.cpp b/src/plugins/texteditor/codeassist/functionhintproposal.cpp index 5a2bb07cfd6..048ce8da569 100644 --- a/src/plugins/texteditor/codeassist/functionhintproposal.cpp +++ b/src/plugins/texteditor/codeassist/functionhintproposal.cpp @@ -32,16 +32,13 @@ using namespace TextEditor; FunctionHintProposal::FunctionHintProposal(int cursorPos, IFunctionHintProposalModel *model) : IAssistProposal(cursorPos) , m_model(model) -{} +{ + setFragile(true); +} FunctionHintProposal::~FunctionHintProposal() {} -bool FunctionHintProposal::isFragile() const -{ - return true; -} - IAssistProposalModel *FunctionHintProposal::model() const { return m_model; diff --git a/src/plugins/texteditor/codeassist/functionhintproposal.h b/src/plugins/texteditor/codeassist/functionhintproposal.h index fd73886b056..53746534541 100644 --- a/src/plugins/texteditor/codeassist/functionhintproposal.h +++ b/src/plugins/texteditor/codeassist/functionhintproposal.h @@ -38,7 +38,6 @@ public: FunctionHintProposal(int cursorPos, IFunctionHintProposalModel *model); ~FunctionHintProposal(); - bool isFragile() const override; IAssistProposalModel *model() const override; IAssistProposalWidget *createWidget() const override; diff --git a/src/plugins/texteditor/codeassist/genericproposal.cpp b/src/plugins/texteditor/codeassist/genericproposal.cpp index 5feac5810b8..33fb0c547f3 100644 --- a/src/plugins/texteditor/codeassist/genericproposal.cpp +++ b/src/plugins/texteditor/codeassist/genericproposal.cpp @@ -44,11 +44,6 @@ GenericProposal::GenericProposal(int cursorPos, const QList &items); ~GenericProposal(); - bool isFragile() const override; bool hasItemsToPropose(const QString &prefix, AssistReason reason) const override; IAssistProposalModel *model() const override; IAssistProposalWidget *createWidget() const override; diff --git a/src/plugins/texteditor/codeassist/iassistproposal.cpp b/src/plugins/texteditor/codeassist/iassistproposal.cpp index 2880235ac2a..fcbe2e83862 100644 --- a/src/plugins/texteditor/codeassist/iassistproposal.cpp +++ b/src/plugins/texteditor/codeassist/iassistproposal.cpp @@ -85,6 +85,11 @@ int IAssistProposal::basePosition() const return m_basePosition; } +bool IAssistProposal::isFragile() const +{ + return m_isFragile; +} + /*! \fn bool TextEditor::IAssistProposal::isCorrective() const @@ -110,6 +115,11 @@ void IAssistProposal::makeCorrection(TextEditorWidget *editorWidget) Q_UNUSED(editorWidget); } +void IAssistProposal::setFragile(bool fragile) +{ + m_isFragile = fragile; +} + /*! \fn IAssistModel *TextEditor::IAssistProposal::model() const diff --git a/src/plugins/texteditor/codeassist/iassistproposal.h b/src/plugins/texteditor/codeassist/iassistproposal.h index 732fe9a4689..4e93993dc26 100644 --- a/src/plugins/texteditor/codeassist/iassistproposal.h +++ b/src/plugins/texteditor/codeassist/iassistproposal.h @@ -42,15 +42,17 @@ public: virtual ~IAssistProposal(); int basePosition() const; + bool isFragile() const; virtual bool hasItemsToPropose(const QString &, AssistReason) const { return true; } - virtual bool isFragile() const = 0; virtual bool isCorrective(TextEditorWidget *editorWidget) const; virtual void makeCorrection(TextEditorWidget *editorWidget); virtual IAssistProposalModel *model() const = 0; virtual IAssistProposalWidget *createWidget() const = 0; + void setFragile(bool fragile); protected: int m_basePosition; + bool m_isFragile = false; }; } // TextEditor