Replace Q_DECL_FINAL with final

Change-Id: I074b69d728dfb597f4eb68cf516a2591658303ba
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

7 files changed, 42 insertions, 42 deletions

diff --git a/src/scxml/qscxmlcompiler.cpp b/src/scxml/qscxmlcompiler.cpp
index a862c46..b39b786 100644
--- a/src/scxml/qscxmlcompiler.cpp
+++ b/src/scxml/qscxmlcompiler.cpp
@@ -595,7 +595,7 @@ public:
         }
     }
 
-    QScxmlInvokableServiceFactory *serviceFactory(int id) const override Q_DECL_FINAL
+    QScxmlInvokableServiceFactory *serviceFactory(int id) const override 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 b7dca8b..b170382 100644
--- a/src/scxml/qscxmlcompiler_p.h
+++ b/src/scxml/qscxmlcompiler_p.h
@@ -706,7 +706,7 @@ public:
         DefaultLoader();
         QByteArray load(const QString &name,
                         const QString &baseDir,
-                        QStringList *errors) override Q_DECL_FINAL;
+                        QStringList *errors) override final;
     };
 
 private:
diff --git a/src/scxml/qscxmlcppdatamodel.h b/src/scxml/qscxmlcppdatamodel.h
index 85f869a..8f71229 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) 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; \
+        QString evaluateToString(QScxmlExecutableContent::EvaluatorId id, bool *ok) override final; \
+        bool evaluateToBool(QScxmlExecutableContent::EvaluatorId id, bool *ok) override final; \
+        QVariant evaluateToVariant(QScxmlExecutableContent::EvaluatorId id, bool *ok) override final; \
+        void evaluateToVoid(QScxmlExecutableContent::EvaluatorId id, bool *ok) override final; \
     private:
 
 QT_BEGIN_NAMESPACE
@@ -66,7 +66,7 @@ public:
     void evaluateInitialization(QScxmlExecutableContent::EvaluatorId id, bool *ok) override;
     void evaluateForeach(QScxmlExecutableContent::EvaluatorId id, bool *ok, ForeachLoopBody *body) override;
 
-    void setScxmlEvent(const QScxmlEvent &scxmlEvent) override Q_DECL_FINAL;
+    void setScxmlEvent(const QScxmlEvent &scxmlEvent) override final;
     const QScxmlEvent &scxmlEvent() const;
 
     QVariant scxmlProperty(const QString &name) const override;
diff --git a/src/scxml/qscxmlecmascriptdatamodel.h b/src/scxml/qscxmlecmascriptdatamodel.h
index 85234d8..658df6d 100644
--- a/src/scxml/qscxmlecmascriptdatamodel.h
+++ b/src/scxml/qscxmlecmascriptdatamodel.h
@@ -53,13 +53,13 @@ public:
 
     Q_INVOKABLE bool setup(const QVariantMap &initialDataValues) override;
 
-    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;
+    QString evaluateToString(QScxmlExecutableContent::EvaluatorId id, bool *ok) override final;
+    bool evaluateToBool(QScxmlExecutableContent::EvaluatorId id, bool *ok) override final;
+    QVariant evaluateToVariant(QScxmlExecutableContent::EvaluatorId id, bool *ok) override final;
+    void evaluateToVoid(QScxmlExecutableContent::EvaluatorId id, bool *ok) override final;
+    void evaluateAssignment(QScxmlExecutableContent::EvaluatorId id, bool *ok) override final;
+    void evaluateInitialization(QScxmlExecutableContent::EvaluatorId id, bool *ok) override final;
+    void evaluateForeach(QScxmlExecutableContent::EvaluatorId id, bool *ok, ForeachLoopBody *body) override final;
 
     void setScxmlEvent(const QScxmlEvent &event) override;
 
diff --git a/src/scxml/qscxmlnulldatamodel.h b/src/scxml/qscxmlnulldatamodel.h
index 2310cc4..b34428d 100644
--- a/src/scxml/qscxmlnulldatamodel.h
+++ b/src/scxml/qscxmlnulldatamodel.h
@@ -55,13 +55,13 @@ public:
 
     Q_INVOKABLE bool setup(const QVariantMap &initialDataValues) override;
 
-    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;
+    QString evaluateToString(QScxmlExecutableContent::EvaluatorId id, bool *ok) override final;
+    bool evaluateToBool(QScxmlExecutableContent::EvaluatorId id, bool *ok) override final;
+    QVariant evaluateToVariant(QScxmlExecutableContent::EvaluatorId id, bool *ok) override final;
+    void evaluateToVoid(QScxmlExecutableContent::EvaluatorId id, bool *ok) override final;
+    void evaluateAssignment(QScxmlExecutableContent::EvaluatorId id, bool *ok) override final;
+    void evaluateInitialization(QScxmlExecutableContent::EvaluatorId id, bool *ok) override final;
+    void evaluateForeach(QScxmlExecutableContent::EvaluatorId id, bool *ok, ForeachLoopBody *body) override final;
 
     void setScxmlEvent(const QScxmlEvent &event) override;
 
