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

23
src/libs/qmljs/qmljsbind.h
View File

@@ -32,7 +32,6 @@
#include <qmljs/parser/qmljsastvisitor_p.h>
#include <qmljs/qmljsvalueowner.h>
#include <utils/qtcoverride.h>
#include <QHash>
#include <QCoreApplication>
@@ -69,21 +68,21 @@ protected:
void accept(AST::Node *node);
bool visit(AST::UiProgram *ast) QTC_OVERRIDE;
bool visit(AST::Program *ast) QTC_OVERRIDE;
bool visit(AST::UiProgram *ast) Q_DECL_OVERRIDE;
bool visit(AST::Program *ast) Q_DECL_OVERRIDE;
// Ui
bool visit(AST::UiImport *ast) QTC_OVERRIDE;
bool visit(AST::UiPublicMember *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::UiImport *ast) Q_DECL_OVERRIDE;
bool visit(AST::UiPublicMember *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;
// QML/JS
bool visit(AST::FunctionDeclaration *ast) QTC_OVERRIDE;
bool visit(AST::FunctionExpression *ast) QTC_OVERRIDE;
bool visit(AST::VariableDeclaration *ast) QTC_OVERRIDE;
bool visit(AST::FunctionDeclaration *ast) Q_DECL_OVERRIDE;
bool visit(AST::FunctionExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::VariableDeclaration *ast) Q_DECL_OVERRIDE;
ObjectValue *switchObjectValue(ObjectValue *newObjectValue);
ObjectValue *bindObject(AST::UiQualifiedId *qualifiedTypeNameId, AST::UiObjectInitializer *initializer);