Canonicalize module naming (QScxml -> QtScxml)

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

45 files changed, 54 insertions, 60 deletions

diff --git a/examples/trafficlight-common/trafficlight.h b/examples/trafficlight-common/trafficlight.h
index 84949d7..edd5401 100644
--- a/examples/trafficlight-common/trafficlight.h
+++ b/examples/trafficlight-common/trafficlight.h
@@ -41,7 +41,7 @@
 #ifndef TRAFFICLIGHT_H
 #define TRAFFICLIGHT_H
 
-#include <QScxml/scxmlstatemachine.h>
+#include <QtScxml/scxmlstatemachine.h>
 
 #include <QWidget>
 
diff --git a/examples/trafficlight-qml-dynamic/trafficlight-qml-dynamic.pro b/examples/trafficlight-qml-dynamic/trafficlight-qml-dynamic.pro
index 6a11de5..7b49387 100644
--- a/examples/trafficlight-qml-dynamic/trafficlight-qml-dynamic.pro
+++ b/examples/trafficlight-qml-dynamic/trafficlight-qml-dynamic.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 
-QT += qml qscxml
+QT += qml scxml
 
 SOURCES += trafficlight-qml-dynamic.cpp
 
diff --git a/examples/trafficlight-qml-static/trafficlight-qml-static.pro b/examples/trafficlight-qml-static/trafficlight-qml-static.pro
index a46fd60..2f2727b 100644
--- a/examples/trafficlight-qml-static/trafficlight-qml-static.pro
+++ b/examples/trafficlight-qml-static/trafficlight-qml-static.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 
-QT += qml qscxml
+QT += qml scxml
 
 CONFIG += c++11
 
diff --git a/examples/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.cpp b/examples/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.cpp
index 24e1611..4100d80 100644
--- a/examples/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.cpp
+++ b/examples/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.cpp
@@ -40,8 +40,8 @@
 
 #include "../trafficlight-common/trafficlight.h"
 
-#include <QScxml/scxmlparser.h>
-#include <QScxml/nulldatamodel.h>
+#include <QtScxml/scxmlparser.h>
+#include <QtScxml/nulldatamodel.h>
 
 #include <QApplication>
 
diff --git a/examples/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.pro b/examples/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.pro
index 9f20a5c..0a8197d 100644
--- a/examples/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.pro
+++ b/examples/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.pro
@@ -1,4 +1,4 @@
-QT += widgets qscxml
+QT += widgets scxml
 
 CONFIG += c++11
 
diff --git a/examples/trafficlight-widgets-static/trafficlight-widgets-static.pro b/examples/trafficlight-widgets-static/trafficlight-widgets-static.pro
index a2a59e4..5139caa 100644
--- a/examples/trafficlight-widgets-static/trafficlight-widgets-static.pro
+++ b/examples/trafficlight-widgets-static/trafficlight-widgets-static.pro
@@ -1,4 +1,4 @@
-QT += widgets qscxml
+QT += widgets scxml
 
 CONFIG += c++11
 
diff --git a/src/imports/scxmlstatemachine/scxmlstatemachine.pro b/src/imports/scxmlstatemachine/scxmlstatemachine.pro
index 4cbf853..40d7fc5 100644
--- a/src/imports/scxmlstatemachine/scxmlstatemachine.pro
+++ b/src/imports/scxmlstatemachine/scxmlstatemachine.pro
@@ -3,7 +3,7 @@ TARGET = scxmlstatemachine
 TARGETPATH = Scxml
 IMPORT_VERSION = 1.0
 
-QT = qscxml qml-private core-private
+QT = scxml qml-private core-private
 
 SOURCES = \
     $$PWD/plugin.cpp \
diff --git a/src/imports/scxmlstatemachine/state.cpp b/src/imports/scxmlstatemachine/state.cpp
index 8a53ff1..4b65d0f 100644
--- a/src/imports/scxmlstatemachine/state.cpp
+++ b/src/imports/scxmlstatemachine/state.cpp
@@ -19,7 +19,7 @@
 #include "state.h"
 #include "statemachine.h"
 
-#include <QScxml/scxmlstatemachine.h>
+#include <QtScxml/scxmlstatemachine.h>
 #include <QQmlInfo>
 
 State::State(StateMachine *parent)
diff --git a/src/imports/scxmlstatemachine/statemachine.cpp b/src/imports/scxmlstatemachine/statemachine.cpp
index d513223..1c55fec 100644
--- a/src/imports/scxmlstatemachine/statemachine.cpp
+++ b/src/imports/scxmlstatemachine/statemachine.cpp
@@ -20,9 +20,9 @@
 #include "state.h"
 #include "statemachine.h"
 
