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

19
src/libs/qmljs/jsoncheck.h
View File

@@ -37,7 +37,6 @@
#include <qmljs/qmljsstaticanalysismessage.h>
#include <utils/json.h>
#include <utils/qtcoverride.h>
#include <QStack>
#include <QList>
@@ -54,16 +53,16 @@ public:
QList<StaticAnalysis::Message> operator()(Utils::JsonSchema *schema);
private:
bool preVisit(AST::Node *) QTC_OVERRIDE;
void postVisit(AST::Node *) QTC_OVERRIDE;
bool preVisit(AST::Node *) Q_DECL_OVERRIDE;
void postVisit(AST::Node *) Q_DECL_OVERRIDE;
bool visit(AST::ObjectLiteral *ast) QTC_OVERRIDE;
bool visit(AST::ArrayLiteral *ast) QTC_OVERRIDE;
bool visit(AST::NullExpression *ast) QTC_OVERRIDE;
bool visit(AST::TrueLiteral *ast) QTC_OVERRIDE;
bool visit(AST::FalseLiteral *ast) QTC_OVERRIDE;
bool visit(AST::NumericLiteral *ast) QTC_OVERRIDE;
bool visit(AST::StringLiteral *ast) QTC_OVERRIDE;
bool visit(AST::ObjectLiteral *ast) Q_DECL_OVERRIDE;
bool visit(AST::ArrayLiteral *ast) Q_DECL_OVERRIDE;
bool visit(AST::NullExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::TrueLiteral *ast) Q_DECL_OVERRIDE;
bool visit(AST::FalseLiteral *ast) Q_DECL_OVERRIDE;
bool visit(AST::NumericLiteral *ast) Q_DECL_OVERRIDE;
bool visit(AST::StringLiteral *ast) Q_DECL_OVERRIDE;
struct AnalysisData
{