Simplify qscxmlexecutablecontent.h

The only things we actually have to export are a few structs and
typedefs. As we have to keep this binary compatible we should strive
to make it as simple as possible.

Change-Id: I54d365530800c86ecc3d859d6daea94e05b893a0
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>

15 files changed, 74 insertions, 73 deletions

diff --git a/src/scxml/qscxmlevent.cpp b/src/scxml/qscxmlevent.cpp
index 893c4a5..6da52d7 100644
--- a/src/scxml/qscxmlevent.cpp
+++ b/src/scxml/qscxmlevent.cpp
@@ -176,7 +176,7 @@ QScxmlEvent *QScxmlEventBuilder::errorEvent(QScxmlStateMachine *stateMachine, co
     return error;
 }
 
-bool QScxmlEventBuilder::evaluate(const Param &param, QScxmlStateMachine *stateMachine,
+bool QScxmlEventBuilder::evaluate(const ParameterInfo &param, QScxmlStateMachine *stateMachine,
                                   QVariantMap &keyValues)
 {
     auto dataModel = stateMachine->dataModel();
@@ -208,7 +208,8 @@ bool QScxmlEventBuilder::evaluate(const Param &param, QScxmlStateMachine *stateM
     }
 }
 
-bool QScxmlEventBuilder::evaluate(const QScxmlExecutableContent::Array<Param> *params, QScxmlStateMachine *stateMachine, QVariantMap &keyValues)
+bool QScxmlEventBuilder::evaluate(const QScxmlExecutableContent::Array<ParameterInfo> *params,
+                                  QScxmlStateMachine *stateMachine, QVariantMap &keyValues)
 {
     if (!params)
         return true;
diff --git a/src/scxml/qscxmlevent_p.h b/src/scxml/qscxmlevent_p.h
index 6eb27d1..aef14d1 100644
--- a/src/scxml/qscxmlevent_p.h
+++ b/src/scxml/qscxmlevent_p.h
@@ -71,7 +71,7 @@ class QScxmlEventBuilder
     QScxmlExecutableContent::EvaluatorId eventexpr;
     QString contents;
     QScxmlExecutableContent::EvaluatorId contentExpr;
-    const QScxmlExecutableContent::Array<QScxmlExecutableContent::Param> *params;
+    const QScxmlExecutableContent::Array<QScxmlExecutableContent::ParameterInfo> *params;
     QScxmlEvent::EventType eventType;
     QString id;
     QString idLocation;
@@ -144,12 +144,13 @@ public:
     static QScxmlEvent *errorEvent(QScxmlStateMachine *stateMachine, const QString &name,
                                    const QString &message, const QString &sendid);
 
-    bool evaluate(const QScxmlExecutableContent::Param &param, QScxmlStateMachine *stateMachine,
-                  QVariantMap &keyValues);
-
-    bool evaluate(const QScxmlExecutableContent::Array<QScxmlExecutableContent::Param> *params,
+    bool evaluate(const QScxmlExecutableContent::ParameterInfo &param,
                   QScxmlStateMachine *stateMachine, QVariantMap &keyValues);
 
+    bool evaluate(
+            const QScxmlExecutableContent::Array<QScxmlExecutableContent::ParameterInfo> *params,
+            QScxmlStateMachine *stateMachine, QVariantMap &keyValues);
+
     void submitError(const QString &type, const QString &msg, const QString &sendid = QString());
 };
 #endif // BUILD_QSCXMLC
diff --git a/src/scxml/qscxmlexecutablecontent.h b/src/scxml/qscxmlexecutablecontent.h
index 6ec532d..d394940 100644
--- a/src/scxml/qscxmlexecutablecontent.h
+++ b/src/scxml/qscxmlexecutablecontent.h
@@ -42,19 +42,18 @@
 
 #include <QtScxml/qscxmlglobals.h>
 
-#include <QVector>
-
 QT_BEGIN_NAMESPACE
 
 namespace QScxmlExecutableContent {
 
-typedef int ContainerId;
+typedef qint32 ContainerId;
+enum { NoContainer = -1 };
 typedef qint32 StringId;
-typedef QVector<StringId> StringIds;
 enum { NoString = -1 };
 typedef qint32 InstructionId;
 enum { NoInstruction = -1 };
-class QScxmlExecutionEngine;
+typedef qint32 EvaluatorId;
+enum { NoEvaluator = -1 };
 
 #if defined(Q_CC_MSVC) || defined(Q_CC_GNU)
 #pragma pack(push, 4) // 4 == sizeof(qint32)
@@ -76,28 +75,15 @@ struct ForeachInfo {
     StringId index;
     StringId context;
 };
-#if defined(Q_CC_MSVC) || defined(Q_CC_GNU)
-#pragma pack(pop)
-#endif
 
-typedef qint32 EvaluatorId;
-enum { NoEvaluator = -1 };
-
-struct Q_SCXML_EXPORT Param
-{
+struct ParameterInfo {
     StringId name;
     EvaluatorId expr;
     StringId location;
-
-    Param(StringId theName, EvaluatorId theExpr, StringId theLocation)
-        : name(theName), expr(theExpr), location(theLocation)
-    {}
-
-    Param() : name(NoString), expr(NoInstruction), location(NoString)
-    {}
-
-    static int calculateSize() { return sizeof(Param) / sizeof(qint32); }
 };
+#if defined(Q_CC_MSVC) || defined(Q_CC_GNU)
+#pragma pack(pop)
+#endif
 
 } // QScxmlExecutableContent namespace
 
diff --git a/src/scxml/qscxmlexecutablecontent_p.h b/src/scxml/qscxmlexecutablecontent_p.h
index 4dbf4f9..04b33a5 100644
--- a/src/scxml/qscxmlexecutablecontent_p.h
+++ b/src/scxml/qscxmlexecutablecontent_p.h
@@ -131,7 +131,7 @@ struct Q_SCXML_EXPORT DoneData: Instruction
     StringId location;
     StringId contents;
     EvaluatorId expr;
-    Array<Param> params;
+    Array<ParameterInfo> params;
 
     static InstructionType kind() { return Instruction::DoneData; }
 };
@@ -203,18 +203,19 @@ struct Q_SCXML_EXPORT Send: Instruction
         return paramsOffset() + params()->size();
     }
 
-    const Array<Param> *params() const {
-        return reinterpret_cast<const Array<Param> *>(
+    const Array<ParameterInfo> *params() const {
+        return reinterpret_cast<const Array<ParameterInfo> *>(
                     reinterpret_cast<const InstructionId *>(this) + paramsOffset());
     }
 
-    Array<Param> *params() {
-        return reinterpret_cast<Array<Param> *>(
+    Array<ParameterInfo> *params() {
+        return reinterpret_cast<Array<ParameterInfo> *>(
                     reinterpret_cast<InstructionId *>(this) + paramsOffset());
     }
 
     static int calculateExtraSize(int paramCount, int nameCount) {
-        return 1 + paramCount * sizeof(Param) / sizeof(qint32) + nameCount * sizeof(StringId) / sizeof(qint32);
+        return 1 + paramCount * sizeof(ParameterInfo) / sizeof(qint32)
+                + nameCount * sizeof(StringId) / sizeof(qint32);
     }
 };
 
@@ -488,6 +489,8 @@ struct StateTable {
 #pragma pack(pop)
 #endif
 
+} // QScxmlExecutableContent namespace
+
 class QScxmlExecutionEngine
 {
     Q_DISABLE_COPY(QScxmlExecutionEngine)
@@ -495,17 +498,16 @@ class QScxmlExecutionEngine
 public:
     QScxmlExecutionEngine(QScxmlStateMachine *stateMachine);
 
-    bool execute(ContainerId ip, const QVariant &extraData = QVariant());
+    bool execute(QScxmlExecutableContent::ContainerId ip, const QVariant &extraData = QVariant());
 
 private:
-    const InstructionId *step(const QScxmlExecutableContent::InstructionId *ip, bool *ok);
+    const QScxmlExecutableContent::InstructionId *step(
+            const QScxmlExecutableContent::InstructionId *ip, bool *ok);
 
     QScxmlStateMachine *stateMachine;
     QVariant extraData;
 };
 
-} // QScxmlExecutableContent namespace
-
 QT_END_NAMESPACE
 
 #endif // EXECUTABLECONTENT_P_H
diff --git a/src/scxml/qscxmlinvokableservice.cpp b/src/scxml/qscxmlinvokableservice.cpp
index 1fdb146..73236ce 100644
--- a/src/scxml/qscxmlinvokableservice.cpp
+++ b/src/scxml/qscxmlinvokableservice.cpp
@@ -104,7 +104,7 @@ public:
          QScxmlExecutableContent::StringId idlocation,
          const QVector<QScxmlExecutableContent::StringId> &namelist,
          bool autoforward,
-         const QVector<QScxmlExecutableContent::Param> &params,
+         const QVector<QScxmlExecutableContent::ParameterInfo> &params,
          QScxmlExecutableContent::ContainerId finalize)
         : invokeLocation(invokeLocation)
         , srcexpr(srcexpr)
@@ -123,7 +123,7 @@ public:
     QScxmlExecutableContent::StringId idPrefix;
     QScxmlExecutableContent::StringId idlocation;
     QVector<QScxmlExecutableContent::StringId> namelist;
-    QVector<QScxmlExecutableContent::Param> params;
+    QVector<QScxmlExecutableContent::ParameterInfo> params;
     QScxmlExecutableContent::ContainerId finalize;
     bool autoforward;
 };
@@ -136,7 +136,7 @@ QScxmlInvokableServiceFactory::QScxmlInvokableServiceFactory(
         QScxmlExecutableContent::StringId idlocation,
         const QVector<QScxmlExecutableContent::StringId> &namelist,
         bool autoforward,
-        const QVector<QScxmlExecutableContent::Param> &params,
+        const QVector<QScxmlExecutableContent::ParameterInfo> &params,
         QScxmlExecutableContent::ContainerId finalize)
     : d(new Data(invokeLocation,
                  srcexpr,
@@ -203,7 +203,7 @@ QVariantMap QScxmlInvokableServiceFactory::calculateData(QScxmlStateMachine *par
     auto dataModel = parent->dataModel();
     auto tableData = parent->tableData();
 
-    for (const QScxmlExecutableContent::Param &param : qAsConst(d->params)) {
+    for (const QScxmlExecutableContent::ParameterInfo &param : qAsConst(d->params)) {
         auto name = tableData->string(param.name);
 
         if (param.expr != QScxmlExecutableContent::NoEvaluator) {
@@ -327,7 +327,7 @@ QScxmlInvokableScxmlServiceFactory::QScxmlInvokableScxmlServiceFactory(
         QScxmlExecutableContent::StringId idlocation,
         const QVector<QScxmlExecutableContent::StringId> &namelist,
         bool doAutoforward,
-        const QVector<QScxmlExecutableContent::Param> &params,
+        const QVector<QScxmlExecutableContent::ParameterInfo> &params,
         QScxmlExecutableContent::ContainerId finalize)
     : QScxmlInvokableServiceFactory(invokeLocation, srcexpr, id, idPrefix, idlocation, namelist,
                                     doAutoforward, params, finalize)
diff --git a/src/scxml/qscxmlinvokableservice.h b/src/scxml/qscxmlinvokableservice.h
index a17fdde..6f08329 100644
--- a/src/scxml/qscxmlinvokableservice.h
+++ b/src/scxml/qscxmlinvokableservice.h
@@ -91,7 +91,7 @@ public:
                                   QScxmlExecutableContent::StringId idlocation,
                                   const QVector<QScxmlExecutableContent::StringId> &namelist,
                                   bool autoforward,
-                                  const QVector<QScxmlExecutableContent::Param> &params,
+                                  const QVector<QScxmlExecutableContent::ParameterInfo> &params,
                                   QScxmlExecutableContent::ContainerId finalizeContent);
     virtual ~QScxmlInvokableServiceFactory();
 
@@ -140,7 +140,7 @@ public:
                                        QScxmlExecutableContent::StringId idlocation,
                                        const QVector<QScxmlExecutableContent::StringId> &namelist,
                                        bool doAutoforward,
-                                       const QVector<QScxmlExecutableContent::Param> &params,
+                                       const QVector<QScxmlExecutableContent::ParameterInfo> &params,
                                        QScxmlExecutableContent::ContainerId finalize);
 
 protected:
@@ -163,7 +163,7 @@ public:
                              QScxmlExecutableContent::StringId idlocation,
                              const QVector<QScxmlExecutableContent::StringId> &namelist,
                              bool doAutoforward,
-                             const QVector<QScxmlExecutableContent::Param> &params,
+                             const QVector<QScxmlExecutableContent::ParameterInfo> &params,
                              QScxmlExecutableContent::ContainerId finalize)
         : QScxmlInvokableScxmlServiceFactory(invokeLocation, QScxmlExecutableContent::NoInstruction,
                                              id, idPrefix, idlocation, namelist, doAutoforward,
@@ -186,7 +186,7 @@ public:
                               QScxmlExecutableContent::StringId idlocation,
                               const QVector<QScxmlExecutableContent::StringId> &namelist,
                               bool doAutoforward,
-                              const QVector<QScxmlExecutableContent::Param> &params,
+                              const QVector<QScxmlExecutableContent::ParameterInfo> &params,
                               QScxmlExecutableContent::ContainerId finalize)
         : QScxmlInvokableScxmlServiceFactory(invokeLocation, srcexpr, id, idPrefix, idlocation,
                                              namelist, doAutoforward, params, finalize)
diff --git a/src/scxml/qscxmlparser.cpp b/src/scxml/qscxmlparser.cpp
index 1d3fe0b..2e8ad9c 100644
--- a/src/scxml/qscxmlparser.cpp
+++ b/src/scxml/qscxmlparser.cpp
@@ -483,7 +483,7 @@ public:
                               QScxmlExecutableContent::StringId idlocation,
                               const QVector<QScxmlExecutableContent::StringId> &namelist,
                               bool autoforward,
-                              const QVector<QScxmlExecutableContent::Param> &params,
+                              const QVector<QScxmlExecutableContent::ParameterInfo> &params,
                               QScxmlExecutableContent::ContainerId finalize)
         : QScxmlInvokableScxmlServiceFactory(invokeLocation, srcexpr, id, idPrefix, idlocation,
                                              namelist, autoforward, params, finalize)
@@ -624,7 +624,7 @@ public:
                 QScxmlExecutableContent::StringId idlocation,
                 const QVector<QScxmlExecutableContent::StringId> &namelist,
                 bool autoforward,
-                const QVector<QScxmlExecutableContent::Param> &params,
+                const QVector<QScxmlExecutableContent::ParameterInfo> &params,
                 QScxmlExecutableContent::ContainerId finalize,
                 const QSharedPointer<DocumentModel::ScxmlDocument> &content) -> int {
             auto factory = new InvokeDynamicScxmlFactory(invokeLocation,
diff --git a/src/scxml/qscxmlstatemachine.cpp b/src/scxml/qscxmlstatemachine.cpp
index 8cb94ad..98011a7 100644
--- a/src/scxml/qscxmlstatemachine.cpp
+++ b/src/scxml/qscxmlstatemachine.cpp
@@ -1434,14 +1434,14 @@ QScxmlStateMachine::QScxmlStateMachine(const QMetaObject *metaObject, QObject *p
     : QObject(*new QScxmlStateMachinePrivate(metaObject), parent)
 {
     Q_D(QScxmlStateMachine);
-    d->m_executionEngine = new QScxmlExecutableContent::QScxmlExecutionEngine(this);
+    d->m_executionEngine = new QScxmlExecutionEngine(this);
 }
 
 QScxmlStateMachine::QScxmlStateMachine(QScxmlStateMachinePrivate &dd, QObject *parent)
     : QObject(dd, parent)
 {
     Q_D(QScxmlStateMachine);
-    d->m_executionEngine = new QScxmlExecutableContent::QScxmlExecutionEngine(this);
+    d->m_executionEngine = new QScxmlExecutionEngine(this);
 }
 
 /*!
diff --git a/src/scxml/qscxmlstatemachine.h b/src/scxml/qscxmlstatemachine.h
index 16bd3d0..a3f833c 100644
--- a/src/scxml/qscxmlstatemachine.h
+++ b/src/scxml/qscxmlstatemachine.h
@@ -58,11 +58,7 @@ QT_BEGIN_NAMESPACE
 class QIODevice;
 class QXmlStreamWriter;
 class QTextStream;
-class QScxmlEventBuilder;
-class QScxmlInvokableServiceFactory;
 class QScxmlInvokableService;
-class QScxmlStateMachine;
-class QScxmlTableData;
 
 class QScxmlStateMachinePrivate;
 class Q_SCXML_EXPORT QScxmlStateMachine: public QObject
@@ -335,10 +331,10 @@ public Q_SLOTS:
     bool init();
 
 protected: // methods for friends:
-    friend QScxmlDataModel;
-    friend QScxmlEventBuilder;
-    friend QScxmlInvokableServiceFactory;
-    friend QScxmlExecutableContent::QScxmlExecutionEngine;
+    friend class QScxmlDataModel;
+    friend class QScxmlEventBuilder;
+    friend class QScxmlInvokableServiceFactory;
+    friend class QScxmlExecutionEngine;
 
 #ifndef Q_QDOC
     // The methods below are used by the compiled state machines.
diff --git a/src/scxml/qscxmlstatemachine_p.h b/src/scxml/qscxmlstatemachine_p.h
index 8ffee02..a25a24c 100644
--- a/src/scxml/qscxmlstatemachine_p.h
+++ b/src/scxml/qscxmlstatemachine_p.h
@@ -333,7 +333,7 @@ public: // types & data fields:
     QScxmlDataModel *m_dataModel;
     QScxmlParserPrivate::DefaultLoader m_defaultLoader;
     QScxmlParser::Loader *m_loader;
-    QScxmlExecutableContent::QScxmlExecutionEngine *m_executionEngine;
+    QScxmlExecutionEngine *m_executionEngine;
     QScxmlTableData *m_tableData;
     const StateTable *m_stateTable;
     QScxmlStateMachine *m_parentStateMachine;
diff --git a/src/scxml/qscxmltabledata.cpp b/src/scxml/qscxmltabledata.cpp
index ced6c16..c2e9dc6 100644
--- a/src/scxml/qscxmltabledata.cpp
+++ b/src/scxml/qscxmltabledata.cpp
@@ -254,9 +254,9 @@ protected: // visitor
                 QVector<QScxmlExecutableContent::StringId> namelist;
                 for (const QString &name : qAsConst(invoke->namelist))
                     namelist += addString(name);
-                QVector<QScxmlExecutableContent::Param> params;
+                QVector<QScxmlExecutableContent::ParameterInfo> params;
                 for (DocumentModel::Param *param : qAsConst(invoke->params)) {
-                    QScxmlExecutableContent::Param p;
+                    QScxmlExecutableContent::ParameterInfo p;
                     p.name = addString(param->name);
                     p.expr = createEvaluatorVariant(QStringLiteral("param"), QStringLiteral("expr"),
                                                     param->expr);
@@ -480,12 +480,14 @@ protected: // visitor
     }
 
 protected:
+    static int paramSize() { return sizeof(ParameterInfo) / sizeof(qint32); }
+
     ContainerId generate(const DocumentModel::DoneData *node)
     {
         auto id = m_instructions.newContainerId();
         DoneData *doneData;
         if (node) {
-            doneData = m_instructions.add<DoneData>(node->params.size() * Param::calculateSize());
+            doneData = m_instructions.add<DoneData>(node->params.size() * paramSize());
             doneData->contents = addString(node->contents);
             doneData->expr = createEvaluatorString(QStringLiteral("donedata"),
                                                    QStringLiteral("expr"),
@@ -529,10 +531,10 @@ protected:
         return id;
     }
 
-    void generate(Array<Param> *out, const QVector<DocumentModel::Param *> &in)
+    void generate(Array<ParameterInfo> *out, const QVector<DocumentModel::Param *> &in)
     {
         out->count = in.size();
-        Param *it = out->data();
+        ParameterInfo *it = out->data();
         for (DocumentModel::Param *f : in) {
             it->name = addString(f->name);
             it->expr = createEvaluatorVariant(QStringLiteral("param"), QStringLiteral("expr"),
@@ -870,7 +872,7 @@ private:
     Table<QVector<EvaluatorInfo>, EvaluatorInfo, EvaluatorId> m_evaluators;
     Table<QVector<AssignmentInfo>, AssignmentInfo, EvaluatorId> m_assignments;
     Table<QVector<ForeachInfo>, ForeachInfo, EvaluatorId> m_foreaches;
-    StringIds &m_dataIds;
+    QVector<StringId> &m_dataIds;
     bool m_isCppDataModel = false;
 
     StateTable m_stateTable;
diff --git a/src/scxml/qscxmltabledata_p.h b/src/scxml/qscxmltabledata_p.h
index 294fa38..85fa91c 100644
--- a/src/scxml/qscxmltabledata_p.h
+++ b/src/scxml/qscxmltabledata_p.h
@@ -54,6 +54,7 @@
 #include <QtScxml/qscxmltabledata.h>
 #include <QtCore/qsharedpointer.h>
 #include <QtCore/qhash.h>
+#include <QtCore/qvector.h>
 
 #include <functional>
 
@@ -77,7 +78,7 @@ public:
             QScxmlExecutableContent::StringId idlocation,
             const QVector<QScxmlExecutableContent::StringId> &namelist,
             bool autoforward,
-            const QVector<QScxmlExecutableContent::Param> &params,
+            const QVector<QScxmlExecutableContent::ParameterInfo> &params,
             QScxmlExecutableContent::ContainerId finalize,
             QSharedPointer<DocumentModel::ScxmlDocument> content)
     > CreateFactoryId;
@@ -121,7 +122,7 @@ public:
     QVector<QScxmlExecutableContent::EvaluatorInfo> theEvaluators;
     QVector<QScxmlExecutableContent::AssignmentInfo> theAssignments;
     QVector<QScxmlExecutableContent::ForeachInfo> theForeaches;
-    QScxmlExecutableContent::StringIds theDataNameIds;
+    QVector<QScxmlExecutableContent::StringId> theDataNameIds;
     QScxmlExecutableContent::EvaluatorId theInitialSetup;
     int theName;
 };
diff --git a/tools/qscxmlc/data.t b/tools/qscxmlc/data.t
index da553f4..2c23de0 100644
--- a/tools/qscxmlc/data.t
+++ b/tools/qscxmlc/data.t
@@ -44,6 +44,17 @@ struct ${classname}::Data: private QScxmlTableData {
     ${classname} &stateMachine;
     ${dataModelField}
 
+    static QScxmlExecutableContent::ParameterInfo param(QScxmlExecutableContent::StringId name,
+                                                        QScxmlExecutableContent::EvaluatorId expr,
+                                                        QScxmlExecutableContent::StringId location)
+    {
+        QScxmlExecutableContent::ParameterInfo p;
+        p.name = name;
+        p.expr = expr;
+        p.location = location;
+        return p;
+    }
+
     static qint32 theInstructions[];
     static QScxmlExecutableContent::StringId dataIds[];
     static QScxmlExecutableContent::EvaluatorInfo evaluators[];
diff --git a/tools/qscxmlc/main.cpp b/tools/qscxmlc/main.cpp
index b401af8..ccc99ed 100644
--- a/tools/qscxmlc/main.cpp
+++ b/tools/qscxmlc/main.cpp
@@ -30,6 +30,7 @@
 #include "qscxmlc.h"
 
 #include <QCoreApplication>
+#include <QStringList>
 
 int main(int argc, char *argv[])
 {
diff --git a/tools/qscxmlc/scxmlcppdumper.cpp b/tools/qscxmlc/scxmlcppdumper.cpp
index 56133a5..723566f 100644
--- a/tools/qscxmlc/scxmlcppdumper.cpp
+++ b/tools/qscxmlc/scxmlcppdumper.cpp
@@ -385,7 +385,7 @@ int createFactoryId(QStringList &factories, const QString &className,
                     QScxmlExecutableContent::StringId idlocation,
                     const QVector<QScxmlExecutableContent::StringId> &namelist,
                     bool autoforward,
-                    const QVector<QScxmlExecutableContent::Param> &params,
+                    const QVector<QScxmlExecutableContent::ParameterInfo> &params,
                     QScxmlExecutableContent::ContainerId finalize,
                     bool useCxx11)
 {
@@ -415,13 +415,13 @@ int createFactoryId(QStringList &factories, const QString &className,
     {
         QStringList l;
         for (const auto &param : params) {
-            l += QStringLiteral("QScxmlExecutableContent::Param(%1, %2, %3)")
+            l += QStringLiteral("param(%1, %2, %3)")
                     .arg(QString::number(param.name),
                          QString::number(param.expr),
                          QString::number(param.location));
         }
         line += QStringLiteral("%1, ").arg(
-                    createVector(QStringLiteral("QScxmlExecutableContent::Param"), l,
+                    createVector(QStringLiteral("QScxmlExecutableContent::ParameterInfo"), l,
                                  useCxx11));
     }
     line += QStringLiteral("%1);").arg(finalize);
@@ -467,7 +467,7 @@ void CppDumper::dump(TranslationUnit *unit)
                 QScxmlExecutableContent::StringId idlocation,
                 const QVector<QScxmlExecutableContent::StringId> &namelist,
                 bool autoforward,
-                const QVector<QScxmlExecutableContent::Param> &params,
+                const QVector<QScxmlExecutableContent::ParameterInfo> &params,
                 QScxmlExecutableContent::ContainerId finalize,
                 const QSharedPointer<DocumentModel::ScxmlDocument> &content) -> int {
             QString className;