Rename QScxmlLibt to QScxml

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

30 files changed, 19 insertions, 19 deletions

diff --git a/src/qml-module/qml-module.pro b/src/qml-module/qml-module.pro
index c401377..4cbf853 100644
--- a/src/qml-module/qml-module.pro
+++ b/src/qml-module/qml-module.pro
@@ -3,7 +3,7 @@ TARGET = scxmlstatemachine
 TARGETPATH = Scxml
 IMPORT_VERSION = 1.0
 
-QT = qscxmllib qml-private core-private
+QT = qscxml qml-private core-private
 
 SOURCES = \
     $$PWD/plugin.cpp \
diff --git a/src/qml-module/state.cpp b/src/qml-module/state.cpp
index 4d41cf4..da240b4 100644
--- a/src/qml-module/state.cpp
+++ b/src/qml-module/state.cpp
@@ -19,7 +19,7 @@
 #include "state.h"
 #include "statemachine.h"
 
-#include <QScxmlLib/scxmlstatetable.h>
+#include <QScxml/scxmlstatetable.h>
 #include <QQmlInfo>
 
 State::State(StateMachine *parent)
diff --git a/src/qml-module/statemachine.cpp b/src/qml-module/statemachine.cpp
index a2534a8..2adec4c 100644
--- a/src/qml-module/statemachine.cpp
+++ b/src/qml-module/statemachine.cpp
@@ -20,9 +20,9 @@
 #include "state.h"
 #include "statemachine.h"
 
-#include <QScxmlLib/ecmascriptdatamodel.h>
-#include <QScxmlLib/scxmlstatetable.h>
-#include <QScxmlLib/scxmlparser.h>
+#include <QScxml/ecmascriptdatamodel.h>
+#include <QScxml/scxmlstatetable.h>
+#include <QScxml/scxmlparser.h>
 #include <QQmlContext>
 #include <QQmlEngine>
 #include <QQmlInfo>
diff --git a/src/qml-module/statemachine.h b/src/qml-module/statemachine.h
index fd5f59c..a192a32 100644
--- a/src/qml-module/statemachine.h
+++ b/src/qml-module/statemachine.h
@@ -22,7 +22,7 @@
 #include <QVector>
 #include <QQmlParserStatus>
 #include <QQmlListProperty>
