feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

libs/qmljs: s/Q_DECL_OVERRIDE/override/g

Browse Source 
Change-Id: I86a5b56ee8587240a03551c0d23edcbd5230494b
Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-06-03 15:34:13 +02:00
parent e97f389441
commit 9da6ac9022
11 changed files with 266 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,16 +54,16 @@ public:
QList<StaticAnalysis::Message> operator()(Utils::JsonSchema *schema); QList<StaticAnalysis::Message> operator()(Utils::JsonSchema *schema);
private: private:
bool preVisit(AST::Node *) Q_DECL_OVERRIDE; bool preVisit(AST::Node *) override;
void postVisit(AST::Node *) Q_DECL_OVERRIDE; void postVisit(AST::Node *) override;
bool visit(AST::ObjectLiteral *ast) Q_DECL_OVERRIDE; bool visit(AST::ObjectLiteral *ast) override;
bool visit(AST::ArrayLiteral *ast) Q_DECL_OVERRIDE; bool visit(AST::ArrayLiteral *ast) override;
bool visit(AST::NullExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::NullExpression *ast) override;
bool visit(AST::TrueLiteral *ast) Q_DECL_OVERRIDE; bool visit(AST::TrueLiteral *ast) override;
bool visit(AST::FalseLiteral *ast) Q_DECL_OVERRIDE; bool visit(AST::FalseLiteral *ast) override;
bool visit(AST::NumericLiteral *ast) Q_DECL_OVERRIDE; bool visit(AST::NumericLiteral *ast) override;
bool visit(AST::StringLiteral *ast) Q_DECL_OVERRIDE; bool visit(AST::StringLiteral *ast) override;
struct AnalysisData struct AnalysisData
{ {

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

@@ -70,21 +70,21 @@ protected:
void accept(AST::Node *node); void accept(AST::Node *node);
bool visit(AST::UiProgram *ast) Q_DECL_OVERRIDE; bool visit(AST::UiProgram *ast) override;
bool visit(AST::Program *ast) Q_DECL_OVERRIDE; bool visit(AST::Program *ast) override;
// Ui // Ui
bool visit(AST::UiImport *ast) Q_DECL_OVERRIDE; bool visit(AST::UiImport *ast) override;
bool visit(AST::UiPublicMember *ast) Q_DECL_OVERRIDE; bool visit(AST::UiPublicMember *ast) override;
bool visit(AST::UiObjectDefinition *ast) Q_DECL_OVERRIDE; bool visit(AST::UiObjectDefinition *ast) override;
bool visit(AST::UiObjectBinding *ast) Q_DECL_OVERRIDE; bool visit(AST::UiObjectBinding *ast) override;
bool visit(AST::UiScriptBinding *ast) Q_DECL_OVERRIDE; bool visit(AST::UiScriptBinding *ast) override;
bool visit(AST::UiArrayBinding *ast) Q_DECL_OVERRIDE; bool visit(AST::UiArrayBinding *ast) override;
// QML/JS // QML/JS
bool visit(AST::FunctionDeclaration *ast) Q_DECL_OVERRIDE; bool visit(AST::FunctionDeclaration *ast) override;
bool visit(AST::FunctionExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::FunctionExpression *ast) override;
bool visit(AST::VariableDeclaration *ast) Q_DECL_OVERRIDE; bool visit(AST::VariableDeclaration *ast) override;
ObjectValue *switchObjectValue(ObjectValue *newObjectValue); ObjectValue *switchObjectValue(ObjectValue *newObjectValue);
ObjectValue *bindObject(AST::UiQualifiedId *qualifiedTypeNameId, AST::UiObjectInitializer *initializer); ObjectValue *bindObject(AST::UiQualifiedId *qualifiedTypeNameId, AST::UiObjectInitializer *initializer);

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

@@ -67,43 +67,43 @@ public:
void disableQmlDesignerUiFileChecks(); void disableQmlDesignerUiFileChecks();
protected: protected:
bool preVisit(AST::Node *ast) Q_DECL_OVERRIDE; bool preVisit(AST::Node *ast) override;
void postVisit(AST::Node *ast) Q_DECL_OVERRIDE; void postVisit(AST::Node *ast) override;
bool visit(AST::UiProgram *ast) Q_DECL_OVERRIDE; bool visit(AST::UiProgram *ast) override;
bool visit(AST::UiObjectDefinition *ast) Q_DECL_OVERRIDE; bool visit(AST::UiObjectDefinition *ast) override;
bool visit(AST::UiObjectBinding *ast) Q_DECL_OVERRIDE; bool visit(AST::UiObjectBinding *ast) override;
bool visit(AST::UiScriptBinding *ast) Q_DECL_OVERRIDE; bool visit(AST::UiScriptBinding *ast) override;
bool visit(AST::UiArrayBinding *ast) Q_DECL_OVERRIDE; bool visit(AST::UiArrayBinding *ast) override;
bool visit(AST::UiPublicMember *ast) Q_DECL_OVERRIDE; bool visit(AST::UiPublicMember *ast) override;
bool visit(AST::IdentifierExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::IdentifierExpression *ast) override;
bool visit(AST::FieldMemberExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::FieldMemberExpression *ast) override;
bool visit(AST::FunctionDeclaration *ast) Q_DECL_OVERRIDE; bool visit(AST::FunctionDeclaration *ast) override;
bool visit(AST::FunctionExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::FunctionExpression *ast) override;
bool visit(AST::UiObjectInitializer *) Q_DECL_OVERRIDE; bool visit(AST::UiObjectInitializer *) override;
bool visit(AST::BinaryExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::BinaryExpression *ast) override;
bool visit(AST::Block *ast) Q_DECL_OVERRIDE; bool visit(AST::Block *ast) override;
bool visit(AST::WithStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::WithStatement *ast) override;
bool visit(AST::VoidExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::VoidExpression *ast) override;
bool visit(AST::Expression *ast) Q_DECL_OVERRIDE; bool visit(AST::Expression *ast) override;
bool visit(AST::ExpressionStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::ExpressionStatement *ast) override;
bool visit(AST::IfStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::IfStatement *ast) override;
bool visit(AST::ForStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::ForStatement *ast) override;
bool visit(AST::LocalForStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::LocalForStatement *ast) override;
bool visit(AST::WhileStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::WhileStatement *ast) override;
bool visit(AST::DoWhileStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::DoWhileStatement *ast) override;
bool visit(AST::CaseBlock *ast) Q_DECL_OVERRIDE; bool visit(AST::CaseBlock *ast) override;
bool visit(AST::NewExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::NewExpression *ast) override;
bool visit(AST::NewMemberExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::NewMemberExpression *ast) override;
bool visit(AST::CallExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::CallExpression *ast) override;
bool visit(AST::StatementList *ast) Q_DECL_OVERRIDE; bool visit(AST::StatementList *ast) override;
bool visit(AST::ReturnStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::ReturnStatement *ast) override;
bool visit(AST::ThrowStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::ThrowStatement *ast) override;
bool visit(AST::DeleteExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::DeleteExpression *ast) override;
bool visit(AST::TypeOfExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::TypeOfExpression *ast) override;
void endVisit(QmlJS::AST::UiObjectInitializer *) Q_DECL_OVERRIDE; void endVisit(QmlJS::AST::UiObjectInitializer *) override;
private: private:
void visitQmlObject(AST::Node *ast, AST::UiQualifiedId *typeId, void visitQmlObject(AST::Node *ast, AST::UiQualifiedId *typeId,

4
src/libs/qmljs/qmljscodeformatter.h
View File

@@ -325,8 +325,8 @@ public:
void setIndentSize(int size); void setIndentSize(int size);
protected: protected:
void onEnter(int newState, int *indentDepth, int *savedIndentDepth) const Q_DECL_OVERRIDE; void onEnter(int newState, int *indentDepth, int *savedIndentDepth) const override;
void adjustIndent(const QList<QmlJS::Token> &tokens, int lexerState, int *indentDepth) const Q_DECL_OVERRIDE; void adjustIndent(const QList<QmlJS::Token> &tokens, int lexerState, int *indentDepth) const override;
private: private:
int m_indentSize; int m_indentSize;

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

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

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

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

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

@@ -65,99 +65,99 @@ protected:
const Value *switchResult(const Value *result); const Value *switchResult(const Value *result);
// Ui // Ui
bool visit(AST::UiProgram *ast) Q_DECL_OVERRIDE; bool visit(AST::UiProgram *ast) override;
bool visit(AST::UiHeaderItemList *ast) Q_DECL_OVERRIDE; bool visit(AST::UiHeaderItemList *ast) override;
bool visit(AST::UiQualifiedPragmaId *ast) Q_DECL_OVERRIDE; bool visit(AST::UiQualifiedPragmaId *ast) override;
bool visit(AST::UiPragma *ast) Q_DECL_OVERRIDE; bool visit(AST::UiPragma *ast) override;
bool visit(AST::UiImport *ast) Q_DECL_OVERRIDE; bool visit(AST::UiImport *ast) override;
bool visit(AST::UiPublicMember *ast) Q_DECL_OVERRIDE; bool visit(AST::UiPublicMember *ast) override;
bool visit(AST::UiSourceElement *ast) Q_DECL_OVERRIDE; bool visit(AST::UiSourceElement *ast) override;
bool visit(AST::UiObjectDefinition *ast) Q_DECL_OVERRIDE; bool visit(AST::UiObjectDefinition *ast) override;
bool visit(AST::UiObjectInitializer *ast) Q_DECL_OVERRIDE; bool visit(AST::UiObjectInitializer *ast) override;
bool visit(AST::UiObjectBinding *ast) Q_DECL_OVERRIDE; bool visit(AST::UiObjectBinding *ast) override;
bool visit(AST::UiScriptBinding *ast) Q_DECL_OVERRIDE; bool visit(AST::UiScriptBinding *ast) override;
bool visit(AST::UiArrayBinding *ast) Q_DECL_OVERRIDE; bool visit(AST::UiArrayBinding *ast) override;
bool visit(AST::UiObjectMemberList *ast) Q_DECL_OVERRIDE; bool visit(AST::UiObjectMemberList *ast) override;
bool visit(AST::UiArrayMemberList *ast) Q_DECL_OVERRIDE; bool visit(AST::UiArrayMemberList *ast) override;
bool visit(AST::UiQualifiedId *ast) Q_DECL_OVERRIDE; bool visit(AST::UiQualifiedId *ast) override;
// QmlJS // QmlJS
bool visit(AST::ThisExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::ThisExpression *ast) override;
bool visit(AST::IdentifierExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::IdentifierExpression *ast) override;
bool visit(AST::NullExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::NullExpression *ast) override;
bool visit(AST::TrueLiteral *ast) Q_DECL_OVERRIDE; bool visit(AST::TrueLiteral *ast) override;
bool visit(AST::FalseLiteral *ast) Q_DECL_OVERRIDE; bool visit(AST::FalseLiteral *ast) override;
bool visit(AST::StringLiteral *ast) Q_DECL_OVERRIDE; bool visit(AST::StringLiteral *ast) override;
bool visit(AST::NumericLiteral *ast) Q_DECL_OVERRIDE; bool visit(AST::NumericLiteral *ast) override;
bool visit(AST::RegExpLiteral *ast) Q_DECL_OVERRIDE; bool visit(AST::RegExpLiteral *ast) override;
bool visit(AST::ArrayLiteral *ast) Q_DECL_OVERRIDE; bool visit(AST::ArrayLiteral *ast) override;
bool visit(AST::ObjectLiteral *ast) Q_DECL_OVERRIDE; bool visit(AST::ObjectLiteral *ast) override;
bool visit(AST::ElementList *ast) Q_DECL_OVERRIDE; bool visit(AST::ElementList *ast) override;
bool visit(AST::Elision *ast) Q_DECL_OVERRIDE; bool visit(AST::Elision *ast) override;
bool visit(AST::PropertyAssignmentList *ast) Q_DECL_OVERRIDE; bool visit(AST::PropertyAssignmentList *ast) override;
bool visit(AST::PropertyGetterSetter *ast) Q_DECL_OVERRIDE; bool visit(AST::PropertyGetterSetter *ast) override;
bool visit(AST::PropertyNameAndValue *ast) Q_DECL_OVERRIDE; bool visit(AST::PropertyNameAndValue *ast) override;
bool visit(AST::NestedExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::NestedExpression *ast) override;
bool visit(AST::IdentifierPropertyName *ast) Q_DECL_OVERRIDE; bool visit(AST::IdentifierPropertyName *ast) override;
bool visit(AST::StringLiteralPropertyName *ast) Q_DECL_OVERRIDE; bool visit(AST::StringLiteralPropertyName *ast) override;
bool visit(AST::NumericLiteralPropertyName *ast) Q_DECL_OVERRIDE; bool visit(AST::NumericLiteralPropertyName *ast) override;
bool visit(AST::ArrayMemberExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::ArrayMemberExpression *ast) override;
bool visit(AST::FieldMemberExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::FieldMemberExpression *ast) override;
bool visit(AST::NewMemberExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::NewMemberExpression *ast) override;
bool visit(AST::NewExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::NewExpression *ast) override;
bool visit(AST::CallExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::CallExpression *ast) override;
bool visit(AST::ArgumentList *ast) Q_DECL_OVERRIDE; bool visit(AST::ArgumentList *ast) override;
bool visit(AST::PostIncrementExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::PostIncrementExpression *ast) override;
bool visit(AST::PostDecrementExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::PostDecrementExpression *ast) override;
bool visit(AST::DeleteExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::DeleteExpression *ast) override;
bool visit(AST::VoidExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::VoidExpression *ast) override;
bool visit(AST::TypeOfExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::TypeOfExpression *ast) override;
bool visit(AST::PreIncrementExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::PreIncrementExpression *ast) override;
bool visit(AST::PreDecrementExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::PreDecrementExpression *ast) override;
bool visit(AST::UnaryPlusExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::UnaryPlusExpression *ast) override;
bool visit(AST::UnaryMinusExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::UnaryMinusExpression *ast) override;
bool visit(AST::TildeExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::TildeExpression *ast) override;
bool visit(AST::NotExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::NotExpression *ast) override;
bool visit(AST::BinaryExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::BinaryExpression *ast) override;
bool visit(AST::ConditionalExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::ConditionalExpression *ast) override;
bool visit(AST::Expression *ast) Q_DECL_OVERRIDE; bool visit(AST::Expression *ast) override;
bool visit(AST::Block *ast) Q_DECL_OVERRIDE; bool visit(AST::Block *ast) override;
bool visit(AST::StatementList *ast) Q_DECL_OVERRIDE; bool visit(AST::StatementList *ast) override;
bool visit(AST::VariableStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::VariableStatement *ast) override;
bool visit(AST::VariableDeclarationList *ast) Q_DECL_OVERRIDE; bool visit(AST::VariableDeclarationList *ast) override;
bool visit(AST::VariableDeclaration *ast) Q_DECL_OVERRIDE; bool visit(AST::VariableDeclaration *ast) override;
bool visit(AST::EmptyStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::EmptyStatement *ast) override;
bool visit(AST::ExpressionStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::ExpressionStatement *ast) override;
bool visit(AST::IfStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::IfStatement *ast) override;
bool visit(AST::DoWhileStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::DoWhileStatement *ast) override;
bool visit(AST::WhileStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::WhileStatement *ast) override;
bool visit(AST::ForStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::ForStatement *ast) override;
bool visit(AST::LocalForStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::LocalForStatement *ast) override;
bool visit(AST::ForEachStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::ForEachStatement *ast) override;
bool visit(AST::LocalForEachStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::LocalForEachStatement *ast) override;
bool visit(AST::ContinueStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::ContinueStatement *ast) override;
bool visit(AST::BreakStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::BreakStatement *ast) override;
bool visit(AST::ReturnStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::ReturnStatement *ast) override;
bool visit(AST::WithStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::WithStatement *ast) override;
bool visit(AST::SwitchStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::SwitchStatement *ast) override;
bool visit(AST::CaseBlock *ast) Q_DECL_OVERRIDE; bool visit(AST::CaseBlock *ast) override;
bool visit(AST::CaseClauses *ast) Q_DECL_OVERRIDE; bool visit(AST::CaseClauses *ast) override;
bool visit(AST::CaseClause *ast) Q_DECL_OVERRIDE; bool visit(AST::CaseClause *ast) override;
bool visit(AST::DefaultClause *ast) Q_DECL_OVERRIDE; bool visit(AST::DefaultClause *ast) override;
bool visit(AST::LabelledStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::LabelledStatement *ast) override;
bool visit(AST::ThrowStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::ThrowStatement *ast) override;
bool visit(AST::TryStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::TryStatement *ast) override;
bool visit(AST::Catch *ast) Q_DECL_OVERRIDE; bool visit(AST::Catch *ast) override;
bool visit(AST::Finally *ast) Q_DECL_OVERRIDE; bool visit(AST::Finally *ast) override;
bool visit(AST::FunctionDeclaration *ast) Q_DECL_OVERRIDE; bool visit(AST::FunctionDeclaration *ast) override;
bool visit(AST::FunctionExpression *ast) Q_DECL_OVERRIDE; bool visit(AST::FunctionExpression *ast) override;
bool visit(AST::FormalParameterList *ast) Q_DECL_OVERRIDE; bool visit(AST::FormalParameterList *ast) override;
bool visit(AST::FunctionBody *ast) Q_DECL_OVERRIDE; bool visit(AST::FunctionBody *ast) override;
bool visit(AST::Program *ast) Q_DECL_OVERRIDE; bool visit(AST::Program *ast) override;
bool visit(AST::SourceElements *ast) Q_DECL_OVERRIDE; bool visit(AST::SourceElements *ast) override;
bool visit(AST::FunctionSourceElement *ast) Q_DECL_OVERRIDE; bool visit(AST::FunctionSourceElement *ast) override;
bool visit(AST::StatementSourceElement *ast) Q_DECL_OVERRIDE; bool visit(AST::StatementSourceElement *ast) override;
bool visit(AST::DebuggerStatement *ast) Q_DECL_OVERRIDE; bool visit(AST::DebuggerStatement *ast) override;
private: private:
QmlJS::Document::Ptr _doc; QmlJS::Document::Ptr _doc;

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

@@ -334,61 +334,61 @@ template <> Q_INLINE_TEMPLATE const ASTSignal *value_cast(const Value *v)
class QMLJS_EXPORT NullValue: public Value class QMLJS_EXPORT NullValue: public Value
{ {
public: public:
const NullValue *asNullValue() const Q_DECL_OVERRIDE; const NullValue *asNullValue() const override;
void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE; void accept(ValueVisitor *visitor) const override;
}; };
class QMLJS_EXPORT UndefinedValue: public Value class QMLJS_EXPORT UndefinedValue: public Value
{ {
public: public:
const UndefinedValue *asUndefinedValue() const Q_DECL_OVERRIDE; const UndefinedValue *asUndefinedValue() const override;
void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE; void accept(ValueVisitor *visitor) const override;
}; };
class QMLJS_EXPORT UnknownValue: public Value class QMLJS_EXPORT UnknownValue: public Value
{ {
public: public:
const UnknownValue *asUnknownValue() const Q_DECL_OVERRIDE; const UnknownValue *asUnknownValue() const override;
void accept(ValueVisitor *) const Q_DECL_OVERRIDE; void accept(ValueVisitor *) const override;
}; };
class QMLJS_EXPORT NumberValue: public Value class QMLJS_EXPORT NumberValue: public Value
{ {
public: public:
const NumberValue *asNumberValue() const Q_DECL_OVERRIDE; const NumberValue *asNumberValue() const override;
void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE; void accept(ValueVisitor *visitor) const override;
}; };
class QMLJS_EXPORT RealValue: public NumberValue class QMLJS_EXPORT RealValue: public NumberValue
{ {
public: public:
const RealValue *asRealValue() const Q_DECL_OVERRIDE; const RealValue *asRealValue() const override;
}; };
class QMLJS_EXPORT IntValue: public NumberValue class QMLJS_EXPORT IntValue: public NumberValue
{ {
public: public:
const IntValue *asIntValue() const Q_DECL_OVERRIDE; const IntValue *asIntValue() const override;
}; };
class QMLJS_EXPORT BooleanValue: public Value class QMLJS_EXPORT BooleanValue: public Value
{ {
public: public:
const BooleanValue *asBooleanValue() const Q_DECL_OVERRIDE; const BooleanValue *asBooleanValue() const override;
void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE; void accept(ValueVisitor *visitor) const override;
}; };
class QMLJS_EXPORT StringValue: public Value class QMLJS_EXPORT StringValue: public Value
{ {
public: public:
const StringValue *asStringValue() const Q_DECL_OVERRIDE; const StringValue *asStringValue() const override;
void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE; void accept(ValueVisitor *visitor) const override;
}; };
class QMLJS_EXPORT UrlValue: public StringValue class QMLJS_EXPORT UrlValue: public StringValue
{ {
public: public:
const UrlValue *asUrlValue() const Q_DECL_OVERRIDE; const UrlValue *asUrlValue() const override;
}; };
class PropertyInfo { class PropertyInfo {
@@ -456,8 +456,8 @@ public:
ValueOwner *valueOwner() const; ValueOwner *valueOwner() const;
// Value interface // Value interface
const Reference *asReference() const Q_DECL_OVERRIDE; const Reference *asReference() const override;
void accept(ValueVisitor *) const Q_DECL_OVERRIDE; void accept(ValueVisitor *) const override;
private: private:
virtual const Value *value(ReferenceContext *referenceContext) const; virtual const Value *value(ReferenceContext *referenceContext) const;
@@ -470,16 +470,16 @@ class QMLJS_EXPORT ColorValue: public Value
{ {
public: public:
// Value interface // Value interface
const ColorValue *asColorValue() const Q_DECL_OVERRIDE; const ColorValue *asColorValue() const override;
void accept(ValueVisitor *) const Q_DECL_OVERRIDE; void accept(ValueVisitor *) const override;
}; };
class QMLJS_EXPORT AnchorLineValue: public Value class QMLJS_EXPORT AnchorLineValue: public Value
{ {
public: public:
// Value interface // Value interface
const AnchorLineValue *asAnchorLineValue() const Q_DECL_OVERRIDE; const AnchorLineValue *asAnchorLineValue() const override;
void accept(ValueVisitor *) const Q_DECL_OVERRIDE; void accept(ValueVisitor *) const override;
}; };
class QMLJS_EXPORT PropertyData { class QMLJS_EXPORT PropertyData {
@@ -526,8 +526,8 @@ public:
{ return lookupMember(name, context.data(), foundInObject, examinePrototypes); } { return lookupMember(name, context.data(), foundInObject, examinePrototypes); }
// Value interface // Value interface
const ObjectValue *asObjectValue() const Q_DECL_OVERRIDE; const ObjectValue *asObjectValue() const override;
void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE; void accept(ValueVisitor *visitor) const override;
QString originId() const QString originId() const
{ return m_originId; } { return m_originId; }
@@ -579,7 +579,7 @@ public:
QmlEnumValue(const CppComponentValue *owner, int index); QmlEnumValue(const CppComponentValue *owner, int index);
~QmlEnumValue(); ~QmlEnumValue();
const QmlEnumValue *asQmlEnumValue() const Q_DECL_OVERRIDE; const QmlEnumValue *asQmlEnumValue() const override;
QString name() const; QString name() const;
QStringList keys() const; QStringList keys() const;
@@ -602,9 +602,9 @@ public:
ValueOwner *valueOwner, const QString &originId); ValueOwner *valueOwner, const QString &originId);
~CppComponentValue(); ~CppComponentValue();
const CppComponentValue *asCppComponentValue() const Q_DECL_OVERRIDE; const CppComponentValue *asCppComponentValue() const override;
void processMembers(MemberProcessor *processor) const Q_DECL_OVERRIDE; void processMembers(MemberProcessor *processor) const override;
const Value *valueForCppName(const QString &typeName) const; const Value *valueForCppName(const QString &typeName) const;
using ObjectValue::prototype; using ObjectValue::prototype;
@@ -673,8 +673,8 @@ public:
virtual const Value *argument(int index) const; virtual const Value *argument(int index) const;
// Value interface // Value interface
const FunctionValue *asFunctionValue() const Q_DECL_OVERRIDE; const FunctionValue *asFunctionValue() const override;
void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE; void accept(ValueVisitor *visitor) const override;
}; };
class QMLJS_EXPORT Function: public FunctionValue class QMLJS_EXPORT Function: public FunctionValue
@@ -689,13 +689,13 @@ public:
void setOptionalNamedArgumentCount(int count); void setOptionalNamedArgumentCount(int count);
// FunctionValue interface // FunctionValue interface
const Value *returnValue() const Q_DECL_OVERRIDE; const Value *returnValue() const override;
int namedArgumentCount() const Q_DECL_OVERRIDE; int namedArgumentCount() const override;
int optionalNamedArgumentCount() const Q_DECL_OVERRIDE; int optionalNamedArgumentCount() const override;
const Value *argument(int index) const Q_DECL_OVERRIDE; const Value *argument(int index) const override;
QString argumentName(int index) const Q_DECL_OVERRIDE; QString argumentName(int index) const override;
bool isVariadic() const Q_DECL_OVERRIDE; bool isVariadic() const override;
const Function *asFunction() const Q_DECL_OVERRIDE; const Function *asFunction() const override;
private: private:
ValueList m_arguments; ValueList m_arguments;
@@ -787,13 +787,13 @@ public:
protected: protected:
const Value *switchResult(const Value *value); const Value *switchResult(const Value *value);
void visit(const NullValue *) Q_DECL_OVERRIDE; void visit(const NullValue *) override;
void visit(const UndefinedValue *) Q_DECL_OVERRIDE; void visit(const UndefinedValue *) override;
void visit(const NumberValue *) Q_DECL_OVERRIDE; void visit(const NumberValue *) override;
void visit(const BooleanValue *) Q_DECL_OVERRIDE; void visit(const BooleanValue *) override;
void visit(const StringValue *) Q_DECL_OVERRIDE; void visit(const StringValue *) override;
void visit(const ObjectValue *) Q_DECL_OVERRIDE; void visit(const ObjectValue *) override;
void visit(const FunctionValue *) Q_DECL_OVERRIDE; void visit(const FunctionValue *) override;
private: private:
ValueOwner *m_valueOwner; ValueOwner *m_valueOwner;
@@ -810,13 +810,13 @@ public:
protected: protected:
const Value *switchResult(const Value *value); const Value *switchResult(const Value *value);
void visit(const NullValue *) Q_DECL_OVERRIDE; void visit(const NullValue *) override;
void visit(const UndefinedValue *) Q_DECL_OVERRIDE; void visit(const UndefinedValue *) override;
void visit(const NumberValue *) Q_DECL_OVERRIDE; void visit(const NumberValue *) override;
void visit(const BooleanValue *) Q_DECL_OVERRIDE; void visit(const BooleanValue *) override;
void visit(const StringValue *) Q_DECL_OVERRIDE; void visit(const StringValue *) override;
void visit(const ObjectValue *) Q_DECL_OVERRIDE; void visit(const ObjectValue *) override;
void visit(const FunctionValue *) Q_DECL_OVERRIDE; void visit(const FunctionValue *) override;
private: private:
ValueOwner *m_valueOwner; ValueOwner *m_valueOwner;
@@ -833,13 +833,13 @@ public:
protected: protected:
const Value *switchResult(const Value *value); const Value *switchResult(const Value *value);
void visit(const NullValue *) Q_DECL_OVERRIDE; void visit(const NullValue *) override;
void visit(const UndefinedValue *) Q_DECL_OVERRIDE; void visit(const UndefinedValue *) override;
void visit(const NumberValue *) Q_DECL_OVERRIDE; void visit(const NumberValue *) override;
void visit(const BooleanValue *) Q_DECL_OVERRIDE; void visit(const BooleanValue *) override;
void visit(const StringValue *) Q_DECL_OVERRIDE; void visit(const StringValue *) override;
void visit(const ObjectValue *) Q_DECL_OVERRIDE; void visit(const ObjectValue *) override;
void visit(const FunctionValue *) Q_DECL_OVERRIDE; void visit(const FunctionValue *) override;
private: private:
ValueOwner *m_valueOwner; ValueOwner *m_valueOwner;
@@ -854,15 +854,15 @@ public:
QString operator()(const Value *value); QString operator()(const Value *value);
protected: protected:
void visit(const NullValue *) Q_DECL_OVERRIDE; void visit(const NullValue *) override;
void visit(const UndefinedValue *) Q_DECL_OVERRIDE; void visit(const UndefinedValue *) override;
void visit(const NumberValue *) Q_DECL_OVERRIDE; void visit(const NumberValue *) override;
void visit(const BooleanValue *) Q_DECL_OVERRIDE; void visit(const BooleanValue *) override;
void visit(const StringValue *) Q_DECL_OVERRIDE; void visit(const StringValue *) override;
void visit(const ObjectValue *object) Q_DECL_OVERRIDE; void visit(const ObjectValue *object) override;
void visit(const FunctionValue *object) Q_DECL_OVERRIDE; void visit(const FunctionValue *object) override;
void visit(const ColorValue *) Q_DECL_OVERRIDE; void visit(const ColorValue *) override;
void visit(const AnchorLineValue *) Q_DECL_OVERRIDE; void visit(const AnchorLineValue *) override;
}; };
// internal // internal
@@ -872,13 +872,13 @@ public:
QmlPrototypeReference(AST::UiQualifiedId *qmlTypeName, const Document *doc, ValueOwner *valueOwner); QmlPrototypeReference(AST::UiQualifiedId *qmlTypeName, const Document *doc, ValueOwner *valueOwner);
~QmlPrototypeReference(); ~QmlPrototypeReference();
const QmlPrototypeReference *asQmlPrototypeReference() const Q_DECL_OVERRIDE; const QmlPrototypeReference *asQmlPrototypeReference() const override;
AST::UiQualifiedId *qmlTypeName() const; AST::UiQualifiedId *qmlTypeName() const;
const Document *document() const; const Document *document() const;
private: private:
const Value *value(ReferenceContext *referenceContext) const Q_DECL_OVERRIDE; const Value *value(ReferenceContext *referenceContext) const override;
AST::UiQualifiedId *m_qmlTypeName; AST::UiQualifiedId *m_qmlTypeName;
const Document *m_doc; const Document *m_doc;
@@ -892,11 +892,11 @@ class QMLJS_EXPORT ASTVariableReference: public Reference
public: public:
ASTVariableReference(AST::VariableDeclaration *ast, const Document *doc, ValueOwner *valueOwner); ASTVariableReference(AST::VariableDeclaration *ast, const Document *doc, ValueOwner *valueOwner);
~ASTVariableReference(); ~ASTVariableReference();
const ASTVariableReference *asAstVariableReference() const Q_DECL_OVERRIDE; const ASTVariableReference *asAstVariableReference() const override;
const AST::VariableDeclaration *ast() const; const AST::VariableDeclaration *ast() const;
private: private:
const Value *value(ReferenceContext *referenceContext) const Q_DECL_OVERRIDE; const Value *value(ReferenceContext *referenceContext) const override;
bool getSourceLocation(QString *fileName, int *line, int *column) const Q_DECL_OVERRIDE; bool getSourceLocation(QString *fileName, int *line, int *column) const override;
}; };
class QMLJS_EXPORT ASTFunctionValue: public FunctionValue class QMLJS_EXPORT ASTFunctionValue: public FunctionValue
@@ -912,12 +912,12 @@ public:
AST::FunctionExpression *ast() const; AST::FunctionExpression *ast() const;
int namedArgumentCount() const Q_DECL_OVERRIDE; int namedArgumentCount() const override;
QString argumentName(int index) const Q_DECL_OVERRIDE; QString argumentName(int index) const override;
bool isVariadic() const Q_DECL_OVERRIDE; bool isVariadic() const override;
const ASTFunctionValue *asAstFunctionValue() const Q_DECL_OVERRIDE; const ASTFunctionValue *asAstFunctionValue() const override;
bool getSourceLocation(QString *fileName, int *line, int *column) const Q_DECL_OVERRIDE; bool getSourceLocation(QString *fileName, int *line, int *column) const override;
}; };
class QMLJS_EXPORT ASTPropertyReference: public Reference class QMLJS_EXPORT ASTPropertyReference: public Reference
@@ -930,15 +930,15 @@ public:
ASTPropertyReference(AST::UiPublicMember *ast, const Document *doc, ValueOwner *valueOwner); ASTPropertyReference(AST::UiPublicMember *ast, const Document *doc, ValueOwner *valueOwner);
~ASTPropertyReference(); ~ASTPropertyReference();
const ASTPropertyReference *asAstPropertyReference() const Q_DECL_OVERRIDE; const ASTPropertyReference *asAstPropertyReference() const override;
AST::UiPublicMember *ast() const { return m_ast; } AST::UiPublicMember *ast() const { return m_ast; }
QString onChangedSlotName() const { return m_onChangedSlotName; } QString onChangedSlotName() const { return m_onChangedSlotName; }
bool getSourceLocation(QString *fileName, int *line, int *column) const Q_DECL_OVERRIDE; bool getSourceLocation(QString *fileName, int *line, int *column) const override;
private: private:
const Value *value(ReferenceContext *referenceContext) const Q_DECL_OVERRIDE; const Value *value(ReferenceContext *referenceContext) const override;
}; };
class QMLJS_EXPORT ASTSignal: public FunctionValue class QMLJS_EXPORT ASTSignal: public FunctionValue
@@ -952,19 +952,19 @@ public:
ASTSignal(AST::UiPublicMember *ast, const Document *doc, ValueOwner *valueOwner); ASTSignal(AST::UiPublicMember *ast, const Document *doc, ValueOwner *valueOwner);
~ASTSignal(); ~ASTSignal();
const ASTSignal *asAstSignal() const Q_DECL_OVERRIDE; const ASTSignal *asAstSignal() const override;
AST::UiPublicMember *ast() const { return m_ast; } AST::UiPublicMember *ast() const { return m_ast; }
QString slotName() const { return m_slotName; } QString slotName() const { return m_slotName; }
const ObjectValue *bodyScope() const { return m_bodyScope; } const ObjectValue *bodyScope() const { return m_bodyScope; }
// FunctionValue interface // FunctionValue interface
int namedArgumentCount() const Q_DECL_OVERRIDE; int namedArgumentCount() const override;
const Value *argument(int index) const Q_DECL_OVERRIDE; const Value *argument(int index) const override;
QString argumentName(int index) const Q_DECL_OVERRIDE; QString argumentName(int index) const override;
// Value interface // Value interface
bool getSourceLocation(QString *fileName, int *line, int *column) const Q_DECL_OVERRIDE; bool getSourceLocation(QString *fileName, int *line, int *column) const override;
}; };
class QMLJS_EXPORT ASTObjectValue: public ObjectValue class QMLJS_EXPORT ASTObjectValue: public ObjectValue
@@ -983,10 +983,10 @@ public:
ValueOwner *valueOwner); ValueOwner *valueOwner);
~ASTObjectValue(); ~ASTObjectValue();
const ASTObjectValue *asAstObjectValue() const Q_DECL_OVERRIDE; const ASTObjectValue *asAstObjectValue() const override;
bool getSourceLocation(QString *fileName, int *line, int *column) const Q_DECL_OVERRIDE; bool getSourceLocation(QString *fileName, int *line, int *column) const override;
void processMembers(MemberProcessor *processor) const Q_DECL_OVERRIDE; void processMembers(MemberProcessor *processor) const override;
QString defaultPropertyName() const; QString defaultPropertyName() const;
@@ -1059,9 +1059,9 @@ public:
virtual const Value *lookupMember(const QString &name, const Context *context, virtual const Value *lookupMember(const QString &name, const Context *context,
const ObjectValue **foundInObject = 0, const ObjectValue **foundInObject = 0,
bool examinePrototypes = true) const Q_DECL_OVERRIDE; bool examinePrototypes = true) const override;
void processMembers(MemberProcessor *processor) const Q_DECL_OVERRIDE; void processMembers(MemberProcessor *processor) const override;
const TypeScope *asTypeScope() const Q_DECL_OVERRIDE; const TypeScope *asTypeScope() const override;
private: private:
const Imports *m_imports; const Imports *m_imports;
}; };
@@ -1073,9 +1073,9 @@ public:
virtual const Value *lookupMember(const QString &name, const Context *context, virtual const Value *lookupMember(const QString &name, const Context *context,
const ObjectValue **foundInObject = 0, const ObjectValue **foundInObject = 0,
bool examinePrototypes = true) const Q_DECL_OVERRIDE; bool examinePrototypes = true) const override;
void processMembers(MemberProcessor *processor) const Q_DECL_OVERRIDE; void processMembers(MemberProcessor *processor) const override;
const JSImportScope *asJSImportScope() const Q_DECL_OVERRIDE; const JSImportScope *asJSImportScope() const override;
private: private:
const Imports *m_imports; const Imports *m_imports;
}; };

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