-#include <QScxml/ecmascriptdatamodel.h>
-#include <QScxml/scxmlstatemachine.h>
-#include <QScxml/scxmlparser.h>
+#include <QtScxml/ecmascriptdatamodel.h>
+#include <QtScxml/scxmlstatemachine.h>
+#include <QtScxml/scxmlparser.h>
 #include <QQmlContext>
 #include <QQmlEngine>
 #include <QQmlInfo>
diff --git a/src/imports/scxmlstatemachine/statemachine.h b/src/imports/scxmlstatemachine/statemachine.h
index c796f1f..e82614a 100644
--- a/src/imports/scxmlstatemachine/statemachine.h
+++ b/src/imports/scxmlstatemachine/statemachine.h
@@ -23,8 +23,8 @@
 #include <QVector>
 #include <QQmlParserStatus>
 #include <QQmlListProperty>
-#include <QScxml/scxmlstatemachine.h>
-#include <QScxml/ecmascriptdatamodel.h>
+#include <QtScxml/scxmlstatemachine.h>
+#include <QtScxml/ecmascriptdatamodel.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qscxml/datamodel.cpp b/src/scxml/datamodel.cpp
index 06a92f0..06a92f0 100644
--- a/src/qscxml/datamodel.cpp
+++ b/src/scxml/datamodel.cpp
diff --git a/src/qscxml/datamodel.h b/src/scxml/datamodel.h
index 78fd955..3f6133d 100644
--- a/src/qscxml/datamodel.h
+++ b/src/scxml/datamodel.h
@@ -19,7 +19,7 @@
 #ifndef DATAMODEL_H
 #define DATAMODEL_H
 
-#include <QScxml/executablecontent.h>
+#include <QtScxml/executablecontent.h>
 
 #include <QVariant>
 #include <QVector>
diff --git a/src/qscxml/ecmascriptdatamodel.cpp b/src/scxml/ecmascriptdatamodel.cpp
index 59bfecd..59bfecd 100644
--- a/src/qscxml/ecmascriptdatamodel.cpp
+++ b/src/scxml/ecmascriptdatamodel.cpp
diff --git a/src/qscxml/ecmascriptdatamodel.h b/src/scxml/ecmascriptdatamodel.h
index 02a5589..02a5589 100644
--- a/src/qscxml/ecmascriptdatamodel.h
+++ b/src/scxml/ecmascriptdatamodel.h
diff --git a/src/qscxml/ecmascriptplatformproperties.cpp b/src/scxml/ecmascriptplatformproperties.cpp
index 653f67c..653f67c 100644
--- a/src/qscxml/ecmascriptplatformproperties.cpp
+++ b/src/scxml/ecmascriptplatformproperties.cpp
diff --git a/src/qscxml/ecmascriptplatformproperties_p.h b/src/scxml/ecmascriptplatformproperties_p.h
index 45afd74..45afd74 100644
--- a/src/qscxml/ecmascriptplatformproperties_p.h
+++ b/src/scxml/ecmascriptplatformproperties_p.h
diff --git a/src/qscxml/executablecontent.cpp b/src/scxml/executablecontent.cpp
index 78b94ab..78b94ab 100644
--- a/src/qscxml/executablecontent.cpp
+++ b/src/scxml/executablecontent.cpp
diff --git a/src/qscxml/executablecontent.h b/src/scxml/executablecontent.h
index c344f0e..f02458d 100644
--- a/src/qscxml/executablecontent.h
+++ b/src/scxml/executablecontent.h
@@ -19,7 +19,7 @@
 #ifndef EXECUTABLECONTENT_H
 #define EXECUTABLECONTENT_H
 
-#include <QScxml/scxmlglobals.h>
+#include <QtScxml/scxmlglobals.h>
 
 #include <QByteArray>
 #include <QString>
diff --git a/src/qscxml/executablecontent_p.h b/src/scxml/executablecontent_p.h
index ed2eb0f..ed2eb0f 100644
--- a/src/qscxml/executablecontent_p.h
+++ b/src/scxml/executablecontent_p.h
diff --git a/src/qscxml/nulldatamodel.cpp b/src/scxml/nulldatamodel.cpp
index c98689f..c98689f 100644
--- a/src/qscxml/nulldatamodel.cpp
+++ b/src/scxml/nulldatamodel.cpp
diff --git a/src/qscxml/nulldatamodel.h b/src/scxml/nulldatamodel.h
index cd19cab..c7c063d 100644
--- a/src/qscxml/nulldatamodel.h
+++ b/src/scxml/nulldatamodel.h
@@ -19,7 +19,7 @@
 #ifndef NULLDATAMODEL_H
 #define NULLDATAMODEL_H
 
