diff options
| author | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2015-12-01 14:28:06 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2015-12-03 14:41:13 +0000 |
| commit | 8c28a16d294e7ea5da5641037e7df8b5ecf3db3b (patch) | |
| tree | 91766484bd79f3956e58e39876c6a2a6130b18c7 /tools | |
| parent | 5ff4c9091abd680f9448b01db6ebffcb09505b27 (diff) | |
Remove QScxmlStateMachine::setDataModel.
The data-model constructor will now do the work.
Change-Id: I32dfaf95b39a4e9dcd0b6f3598fe89fdf150c909
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qscxmlc/scxmlcppdumper.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/qscxmlc/scxmlcppdumper.cpp b/tools/qscxmlc/scxmlcppdumper.cpp index 96e42fc..807b96f 100644 --- a/tools/qscxmlc/scxmlcppdumper.cpp +++ b/tools/qscxmlc/scxmlcppdumper.cpp @@ -232,10 +232,9 @@ protected: << QString(); } if (node->dataModel == Scxml::CppDataModel) { + // Tell the builder not to generate any script strings when visiting any executable content. + // We'll take care of the evaluators ourselves. setIsCppDataModel(true); - clazz.dataModelClassName = node->cppDataModelClassName; - } else { - clazz.init.impl << QStringLiteral("stateMachine.setDataModel(&dataModel);"); } QString binding; @@ -287,12 +286,15 @@ protected: case Scxml::NullDataModel: clazz.classFields << QStringLiteral("QScxmlNullDataModel dataModel;"); clazz.implIncludes << QStringLiteral("QScxmlNullDataModel"); + clazz.constructor.initializer << QStringLiteral("dataModel(&stateMachine)"); break; case Scxml::JSDataModel: clazz.classFields << QStringLiteral("QScxmlEcmaScriptDataModel dataModel;"); clazz.implIncludes << QStringLiteral("QScxmlEcmaScriptDataModel"); + clazz.constructor.initializer << QStringLiteral("dataModel(&stateMachine)"); break; case Scxml::CppDataModel: + clazz.dataModelClassName = node->cppDataModelClassName; clazz.implIncludes << node->cppDataModelHeaderName; break; default: |