@@ -49,13 +49,13 @@ protected:
using Visitor::visit; using Visitor::visit;
bool preVisit(AST::Node *node) Q_DECL_OVERRIDE; bool preVisit(AST::Node *node) override;
bool visit(AST::UiPublicMember *node) Q_DECL_OVERRIDE; bool visit(AST::UiPublicMember *node) override;
bool visit(AST::UiScriptBinding *node) Q_DECL_OVERRIDE; bool visit(AST::UiScriptBinding *node) override;
bool visit(AST::UiObjectDefinition *node) Q_DECL_OVERRIDE; bool visit(AST::UiObjectDefinition *node) override;
bool visit(AST::UiObjectBinding *node) Q_DECL_OVERRIDE; bool visit(AST::UiObjectBinding *node) override;
bool visit(AST::FunctionDeclaration *node) Q_DECL_OVERRIDE; bool visit(AST::FunctionDeclaration *node) override;
bool visit(AST::FunctionExpression *node) Q_DECL_OVERRIDE; bool visit(AST::FunctionExpression *node) override;
private: private:
bool containsOffset(AST::SourceLocation start, AST::SourceLocation end); bool containsOffset(AST::SourceLocation start, AST::SourceLocation end);

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

@@ -122,9 +122,9 @@ public:
SimpleReaderNode::Ptr readFromSource(const QString &source); SimpleReaderNode::Ptr readFromSource(const QString &source);
protected: protected:
void elementStart(const QString &name) Q_DECL_OVERRIDE; void elementStart(const QString &name) override;
void elementEnd() Q_DECL_OVERRIDE; void elementEnd() override;
void propertyDefinition(const QString &name, const QVariant &value) Q_DECL_OVERRIDE; void propertyDefinition(const QString &name, const QVariant &value) override;
private: private:
SimpleReaderNode::Ptr m_rootNode; SimpleReaderNode::Ptr m_rootNode;

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

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