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

5
src/libs/qmljs/qmljscodeformatter.h
View File

@@ -34,7 +34,6 @@
#include "qmljsscanner.h"
#include <utils/qtcoverride.h>
#include <QStack>
#include <QList>
#include <QVector>
@@ -324,8 +323,8 @@ public:
void setIndentSize(int size);
protected:
void onEnter(int newState, int *indentDepth, int *savedIndentDepth) const QTC_OVERRIDE;
void adjustIndent(const QList<QmlJS::Token> &tokens, int lexerState, int *indentDepth) const QTC_OVERRIDE;
void onEnter(int newState, int *indentDepth, int *savedIndentDepth) const Q_DECL_OVERRIDE;
void adjustIndent(const QList<QmlJS::Token> &tokens, int lexerState, int *indentDepth) const Q_DECL_OVERRIDE;
private:
int m_indentSize;