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

13
src/plugins/texteditor/codeassist/genericproposal.h
View File

@@ -32,7 +32,6 @@
#include "iassistproposal.h"
#include <utils/qtcoverride.h>
namespace TextEditor {
@@ -46,12 +45,12 @@ public:
GenericProposal(int cursorPos, const QList<AssistProposalItem *> &items);
~GenericProposal();
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;
protected:
void moveBasePosition(int length);