-#include <QScxmlLib/scxmlstatetable.h>
+#include <QScxml/scxmlstatetable.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qscxmllib/datamodel.cpp b/src/qscxml/datamodel.cpp
index 7cba99c..7cba99c 100644
--- a/src/qscxmllib/datamodel.cpp
+++ b/src/qscxml/datamodel.cpp
diff --git a/src/qscxmllib/datamodel.h b/src/qscxml/datamodel.h
index 05a9743..05a9743 100644
--- a/src/qscxmllib/datamodel.h
+++ b/src/qscxml/datamodel.h
diff --git a/src/qscxmllib/ecmascriptdatamodel.cpp b/src/qscxml/ecmascriptdatamodel.cpp
index b8728b8..b8728b8 100644
--- a/src/qscxmllib/ecmascriptdatamodel.cpp
+++ b/src/qscxml/ecmascriptdatamodel.cpp
diff --git a/src/qscxmllib/ecmascriptdatamodel.h b/src/qscxml/ecmascriptdatamodel.h
index 2dd3412..2dd3412 100644
--- a/src/qscxmllib/ecmascriptdatamodel.h
+++ b/src/qscxml/ecmascriptdatamodel.h
diff --git a/src/qscxmllib/ecmascriptplatformproperties.cpp b/src/qscxml/ecmascriptplatformproperties.cpp
index 71a7eb2..71a7eb2 100644
--- a/src/qscxmllib/ecmascriptplatformproperties.cpp
+++ b/src/qscxml/ecmascriptplatformproperties.cpp
diff --git a/src/qscxmllib/ecmascriptplatformproperties.h b/src/qscxml/ecmascriptplatformproperties.h
index 26b89b3..26b89b3 100644
--- a/src/qscxmllib/ecmascriptplatformproperties.h
+++ b/src/qscxml/ecmascriptplatformproperties.h
diff --git a/src/qscxmllib/executablecontent.cpp b/src/qscxml/executablecontent.cpp
index 67db47a..67db47a 100644
--- a/src/qscxmllib/executablecontent.cpp
+++ b/src/qscxml/executablecontent.cpp
diff --git a/src/qscxmllib/executablecontent.h b/src/qscxml/executablecontent.h
index 1c403aa..1c403aa 100644
--- a/src/qscxmllib/executablecontent.h
+++ b/src/qscxml/executablecontent.h
diff --git a/src/qscxmllib/executablecontent_p.h b/src/qscxml/executablecontent_p.h
index 7b18fb3..7b18fb3 100644
--- a/src/qscxmllib/executablecontent_p.h
+++ b/src/qscxml/executablecontent_p.h
diff --git a/src/qscxmllib/nulldatamodel.cpp b/src/qscxml/nulldatamodel.cpp
index 0eb0039..0eb0039 100644
--- a/src/qscxmllib/nulldatamodel.cpp
+++ b/src/qscxml/nulldatamodel.cpp
diff --git a/src/qscxmllib/nulldatamodel.h b/src/qscxml/nulldatamodel.h
index ef40d77..ef40d77 100644
--- a/src/qscxmllib/nulldatamodel.h
+++ b/src/qscxml/nulldatamodel.h
diff --git a/src/qscxmllib/qscxmllib.pro b/src/qscxml/qscxml.pro
index 38d3ae7..a38548c 100644
--- a/src/qscxmllib/qscxmllib.pro
+++ b/src/qscxml/qscxml.pro
@@ -1,5 +1,5 @@
-TARGET = QScxmlLib
-MODULE = qscxmllib
+TARGET = QScxml
+MODULE = qscxml
 
 QT       += core core-private qml qml-private
 
diff --git a/src/qscxmllib/scxmlcppdumper.cpp b/src/qscxml/scxmlcppdumper.cpp
index d9596e9..d72a936 100644
--- a/src/qscxmllib/scxmlcppdumper.cpp
+++ b/src/qscxml/scxmlcppdumper.cpp
@@ -140,7 +140,7 @@ static QString toHex(const QString &str)
 }
 
 const char *headerStart =
-        "#include <QScxmlLib/scxmlstatetable.h>\n"
+        "#include <QScxml/scxmlstatetable.h>\n"
         "\n";
 
 using namespace DocumentModel;
@@ -195,11 +195,11 @@ protected:
         switch (node->dataModel) {
         case Scxml::NullDataModel:
             dmName = QStringLiteral("Null");
-            clazz.implIncludes << QStringLiteral("QScxmlLib/nulldatamodel.h");
+            clazz.implIncludes << QStringLiteral("QScxml/nulldatamodel.h");
             break;
         case Scxml::JSDataModel:
             dmName = QStringLiteral("EcmaScript");
-            clazz.implIncludes << QStringLiteral("QScxmlLib/ecmascriptdatamodel.h");
+            clazz.implIncludes << QStringLiteral("QScxml/ecmascriptdatamodel.h");
             break;
         default:
             Q_UNREACHABLE();
@@ -220,7 +220,7 @@ protected:
         }
         clazz.init.impl << QStringLiteral("table.setDataBinding(Scxml::StateTable::%1Binding);").arg(binding);
 
