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
{

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);

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,

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;

10
src/libs/qmljs/qmljsdescribevalue.cpp
View File

@@ -187,7 +187,7 @@ public:
return true;
}
bool processProperty(const QString &name, const Value *value, const PropertyInfo &pInfo) QTC_OVERRIDE
bool processProperty(const QString &name, const Value *value, const PropertyInfo &pInfo) Q_DECL_OVERRIDE
{
d.dumpNewline();
d.dump(name);
@@ -200,19 +200,19 @@ public:
d.closeContext("");
return true;
}
bool processEnumerator(const QString &name, const Value *value) QTC_OVERRIDE
bool processEnumerator(const QString &name, const Value *value) Q_DECL_OVERRIDE
{
return dump(name, value);
}
bool processSignal(const QString &name, const Value *value) QTC_OVERRIDE
bool processSignal(const QString &name, const Value *value) Q_DECL_OVERRIDE
{
return dump(name, value);
}
bool processSlot(const QString &name, const Value *value) QTC_OVERRIDE
bool processSlot(const QString &name, const Value *value) Q_DECL_OVERRIDE
{
return dump(name, value);
}
bool processGeneratedSlot(const QString &name, const Value *value) QTC_OVERRIDE
bool processGeneratedSlot(const QString &name, const Value *value) Q_DECL_OVERRIDE
{
return dump(name, value);
}

22
src/libs/qmljs/qmljsdescribevalue.h
View File

@@ -48,17 +48,17 @@ public:
virtual ~DescribeValueVisitor();
QString operator()(const Value *value);
void visit(const NullValue *) QTC_OVERRIDE;
void visit(const UndefinedValue *) QTC_OVERRIDE;
void visit(const UnknownValue *) QTC_OVERRIDE;
void visit(const NumberValue *) QTC_OVERRIDE;
void visit(const BooleanValue *) QTC_OVERRIDE;
void visit(const StringValue *) QTC_OVERRIDE;
void visit(const ObjectValue *) QTC_OVERRIDE;
void visit(const FunctionValue *) QTC_OVERRIDE;
void visit(const Reference *) QTC_OVERRIDE;
void visit(const ColorValue *) QTC_OVERRIDE;
void visit(const AnchorLineValue *) QTC_OVERRIDE;
void visit(const NullValue *) Q_DECL_OVERRIDE;
void visit(const UndefinedValue *) Q_DECL_OVERRIDE;
void visit(const UnknownValue *) Q_DECL_OVERRIDE;
void visit(const NumberValue *) Q_DECL_OVERRIDE;
void visit(const BooleanValue *) Q_DECL_OVERRIDE;
void visit(const StringValue *) Q_DECL_OVERRIDE;
void visit(const ObjectValue *) Q_DECL_OVERRIDE;
void visit(const FunctionValue *) Q_DECL_OVERRIDE;
void visit(const Reference *) Q_DECL_OVERRIDE;
void visit(const ColorValue *) Q_DECL_OVERRIDE;
void visit(const AnchorLineValue *) Q_DECL_OVERRIDE;
QString description() const;
void basicDump(const char *baseName, const Value *value, bool opensContext);
void dumpNewline();

183
src/libs/qmljs/qmljsevaluate.h
View File

