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

15
src/libs/qmljs/qmljsscopeastpath.h
View File

@@ -33,7 +33,6 @@
#include "qmljs_global.h"
#include "parser/qmljsastvisitor_p.h"
#include "qmljsdocument.h"
#include <utils/qtcoverride.h>
namespace QmlJS {
@@ -49,13 +48,13 @@ protected:
using Visitor::visit;
bool preVisit(AST::Node *node) QTC_OVERRIDE;
bool visit(AST::UiPublicMember *node) QTC_OVERRIDE;
bool visit(AST::UiScriptBinding *node) QTC_OVERRIDE;
bool visit(AST::UiObjectDefinition *node) QTC_OVERRIDE;
bool visit(AST::UiObjectBinding *node) QTC_OVERRIDE;
bool visit(AST::FunctionDeclaration *node) QTC_OVERRIDE;
bool visit(AST::FunctionExpression *node) QTC_OVERRIDE;
bool preVisit(AST::Node *node) Q_DECL_OVERRIDE;
bool visit(AST::UiPublicMember *node) Q_DECL_OVERRIDE;
bool visit(AST::UiScriptBinding *node) Q_DECL_OVERRIDE;
bool visit(AST::UiObjectDefinition *node) Q_DECL_OVERRIDE;
bool visit(AST::UiObjectBinding *node) Q_DECL_OVERRIDE;
bool visit(AST::FunctionDeclaration *node) Q_DECL_OVERRIDE;
bool visit(AST::FunctionExpression *node) Q_DECL_OVERRIDE;
private:
bool containsOffset(AST::SourceLocation start, AST::SourceLocation end);