Don't generate empty switch statements for C++ data models

Some compilers will complain about them.

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

1 files changed, 15 insertions, 23 deletions

diff --git a/tools/qscxmlc/cppdatamodel.t b/tools/qscxmlc/cppdatamodel.t
index 524571b..2ca5b16 100644
--- a/tools/qscxmlc/cppdatamodel.t
+++ b/tools/qscxmlc/cppdatamodel.t
@@ -1,42 +1,34 @@
 QString ${datamodel}::evaluateToString(QScxmlExecutableContent::EvaluatorId id, bool *ok)
 {
     *ok = true;
-    switch (id) {
-${evaluateToStringCases}    default:
-        Q_UNREACHABLE();
-        *ok = false;
-        return QString();
-    }
+${evaluateToStringCases}
+    Q_UNREACHABLE();
+    *ok = false;
+    return QString();
 }
 
 bool ${datamodel}::evaluateToBool(QScxmlExecutableContent::EvaluatorId id, bool *ok)
 {
     *ok = true;
-    switch (id) {
-${evaluateToBoolCases}    default:
-        Q_UNREACHABLE();
-        *ok = false;
-        return false;
-    }
+${evaluateToBoolCases}
+    Q_UNREACHABLE();
+    *ok = false;
+    return false;
 }
 
 QVariant ${datamodel}::evaluateToVariant(QScxmlExecutableContent::EvaluatorId id, bool *ok)
 {
     *ok = true;
-    switch (id) {
-${evaluateToVariantCases}    default:
-        Q_UNREACHABLE();
-        *ok = false;
-        return QVariant();
-    }
+${evaluateToVariantCases}
+    Q_UNREACHABLE();
+    *ok = false;
+    return QVariant();
 }
 
 void ${datamodel}::evaluateToVoid(QScxmlExecutableContent::EvaluatorId id, bool *ok)
 {
     *ok = true;
-    switch (id) {
-${evaluateToVoidCases}    default:
-        Q_UNREACHABLE();
-        *ok = false;
-    }
+${evaluateToVoidCases}
+    Q_UNREACHABLE();
+    *ok = false;
 }