Resolve the mixup of various ID types

We should not compare instances of different IDs with one another.

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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/scxml/qscxmltabledata.cpp b/src/scxml/qscxmltabledata.cpp
index 2457840..5d5115e 100644
--- a/src/scxml/qscxmltabledata.cpp
+++ b/src/scxml/qscxmltabledata.cpp
@@ -68,7 +68,7 @@ public:
 
     {
         m_activeSequences.reserve(4);
-        tableData.theInitialSetup = QScxmlExecutableContent::NoInstruction;
+        tableData.theInitialSetup = QScxmlExecutableContent::NoContainer;
     }
 
     void buildTableData(DocumentModel::ScxmlDocument *doc)
@@ -264,7 +264,7 @@ protected: // visitor
                     params.append(p);
                 }
                 QScxmlExecutableContent::ContainerId finalize =
-                        QScxmlExecutableContent::NoInstruction;
+                        QScxmlExecutableContent::NoContainer;
                 if (!invoke->finalize.isEmpty()) {
                     finalize = startNewSequence();
                     visit(&invoke->finalize);
@@ -528,7 +528,7 @@ protected:
     ContainerId generate(const DocumentModel::InstructionSequences &inSequences)
     {
         if (inSequences.isEmpty())
-            return NoInstruction;
+            return NoContainer;
 
         auto id = m_instructions.newContainerId();
         auto outSequences = m_instructions.add<InstructionSequences>();