-#include <QScxml/datamodel.h>
+#include <QtScxml/datamodel.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qscxml/qscxml.pro b/src/scxml/scxml.pro
index 20f5ebb..3da93bb 100644
--- a/src/qscxml/qscxml.pro
+++ b/src/scxml/scxml.pro
@@ -1,13 +1,10 @@
-TARGET = QScxml
-MODULE = qscxml
-
-QT       += core core-private qml qml-private
+TARGET = QtScxml
+QT = core-private qml-private
 
 load(qt_module)
 
 CONFIG   += c++11
-DEFINES  += SCXML_LIBRARY \
-            QT_NO_CAST_FROM_ASCII
+DEFINES  += QT_NO_CAST_FROM_ASCII
 
 HEADERS += \
     scxmlparser.h \
diff --git a/src/qscxml/scxmlevent.cpp b/src/scxml/scxmlevent.cpp
index 9953ed1..9953ed1 100644
--- a/src/qscxml/scxmlevent.cpp
+++ b/src/scxml/scxmlevent.cpp
diff --git a/src/qscxml/scxmlevent.h b/src/scxml/scxmlevent.h
index 3eb4694..70d44a1 100644
--- a/src/qscxml/scxmlevent.h
+++ b/src/scxml/scxmlevent.h
@@ -19,7 +19,7 @@
 #ifndef SCXMLEVENT_H
 #define SCXMLEVENT_H
 
-#include <QScxml/scxmlglobals.h>
+#include <QtScxml/scxmlglobals.h>
 
 #include <QEvent>
 #include <QStringList>
diff --git a/src/qscxml/scxmlevent_p.h b/src/scxml/scxmlevent_p.h
index 71c86a4..71c86a4 100644
--- a/src/qscxml/scxmlevent_p.h
+++ b/src/scxml/scxmlevent_p.h
diff --git a/src/qscxml/scxmlglobals.h b/src/scxml/scxmlglobals.h
index 2af1535..866cbd8 100644
--- a/src/qscxml/scxmlglobals.h
+++ b/src/scxml/scxmlglobals.h
@@ -21,17 +21,15 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifndef SCXML_EXPORT
-#   ifndef QT_STATIC
-#       ifdef SCXML_LIBRARY
-#           define SCXML_EXPORT Q_DECL_EXPORT
-#       else
-#           define SCXML_EXPORT Q_DECL_IMPORT
-#       endif
-#   else
-#       define SCXML_EXPORT
-#   endif
-#endif // SCXML_EXPORT
+#ifndef QT_STATIC
+#  ifdef QT_BUILD_SCXML_LIB
+#    define SCXML_EXPORT Q_DECL_EXPORT
+#  else
+#    define SCXML_EXPORT Q_DECL_IMPORT
+#  endif
+#else
+#  define SCXML_EXPORT
+#endif
 
 #ifdef QT_DEBUG
 #  define SCXML_DEBUG
diff --git a/src/qscxml/scxmlparser.cpp b/src/scxml/scxmlparser.cpp
index 89dc53d..89dc53d 100644
--- a/src/qscxml/scxmlparser.cpp
+++ b/src/scxml/scxmlparser.cpp
diff --git a/src/qscxml/scxmlparser.h b/src/scxml/scxmlparser.h
index 8f73759..e0acaa7 100644
--- a/src/qscxml/scxmlparser.h
+++ b/src/scxml/scxmlparser.h
@@ -19,7 +19,7 @@
 #ifndef SCXMLPARSER_H
 #define SCXMLPARSER_H
 
-#include <QScxml/scxmlstatemachine.h>
+#include <QtScxml/scxmlstatemachine.h>
 
 #include <QStringList>
 #include <QString>
diff --git a/src/qscxml/scxmlparser_p.h b/src/scxml/scxmlparser_p.h
index 741036f..741036f 100644
--- a/src/qscxml/scxmlparser_p.h
+++ b/src/scxml/scxmlparser_p.h
diff --git a/src/qscxml/scxmlqstates.cpp b/src/scxml/scxmlqstates.cpp
index cb253d4..cb253d4 100644
--- a/src/qscxml/scxmlqstates.cpp
+++ b/src/scxml/scxmlqstates.cpp
diff --git a/src/qscxml/scxmlqstates.h b/src/scxml/scxmlqstates.h
index f835545..28a86ed 100644
--- a/src/qscxml/scxmlqstates.h
+++ b/src/scxml/scxmlqstates.h
@@ -19,7 +19,7 @@
 #ifndef SCXMLQSTATES_H
 #define SCXMLQSTATES_H
 