diff --git a/src/scxml/qscxmltabledata.cpp b/src/scxml/qscxmltabledata.cpp
index 533cd1d..23ead19 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) override Q_DECL_FINAL
+    bool visit(DocumentModel::Scxml *node) override final
     {
         setName(node->name);
 
@@ -278,7 +278,7 @@ protected: // visitor
         return false;
     }
 
-    bool visit(DocumentModel::State *state) override Q_DECL_FINAL
+    bool visit(DocumentModel::State *state) override 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) override Q_DECL_FINAL
+    bool visit(DocumentModel::Transition *transition) override 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) override Q_DECL_FINAL
+    bool visit(DocumentModel::HistoryState *historyState) override 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) override Q_DECL_FINAL
+    bool visit(DocumentModel::Send *node) override final
     {
         auto instr = m_instructions.add<Send>(Send::calculateExtraSize(node->params.size(),
                                                                        node->namelist.size()));
@@ -486,13 +486,13 @@ protected: // visitor
         return false;
     }
 
-    void visit(DocumentModel::Raise *node) override Q_DECL_FINAL
+    void visit(DocumentModel::Raise *node) override final
     {
         auto instr = m_instructions.add<Raise>();
         instr->event = addString(node->event);
     }
 
-    void visit(DocumentModel::Log *node) override Q_DECL_FINAL
+    void visit(DocumentModel::Log *node) override final
     {
         auto instr = m_instructions.add<Log>();
         instr->label = addString(node->label);
@@ -501,7 +501,7 @@ protected: // visitor
                                             node->expr);
     }
 
-    void visit(DocumentModel::Script *node) override Q_DECL_FINAL
+    void visit(DocumentModel::Script *node) override final
     {
         auto instr = m_instructions.add<JavaScript>();
         instr->go = createEvaluatorVoid(QStringLiteral("script"),
@@ -509,14 +509,14 @@ protected: // visitor
                                         node->content);
     }
 
-    void visit(DocumentModel::Assign *node) override Q_DECL_FINAL
+    void visit(DocumentModel::Assign *node) override final
     {
         auto instr = m_instructions.add<Assign>();
         auto ctxt = createContext(QStringLiteral("assign"), QStringLiteral("expr"), node->expr);
         instr->expression = addAssignment(node->location, node->expr, ctxt);
     }
 
-    bool visit(DocumentModel::If *node) override Q_DECL_FINAL
+    bool visit(DocumentModel::If *node) override final
     {
         auto instr = m_instructions.add<If>(node->conditions.size());
         instr->conditions.count = node->conditions.size();
@@ -533,7 +533,7 @@ protected: // visitor
         return false;
     }
 
-    bool visit(DocumentModel::Foreach *node) override Q_DECL_FINAL
+    bool visit(DocumentModel::Foreach *node) override final
     {
         auto instr = m_instructions.add<Foreach>();
         auto ctxt = createContextString(QStringLiteral("foreach"));
@@ -544,7 +544,7 @@ protected: // visitor
         return false;
     }
 
-    void visit(DocumentModel::Cancel *node) override Q_DECL_FINAL
+    void visit(DocumentModel::Cancel *node) override final
     {
         auto instr = m_instructions.add<Cancel>();
         instr->sendid = addString(node->sendid);
diff --git a/src/scxml/qscxmltabledata_p.h b/src/scxml/qscxmltabledata_p.h
index d4bc36a..47d8bac 100644
--- a/src/scxml/qscxmltabledata_p.h
+++ b/src/scxml/qscxmltabledata_p.h
@@ -95,18 +95,18 @@ public:
     static QString toString(const int *stateMachineTable);
 
 public:
-    QString string(QScxmlExecutableContent::StringId id) const override Q_DECL_FINAL;
-    QScxmlExecutableContent::InstructionId *instructions() const override Q_DECL_FINAL;
+    QString string(QScxmlExecutableContent::StringId id) const override final;
+    QScxmlExecutableContent::InstructionId *instructions() const override final;
     QScxmlExecutableContent::EvaluatorInfo evaluatorInfo(
-            QScxmlExecutableContent::EvaluatorId evaluatorId) const override Q_DECL_FINAL;
+            QScxmlExecutableContent::EvaluatorId evaluatorId) const override final;
     QScxmlExecutableContent::AssignmentInfo assignmentInfo(
-            QScxmlExecutableContent::EvaluatorId assignmentId) const override Q_DECL_FINAL;
+            QScxmlExecutableContent::EvaluatorId assignmentId) const override final;
     QScxmlExecutableContent::ForeachInfo foreachInfo(
-            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;
+            QScxmlExecutableContent::EvaluatorId foreachId) const override final;
+    QScxmlExecutableContent::StringId *dataNames(int *count) const override final;
+    QScxmlExecutableContent::ContainerId initialSetup() const override final;
+    QString name() const override final;
+    const qint32 *stateMachineTable() const override final;
     QScxmlInvokableServiceFactory *serviceFactory(int id) const override;
 
 public: