diff options
| author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2014-09-24 12:49:32 +0200 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2014-09-25 12:16:47 +0200 |
| commit | 48f19e925b9af6fb0b22c8bd6c34a4778fe280a8 (patch) | |
| tree | b929e23cd0487100fa7f21234400b616231e4143 /src/plugins/texteditor/codeassist/functionhintproposal.h | |
| parent | 652c53bf06826bc347d5384b3da01c8a083b2118 (diff) | |
| download | qt-creator-48f19e925b9af6fb0b22c8bd6c34a4778fe280a8.tar.gz | |
Use Q_DECL_OVERRIDE instead of QTC_OVERRIDE
This patch removes src/libs/utils/qtcoverride.h
and uses Q_DECL_OVERRIDE from Qt 5 instead.
Change-Id: I61ffa539648ffe996dc061eec7708c04580c0f09
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Diffstat (limited to 'src/plugins/texteditor/codeassist/functionhintproposal.h')
| -rw-r--r-- | src/plugins/texteditor/codeassist/functionhintproposal.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/plugins/texteditor/codeassist/functionhintproposal.h b/src/plugins/texteditor/codeassist/functionhintproposal.h index 1089b71f51..b83f753a73 100644 --- a/src/plugins/texteditor/codeassist/functionhintproposal.h +++ b/src/plugins/texteditor/codeassist/functionhintproposal.h @@ -32,7 +32,6 @@ #include "iassistproposal.h" -#include <utils/qtcoverride.h> namespace TextEditor { @@ -44,12 +43,12 @@ public: FunctionHintProposal(int cursorPos, IFunctionHintProposalModel *model); ~FunctionHintProposal(); - bool isFragile() const QTC_OVERRIDE; - int basePosition() const QTC_OVERRIDE; - bool isCorrective() const QTC_OVERRIDE; - void makeCorrection(BaseTextEditorWidget *editorWidget) QTC_OVERRIDE; - IAssistProposalModel *model() const QTC_OVERRIDE; - IAssistProposalWidget *createWidget() const QTC_OVERRIDE; + bool isFragile() const Q_DECL_OVERRIDE; + int basePosition() const Q_DECL_OVERRIDE; + bool isCorrective() const Q_DECL_OVERRIDE; + void makeCorrection(BaseTextEditorWidget *editorWidget) Q_DECL_OVERRIDE; + IAssistProposalModel *model() const Q_DECL_OVERRIDE; + IAssistProposalWidget *createWidget() const Q_DECL_OVERRIDE; private: int m_basePosition; |