-#include <QScxml/scxmlstatemachine.h>
+#include <QtScxml/scxmlstatemachine.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qscxml/scxmlstatemachine.cpp b/src/scxml/scxmlstatemachine.cpp
index 46f4ab6..46f4ab6 100644
--- a/src/qscxml/scxmlstatemachine.cpp
+++ b/src/scxml/scxmlstatemachine.cpp
diff --git a/src/qscxml/scxmlstatemachine.h b/src/scxml/scxmlstatemachine.h
index 41b8674..b65235a 100644
--- a/src/qscxml/scxmlstatemachine.h
+++ b/src/scxml/scxmlstatemachine.h
@@ -19,9 +19,9 @@
 #ifndef SCXMLSTATEMACHINE_H
 #define SCXMLSTATEMACHINE_H
 
-#include <QScxml/datamodel.h>
-#include <QScxml/executablecontent.h>
-#include <QScxml/scxmlevent.h>
+#include <QtScxml/datamodel.h>
+#include <QtScxml/executablecontent.h>
+#include <QtScxml/scxmlevent.h>
 
 #include <QState>
 #include <QFinalState>
diff --git a/src/qscxml/scxmlstatemachine_p.h b/src/scxml/scxmlstatemachine_p.h
index c7d2d27..c7d2d27 100644
--- a/src/qscxml/scxmlstatemachine_p.h
+++ b/src/scxml/scxmlstatemachine_p.h
diff --git a/src/src.pro b/src/src.pro
index 1e4c0c7..e1073fb 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,9 +1,8 @@
 TEMPLATE = subdirs
 
-SUBDIRS += qscxml
-qscxmlparse.depends = qscxml
+SUBDIRS += scxml
 
 qtHaveModule(qml) {
     SUBDIRS += imports
-    imports.depends = qscxml
+    imports.depends = scxml
 }
diff --git a/sync.profile b/sync.profile
index c2442b0..acbc753 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,5 +1,5 @@
 %modules = ( # path to module name map
-    "QScxml" => "$basedir/src/qscxml",
+    "QtScxml" => "$basedir/src/scxml",
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );
diff --git a/tests/auto/scion/scion.pro b/tests/auto/scion/scion.pro
index 004d447..c1db3e5 100644
--- a/tests/auto/scion/scion.pro
+++ b/tests/auto/scion/scion.pro
@@ -1,4 +1,4 @@
-QT += testlib qscxml
+QT += testlib scxml
 CONFIG += testcase
 
 QT += core qml
diff --git a/tests/auto/scion/tst_scion.cpp b/tests/auto/scion/tst_scion.cpp
index bbdc0a9..6326335 100644
--- a/tests/auto/scion/tst_scion.cpp
+++ b/tests/auto/scion/tst_scion.cpp
@@ -19,9 +19,9 @@
 #include <QtTest/QtTest>
 #include <QJsonDocument>
 
-#include <QScxml/scxmlparser.h>
-#include <QScxml/ecmascriptdatamodel.h>
-#include <QScxml/nulldatamodel.h>
+#include <QtScxml/scxmlparser.h>
+#include <QtScxml/ecmascriptdatamodel.h>
+#include <QtScxml/nulldatamodel.h>
 
 #include "scxml/scion.h"
 #include "scxml/compiled_tests.h"
diff --git a/tests/manual/cppgen/cppgen.pro b/tests/manual/cppgen/cppgen.pro
index 5e5d33e..ea57732 100644
--- a/tests/manual/cppgen/cppgen.pro
+++ b/tests/manual/cppgen/cppgen.pro
@@ -1,6 +1,6 @@
 option(host_build)
 
-QT += testlib qscxml
+QT += testlib scxml
 CONFIG += testcase
 
 QT += core qml
diff --git a/tests/manual/cppgen/tst_cppgen.cpp b/tests/manual/cppgen/tst_cppgen.cpp
index 35b15f0..b96f38e 100644
--- a/tests/manual/cppgen/tst_cppgen.cpp
+++ b/tests/manual/cppgen/tst_cppgen.cpp
@@ -18,7 +18,7 @@
 
 #include <QtTest/QtTest>
 
-#include <QScxml/scxmlcppdumper.h>
+#include <QtScxml/scxmlcppdumper.h>
 
 using namespace Scxml;
 
diff --git a/tests/manual/testCpp/testCpp.pro b/tests/manual/testCpp/testCpp.pro
index 50e92c4..25c27b4 100644
--- a/tests/manual/testCpp/testCpp.pro
+++ b/tests/manual/testCpp/testCpp.pro
@@ -1,6 +1,6 @@
 option(host_build)
 
