diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2016-03-10 11:16:52 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2016-03-30 11:56:34 +0000 |
| commit | 2f2e803aa720e8a60b18eab7e4c41e67cd449457 (patch) | |
| tree | 6807c3d6a8140e04e70d805f2e046eacda4c846f /examples/scxml | |
| parent | 40914b6c47945dbce11f4993cd0dcf4f640161b3 (diff) | |
Drop the stateMachine parameter from data model constructors
Instead, make the data model a Q_PROPERTY of state machines. This makes
it much easier to independently instantiate state machines and data
models from QML and connect them via properties.
Change-Id: I62d712dd0ad7817c39432204ced431b8041e442d
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Diffstat (limited to 'examples/scxml')
3 files changed, 2 insertions, 9 deletions
diff --git a/examples/scxml/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.cpp b/examples/scxml/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.cpp index cc087f2..461e84f 100644 --- a/examples/scxml/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.cpp +++ b/examples/scxml/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.cpp @@ -60,7 +60,8 @@ int main(int argc, char *argv[]) QGuiApplication app(argc, argv); MediaPlayerStateMachine stateMachine; - TheDataModel dataModel(&stateMachine); + TheDataModel dataModel; + stateMachine.setDataModel(&dataModel); stateMachine.init(); stateMachine.start(); diff --git a/examples/scxml/mediaplayer-qml-cppdatamodel/thedatamodel.cpp b/examples/scxml/mediaplayer-qml-cppdatamodel/thedatamodel.cpp index b4409ef..0a3e200 100644 --- a/examples/scxml/mediaplayer-qml-cppdatamodel/thedatamodel.cpp +++ b/examples/scxml/mediaplayer-qml-cppdatamodel/thedatamodel.cpp @@ -52,11 +52,6 @@ #include <QScxmlEvent> -TheDataModel::TheDataModel(QScxmlStateMachine *stateMachine) - : QScxmlCppDataModel(stateMachine) -{ -} - bool TheDataModel::isValidMedia() const { QString eventMedia = eventData().value(QStringLiteral("media")).toString(); diff --git a/examples/scxml/mediaplayer-qml-cppdatamodel/thedatamodel.h b/examples/scxml/mediaplayer-qml-cppdatamodel/thedatamodel.h index e0f5bdf..e7a0e79 100644 --- a/examples/scxml/mediaplayer-qml-cppdatamodel/thedatamodel.h +++ b/examples/scxml/mediaplayer-qml-cppdatamodel/thedatamodel.h @@ -58,9 +58,6 @@ class TheDataModel: public QScxmlCppDataModel Q_OBJECT Q_SCXML_DATAMODEL -public: - TheDataModel(QScxmlStateMachine *stateMachine); - private: bool isValidMedia() const; QVariantMap eventData() const; |