summaryrefslogtreecommitdiffstats
path: root/examples/scxml
diff options
context:
space:
mode:
Diffstat (limited to 'examples/scxml')
-rw-r--r--examples/scxml/mediaplayer-qml-cppdatamodel/mediaplayer-qml-cppdatamodel.cpp3
-rw-r--r--examples/scxml/mediaplayer-qml-cppdatamodel/thedatamodel.cpp5
-rw-r--r--examples/scxml/mediaplayer-qml-cppdatamodel/thedatamodel.h3
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;