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/functionhintproposalwidget.h | |
parent | 652c53bf06826bc347d5384b3da01c8a083b2118 (diff) |
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/functionhintproposalwidget.h')
-rw-r--r-- | src/plugins/texteditor/codeassist/functionhintproposalwidget.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/plugins/texteditor/codeassist/functionhintproposalwidget.h b/src/plugins/texteditor/codeassist/functionhintproposalwidget.h index de8b1b1120..d4122752e2 100644 --- a/src/plugins/texteditor/codeassist/functionhintproposalwidget.h +++ b/src/plugins/texteditor/codeassist/functionhintproposalwidget.h @@ -32,7 +32,6 @@ #include "iassistproposalwidget.h" -#include <utils/qtcoverride.h> namespace TextEditor { @@ -46,20 +45,20 @@ public: FunctionHintProposalWidget(); ~FunctionHintProposalWidget(); - void setAssistant(CodeAssistant *assistant) QTC_OVERRIDE; - void setReason(AssistReason reason) QTC_OVERRIDE; - void setKind(AssistKind kind) QTC_OVERRIDE; - void setUnderlyingWidget(const QWidget *underlyingWidget) QTC_OVERRIDE; - void setModel(IAssistProposalModel *model) QTC_OVERRIDE; - void setDisplayRect(const QRect &rect) QTC_OVERRIDE; - void setIsSynchronized(bool isSync) QTC_OVERRIDE; + void setAssistant(CodeAssistant *assistant) Q_DECL_OVERRIDE; + void setReason(AssistReason reason) Q_DECL_OVERRIDE; + void setKind(AssistKind kind) Q_DECL_OVERRIDE; + void setUnderlyingWidget(const QWidget *underlyingWidget) Q_DECL_OVERRIDE; + void setModel(IAssistProposalModel *model) Q_DECL_OVERRIDE; + void setDisplayRect(const QRect &rect) Q_DECL_OVERRIDE; + void setIsSynchronized(bool isSync) Q_DECL_OVERRIDE; - void showProposal(const QString &prefix) QTC_OVERRIDE; - void updateProposal(const QString &prefix) QTC_OVERRIDE; - void closeProposal() QTC_OVERRIDE; + void showProposal(const QString &prefix) Q_DECL_OVERRIDE; + void updateProposal(const QString &prefix) Q_DECL_OVERRIDE; + void closeProposal() Q_DECL_OVERRIDE; protected: - bool eventFilter(QObject *o, QEvent *e) QTC_OVERRIDE; + bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE; private slots: void nextPage(); |