feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Use Q_DECL_OVERRIDE instead of QTC_OVERRIDE

Browse Source 
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>
This commit is contained in:
Thomas Hartmann
2014-09-24 12:49:32 +02:00
parent 652c53bf06
commit 48f19e925b
100 changed files with 985 additions and 1100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/texteditor/codeassist/genericproposalwidget.h
View File

@@ -34,7 +34,6 @@
#include <texteditor/texteditor_global.h>
#include <utils/qtcoverride.h>
namespace TextEditor {
@@ -50,17 +49,17 @@ public:
GenericProposalWidget();
~GenericProposalWidget();
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;
private:
bool updateAndCheck(const QString &prefix);