diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2016-11-29 10:12:44 +0100 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2016-11-30 08:32:31 +0000 |
commit | b0a54c19641d14c0cb0b2f8eae4190bc7b27fa7c (patch) | |
tree | cf930b75c1ea0e8d826c80d9d0236225628e9dfa | |
parent | b4995157af050061e0d537cf393fcc1f14e5f3ef (diff) |
Drop Q_UNREACHABLE() from C++ data model methods
It's not illegal to do e.g. <assign> in your SCXML document without
implementing the assign operation in your data model. The assignment
will fail, setting the ok parameter to false. That should be enough.
Q_UNREACHABLE() is unreliable anyway as it only triggers in debug
builds.
Change-Id: Ib29a20682d2c9256fcf59d29e32383c1df675eba
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
-rw-r--r-- | src/scxml/qscxmlcppdatamodel.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/scxml/qscxmlcppdatamodel.cpp b/src/scxml/qscxmlcppdatamodel.cpp index 69f0fbd..060c220 100644 --- a/src/scxml/qscxmlcppdatamodel.cpp +++ b/src/scxml/qscxmlcppdatamodel.cpp @@ -152,14 +152,12 @@ void QScxmlCppDataModel::evaluateAssignment(EvaluatorId id, bool *ok) { Q_UNUSED(id); *ok = false; - Q_UNREACHABLE(); } void QScxmlCppDataModel::evaluateInitialization(EvaluatorId id, bool *ok) { Q_UNUSED(id); *ok = false; - Q_UNREACHABLE(); } void QScxmlCppDataModel::evaluateForeach(EvaluatorId id, bool *ok, ForeachLoopBody *body) @@ -167,7 +165,6 @@ void QScxmlCppDataModel::evaluateForeach(EvaluatorId id, bool *ok, ForeachLoopBo Q_UNUSED(id); Q_UNUSED(body); *ok = false; - Q_UNREACHABLE(); } /*! @@ -225,7 +222,6 @@ bool QScxmlCppDataModel::setScxmlProperty(const QString &name, const QVariant &v Q_UNUSED(name); Q_UNUSED(value); Q_UNUSED(context); - Q_UNREACHABLE(); return false; } |