-QT       += core qml qscxml
+QT       += core qml scxml
 QT       -= gui
 
 TARGET = testCpp
diff --git a/tools/qscxmlc/qscxmlc.cpp b/tools/qscxmlc/qscxmlc.cpp
index 71dfa2f..1ec54dc 100644
--- a/tools/qscxmlc/qscxmlc.cpp
+++ b/tools/qscxmlc/qscxmlc.cpp
@@ -16,7 +16,7 @@
  ** from Digia Plc.
  ****************************************************************************/
 
-#include <QScxml/scxmlparser.h>
+#include <QtScxml/scxmlparser.h>
 #include "scxmlcppdumper.h"
 
 #include <QCoreApplication>
diff --git a/tools/qscxmlc/qscxmlc.pro b/tools/qscxmlc/qscxmlc.pro
index bc14ea4..61c2d00 100644
--- a/tools/qscxmlc/qscxmlc.pro
+++ b/tools/qscxmlc/qscxmlc.pro
@@ -1,5 +1,5 @@
 option(host_build)
-QT += core qml qscxml-private
+QT += core qml scxml-private
 
 TARGET = qscxmlc
 CONFIG += console c++11
diff --git a/tools/qscxmlc/scxmlcppdumper.cpp b/tools/qscxmlc/scxmlcppdumper.cpp
index 83988d7..f8dfe2e 100644
--- a/tools/qscxmlc/scxmlcppdumper.cpp
+++ b/tools/qscxmlc/scxmlcppdumper.cpp
@@ -16,7 +16,7 @@
  ** from Digia Plc.
  ****************************************************************************/
 
-#include <QScxml/private/executablecontent_p.h>
+#include <QtScxml/private/executablecontent_p.h>
 #include "scxmlcppdumper.h"
 
 #include <algorithm>
@@ -141,7 +141,7 @@ static QString toHex(const QString &str)
 }
 
 const char *headerStart =
-        "#include <QScxml/scxmlstatemachine.h>\n"
+        "#include <QtScxml/scxmlstatemachine.h>\n"
         "\n";
 
 using namespace DocumentModel;
@@ -215,7 +215,7 @@ protected:
         }
         clazz.init.impl << QStringLiteral("stateMachine.setDataBinding(Scxml::StateMachine::%1Binding);").arg(binding);
 
-        clazz.implIncludes << QStringLiteral("QScxml/executablecontent.h");
+        clazz.implIncludes << QStringLiteral("QtScxml/executablecontent.h");
         clazz.init.impl << QStringLiteral("stateMachine.setTableData(this);");
 
         foreach (AbstractState *s, node->initialStates) {
@@ -251,11 +251,11 @@ protected:
             switch (node->dataModel) {
             case Scxml::NullDataModel:
                 dmName = QStringLiteral("Null");
-                clazz.implIncludes << QStringLiteral("QScxml/nulldatamodel.h");
+                clazz.implIncludes << QStringLiteral("QtScxml/nulldatamodel.h");
                 break;
             case Scxml::JSDataModel:
                 dmName = QStringLiteral("EcmaScript");
-                clazz.implIncludes << QStringLiteral("QScxml/ecmascriptdatamodel.h");
+                clazz.implIncludes << QStringLiteral("QtScxml/ecmascriptdatamodel.h");
                 break;
             default:
                 Q_UNREACHABLE();
@@ -889,7 +889,7 @@ void CppDumper::dump(DocumentModel::ScxmlDocument *doc)
     // Generate the .cpp file:
     cpp << l("#include \"") << headerName << l("\"") << endl
         << endl
-        << QStringLiteral("#include <QScxml/scxmlqstates.h>") << endl;
+        << QStringLiteral("#include <QtScxml/scxmlqstates.h>") << endl;
     if (!clazz.implIncludes.isEmpty()) {
         clazz.implIncludes.write(cpp, QStringLiteral("#include <"), QStringLiteral(">\n"));
         cpp << endl;
diff --git a/tools/qscxmlc/scxmlcppdumper.h b/tools/qscxmlc/scxmlcppdumper.h
index 44a8cd8..9000284 100644
--- a/tools/qscxmlc/scxmlcppdumper.h
+++ b/tools/qscxmlc/scxmlcppdumper.h
@@ -22,7 +22,7 @@
 #include "scxmlglobals.h"
 #include "scxmlstatemachine.h"
 
-#include <QScxml/private/scxmlparser_p.h>
+#include <QtScxml/private/scxmlparser_p.h>
 
 #include <QTextStream>