@@ -34,7 +34,6 @@
#include "qmljsdocument.h"
#include "qmljsscopechain.h"
#include <utils/qtcoverride.h>
namespace QmlJS {
@@ -65,99 +64,99 @@ protected:
const Value *switchResult(const Value *result);
// Ui
bool visit(AST::UiProgram *ast) QTC_OVERRIDE;
bool visit(AST::UiHeaderItemList *ast) QTC_OVERRIDE;
bool visit(AST::UiQualifiedPragmaId *ast) QTC_OVERRIDE;
bool visit(AST::UiPragma *ast) QTC_OVERRIDE;
bool visit(AST::UiImport *ast) QTC_OVERRIDE;
bool visit(AST::UiPublicMember *ast) QTC_OVERRIDE;
bool visit(AST::UiSourceElement *ast) QTC_OVERRIDE;
bool visit(AST::UiObjectDefinition *ast) QTC_OVERRIDE;
bool visit(AST::UiObjectInitializer *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::UiObjectMemberList *ast) QTC_OVERRIDE;
bool visit(AST::UiArrayMemberList *ast) QTC_OVERRIDE;
bool visit(AST::UiQualifiedId *ast) QTC_OVERRIDE;
bool visit(AST::UiProgram *ast) Q_DECL_OVERRIDE;
bool visit(AST::UiHeaderItemList *ast) Q_DECL_OVERRIDE;
bool visit(AST::UiQualifiedPragmaId *ast) Q_DECL_OVERRIDE;
bool visit(AST::UiPragma *ast) Q_DECL_OVERRIDE;
bool visit(AST::UiImport *ast) Q_DECL_OVERRIDE;
bool visit(AST::UiPublicMember *ast) Q_DECL_OVERRIDE;
bool visit(AST::UiSourceElement *ast) Q_DECL_OVERRIDE;
bool visit(AST::UiObjectDefinition *ast) Q_DECL_OVERRIDE;
bool visit(AST::UiObjectInitializer *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::UiObjectMemberList *ast) Q_DECL_OVERRIDE;
bool visit(AST::UiArrayMemberList *ast) Q_DECL_OVERRIDE;
bool visit(AST::UiQualifiedId *ast) Q_DECL_OVERRIDE;
// QmlJS
bool visit(AST::ThisExpression *ast) QTC_OVERRIDE;
bool visit(AST::IdentifierExpression *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::StringLiteral *ast) QTC_OVERRIDE;
bool visit(AST::NumericLiteral *ast) QTC_OVERRIDE;
bool visit(AST::RegExpLiteral *ast) QTC_OVERRIDE;
bool visit(AST::ArrayLiteral *ast) QTC_OVERRIDE;
bool visit(AST::ObjectLiteral *ast) QTC_OVERRIDE;
bool visit(AST::ElementList *ast) QTC_OVERRIDE;
bool visit(AST::Elision *ast) QTC_OVERRIDE;
bool visit(AST::PropertyAssignmentList *ast) QTC_OVERRIDE;
bool visit(AST::PropertyGetterSetter *ast) QTC_OVERRIDE;
bool visit(AST::PropertyNameAndValue *ast) QTC_OVERRIDE;
bool visit(AST::NestedExpression *ast) QTC_OVERRIDE;
bool visit(AST::IdentifierPropertyName *ast) QTC_OVERRIDE;
bool visit(AST::StringLiteralPropertyName *ast) QTC_OVERRIDE;
bool visit(AST::NumericLiteralPropertyName *ast) QTC_OVERRIDE;
bool visit(AST::ArrayMemberExpression *ast) QTC_OVERRIDE;
bool visit(AST::FieldMemberExpression *ast) QTC_OVERRIDE;
bool visit(AST::NewMemberExpression *ast) QTC_OVERRIDE;
bool visit(AST::NewExpression *ast) QTC_OVERRIDE;
bool visit(AST::CallExpression *ast) QTC_OVERRIDE;
bool visit(AST::ArgumentList *ast) QTC_OVERRIDE;
bool visit(AST::PostIncrementExpression *ast) QTC_OVERRIDE;
bool visit(AST::PostDecrementExpression *ast) QTC_OVERRIDE;
bool visit(AST::DeleteExpression *ast) QTC_OVERRIDE;
bool visit(AST::VoidExpression *ast) QTC_OVERRIDE;
bool visit(AST::TypeOfExpression *ast) QTC_OVERRIDE;
bool visit(AST::PreIncrementExpression *ast) QTC_OVERRIDE;
bool visit(AST::PreDecrementExpression *ast) QTC_OVERRIDE;
bool visit(AST::UnaryPlusExpression *ast) QTC_OVERRIDE;
bool visit(AST::UnaryMinusExpression *ast) QTC_OVERRIDE;
bool visit(AST::TildeExpression *ast) QTC_OVERRIDE;
bool visit(AST::NotExpression *ast) QTC_OVERRIDE;
bool visit(AST::BinaryExpression *ast) QTC_OVERRIDE;
bool visit(AST::ConditionalExpression *ast) QTC_OVERRIDE;
bool visit(AST::Expression *ast) QTC_OVERRIDE;
bool visit(AST::Block *ast) QTC_OVERRIDE;
bool visit(AST::StatementList *ast) QTC_OVERRIDE;
bool visit(AST::VariableStatement *ast) QTC_OVERRIDE;
bool visit(AST::VariableDeclarationList *ast) QTC_OVERRIDE;
bool visit(AST::VariableDeclaration *ast) QTC_OVERRIDE;
bool visit(AST::EmptyStatement *ast) QTC_OVERRIDE;
bool visit(AST::ExpressionStatement *ast) QTC_OVERRIDE;
bool visit(AST::IfStatement *ast) QTC_OVERRIDE;
bool visit(AST::DoWhileStatement *ast) QTC_OVERRIDE;
bool visit(AST::WhileStatement *ast) QTC_OVERRIDE;
bool visit(AST::ForStatement *ast) QTC_OVERRIDE;
bool visit(AST::LocalForStatement *ast) QTC_OVERRIDE;
bool visit(AST::ForEachStatement *ast) QTC_OVERRIDE;
bool visit(AST::LocalForEachStatement *ast) QTC_OVERRIDE;
bool visit(AST::ContinueStatement *ast) QTC_OVERRIDE;
bool visit(AST::BreakStatement *ast) QTC_OVERRIDE;
bool visit(AST::ReturnStatement *ast) QTC_OVERRIDE;
bool visit(AST::WithStatement *ast) QTC_OVERRIDE;
bool visit(AST::SwitchStatement *ast) QTC_OVERRIDE;
bool visit(AST::CaseBlock *ast) QTC_OVERRIDE;
bool visit(AST::CaseClauses *ast) QTC_OVERRIDE;
bool visit(AST::CaseClause *ast) QTC_OVERRIDE;
bool visit(AST::DefaultClause *ast) QTC_OVERRIDE;
bool visit(AST::LabelledStatement *ast) QTC_OVERRIDE;
bool visit(AST::ThrowStatement *ast) QTC_OVERRIDE;
bool visit(AST::TryStatement *ast) QTC_OVERRIDE;
bool visit(AST::Catch *ast) QTC_OVERRIDE;
bool visit(AST::Finally *ast) QTC_OVERRIDE;
bool visit(AST::FunctionDeclaration *ast) QTC_OVERRIDE;
bool visit(AST::FunctionExpression *ast) QTC_OVERRIDE;
bool visit(AST::FormalParameterList *ast) QTC_OVERRIDE;
bool visit(AST::FunctionBody *ast) QTC_OVERRIDE;
bool visit(AST::Program *ast) QTC_OVERRIDE;
bool visit(AST::SourceElements *ast) QTC_OVERRIDE;
bool visit(AST::FunctionSourceElement *ast) QTC_OVERRIDE;
bool visit(AST::StatementSourceElement *ast) QTC_OVERRIDE;
bool visit(AST::DebuggerStatement *ast) QTC_OVERRIDE;
bool visit(AST::ThisExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::IdentifierExpression *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::StringLiteral *ast) Q_DECL_OVERRIDE;
bool visit(AST::NumericLiteral *ast) Q_DECL_OVERRIDE;
bool visit(AST::RegExpLiteral *ast) Q_DECL_OVERRIDE;
bool visit(AST::ArrayLiteral *ast) Q_DECL_OVERRIDE;
bool visit(AST::ObjectLiteral *ast) Q_DECL_OVERRIDE;
bool visit(AST::ElementList *ast) Q_DECL_OVERRIDE;
bool visit(AST::Elision *ast) Q_DECL_OVERRIDE;
bool visit(AST::PropertyAssignmentList *ast) Q_DECL_OVERRIDE;
bool visit(AST::PropertyGetterSetter *ast) Q_DECL_OVERRIDE;
bool visit(AST::PropertyNameAndValue *ast) Q_DECL_OVERRIDE;
bool visit(AST::NestedExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::IdentifierPropertyName *ast) Q_DECL_OVERRIDE;
bool visit(AST::StringLiteralPropertyName *ast) Q_DECL_OVERRIDE;
bool visit(AST::NumericLiteralPropertyName *ast) Q_DECL_OVERRIDE;
bool visit(AST::ArrayMemberExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::FieldMemberExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::NewMemberExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::NewExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::CallExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::ArgumentList *ast) Q_DECL_OVERRIDE;
bool visit(AST::PostIncrementExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::PostDecrementExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::DeleteExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::VoidExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::TypeOfExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::PreIncrementExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::PreDecrementExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::UnaryPlusExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::UnaryMinusExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::TildeExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::NotExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::BinaryExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::ConditionalExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::Expression *ast) Q_DECL_OVERRIDE;
bool visit(AST::Block *ast) Q_DECL_OVERRIDE;
bool visit(AST::StatementList *ast) Q_DECL_OVERRIDE;
bool visit(AST::VariableStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::VariableDeclarationList *ast) Q_DECL_OVERRIDE;
bool visit(AST::VariableDeclaration *ast) Q_DECL_OVERRIDE;
bool visit(AST::EmptyStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::ExpressionStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::IfStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::DoWhileStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::WhileStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::ForStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::LocalForStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::ForEachStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::LocalForEachStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::ContinueStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::BreakStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::ReturnStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::WithStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::SwitchStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::CaseBlock *ast) Q_DECL_OVERRIDE;
bool visit(AST::CaseClauses *ast) Q_DECL_OVERRIDE;
bool visit(AST::CaseClause *ast) Q_DECL_OVERRIDE;
bool visit(AST::DefaultClause *ast) Q_DECL_OVERRIDE;
bool visit(AST::LabelledStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::ThrowStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::TryStatement *ast) Q_DECL_OVERRIDE;
bool visit(AST::Catch *ast) Q_DECL_OVERRIDE;
bool visit(AST::Finally *ast) Q_DECL_OVERRIDE;
bool visit(AST::FunctionDeclaration *ast) Q_DECL_OVERRIDE;
bool visit(AST::FunctionExpression *ast) Q_DECL_OVERRIDE;
bool visit(AST::FormalParameterList *ast) Q_DECL_OVERRIDE;
bool visit(AST::FunctionBody *ast) Q_DECL_OVERRIDE;
bool visit(AST::Program *ast) Q_DECL_OVERRIDE;
bool visit(AST::SourceElements *ast) Q_DECL_OVERRIDE;
bool visit(AST::FunctionSourceElement *ast) Q_DECL_OVERRIDE;
bool visit(AST::StatementSourceElement *ast) Q_DECL_OVERRIDE;
bool visit(AST::DebuggerStatement *ast) Q_DECL_OVERRIDE;
private:
QmlJS::Document::Ptr _doc;

1
src/libs/qmljs/qmljsimportdependencies.h
View File

@@ -34,7 +34,6 @@
#include "qmljsdialect.h"
#include <languageutils/componentversion.h>
#include <utils/qtcoverride.h>
#include <QObject>
#include <QString>

179
src/libs/qmljs/qmljsinterpreter.h
View File

@@ -34,7 +34,6 @@
#include <qmljs/qmljsconstants.h>
#include <qmljs/qmljsdocument.h>
#include <qmljs/qmljsimportdependencies.h>
#include <utils/qtcoverride.h>
#include <QFileInfoList>
#include <QHash>
@@ -331,61 +330,61 @@ template <> Q_INLINE_TEMPLATE const ASTSignal *value_cast(const Value *v)
class QMLJS_EXPORT NullValue: public Value
{
public:
const NullValue *asNullValue() const QTC_OVERRIDE;
void accept(ValueVisitor *visitor) const QTC_OVERRIDE;
const NullValue *asNullValue() const Q_DECL_OVERRIDE;
void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT UndefinedValue: public Value
{
public:
const UndefinedValue *asUndefinedValue() const QTC_OVERRIDE;
void accept(ValueVisitor *visitor) const QTC_OVERRIDE;
const UndefinedValue *asUndefinedValue() const Q_DECL_OVERRIDE;
void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT UnknownValue: public Value
{
public:
const UnknownValue *asUnknownValue() const QTC_OVERRIDE;
void accept(ValueVisitor *) const QTC_OVERRIDE;
const UnknownValue *asUnknownValue() const Q_DECL_OVERRIDE;
void accept(ValueVisitor *) const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT NumberValue: public Value
{
public:
const NumberValue *asNumberValue() const QTC_OVERRIDE;
void accept(ValueVisitor *visitor) const QTC_OVERRIDE;
const NumberValue *asNumberValue() const Q_DECL_OVERRIDE;
void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT RealValue: public NumberValue
{
public:
const RealValue *asRealValue() const QTC_OVERRIDE;
const RealValue *asRealValue() const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT IntValue: public NumberValue
{
public:
const IntValue *asIntValue() const QTC_OVERRIDE;
const IntValue *asIntValue() const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT BooleanValue: public Value
{
public:
const BooleanValue *asBooleanValue() const QTC_OVERRIDE;
void accept(ValueVisitor *visitor) const QTC_OVERRIDE;
const BooleanValue *asBooleanValue() const Q_DECL_OVERRIDE;
void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT StringValue: public Value
{
public:
const StringValue *asStringValue() const QTC_OVERRIDE;
void accept(ValueVisitor *visitor) const QTC_OVERRIDE;
const StringValue *asStringValue() const Q_DECL_OVERRIDE;
void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT UrlValue: public StringValue
{
public:
const UrlValue *asUrlValue() const QTC_OVERRIDE;
const UrlValue *asUrlValue() const Q_DECL_OVERRIDE;
};
class PropertyInfo {
@@ -453,8 +452,8 @@ public:
ValueOwner *valueOwner() const;
// Value interface
const Reference *asReference() const QTC_OVERRIDE;
void accept(ValueVisitor *) const QTC_OVERRIDE;
const Reference *asReference() const Q_DECL_OVERRIDE;
void accept(ValueVisitor *) const Q_DECL_OVERRIDE;
private:
virtual const Value *value(ReferenceContext *referenceContext) const;
@@ -467,16 +466,16 @@ class QMLJS_EXPORT ColorValue: public Value
{
public:
// Value interface
const ColorValue *asColorValue() const QTC_OVERRIDE;
void accept(ValueVisitor *) const QTC_OVERRIDE;
const ColorValue *asColorValue() const Q_DECL_OVERRIDE;
void accept(ValueVisitor *) const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT AnchorLineValue: public Value
{
public:
// Value interface
const AnchorLineValue *asAnchorLineValue() const QTC_OVERRIDE;
void accept(ValueVisitor *) const QTC_OVERRIDE;
const AnchorLineValue *asAnchorLineValue() const Q_DECL_OVERRIDE;
void accept(ValueVisitor *) const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT PropertyData {
@@ -523,8 +522,8 @@ public:
{ return lookupMember(name, context.data(), foundInObject, examinePrototypes); }
// Value interface
const ObjectValue *asObjectValue() const QTC_OVERRIDE;
void accept(ValueVisitor *visitor) const QTC_OVERRIDE;
const ObjectValue *asObjectValue() const Q_DECL_OVERRIDE;
void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE;
QString originId() const
{ return m_originId; }
@@ -576,7 +575,7 @@ public:
QmlEnumValue(const CppComponentValue *owner, int index);
~QmlEnumValue();
const QmlEnumValue *asQmlEnumValue() const QTC_OVERRIDE;
const QmlEnumValue *asQmlEnumValue() const Q_DECL_OVERRIDE;
QString name() const;
QStringList keys() const;
@@ -599,9 +598,9 @@ public:
ValueOwner *valueOwner, const QString &originId);
~CppComponentValue();
const CppComponentValue *asCppComponentValue() const QTC_OVERRIDE;
const CppComponentValue *asCppComponentValue() const Q_DECL_OVERRIDE;
void processMembers(MemberProcessor *processor) const QTC_OVERRIDE;
void processMembers(MemberProcessor *processor) const Q_DECL_OVERRIDE;
const Value *valueForCppName(const QString &typeName) const;
using ObjectValue::prototype;
@@ -670,8 +669,8 @@ public:
virtual const Value *argument(int index) const;
// Value interface
const FunctionValue *asFunctionValue() const QTC_OVERRIDE;
void accept(ValueVisitor *visitor) const QTC_OVERRIDE;
const FunctionValue *asFunctionValue() const Q_DECL_OVERRIDE;
void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT Function: public FunctionValue
@@ -686,13 +685,13 @@ public:
void setOptionalNamedArgumentCount(int count);
// FunctionValue interface
const Value *returnValue() const QTC_OVERRIDE;
int namedArgumentCount() const QTC_OVERRIDE;
int optionalNamedArgumentCount() const QTC_OVERRIDE;
const Value *argument(int index) const QTC_OVERRIDE;
QString argumentName(int index) const QTC_OVERRIDE;
bool isVariadic() const QTC_OVERRIDE;
const Function *asFunction() const QTC_OVERRIDE;
const Value *returnValue() const Q_DECL_OVERRIDE;
int namedArgumentCount() const Q_DECL_OVERRIDE;
int optionalNamedArgumentCount() const Q_DECL_OVERRIDE;
const Value *argument(int index) const Q_DECL_OVERRIDE;
QString argumentName(int index) const Q_DECL_OVERRIDE;
bool isVariadic() const Q_DECL_OVERRIDE;
const Function *asFunction() const Q_DECL_OVERRIDE;
private:
ValueList m_arguments;
@@ -784,13 +783,13 @@ public:
protected:
const Value *switchResult(const Value *value);
void visit(const NullValue *) QTC_OVERRIDE;
void visit(const UndefinedValue *) QTC_OVERRIDE;
void visit(const NumberValue *) QTC_OVERRIDE;
void visit(const BooleanValue *) QTC_OVERRIDE;
void visit(const StringValue *) QTC_OVERRIDE;
void visit(const ObjectValue *) QTC_OVERRIDE;
void visit(const FunctionValue *) QTC_OVERRIDE;
void visit(const NullValue *) Q_DECL_OVERRIDE;
void visit(const UndefinedValue *) Q_DECL_OVERRIDE;
void visit(const NumberValue *) Q_DECL_OVERRIDE;
void visit(const BooleanValue *) Q_DECL_OVERRIDE;
void visit(const StringValue *) Q_DECL_OVERRIDE;
void visit(const ObjectValue *) Q_DECL_OVERRIDE;
void visit(const FunctionValue *) Q_DECL_OVERRIDE;
private:
ValueOwner *m_valueOwner;
@@ -807,13 +806,13 @@ public:
protected:
const Value *switchResult(const Value *value);
void visit(const NullValue *) QTC_OVERRIDE;
void visit(const UndefinedValue *) QTC_OVERRIDE;
void visit(const NumberValue *) QTC_OVERRIDE;
void visit(const BooleanValue *) QTC_OVERRIDE;
void visit(const StringValue *) QTC_OVERRIDE;
void visit(const ObjectValue *) QTC_OVERRIDE;
void visit(const FunctionValue *) QTC_OVERRIDE;
void visit(const NullValue *) Q_DECL_OVERRIDE;
void visit(const UndefinedValue *) Q_DECL_OVERRIDE;
void visit(const NumberValue *) Q_DECL_OVERRIDE;
void visit(const BooleanValue *) Q_DECL_OVERRIDE;
void visit(const StringValue *) Q_DECL_OVERRIDE;
void visit(const ObjectValue *) Q_DECL_OVERRIDE;
void visit(const FunctionValue *) Q_DECL_OVERRIDE;
private:
ValueOwner *m_valueOwner;
@@ -830,13 +829,13 @@ public:
protected:
const Value *switchResult(const Value *value);
void visit(const NullValue *) QTC_OVERRIDE;
void visit(const UndefinedValue *) QTC_OVERRIDE;
void visit(const NumberValue *) QTC_OVERRIDE;
void visit(const BooleanValue *) QTC_OVERRIDE;
void visit(const StringValue *) QTC_OVERRIDE;
void visit(const ObjectValue *) QTC_OVERRIDE;
void visit(const FunctionValue *) QTC_OVERRIDE;
void visit(const NullValue *) Q_DECL_OVERRIDE;
void visit(const UndefinedValue *) Q_DECL_OVERRIDE;
void visit(const NumberValue *) Q_DECL_OVERRIDE;
void visit(const BooleanValue *) Q_DECL_OVERRIDE;
void visit(const StringValue *) Q_DECL_OVERRIDE;
void visit(const ObjectValue *) Q_DECL_OVERRIDE;
void visit(const FunctionValue *) Q_DECL_OVERRIDE;
private:
ValueOwner *m_valueOwner;
@@ -851,15 +850,15 @@ public:
QString operator()(const Value *value);
protected:
void visit(const NullValue *) QTC_OVERRIDE;
void visit(const UndefinedValue *) QTC_OVERRIDE;
void visit(const NumberValue *) QTC_OVERRIDE;
void visit(const BooleanValue *) QTC_OVERRIDE;
void visit(const StringValue *) QTC_OVERRIDE;
void visit(const ObjectValue *object) QTC_OVERRIDE;
void visit(const FunctionValue *object) QTC_OVERRIDE;
void visit(const ColorValue *) QTC_OVERRIDE;
void visit(const AnchorLineValue *) QTC_OVERRIDE;
void visit(const NullValue *) Q_DECL_OVERRIDE;
void visit(const UndefinedValue *) Q_DECL_OVERRIDE;
void visit(const NumberValue *) Q_DECL_OVERRIDE;
void visit(const BooleanValue *) Q_DECL_OVERRIDE;
void visit(const StringValue *) Q_DECL_OVERRIDE;
void visit(const ObjectValue *object) Q_DECL_OVERRIDE;
void visit(const FunctionValue *object) Q_DECL_OVERRIDE;
void visit(const ColorValue *) Q_DECL_OVERRIDE;
void visit(const AnchorLineValue *) Q_DECL_OVERRIDE;
};
// internal
@@ -869,12 +868,12 @@ public:
QmlPrototypeReference(AST::UiQualifiedId *qmlTypeName, const Document *doc, ValueOwner *valueOwner);
~QmlPrototypeReference();
const QmlPrototypeReference *asQmlPrototypeReference() const QTC_OVERRIDE;
const QmlPrototypeReference *asQmlPrototypeReference() const Q_DECL_OVERRIDE;
AST::UiQualifiedId *qmlTypeName() const;
private:
const Value *value(ReferenceContext *referenceContext) const QTC_OVERRIDE;
const Value *value(ReferenceContext *referenceContext) const Q_DECL_OVERRIDE;
AST::UiQualifiedId *m_qmlTypeName;
const Document *m_doc;
@@ -888,11 +887,11 @@ class QMLJS_EXPORT ASTVariableReference: public Reference
public:
ASTVariableReference(AST::VariableDeclaration *ast, const Document *doc, ValueOwner *valueOwner);
~ASTVariableReference();
const ASTVariableReference *asAstVariableReference() const QTC_OVERRIDE;
const ASTVariableReference *asAstVariableReference() const Q_DECL_OVERRIDE;
const AST::VariableDeclaration *ast() const;
private:
const Value *value(ReferenceContext *referenceContext) const QTC_OVERRIDE;
bool getSourceLocation(QString *fileName, int *line, int *column) const QTC_OVERRIDE;
const Value *value(ReferenceContext *referenceContext) const Q_DECL_OVERRIDE;
bool getSourceLocation(QString *fileName, int *line, int *column) const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT ASTFunctionValue: public FunctionValue
@@ -908,12 +907,12 @@ public:
AST::FunctionExpression *ast() const;
int namedArgumentCount() const QTC_OVERRIDE;
QString argumentName(int index) const QTC_OVERRIDE;
bool isVariadic() const QTC_OVERRIDE;
const ASTFunctionValue *asAstFunctionValue() const QTC_OVERRIDE;
int namedArgumentCount() const Q_DECL_OVERRIDE;
QString argumentName(int index) const Q_DECL_OVERRIDE;
bool isVariadic() const Q_DECL_OVERRIDE;
const ASTFunctionValue *asAstFunctionValue() const Q_DECL_OVERRIDE;
bool getSourceLocation(QString *fileName, int *line, int *column) const QTC_OVERRIDE;
bool getSourceLocation(QString *fileName, int *line, int *column) const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT ASTPropertyReference: public Reference
@@ -926,15 +925,15 @@ public:
ASTPropertyReference(AST::UiPublicMember *ast, const Document *doc, ValueOwner *valueOwner);
~ASTPropertyReference();
const ASTPropertyReference *asAstPropertyReference() const QTC_OVERRIDE;
const ASTPropertyReference *asAstPropertyReference() const Q_DECL_OVERRIDE;
AST::UiPublicMember *ast() const { return m_ast; }
QString onChangedSlotName() const { return m_onChangedSlotName; }
bool getSourceLocation(QString *fileName, int *line, int *column) const QTC_OVERRIDE;
bool getSourceLocation(QString *fileName, int *line, int *column) const Q_DECL_OVERRIDE;
private:
const Value *value(ReferenceContext *referenceContext) const QTC_OVERRIDE;
const Value *value(ReferenceContext *referenceContext) const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT ASTSignal: public FunctionValue
@@ -948,19 +947,19 @@ public:
ASTSignal(AST::UiPublicMember *ast, const Document *doc, ValueOwner *valueOwner);
~ASTSignal();
const ASTSignal *asAstSignal() const QTC_OVERRIDE;
const ASTSignal *asAstSignal() const Q_DECL_OVERRIDE;
AST::UiPublicMember *ast() const { return m_ast; }
QString slotName() const { return m_slotName; }
const ObjectValue *bodyScope() const { return m_bodyScope; }
// FunctionValue interface
int namedArgumentCount() const QTC_OVERRIDE;
const Value *argument(int index) const QTC_OVERRIDE;
QString argumentName(int index) const QTC_OVERRIDE;
int namedArgumentCount() const Q_DECL_OVERRIDE;
const Value *argument(int index) const Q_DECL_OVERRIDE;
QString argumentName(int index) const Q_DECL_OVERRIDE;
// Value interface
bool getSourceLocation(QString *fileName, int *line, int *column) const QTC_OVERRIDE;
bool getSourceLocation(QString *fileName, int *line, int *column) const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT ASTObjectValue: public ObjectValue
@@ -979,10 +978,10 @@ public:
ValueOwner *valueOwner);
~ASTObjectValue();
const ASTObjectValue *asAstObjectValue() const QTC_OVERRIDE;
const ASTObjectValue *asAstObjectValue() const Q_DECL_OVERRIDE;
bool getSourceLocation(QString *fileName, int *line, int *column) const;
void processMembers(MemberProcessor *processor) const QTC_OVERRIDE;
void processMembers(MemberProcessor *processor) const Q_DECL_OVERRIDE;
QString defaultPropertyName() const;
@@ -1056,8 +1055,8 @@ public:
virtual const Value *lookupMember(const QString &name, const Context *context,
const ObjectValue **foundInObject = 0,
bool examinePrototypes = true) const;
void processMembers(MemberProcessor *processor) const QTC_OVERRIDE;
const TypeScope *asTypeScope() const QTC_OVERRIDE;
void processMembers(MemberProcessor *processor) const Q_DECL_OVERRIDE;
const TypeScope *asTypeScope() const Q_DECL_OVERRIDE;
private:
const Imports *m_imports;
};
@@ -1070,8 +1069,8 @@ public:
virtual const Value *lookupMember(const QString &name, const Context *context,
const ObjectValue **foundInObject = 0,
bool examinePrototypes = true) const;
void processMembers(MemberProcessor *processor) const QTC_OVERRIDE;
const JSImportScope *asJSImportScope() const QTC_OVERRIDE;
void processMembers(MemberProcessor *processor) const Q_DECL_OVERRIDE;
const JSImportScope *asJSImportScope() const Q_DECL_OVERRIDE;
private:
const Imports *m_imports;
};

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);

7
src/libs/qmljs/qmljssimplereader.h
View File

@@ -33,7 +33,6 @@
#include <qmljs/qmljs_global.h>
#include <qmljs/parser/qmljsastfwd_p.h>
#include <utils/qtcoverride.h>
#include <QHash>
#include <QList>
@@ -122,9 +121,9 @@ public:
SimpleReaderNode::Ptr readFromSource(const QString &source);
protected:
void elementStart(const QString &name) QTC_OVERRIDE;
void elementEnd() QTC_OVERRIDE;
void propertyDefinition(const QString &name, const QVariant &value) QTC_OVERRIDE;
void elementStart(const QString &name) Q_DECL_OVERRIDE;
void elementEnd() Q_DECL_OVERRIDE;
void propertyDefinition(const QString &name, const QVariant &value) Q_DECL_OVERRIDE;
private:
SimpleReaderNode::Ptr m_rootNode;

2
src/libs/qmljs/qmljsvalueowner.cpp
View File

@@ -53,7 +53,7 @@ public:
QtObjectPrototypeReference(ValueOwner *owner)
: Reference(owner)
{}
const QtObjectPrototypeReference *asQtObjectPrototypeReference() const QTC_OVERRIDE
const QtObjectPrototypeReference *asQtObjectPrototypeReference() const Q_DECL_OVERRIDE
{
return this;
}