CodeAssist: The correction is just used inside C++ proposal.

Adding an empty default implementation to the base and
Removing boilerplate code from the specialized classes.

Change-Id: I4469d9f05d2ff153c0867c10683f86b4f656fd3d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2016-03-14 13:36:56 +01:00
parent 6e4a719738
commit ac2005b4e8
6 changed files with 12 additions and 22 deletions

View File

@@ -42,14 +42,6 @@ bool FunctionHintProposal::isFragile() const
return true; return true;
} }
bool FunctionHintProposal::isCorrective() const
{
return false;
}
void FunctionHintProposal::makeCorrection(TextEditorWidget *)
{}
IAssistProposalModel *FunctionHintProposal::model() const IAssistProposalModel *FunctionHintProposal::model() const
{ {
return m_model; return m_model;

View File

@@ -39,8 +39,6 @@ public:
~FunctionHintProposal(); ~FunctionHintProposal();
bool isFragile() const override; bool isFragile() const override;
bool isCorrective() const override;
void makeCorrection(TextEditorWidget *editorWidget) override;
IAssistProposalModel *model() const override; IAssistProposalModel *model() const override;
IAssistProposalWidget *createWidget() const override; IAssistProposalWidget *createWidget() const override;

View File

@@ -49,14 +49,6 @@ bool GenericProposal::isFragile() const
return false; return false;
} }
bool GenericProposal::isCorrective() const
{
return false;
}
void GenericProposal::makeCorrection(TextEditorWidget *)
{}
IAssistProposalModel *GenericProposal::model() const IAssistProposalModel *GenericProposal::model() const
{ {
return m_model; return m_model;

View File

@@ -41,8 +41,6 @@ public:
~GenericProposal(); ~GenericProposal();
bool isFragile() const override; bool isFragile() const override;
bool isCorrective() const override;
void makeCorrection(TextEditorWidget *editorWidget) override;
IAssistProposalModel *model() const override; IAssistProposalModel *model() const override;
IAssistProposalWidget *createWidget() const override; IAssistProposalWidget *createWidget() const override;

View File

@@ -93,12 +93,22 @@ int IAssistProposal::basePosition() const
is displayed. is displayed.
*/ */
bool IAssistProposal::isCorrective() const
{
return false;
}
/*! /*!
\fn void TextEditor::IAssistProposal::makeCorrection(BaseTextEditor *editor) \fn void TextEditor::IAssistProposal::makeCorrection(BaseTextEditor *editor)
This allows a correction to be made in the case this is a corrective proposal. This allows a correction to be made in the case this is a corrective proposal.
*/ */
void IAssistProposal::makeCorrection(TextEditorWidget *editorWidget)
{
Q_UNUSED(editorWidget);
}
/*! /*!
\fn IAssistModel *TextEditor::IAssistProposal::model() const \fn IAssistModel *TextEditor::IAssistProposal::model() const

View File

@@ -41,8 +41,8 @@ public:
int basePosition() const; int basePosition() const;
virtual bool isFragile() const = 0; virtual bool isFragile() const = 0;
virtual bool isCorrective() const = 0; virtual bool isCorrective() const;
virtual void makeCorrection(TextEditorWidget *editorWidget) = 0; virtual void makeCorrection(TextEditorWidget *editorWidget);
virtual IAssistProposalModel *model() const = 0; virtual IAssistProposalModel *model() const = 0;
virtual IAssistProposalWidget *createWidget() const = 0; virtual IAssistProposalWidget *createWidget() const = 0;