Better connection mechanism for events

The connectToEvent() mechanism is analogous to connectToState() and
allows arbitrary event specifications, with '.' and '*'. In addition
a QML component is provided to make event connections available in QML.

Change-Id: Ie45422481a794b1b350347c383318857e5dc3f6d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

1 files changed, 1 insertions, 8 deletions

diff --git a/examples/scxml/pinball/mainwindow.cpp b/examples/scxml/pinball/mainwindow.cpp
index 9e525c2..1e7b13c 100644
--- a/examples/scxml/pinball/mainwindow.cpp
+++ b/examples/scxml/pinball/mainwindow.cpp
@@ -89,8 +89,7 @@ MainWindow::MainWindow(Pinball *machine, QWidget *parent) :
     initAndConnect(QLatin1String("onState"), m_ui->ballOutButton);
 
     // datamodel update
-    connect(m_machine, SIGNAL(eventOccurred(const QScxmlEvent &)),
-            this, SLOT(eventOccurred(const QScxmlEvent &)));
+    m_machine->connectToEvent("updateScore", this, &MainWindow::eventOccurred);
 
     // gui interaction
     connect(m_ui->cButton, &QAbstractButton::clicked,
@@ -129,12 +128,6 @@ void MainWindow::initAndConnect(const QString &state, QWidget *widget)
 
 void MainWindow::eventOccurred(const QScxmlEvent &event)
 {
-    if (event.originType() != QLatin1String("qt:signal"))
-        return;
-
-    if (event.name() != QLatin1String("updateScore"))
-        return;
-
     const QVariant data = event.data();
     const QString highScore = data.toMap().value("highScore").toString();
     m_ui->highScoreLabel->setText(highScore);