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

69
src/libs/qmljs/qmljscheck.h
View File

@@ -34,7 +34,6 @@
#include <qmljs/qmljsscopechain.h>
#include <qmljs/qmljsstaticanalysismessage.h>
#include <qmljs/parser/qmljsastvisitor_p.h>
#include <utils/qtcoverride.h>
#include <QCoreApplication>
#include <QSet>
@@ -61,43 +60,43 @@ public:
void disableMessage(StaticAnalysis::Type type);
protected:
bool preVisit(AST::Node *ast) QTC_OVERRIDE;
void postVisit(AST::Node *ast) QTC_OVERRIDE;
bool preVisit(AST::Node *ast) Q_DECL_OVERRIDE;
void postVisit(AST::Node *ast) Q_DECL_OVERRIDE;
bool visit(AST::UiProgram *ast) QTC_OVERRIDE;
bool visit(AST::UiObjectDefinition *ast) QTC_OVERRIDE;
bool visit(AST::UiObjectBinding *ast) QTC_OVERRIDE;
bool visit(AST::UiScriptBinding *ast) QTC_OVERRIDE;
bool visit(AST::UiArrayBinding *ast) QTC_OVERRIDE;
bool visit(AST::UiPublicMember *ast) QTC_OVERRIDE;
bool visit(AST::IdentifierExpression *ast) QTC_OVERRIDE;
bool visit(AST::FieldMemberExpression *ast) QTC_OVERRIDE;
bool visit(AST::FunctionDeclaration *ast) QTC_OVERRIDE;
bool visit(AST::FunctionExpression *ast) QTC_OVERRIDE;
bool visit(AST::UiObjectInitializer *) QTC_OVERRIDE;
bool visit(AST::UiProgram *ast) Q_DECL_OVERRIDE;
bool visit(AST::UiObjectDefinition *ast) Q_DECL_OVERRIDE;
bool visit(AST::UiObjectBinding *ast) Q_DECL_OVERRIDE;
bool visit(AST::UiScriptBinding *ast) Q_DECL_OVERRIDE;
bool visit(AST::UiArrayBinding *ast) Q_DECL_OVERRIDE;
bool visit(AST::UiPublicMember *ast) Q_DECL_OVERRIDE;
bool visit(AST::IdentifierExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::FieldMemberExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::FunctionDeclaration *ast) Q_DECL_OVERRIDE;
bool visit(AST::FunctionExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::UiObjectInitializer *) Q_DECL_OVERRIDE;
bool visit(AST::BinaryExpression *ast) QTC_OVERRIDE;
bool visit(AST::Block *ast) QTC_OVERRIDE;
bool visit(AST::WithStatement *ast) QTC_OVERRIDE;
bool visit(AST::VoidExpression *ast) QTC_OVERRIDE;
bool visit(AST::Expression *ast) QTC_OVERRIDE;
bool visit(AST::ExpressionStatement *ast) QTC_OVERRIDE;
bool visit(AST::IfStatement *ast) QTC_OVERRIDE;
bool visit(AST::ForStatement *ast) QTC_OVERRIDE;
bool visit(AST::LocalForStatement *ast) QTC_OVERRIDE;
bool visit(AST::WhileStatement *ast) QTC_OVERRIDE;
bool visit(AST::DoWhileStatement *ast) QTC_OVERRIDE;
bool visit(AST::CaseBlock *ast) QTC_OVERRIDE;
bool visit(AST::NewExpression *ast) QTC_OVERRIDE;
bool visit(AST::NewMemberExpression *ast) QTC_OVERRIDE;
bool visit(AST::CallExpression *ast) QTC_OVERRIDE;
bool visit(AST::StatementList *ast) QTC_OVERRIDE;
bool visit(AST::ReturnStatement *ast) QTC_OVERRIDE;
bool visit(AST::ThrowStatement *ast) QTC_OVERRIDE;
bool visit(AST::DeleteExpression *ast) QTC_OVERRIDE;
bool visit(AST::TypeOfExpression *ast) QTC_OVERRIDE;
bool visit(AST::BinaryExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::Block *ast) Q_DECL_OVERRIDE;
bool visit(AST::WithStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::VoidExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::Expression *ast) Q_DECL_OVERRIDE;
bool visit(AST::ExpressionStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::IfStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::ForStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::LocalForStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::WhileStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::DoWhileStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::CaseBlock *ast) Q_DECL_OVERRIDE;
bool visit(AST::NewExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::NewMemberExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::CallExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::StatementList *ast) Q_DECL_OVERRIDE;
bool visit(AST::ReturnStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::ThrowStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::DeleteExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::TypeOfExpression *ast) Q_DECL_OVERRIDE;
void endVisit(QmlJS::AST::UiObjectInitializer *) QTC_OVERRIDE;
void endVisit(QmlJS::AST::UiObjectInitializer *) Q_DECL_OVERRIDE;
private:
void visitQmlObject(AST::Node *ast, AST::UiQualifiedId *typeId,