From e9c66a7acd26af08bb8132cf31c7cb5716f9a53e Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Wed, 20 Sep 2017 20:57:46 +0200 Subject: Replace Q_DECL_OVERRIDE with override Change-Id: I68e08fd214ad3dbf4de9c9e23b1725950925c1fb Reviewed-by: Ulf Hermann --- src/scxml/qscxmlcompiler.cpp | 30 +++++++++--------- src/scxml/qscxmlcompiler_p.h | 58 +++++++++++++++++------------------ src/scxml/qscxmlcppdatamodel.h | 24 +++++++-------- src/scxml/qscxmlecmascriptdatamodel.h | 24 +++++++-------- src/scxml/qscxmlexecutablecontent.cpp | 2 +- src/scxml/qscxmlinvokableservice.h | 4 +-- src/scxml/qscxmlinvokableservice_p.h | 8 ++--- src/scxml/qscxmlnulldatamodel.h | 24 +++++++-------- src/scxml/qscxmlstatemachine_p.h | 2 +- src/scxml/qscxmltabledata.cpp | 24 +++++++-------- src/scxml/qscxmltabledata_p.h | 20 ++++++------ 11 files changed, 110 insertions(+), 110 deletions(-) (limited to 'src') diff --git a/src/scxml/qscxmlcompiler.cpp b/src/scxml/qscxmlcompiler.cpp index 4256c72..a862c46 100644 --- a/src/scxml/qscxmlcompiler.cpp +++ b/src/scxml/qscxmlcompiler.cpp @@ -106,7 +106,7 @@ public: } private: - bool visit(DocumentModel::Scxml *scxml) Q_DECL_OVERRIDE + bool visit(DocumentModel::Scxml *scxml) override { if (!scxml->name.isEmpty() && !isValidToken(scxml->name, XmlNmtoken)) { error(scxml->xmlLocation, @@ -133,12 +133,12 @@ private: return true; } - void endVisit(DocumentModel::Scxml *) Q_DECL_OVERRIDE + void endVisit(DocumentModel::Scxml *) override { m_parentNodes.removeLast(); } - bool visit(DocumentModel::State *state) Q_DECL_OVERRIDE + bool visit(DocumentModel::State *state) override { if (!state->id.isEmpty() && !isValidToken(state->id, XmlNCName)) { error(state->xmlLocation, QStringLiteral("'%1' is not a valid XML ID").arg(state->id)); @@ -197,12 +197,12 @@ private: return true; } - void endVisit(DocumentModel::State *) Q_DECL_OVERRIDE + void endVisit(DocumentModel::State *) override { m_parentNodes.removeLast(); } - bool visit(DocumentModel::Transition *transition) Q_DECL_OVERRIDE + bool visit(DocumentModel::Transition *transition) override { Q_ASSERT(transition->targetStates.isEmpty()); @@ -226,12 +226,12 @@ private: return true; } - void endVisit(DocumentModel::Transition *) Q_DECL_OVERRIDE + void endVisit(DocumentModel::Transition *) override { m_parentNodes.removeLast(); } - bool visit(DocumentModel::HistoryState *state) Q_DECL_OVERRIDE + bool visit(DocumentModel::HistoryState *state) override { bool seenTransition = false; for (DocumentModel::StateOrTransition *sot : qAsConst(state->children)) { @@ -252,25 +252,25 @@ private: return false; } - bool visit(DocumentModel::Send *node) Q_DECL_OVERRIDE + bool visit(DocumentModel::Send *node) override { checkEvent(node->event, node->xmlLocation, ForbidWildCards); checkExpr(node->xmlLocation, QStringLiteral("send"), QStringLiteral("eventexpr"), node->eventexpr); return true; } - void visit(DocumentModel::Cancel *node) Q_DECL_OVERRIDE + void visit(DocumentModel::Cancel *node) override { checkExpr(node->xmlLocation, QStringLiteral("cancel"), QStringLiteral("sendidexpr"), node->sendidexpr); } - bool visit(DocumentModel::DoneData *node) Q_DECL_OVERRIDE + bool visit(DocumentModel::DoneData *node) override { checkExpr(node->xmlLocation, QStringLiteral("donedata"), QStringLiteral("expr"), node->expr); return false; } - bool visit(DocumentModel::Invoke *node) Q_DECL_OVERRIDE + bool visit(DocumentModel::Invoke *node) override { if (!node->srcexpr.isEmpty()) return false; @@ -478,7 +478,7 @@ public: void setContent(const QSharedPointer &content) { m_content = content; } - QScxmlInvokableService *invoke(QScxmlStateMachine *child) Q_DECL_OVERRIDE; + QScxmlInvokableService *invoke(QScxmlStateMachine *child) override; private: QSharedPointer m_content; @@ -498,10 +498,10 @@ class DynamicStateMachine: public QScxmlStateMachine, public QScxmlInternal::Gen public: Q_OBJECT_CHECK - const QMetaObject *metaObject() const Q_DECL_OVERRIDE + const QMetaObject *metaObject() const override { return d_func()->m_metaObject; } - int qt_metacall(QMetaObject::Call _c, int _id, void **_a) Q_DECL_OVERRIDE + int qt_metacall(QMetaObject::Call _c, int _id, void **_a) override { Q_D(DynamicStateMachine); _id = QScxmlStateMachine::qt_metacall(_c, _id, _a); @@ -595,7 +595,7 @@ public: } } - QScxmlInvokableServiceFactory *serviceFactory(int id) const Q_DECL_OVERRIDE Q_DECL_FINAL + QScxmlInvokableServiceFactory *serviceFactory(int id) const override Q_DECL_FINAL { return m_allFactoriesById.at(id); } static DynamicStateMachine *build(DocumentModel::ScxmlDocument *doc) diff --git a/src/scxml/qscxmlcompiler_p.h b/src/scxml/qscxmlcompiler_p.h index d3e25df..b7dca8b 100644 --- a/src/scxml/qscxmlcompiler_p.h +++ b/src/scxml/qscxmlcompiler_p.h @@ -112,7 +112,7 @@ struct DataElement: public Node QString content; DataElement(const XmlLocation &xmlLocation): Node(xmlLocation) {} - void accept(NodeVisitor *visitor) Q_DECL_OVERRIDE; + void accept(NodeVisitor *visitor) override; }; struct Param: public Node @@ -122,7 +122,7 @@ struct Param: public Node QString location; Param(const XmlLocation &xmlLocation): Node(xmlLocation) {} - void accept(NodeVisitor *visitor) Q_DECL_OVERRIDE; + void accept(NodeVisitor *visitor) override; }; struct DoneData: public Node @@ -132,7 +132,7 @@ struct DoneData: public Node QVector params; DoneData(const XmlLocation &xmlLocation): Node(xmlLocation) {} - void accept(NodeVisitor *visitor) Q_DECL_OVERRIDE; + void accept(NodeVisitor *visitor) override; }; struct Instruction: public Node @@ -162,8 +162,8 @@ struct Send: public Instruction QString contentexpr; Send(const XmlLocation &xmlLocation): Instruction(xmlLocation) {} - Send *asSend() Q_DECL_OVERRIDE { return this; } - void accept(NodeVisitor *visitor) Q_DECL_OVERRIDE; + Send *asSend() override { return this; } + void accept(NodeVisitor *visitor) override; }; struct ScxmlDocument; @@ -183,8 +183,8 @@ struct Invoke: public Instruction QSharedPointer content; Invoke(const XmlLocation &xmlLocation): Instruction(xmlLocation) {} - Invoke *asInvoke() Q_DECL_OVERRIDE { return this; } - void accept(NodeVisitor *visitor) Q_DECL_OVERRIDE; + Invoke *asInvoke() override { return this; } + void accept(NodeVisitor *visitor) override; }; struct Raise: public Instruction @@ -192,7 +192,7 @@ struct Raise: public Instruction QString event; Raise(const XmlLocation &xmlLocation): Instruction(xmlLocation) {} - void accept(NodeVisitor *visitor) Q_DECL_OVERRIDE; + void accept(NodeVisitor *visitor) override; }; struct Log: public Instruction @@ -200,7 +200,7 @@ struct Log: public Instruction QString label, expr; Log(const XmlLocation &xmlLocation): Instruction(xmlLocation) {} - void accept(NodeVisitor *visitor) Q_DECL_OVERRIDE; + void accept(NodeVisitor *visitor) override; }; struct Script: public Instruction @@ -209,8 +209,8 @@ struct Script: public Instruction QString content; Script(const XmlLocation &xmlLocation): Instruction(xmlLocation) {} - Script *asScript() Q_DECL_OVERRIDE { return this; } - void accept(NodeVisitor *visitor) Q_DECL_OVERRIDE; + Script *asScript() override { return this; } + void accept(NodeVisitor *visitor) override; }; struct Assign: public Instruction @@ -220,7 +220,7 @@ struct Assign: public Instruction QString content; Assign(const XmlLocation &xmlLocation): Instruction(xmlLocation) {} - void accept(NodeVisitor *visitor) Q_DECL_OVERRIDE; + void accept(NodeVisitor *visitor) override; }; struct If: public Instruction @@ -229,8 +229,8 @@ struct If: public Instruction InstructionSequences blocks; If(const XmlLocation &xmlLocation): Instruction(xmlLocation) {} - If *asIf() Q_DECL_OVERRIDE { return this; } - void accept(NodeVisitor *visitor) Q_DECL_OVERRIDE; + If *asIf() override { return this; } + void accept(NodeVisitor *visitor) override; }; struct Foreach: public Instruction @@ -241,7 +241,7 @@ struct Foreach: public Instruction InstructionSequence block; Foreach(const XmlLocation &xmlLocation): Instruction(xmlLocation) {} - void accept(NodeVisitor *visitor) Q_DECL_OVERRIDE; + void accept(NodeVisitor *visitor) override; }; struct Cancel: public Instruction @@ -250,7 +250,7 @@ struct Cancel: public Instruction QString sendidexpr; Cancel(const XmlLocation &xmlLocation): Instruction(xmlLocation) {} - void accept(NodeVisitor *visitor) Q_DECL_OVERRIDE; + void accept(NodeVisitor *visitor) override; }; struct StateOrTransition: public Node @@ -277,7 +277,7 @@ struct AbstractState: public StateContainer { QString id; - AbstractState *asAbstractState() Q_DECL_OVERRIDE { return this; } + AbstractState *asAbstractState() override { return this; } }; struct State: public AbstractState, public StateOrTransition @@ -302,15 +302,15 @@ struct State: public AbstractState, public StateOrTransition , initialTransition(Q_NULLPTR) {} - void add(StateOrTransition *s) Q_DECL_OVERRIDE + void add(StateOrTransition *s) override { Q_ASSERT(s); children.append(s); } - State *asState() Q_DECL_OVERRIDE { return this; } + State *asState() override { return this; } - void accept(NodeVisitor *visitor) Q_DECL_OVERRIDE; + void accept(NodeVisitor *visitor) override; }; struct Transition: public StateOrTransition @@ -329,9 +329,9 @@ struct Transition: public StateOrTransition , type(External) {} - Transition *asTransition() Q_DECL_OVERRIDE { return this; } + Transition *asTransition() override { return this; } - void accept(NodeVisitor *visitor) Q_DECL_OVERRIDE; + void accept(NodeVisitor *visitor) override; }; struct HistoryState: public AbstractState, public StateOrTransition @@ -345,7 +345,7 @@ struct HistoryState: public AbstractState, public StateOrTransition , type(Shallow) {} - void add(StateOrTransition *s) Q_DECL_OVERRIDE + void add(StateOrTransition *s) override { Q_ASSERT(s); children.append(s); @@ -354,8 +354,8 @@ struct HistoryState: public AbstractState, public StateOrTransition Transition *defaultConfiguration() { return children.isEmpty() ? Q_NULLPTR : children.first()->asTransition(); } - HistoryState *asHistoryState() Q_DECL_OVERRIDE { return this; } - void accept(NodeVisitor *visitor) Q_DECL_OVERRIDE; + HistoryState *asHistoryState() override { return this; } + void accept(NodeVisitor *visitor) override; }; struct Scxml: public StateContainer, public Node @@ -390,15 +390,15 @@ struct Scxml: public StateContainer, public Node , initialTransition(nullptr) {} - void add(StateOrTransition *s) Q_DECL_OVERRIDE + void add(StateOrTransition *s) override { Q_ASSERT(s); children.append(s); } - Scxml *asScxml() Q_DECL_OVERRIDE { return this; } + Scxml *asScxml() override { return this; } - void accept(NodeVisitor *visitor) Q_DECL_OVERRIDE; + void accept(NodeVisitor *visitor) override; }; struct ScxmlDocument @@ -706,7 +706,7 @@ public: DefaultLoader(); QByteArray load(const QString &name, const QString &baseDir, - QStringList *errors) Q_DECL_OVERRIDE Q_DECL_FINAL; + QStringList *errors) override Q_DECL_FINAL; }; private: diff --git a/src/scxml/qscxmlcppdatamodel.h b/src/scxml/qscxmlcppdatamodel.h index 244259f..85f869a 100644 --- a/src/scxml/qscxmlcppdatamodel.h +++ b/src/scxml/qscxmlcppdatamodel.h @@ -44,10 +44,10 @@ #define Q_SCXML_DATAMODEL \ public: \ - QString evaluateToString(QScxmlExecutableContent::EvaluatorId id, bool *ok) Q_DECL_OVERRIDE Q_DECL_FINAL; \ - bool evaluateToBool(QScxmlExecutableContent::EvaluatorId id, bool *ok) Q_DECL_OVERRIDE Q_DECL_FINAL; \ - QVariant evaluateToVariant(QScxmlExecutableContent::EvaluatorId id, bool *ok) Q_DECL_OVERRIDE Q_DECL_FINAL; \ - void evaluateToVoid(QScxmlExecutableContent::EvaluatorId id, bool *ok) Q_DECL_OVERRIDE Q_DECL_FINAL; \ + QString evaluateToString(QScxmlExecutableContent::EvaluatorId id, bool *ok) override Q_DECL_FINAL; \ + bool evaluateToBool(QScxmlExecutableContent::EvaluatorId id, bool *ok) override Q_DECL_FINAL; \ + QVariant evaluateToVariant(QScxmlExecutableContent::EvaluatorId id, bool *ok) override Q_DECL_FINAL; \ + void evaluateToVoid(QScxmlExecutableContent::EvaluatorId id, bool *ok) override Q_DECL_FINAL; \ private: QT_BEGIN_NAMESPACE @@ -60,18 +60,18 @@ class Q_SCXML_EXPORT QScxmlCppDataModel: public QScxmlDataModel public: explicit QScxmlCppDataModel(QObject *parent = nullptr); - Q_INVOKABLE bool setup(const QVariantMap &initialDataValues) Q_DECL_OVERRIDE; + Q_INVOKABLE bool setup(const QVariantMap &initialDataValues) override; - void evaluateAssignment(QScxmlExecutableContent::EvaluatorId id, bool *ok) Q_DECL_OVERRIDE; - void evaluateInitialization(QScxmlExecutableContent::EvaluatorId id, bool *ok) Q_DECL_OVERRIDE; - void evaluateForeach(QScxmlExecutableContent::EvaluatorId id, bool *ok, ForeachLoopBody *body) Q_DECL_OVERRIDE; + void evaluateAssignment(QScxmlExecutableContent::EvaluatorId id, bool *ok) override; + void evaluateInitialization(QScxmlExecutableContent::EvaluatorId id, bool *ok) override; + void evaluateForeach(QScxmlExecutableContent::EvaluatorId id, bool *ok, ForeachLoopBody *body) override; - void setScxmlEvent(const QScxmlEvent &scxmlEvent) Q_DECL_OVERRIDE Q_DECL_FINAL; + void setScxmlEvent(const QScxmlEvent &scxmlEvent) override Q_DECL_FINAL; const QScxmlEvent &scxmlEvent() const; - QVariant scxmlProperty(const QString &name) const Q_DECL_OVERRIDE; - bool hasScxmlProperty(const QString &name) const Q_DECL_OVERRIDE; - bool setScxmlProperty(const QString &name, const QVariant &value, const QString &context) Q_DECL_OVERRIDE; + QVariant scxmlProperty(const QString &name) const override; + bool hasScxmlProperty(const QString &name) const override; + bool setScxmlProperty(const QString &name, const QVariant &value, const QString &context) override; bool inState(const QString &stateName) const; }; diff --git a/src/scxml/qscxmlecmascriptdatamodel.h b/src/scxml/qscxmlecmascriptdatamodel.h index 2e105ea..85234d8 100644 --- a/src/scxml/qscxmlecmascriptdatamodel.h +++ b/src/scxml/qscxmlecmascriptdatamodel.h @@ -51,21 +51,21 @@ class Q_SCXML_EXPORT QScxmlEcmaScriptDataModel: public QScxmlDataModel public: explicit QScxmlEcmaScriptDataModel(QObject *parent = nullptr); - Q_INVOKABLE bool setup(const QVariantMap &initialDataValues) Q_DECL_OVERRIDE; + Q_INVOKABLE bool setup(const QVariantMap &initialDataValues) override; - QString evaluateToString(QScxmlExecutableContent::EvaluatorId id, bool *ok) Q_DECL_OVERRIDE Q_DECL_FINAL; - bool evaluateToBool(QScxmlExecutableContent::EvaluatorId id, bool *ok) Q_DECL_OVERRIDE Q_DECL_FINAL; - QVariant evaluateToVariant(QScxmlExecutableContent::EvaluatorId id, bool *ok) Q_DECL_OVERRIDE Q_DECL_FINAL; - void evaluateToVoid(QScxmlExecutableContent::EvaluatorId id, bool *ok) Q_DECL_OVERRIDE Q_DECL_FINAL; - void evaluateAssignment(QScxmlExecutableContent::EvaluatorId id, bool *ok) Q_DECL_OVERRIDE Q_DECL_FINAL; - void evaluateInitialization(QScxmlExecutableContent::EvaluatorId id, bool *ok) Q_DECL_OVERRIDE Q_DECL_FINAL; - void evaluateForeach(QScxmlExecutableContent::EvaluatorId id, bool *ok, ForeachLoopBody *body) Q_DECL_OVERRIDE Q_DECL_FINAL; + QString evaluateToString(QScxmlExecutableContent::EvaluatorId id, bool *ok) override Q_DECL_FINAL; + bool evaluateToBool(QScxmlExecutableContent::EvaluatorId id, bool *ok) override Q_DECL_FINAL; + QVariant evaluateToVariant(QScxmlExecutableContent::EvaluatorId id, bool *ok) override Q_DECL_FINAL; + void evaluateToVoid(QScxmlExecutableContent::EvaluatorId id, bool *ok) override Q_DECL_FINAL; + void evaluateAssignment(QScxmlExecutableContent::EvaluatorId id, bool *ok) override Q_DECL_FINAL; + void evaluateInitialization(QScxmlExecutableContent::EvaluatorId id, bool *ok) override Q_DECL_FINAL; + void evaluateForeach(QScxmlExecutableContent::EvaluatorId id, bool *ok, ForeachLoopBody *body) override Q_DECL_FINAL; - void setScxmlEvent(const QScxmlEvent &event) Q_DECL_OVERRIDE; + void setScxmlEvent(const QScxmlEvent &event) override; - QVariant scxmlProperty(const QString &name) const Q_DECL_OVERRIDE; - bool hasScxmlProperty(const QString &name) const Q_DECL_OVERRIDE; - bool setScxmlProperty(const QString &name, const QVariant &value, const QString &context) Q_DECL_OVERRIDE; + QVariant scxmlProperty(const QString &name) const override; + bool hasScxmlProperty(const QString &name) const override; + bool setScxmlProperty(const QString &name, const QVariant &value, const QString &context) override; }; QT_END_NAMESPACE diff --git a/src/scxml/qscxmlexecutablecontent.cpp b/src/scxml/qscxmlexecutablecontent.cpp index 2401aa6..26c8ab2 100644 --- a/src/scxml/qscxmlexecutablecontent.cpp +++ b/src/scxml/qscxmlexecutablecontent.cpp @@ -387,7 +387,7 @@ const InstructionId *QScxmlExecutionEngine::step(const InstructionId *ip, bool * , loopStart(loopStart) {} - void run(bool *ok) Q_DECL_OVERRIDE + void run(bool *ok) override { engine->step(loopStart, ok); } diff --git a/src/scxml/qscxmlinvokableservice.h b/src/scxml/qscxmlinvokableservice.h index a3c09e8..65ce4fc 100644 --- a/src/scxml/qscxmlinvokableservice.h +++ b/src/scxml/qscxmlinvokableservice.h @@ -108,7 +108,7 @@ public: const QVector ¶meters, QObject *parent = nullptr); - QScxmlInvokableService *invoke(QScxmlStateMachine *parentStateMachine) Q_DECL_OVERRIDE; + QScxmlInvokableService *invoke(QScxmlStateMachine *parentStateMachine) override; }; class Q_SCXML_EXPORT QScxmlDynamicScxmlServiceFactory: public QScxmlInvokableServiceFactory @@ -121,7 +121,7 @@ public: const QVector ¶meters, QObject *parent = nullptr); - QScxmlInvokableService *invoke(QScxmlStateMachine *parentStateMachine) Q_DECL_OVERRIDE; + QScxmlInvokableService *invoke(QScxmlStateMachine *parentStateMachine) override; }; QT_END_NAMESPACE diff --git a/src/scxml/qscxmlinvokableservice_p.h b/src/scxml/qscxmlinvokableservice_p.h index 37ca870..dce1d64 100644 --- a/src/scxml/qscxmlinvokableservice_p.h +++ b/src/scxml/qscxmlinvokableservice_p.h @@ -95,10 +95,10 @@ public: QScxmlInvokableServiceFactory *parent); ~QScxmlScxmlService(); - bool start() Q_DECL_OVERRIDE; - QString id() const Q_DECL_OVERRIDE; - QString name() const Q_DECL_OVERRIDE; - void postEvent(QScxmlEvent *event) Q_DECL_OVERRIDE; + bool start() override; + QString id() const override; + QString name() const override; + void postEvent(QScxmlEvent *event) override; QScxmlStateMachine *stateMachine() const; private: diff --git a/src/scxml/qscxmlnulldatamodel.h b/src/scxml/qscxmlnulldatamodel.h index 830162f..2310cc4 100644 --- a/src/scxml/qscxmlnulldatamodel.h +++ b/src/scxml/qscxmlnulldatamodel.h @@ -53,21 +53,21 @@ public: explicit QScxmlNullDataModel(QObject *parent = nullptr); ~QScxmlNullDataModel(); - Q_INVOKABLE bool setup(const QVariantMap &initialDataValues) Q_DECL_OVERRIDE; + Q_INVOKABLE bool setup(const QVariantMap &initialDataValues) override; - QString evaluateToString(QScxmlExecutableContent::EvaluatorId id, bool *ok) Q_DECL_OVERRIDE Q_DECL_FINAL; - bool evaluateToBool(QScxmlExecutableContent::EvaluatorId id, bool *ok) Q_DECL_OVERRIDE Q_DECL_FINAL; - QVariant evaluateToVariant(QScxmlExecutableContent::EvaluatorId id, bool *ok) Q_DECL_OVERRIDE Q_DECL_FINAL; - void evaluateToVoid(QScxmlExecutableContent::EvaluatorId id, bool *ok) Q_DECL_OVERRIDE Q_DECL_FINAL; - void evaluateAssignment(QScxmlExecutableContent::EvaluatorId id, bool *ok) Q_DECL_OVERRIDE Q_DECL_FINAL; - void evaluateInitialization(QScxmlExecutableContent::EvaluatorId id, bool *ok) Q_DECL_OVERRIDE Q_DECL_FINAL; - void evaluateForeach(QScxmlExecutableContent::EvaluatorId id, bool *ok, ForeachLoopBody *body) Q_DECL_OVERRIDE Q_DECL_FINAL; + QString evaluateToString(QScxmlExecutableContent::EvaluatorId id, bool *ok) override Q_DECL_FINAL; + bool evaluateToBool(QScxmlExecutableContent::EvaluatorId id, bool *ok) override Q_DECL_FINAL; + QVariant evaluateToVariant(QScxmlExecutableContent::EvaluatorId id, bool *ok) override Q_DECL_FINAL; + void evaluateToVoid(QScxmlExecutableContent::EvaluatorId id, bool *ok) override Q_DECL_FINAL; + void evaluateAssignment(QScxmlExecutableContent::EvaluatorId id, bool *ok) override Q_DECL_FINAL; + void evaluateInitialization(QScxmlExecutableContent::EvaluatorId id, bool *ok) override Q_DECL_FINAL; + void evaluateForeach(QScxmlExecutableContent::EvaluatorId id, bool *ok, ForeachLoopBody *body) override Q_DECL_FINAL; - void setScxmlEvent(const QScxmlEvent &event) Q_DECL_OVERRIDE; + void setScxmlEvent(const QScxmlEvent &event) override; - QVariant scxmlProperty(const QString &name) const Q_DECL_OVERRIDE; - bool hasScxmlProperty(const QString &name) const Q_DECL_OVERRIDE; - bool setScxmlProperty(const QString &name, const QVariant &value, const QString &context) Q_DECL_OVERRIDE; + QVariant scxmlProperty(const QString &name) const override; + bool hasScxmlProperty(const QString &name) const override; + bool setScxmlProperty(const QString &name, const QVariant &value, const QString &context) override; }; QT_END_NAMESPACE diff --git a/src/scxml/qscxmlstatemachine_p.h b/src/scxml/qscxmlstatemachine_p.h index a2926a8..aa08f1c 100644 --- a/src/scxml/qscxmlstatemachine_p.h +++ b/src/scxml/qscxmlstatemachine_p.h @@ -77,7 +77,7 @@ public: Q_INVOKABLE void doProcessEvents(); protected: - void timerEvent(QTimerEvent *timerEvent) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *timerEvent) override; }; class ScxmlEventRouter : public QObject diff --git a/src/scxml/qscxmltabledata.cpp b/src/scxml/qscxmltabledata.cpp index f9665d3..533cd1d 100644 --- a/src/scxml/qscxmltabledata.cpp +++ b/src/scxml/qscxmltabledata.cpp @@ -213,7 +213,7 @@ public: protected: // visitor using NodeVisitor::visit; - bool visit(DocumentModel::Scxml *node) Q_DECL_OVERRIDE Q_DECL_FINAL + bool visit(DocumentModel::Scxml *node) override Q_DECL_FINAL { setName(node->name); @@ -278,7 +278,7 @@ protected: // visitor return false; } - bool visit(DocumentModel::State *state) Q_DECL_OVERRIDE Q_DECL_FINAL + bool visit(DocumentModel::State *state) override Q_DECL_FINAL { m_stateNames.add(state->id); const int stateIndex = m_docStatesIndices.value(state, -1); @@ -378,7 +378,7 @@ protected: // visitor return false; } - bool visit(DocumentModel::Transition *transition) Q_DECL_OVERRIDE Q_DECL_FINAL + bool visit(DocumentModel::Transition *transition) override Q_DECL_FINAL { const int transitionIndex = m_docTransitionIndices.value(transition, -1); Q_ASSERT(transitionIndex != -1); @@ -428,7 +428,7 @@ protected: // visitor return false; } - bool visit(DocumentModel::HistoryState *historyState) Q_DECL_OVERRIDE Q_DECL_FINAL + bool visit(DocumentModel::HistoryState *historyState) override Q_DECL_FINAL { const int stateIndex = m_docStatesIndices.value(historyState, -1); Q_ASSERT(stateIndex != -1); @@ -454,7 +454,7 @@ protected: // visitor return false; } - bool visit(DocumentModel::Send *node) Q_DECL_OVERRIDE Q_DECL_FINAL + bool visit(DocumentModel::Send *node) override Q_DECL_FINAL { auto instr = m_instructions.add(Send::calculateExtraSize(node->params.size(), node->namelist.size())); @@ -486,13 +486,13 @@ protected: // visitor return false; } - void visit(DocumentModel::Raise *node) Q_DECL_OVERRIDE Q_DECL_FINAL + void visit(DocumentModel::Raise *node) override Q_DECL_FINAL { auto instr = m_instructions.add(); instr->event = addString(node->event); } - void visit(DocumentModel::Log *node) Q_DECL_OVERRIDE Q_DECL_FINAL + void visit(DocumentModel::Log *node) override Q_DECL_FINAL { auto instr = m_instructions.add(); instr->label = addString(node->label); @@ -501,7 +501,7 @@ protected: // visitor node->expr); } - void visit(DocumentModel::Script *node) Q_DECL_OVERRIDE Q_DECL_FINAL + void visit(DocumentModel::Script *node) override Q_DECL_FINAL { auto instr = m_instructions.add(); instr->go = createEvaluatorVoid(QStringLiteral("script"), @@ -509,14 +509,14 @@ protected: // visitor node->content); } - void visit(DocumentModel::Assign *node) Q_DECL_OVERRIDE Q_DECL_FINAL + void visit(DocumentModel::Assign *node) override Q_DECL_FINAL { auto instr = m_instructions.add(); auto ctxt = createContext(QStringLiteral("assign"), QStringLiteral("expr"), node->expr); instr->expression = addAssignment(node->location, node->expr, ctxt); } - bool visit(DocumentModel::If *node) Q_DECL_OVERRIDE Q_DECL_FINAL + bool visit(DocumentModel::If *node) override Q_DECL_FINAL { auto instr = m_instructions.add(node->conditions.size()); instr->conditions.count = node->conditions.size(); @@ -533,7 +533,7 @@ protected: // visitor return false; } - bool visit(DocumentModel::Foreach *node) Q_DECL_OVERRIDE Q_DECL_FINAL + bool visit(DocumentModel::Foreach *node) override Q_DECL_FINAL { auto instr = m_instructions.add(); auto ctxt = createContextString(QStringLiteral("foreach")); @@ -544,7 +544,7 @@ protected: // visitor return false; } - void visit(DocumentModel::Cancel *node) Q_DECL_OVERRIDE Q_DECL_FINAL + void visit(DocumentModel::Cancel *node) override Q_DECL_FINAL { auto instr = m_instructions.add(); instr->sendid = addString(node->sendid); diff --git a/src/scxml/qscxmltabledata_p.h b/src/scxml/qscxmltabledata_p.h index 767b88a..d4bc36a 100644 --- a/src/scxml/qscxmltabledata_p.h +++ b/src/scxml/qscxmltabledata_p.h @@ -95,19 +95,19 @@ public: static QString toString(const int *stateMachineTable); public: - QString string(QScxmlExecutableContent::StringId id) const Q_DECL_OVERRIDE Q_DECL_FINAL; - QScxmlExecutableContent::InstructionId *instructions() const Q_DECL_OVERRIDE Q_DECL_FINAL; + QString string(QScxmlExecutableContent::StringId id) const override Q_DECL_FINAL; + QScxmlExecutableContent::InstructionId *instructions() const override Q_DECL_FINAL; QScxmlExecutableContent::EvaluatorInfo evaluatorInfo( - QScxmlExecutableContent::EvaluatorId evaluatorId) const Q_DECL_OVERRIDE Q_DECL_FINAL; + QScxmlExecutableContent::EvaluatorId evaluatorId) const override Q_DECL_FINAL; QScxmlExecutableContent::AssignmentInfo assignmentInfo( - QScxmlExecutableContent::EvaluatorId assignmentId) const Q_DECL_OVERRIDE Q_DECL_FINAL; + QScxmlExecutableContent::EvaluatorId assignmentId) const override Q_DECL_FINAL; QScxmlExecutableContent::ForeachInfo foreachInfo( - QScxmlExecutableContent::EvaluatorId foreachId) const Q_DECL_OVERRIDE Q_DECL_FINAL; - QScxmlExecutableContent::StringId *dataNames(int *count) const Q_DECL_OVERRIDE Q_DECL_FINAL; - QScxmlExecutableContent::ContainerId initialSetup() const Q_DECL_OVERRIDE Q_DECL_FINAL; - QString name() const Q_DECL_OVERRIDE Q_DECL_FINAL; - const qint32 *stateMachineTable() const Q_DECL_OVERRIDE Q_DECL_FINAL; - QScxmlInvokableServiceFactory *serviceFactory(int id) const Q_DECL_OVERRIDE; + QScxmlExecutableContent::EvaluatorId foreachId) const override Q_DECL_FINAL; + QScxmlExecutableContent::StringId *dataNames(int *count) const override Q_DECL_FINAL; + QScxmlExecutableContent::ContainerId initialSetup() const override Q_DECL_FINAL; + QString name() const override Q_DECL_FINAL; + const qint32 *stateMachineTable() const override Q_DECL_FINAL; + QScxmlInvokableServiceFactory *serviceFactory(int id) const override; public: QVector theStateMachineTable; -- cgit v1.2.3