-        clazz.implIncludes << QStringLiteral("QScxmlLib/executablecontent.h");
+        clazz.implIncludes << QStringLiteral("QScxml/executablecontent.h");
         clazz.init.impl << QStringLiteral("table.setTableData(this);");
 
         foreach (AbstractState *s, node->initialStates) {
diff --git a/src/qscxmllib/scxmlcppdumper.h b/src/qscxml/scxmlcppdumper.h
index f215b28..f215b28 100644
--- a/src/qscxmllib/scxmlcppdumper.h
+++ b/src/qscxml/scxmlcppdumper.h
diff --git a/src/qscxmllib/scxmlevent.cpp b/src/qscxml/scxmlevent.cpp
index 2034e63..2034e63 100644
--- a/src/qscxmllib/scxmlevent.cpp
+++ b/src/qscxml/scxmlevent.cpp
diff --git a/src/qscxmllib/scxmlevent.h b/src/qscxml/scxmlevent.h
index ca8fd82..ca8fd82 100644
--- a/src/qscxmllib/scxmlevent.h
+++ b/src/qscxml/scxmlevent.h
diff --git a/src/qscxmllib/scxmlevent_p.h b/src/qscxml/scxmlevent_p.h
index 128a80a..128a80a 100644
--- a/src/qscxmllib/scxmlevent_p.h
+++ b/src/qscxml/scxmlevent_p.h
diff --git a/src/qscxmllib/scxmlglobals.h b/src/qscxml/scxmlglobals.h
index b60520c..b60520c 100644
--- a/src/qscxmllib/scxmlglobals.h
+++ b/src/qscxml/scxmlglobals.h
diff --git a/src/qscxmllib/scxmlparser.cpp b/src/qscxml/scxmlparser.cpp
index 50ac13f..50ac13f 100644
--- a/src/qscxmllib/scxmlparser.cpp
+++ b/src/qscxml/scxmlparser.cpp
diff --git a/src/qscxmllib/scxmlparser.h b/src/qscxml/scxmlparser.h
index 4c83baa..4c83baa 100644
--- a/src/qscxmllib/scxmlparser.h
+++ b/src/qscxml/scxmlparser.h
diff --git a/src/qscxmllib/scxmlstatetable.cpp b/src/qscxml/scxmlstatetable.cpp
index 5ffa56a..5ffa56a 100644
--- a/src/qscxmllib/scxmlstatetable.cpp
+++ b/src/qscxml/scxmlstatetable.cpp
diff --git a/src/qscxmllib/scxmlstatetable.h b/src/qscxml/scxmlstatetable.h
index 8e35f8c..8e35f8c 100644
--- a/src/qscxmllib/scxmlstatetable.h
+++ b/src/qscxml/scxmlstatetable.h
diff --git a/src/qscxmllib/scxmlstatetable_p.h b/src/qscxml/scxmlstatetable_p.h
index b4b6eb1..b4b6eb1 100644
--- a/src/qscxmllib/scxmlstatetable_p.h
+++ b/src/qscxml/scxmlstatetable_p.h
diff --git a/src/qscxmlcpp/qscxmlcpp.cpp b/src/qscxmlcpp/qscxmlcpp.cpp
index 95cbdb8..0a28286 100644
--- a/src/qscxmlcpp/qscxmlcpp.cpp
+++ b/src/qscxmlcpp/qscxmlcpp.cpp
@@ -16,8 +16,8 @@
  ** from Digia Plc.
  ****************************************************************************/
 
-#include <QScxmlLib/scxmlparser.h>
-#include <QScxmlLib/scxmlcppdumper.h>
+#include <QScxml/scxmlparser.h>
+#include <QScxml/scxmlcppdumper.h>
 
 #include <QCoreApplication>
 #include <QFile>
diff --git a/src/qscxmlcpp/qscxmlcpp.pro b/src/qscxmlcpp/qscxmlcpp.pro
index d71223c..3924e99 100644
--- a/src/qscxmlcpp/qscxmlcpp.pro
+++ b/src/qscxmlcpp/qscxmlcpp.pro
@@ -1,5 +1,5 @@
 option(host_build)
-QT       += core qml qscxmllib
+QT       += core qml qscxml
 
 TARGET = qscxmlcpp
 CONFIG   += console c++11
diff --git a/src/src.pro b/src/src.pro
index 5a23ed5..69994a7 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,12 +1,12 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
-    qscxmllib \
+    qscxml \
     qscxmlcpp
 
-qscxmlparse.depends = qscxmllib
-qscxmlcpp.depends = qscxmllib
-imports.depends = qscxmllib
+qscxmlparse.depends = qscxml
+qscxmlcpp.depends = qscxml
+imports.depends = qscxml
 
 qtHaveModule(qml) {
     SUBDIRS +=  qml-module