diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-01-06 11:14:03 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-02-07 12:54:21 +0000 |
| commit | bd5dd290e5a056d22688a64a58c2a669fed2d085 (patch) | |
| tree | cdb95cf5f3e9f343c20459a84c151408d1bc123f /examples/scxml/ftpclient | |
| parent | 50f27e0ea97d97c396b58aceb045edfcc62eee45 (diff) | |
Make ftpclient example valid scxml
Section 6.2.3 of the standard says "A conformant SCXML document MUST
specify exactly one of 'event', 'eventexpr' and <content>." Therefore
we cannot use <content> with 'eventexpr', but we can use <param>
instead.
Change-Id: I64c0ec8a1f08d5b441e5b52a83800800f8a99d03
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'examples/scxml/ftpclient')
| -rw-r--r-- | examples/scxml/ftpclient/main.cpp | 3 | ||||
| -rw-r--r-- | examples/scxml/ftpclient/simpleftp.scxml | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/examples/scxml/ftpclient/main.cpp b/examples/scxml/ftpclient/main.cpp index 25102d2..8dd0c16 100644 --- a/examples/scxml/ftpclient/main.cpp +++ b/examples/scxml/ftpclient/main.cpp @@ -89,7 +89,8 @@ int main(int argc, char *argv[]) // Translate commands from the state machine into FTP control messages. ftpClient.connectToEvent("submit.cmd", &controlChannel, [&controlChannel](const QScxmlEvent &event) { - controlChannel.command(event.name().mid(11).toUtf8(), event.data().toByteArray()); + controlChannel.command(event.name().mid(11).toUtf8(), + event.data().toMap()["params"].toByteArray()); }); // Commands to be sent diff --git a/examples/scxml/ftpclient/simpleftp.scxml b/examples/scxml/ftpclient/simpleftp.scxml index 79eb7b9..7d57040 100644 --- a/examples/scxml/ftpclient/simpleftp.scxml +++ b/examples/scxml/ftpclient/simpleftp.scxml @@ -75,7 +75,7 @@ <state id="W"> <onentry> <send eventexpr=""submit." + _event.name"> - <content expr="_event.data"/> + <param name="params" expr="_event.data"/> </send> </onentry> |