Support locationid in <invoke>.

Change-Id: Ie76d858cdc086dd376b16e9469dd3723cdba261d
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>

2 files changed, 9 insertions, 3 deletions

diff --git a/tools/qscxmlc/qscxmlc.cpp b/tools/qscxmlc/qscxmlc.cpp
index 0388a1f..f2ac483 100644
--- a/tools/qscxmlc/qscxmlc.cpp
+++ b/tools/qscxmlc/qscxmlc.cpp
@@ -148,6 +148,12 @@ int main(int argc, char *argv[])
     mainDoc->root->accept(&collector);
     if (mainClassname.isEmpty())
         mainClassname = mainDoc->root->name;
+    if (mainClassname.isEmpty()) {
+        mainClassname = QFileInfo(scxmlFileName).fileName();
+        int dot = mainClassname.indexOf(QLatin1Char('.'));
+        if (dot != -1)
+            mainClassname = mainClassname.left(dot);
+    }
     collector.docs.insert(mainDoc, mainClassname);
 
     TranslationUnit tu = options;
@@ -157,7 +163,7 @@ int main(int argc, char *argv[])
     for (QMap<DocumentModel::ScxmlDocument *, QString>::const_iterator i = collector.docs.begin(), ei = collector.docs.end(); i != ei; ++i) {
         auto name = i.value();
         if (name.isEmpty()) {
-            name = QStringLiteral("StateMachine_%1").arg(tu.classnameForDocument.size() + 1);
+            name = QStringLiteral("%1_StateMachine_%2").arg(mainClassname).arg(tu.classnameForDocument.size() + 1);
         }
         tu.classnameForDocument.insert(i.key(), name);
     }
diff --git a/tools/qscxmlc/scxmlcppdumper.cpp b/tools/qscxmlc/scxmlcppdumper.cpp
index b1f6498..714e580 100644
--- a/tools/qscxmlc/scxmlcppdumper.cpp
+++ b/tools/qscxmlc/scxmlcppdumper.cpp
@@ -1020,13 +1020,13 @@ void CppDumper::writeClass(const ClassDump &clazz)
       << l("    struct Data;") << endl
       << l("    friend Data;") << endl
       << l("    struct Data *data;") << endl
-      << l("};") << endl;
+      << l("};") << endl << endl;
 }
 
 void CppDumper::writeHeaderEnd(const QString &headerGuard)
 {
     if (!m_translationUnit->namespaceName.isEmpty())
-        h << endl << l("} // namespace ") << m_translationUnit->namespaceName << endl;
+        h << l("} // namespace ") << m_translationUnit->namespaceName << endl;
     h << endl
       << QStringLiteral("#endif // ") << headerGuard << endl;
 }