diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2016-11-29 11:47:03 +0100 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2016-11-30 08:32:37 +0000 |
| commit | a878c9714c8f51b4464ac9eb98165e47d20fd2f1 (patch) | |
| tree | 2a10b0958da7189d195a446fb609e3082ebf614a /src | |
| parent | b0a54c19641d14c0cb0b2f8eae4190bc7b27fa7c (diff) | |
Drop the final from methods of QScxmlCppDataModel
There is no reason to prohibit the implementation of <assign>,
<foreach> and initialization. That will just make people resort to
the base class instead of using the facilities offered by the C++
data model.
Change-Id: Ic2c8d679a2c8f1c592cb3075c0b70c7cff80cd9c
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/scxml/qscxmlcppdatamodel.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/scxml/qscxmlcppdatamodel.h b/src/scxml/qscxmlcppdatamodel.h index 5de8f14..a491326 100644 --- a/src/scxml/qscxmlcppdatamodel.h +++ b/src/scxml/qscxmlcppdatamodel.h @@ -63,11 +63,10 @@ public: Q_INVOKABLE bool setup(const QVariantMap &initialDataValues) Q_DECL_OVERRIDE; #ifndef Q_QDOC - 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; + 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; #endif // Q_QDOC - void setScxmlEvent(const QScxmlEvent &scxmlEvent) Q_DECL_OVERRIDE Q_DECL_FINAL; const QScxmlEvent &scxmlEvent() const; |