diff options
-rw-r--r-- | examples/mediaplayer-qml-cppdatamodel/thedatamodel.h | 2 | ||||
-rw-r--r-- | examples/trafficlight-common/trafficlight.h | 2 | ||||
-rw-r--r-- | examples/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.cpp | 3 | ||||
-rw-r--r-- | src/scxml/qscxmlcppdatamodel.cpp (renamed from src/scxml/cppdatamodel.cpp) | 4 | ||||
-rw-r--r-- | src/scxml/qscxmlcppdatamodel.h (renamed from src/scxml/cppdatamodel.h) | 2 | ||||
-rw-r--r-- | src/scxml/qscxmlcppdatamodel_p.h (renamed from src/scxml/cppdatamodel_p.h) | 4 | ||||
-rw-r--r-- | src/scxml/qscxmldatamodel.cpp (renamed from src/scxml/datamodel.cpp) | 2 | ||||
-rw-r--r-- | src/scxml/qscxmldatamodel.h (renamed from src/scxml/datamodel.h) | 2 | ||||
-rw-r--r-- | src/scxml/qscxmlecmascriptdatamodel.cpp (renamed from src/scxml/ecmascriptdatamodel.cpp) | 6 | ||||
-rw-r--r-- | src/scxml/qscxmlecmascriptdatamodel.h (renamed from src/scxml/ecmascriptdatamodel.h) | 2 | ||||
-rw-r--r-- | src/scxml/qscxmlecmascriptplatformproperties.cpp (renamed from src/scxml/ecmascriptplatformproperties.cpp) | 4 | ||||
-rw-r--r-- | src/scxml/qscxmlecmascriptplatformproperties_p.h (renamed from src/scxml/ecmascriptplatformproperties_p.h) | 2 | ||||
-rw-r--r-- | src/scxml/qscxmlevent.cpp (renamed from src/scxml/scxmlevent.cpp) | 4 | ||||
-rw-r--r-- | src/scxml/qscxmlevent.h (renamed from src/scxml/scxmlevent.h) | 2 | ||||
-rw-r--r-- | src/scxml/qscxmlevent_p.h (renamed from src/scxml/scxmlevent_p.h) | 6 | ||||
-rw-r--r-- | src/scxml/qscxmlexecutablecontent.cpp (renamed from src/scxml/executablecontent.cpp) | 6 | ||||
-rw-r--r-- | src/scxml/qscxmlexecutablecontent.h (renamed from src/scxml/executablecontent.h) | 2 | ||||
-rw-r--r-- | src/scxml/qscxmlexecutablecontent_p.h (renamed from src/scxml/executablecontent_p.h) | 8 | ||||
-rw-r--r-- | src/scxml/qscxmlglobals.h (renamed from src/scxml/scxmlglobals.h) | 0 | ||||
-rw-r--r-- | src/scxml/qscxmlnulldatamodel.cpp (renamed from src/scxml/nulldatamodel.cpp) | 6 | ||||
-rw-r--r-- | src/scxml/qscxmlnulldatamodel.h (renamed from src/scxml/nulldatamodel.h) | 2 | ||||
-rw-r--r-- | src/scxml/qscxmlparser.cpp (renamed from src/scxml/scxmlparser.cpp) | 12 | ||||
-rw-r--r-- | src/scxml/qscxmlparser.h (renamed from src/scxml/scxmlparser.h) | 2 | ||||
-rw-r--r-- | src/scxml/qscxmlparser_p.h (renamed from src/scxml/scxmlparser_p.h) | 2 | ||||
-rw-r--r-- | src/scxml/qscxmlqstates.cpp (renamed from src/scxml/scxmlqstates.cpp) | 6 | ||||
-rw-r--r-- | src/scxml/qscxmlqstates.h (renamed from src/scxml/scxmlqstates.h) | 2 | ||||
-rw-r--r-- | src/scxml/qscxmlqstates_p.h (renamed from src/scxml/scxmlqstates_p.h) | 2 | ||||
-rw-r--r-- | src/scxml/qscxmlstatemachine.cpp (renamed from src/scxml/scxmlstatemachine.cpp) | 8 | ||||
-rw-r--r-- | src/scxml/qscxmlstatemachine.h (renamed from src/scxml/scxmlstatemachine.h) | 6 | ||||
-rw-r--r-- | src/scxml/qscxmlstatemachine_p.h (renamed from src/scxml/scxmlstatemachine_p.h) | 4 | ||||
-rw-r--r-- | src/scxml/scxml.pro | 54 | ||||
-rw-r--r-- | tests/auto/scion/tst_scion.cpp | 6 | ||||
-rw-r--r-- | tools/qscxmlc/qscxmlc.cpp | 2 | ||||
-rw-r--r-- | tools/qscxmlc/scxmlcppdumper.cpp | 13 | ||||
-rw-r--r-- | tools/qscxmlc/scxmlcppdumper.h | 6 |
35 files changed, 97 insertions, 99 deletions
diff --git a/examples/mediaplayer-qml-cppdatamodel/thedatamodel.h b/examples/mediaplayer-qml-cppdatamodel/thedatamodel.h index 9c15ff2..86ef092 100644 --- a/examples/mediaplayer-qml-cppdatamodel/thedatamodel.h +++ b/examples/mediaplayer-qml-cppdatamodel/thedatamodel.h @@ -41,7 +41,7 @@ #ifndef THEDATAMODEL_H #define THEDATAMODEL_H -#include "cppdatamodel.h" +#include "qscxmlcppdatamodel.h" class TheDataModel: public QScxmlCppDataModel { diff --git a/examples/trafficlight-common/trafficlight.h b/examples/trafficlight-common/trafficlight.h index 1a7bdfa..cf2ec67 100644 --- a/examples/trafficlight-common/trafficlight.h +++ b/examples/trafficlight-common/trafficlight.h @@ -41,7 +41,7 @@ #ifndef TRAFFICLIGHT_H #define TRAFFICLIGHT_H -#include <QtScxml/scxmlstatemachine.h> +#include <QScxmlStateMachine> #include <QWidget> diff --git a/examples/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.cpp b/examples/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.cpp index e3cda83..6934fa9 100644 --- a/examples/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.cpp +++ b/examples/trafficlight-widgets-dynamic/trafficlight-widgets-dynamic.cpp @@ -40,8 +40,7 @@ #include "../trafficlight-common/trafficlight.h" -#include <QtScxml/scxmlparser.h> -#include <QtScxml/nulldatamodel.h> +#include <QScxmlNullDataModel> #include <QApplication> diff --git a/src/scxml/cppdatamodel.cpp b/src/scxml/qscxmlcppdatamodel.cpp index 2897c0b..5391d3f 100644 --- a/src/scxml/cppdatamodel.cpp +++ b/src/scxml/qscxmlcppdatamodel.cpp @@ -16,8 +16,8 @@ ** from Digia Plc. ****************************************************************************/ -#include "cppdatamodel_p.h" -#include "scxmlstatemachine.h" +#include "qscxmlcppdatamodel_p.h" +#include "qscxmlstatemachine.h" QT_USE_NAMESPACE diff --git a/src/scxml/cppdatamodel.h b/src/scxml/qscxmlcppdatamodel.h index 3231da4..4509bb8 100644 --- a/src/scxml/cppdatamodel.h +++ b/src/scxml/qscxmlcppdatamodel.h @@ -19,7 +19,7 @@ #ifndef CPPDATAMODEL_H #define CPPDATAMODEL_H -#include "datamodel.h" +#include <QtScxml/qscxmldatamodel.h> #define Q_SCXML_DATAMODEL \ public: \ diff --git a/src/scxml/cppdatamodel_p.h b/src/scxml/qscxmlcppdatamodel_p.h index d10dc0a..e6ad3a8 100644 --- a/src/scxml/cppdatamodel_p.h +++ b/src/scxml/qscxmlcppdatamodel_p.h @@ -19,8 +19,8 @@ #ifndef CPPDATAMODEL_P_H #define CPPDATAMODEL_P_H -#include "cppdatamodel.h" -#include "QScxmlEvent" +#include <QtScxml/qscxmlcppdatamodel.h> +#include <QtScxml/qscxmlevent.h> QT_BEGIN_NAMESPACE diff --git a/src/scxml/datamodel.cpp b/src/scxml/qscxmldatamodel.cpp index 6c4521e..4076b89 100644 --- a/src/scxml/datamodel.cpp +++ b/src/scxml/qscxmldatamodel.cpp @@ -16,7 +16,7 @@ ** from Digia Plc. ****************************************************************************/ -#include "datamodel.h" +#include "qscxmldatamodel.h" class QScxmlDataModel::Data { diff --git a/src/scxml/datamodel.h b/src/scxml/qscxmldatamodel.h index af096b2..9568a94 100644 --- a/src/scxml/datamodel.h +++ b/src/scxml/qscxmldatamodel.h @@ -19,7 +19,7 @@ #ifndef DATAMODEL_H #define DATAMODEL_H -#include <QtScxml/executablecontent.h> +#include <QtScxml/qscxmlexecutablecontent.h> #include <QVariant> #include <QVector> diff --git a/src/scxml/ecmascriptdatamodel.cpp b/src/scxml/qscxmlecmascriptdatamodel.cpp index 53db59e..8548fd2 100644 --- a/src/scxml/ecmascriptdatamodel.cpp +++ b/src/scxml/qscxmlecmascriptdatamodel.cpp @@ -16,9 +16,9 @@ ** from Digia Plc. ****************************************************************************/ -#include "ecmascriptdatamodel.h" -#include "ecmascriptplatformproperties_p.h" -#include "executablecontent_p.h" +#include "qscxmlecmascriptdatamodel.h" +#include "qscxmlecmascriptplatformproperties_p.h" +#include "qscxmlexecutablecontent_p.h" #include <QJsonDocument> #include <QtQml/private/qjsvalue_p.h> diff --git a/src/scxml/ecmascriptdatamodel.h b/src/scxml/qscxmlecmascriptdatamodel.h index 169cd41..7da2dd0 100644 --- a/src/scxml/ecmascriptdatamodel.h +++ b/src/scxml/qscxmlecmascriptdatamodel.h @@ -19,7 +19,7 @@ #ifndef ECMASCRIPTDATAMODEL_H #define ECMASCRIPTDATAMODEL_H -#include "datamodel.h" +#include <QtScxml/qscxmldatamodel.h> QT_BEGIN_NAMESPACE class QJSEngine; diff --git a/src/scxml/ecmascriptplatformproperties.cpp b/src/scxml/qscxmlecmascriptplatformproperties.cpp index b9fac7c..c41ea8c 100644 --- a/src/scxml/ecmascriptplatformproperties.cpp +++ b/src/scxml/qscxmlecmascriptplatformproperties.cpp @@ -16,8 +16,8 @@ ** from Digia Plc. ****************************************************************************/ -#include "ecmascriptplatformproperties_p.h" -#include "scxmlstatemachine.h" +#include "qscxmlecmascriptplatformproperties_p.h" +#include "qscxmlstatemachine.h" QT_BEGIN_NAMESPACE class QScxmlPlatformProperties::Data diff --git a/src/scxml/ecmascriptplatformproperties_p.h b/src/scxml/qscxmlecmascriptplatformproperties_p.h index 9e2eaf5..93b479d 100644 --- a/src/scxml/ecmascriptplatformproperties_p.h +++ b/src/scxml/qscxmlecmascriptplatformproperties_p.h @@ -30,7 +30,7 @@ // We mean it. // -#include "scxmlglobals.h" +#include "qscxmlglobals.h" #include <QJSValue> #include <QObject> diff --git a/src/scxml/scxmlevent.cpp b/src/scxml/qscxmlevent.cpp index ea6a1cc..a4640e9 100644 --- a/src/scxml/scxmlevent.cpp +++ b/src/scxml/qscxmlevent.cpp @@ -16,8 +16,8 @@ ** from Digia Plc. ****************************************************************************/ -#include "executablecontent_p.h" -#include "scxmlevent_p.h" +#include "qscxmlexecutablecontent_p.h" +#include "qscxmlevent_p.h" QT_USE_NAMESPACE diff --git a/src/scxml/scxmlevent.h b/src/scxml/qscxmlevent.h index 22a85db..dc8df01 100644 --- a/src/scxml/scxmlevent.h +++ b/src/scxml/qscxmlevent.h @@ -19,7 +19,7 @@ #ifndef SCXMLEVENT_H #define SCXMLEVENT_H -#include <QtScxml/scxmlglobals.h> +#include <QtScxml/qscxmlglobals.h> #include <QEvent> #include <QStringList> diff --git a/src/scxml/scxmlevent_p.h b/src/scxml/qscxmlevent_p.h index 2dd2007..31ee497 100644 --- a/src/scxml/scxmlevent_p.h +++ b/src/scxml/qscxmlevent_p.h @@ -30,9 +30,9 @@ // We mean it. // -#include "scxmlevent.h" -#include "scxmlstatemachine.h" -#include "executablecontent_p.h" +#include <QtScxml/qscxmlevent.h> +#include <QtScxml/qscxmlstatemachine.h> +#include <QtScxml/private/qscxmlexecutablecontent_p.h> #include <QAtomicInt> diff --git a/src/scxml/executablecontent.cpp b/src/scxml/qscxmlexecutablecontent.cpp index 912937e..570e9b8 100644 --- a/src/scxml/executablecontent.cpp +++ b/src/scxml/qscxmlexecutablecontent.cpp @@ -16,9 +16,9 @@ ** from Digia Plc. ****************************************************************************/ -#include "executablecontent_p.h" -#include "scxmlparser_p.h" -#include "scxmlevent_p.h" +#include "qscxmlexecutablecontent_p.h" +#include "qscxmlparser_p.h" +#include "qscxmlevent_p.h" using namespace QScxmlExecutableContent; diff --git a/src/scxml/executablecontent.h b/src/scxml/qscxmlexecutablecontent.h index 0328fc4..018280f 100644 --- a/src/scxml/executablecontent.h +++ b/src/scxml/qscxmlexecutablecontent.h @@ -19,7 +19,7 @@ #ifndef EXECUTABLECONTENT_H #define EXECUTABLECONTENT_H -#include <QtScxml/scxmlglobals.h> +#include <QtScxml/qscxmlglobals.h> #include <QVector> diff --git a/src/scxml/executablecontent_p.h b/src/scxml/qscxmlexecutablecontent_p.h index 2f9330e..a16d19a 100644 --- a/src/scxml/executablecontent_p.h +++ b/src/scxml/qscxmlexecutablecontent_p.h @@ -30,10 +30,10 @@ // We mean it. // -#include "datamodel.h" -#include "executablecontent.h" -#include "scxmlparser_p.h" -#include "scxmlstatemachine.h" +#include <QtScxml/qscxmldatamodel.h> +#include <QtScxml/qscxmlexecutablecontent.h> +#include <QtScxml/private/qscxmlparser_p.h> +#include <QtScxml/qscxmlstatemachine.h> QT_BEGIN_NAMESPACE diff --git a/src/scxml/scxmlglobals.h b/src/scxml/qscxmlglobals.h index 7e58370..7e58370 100644 --- a/src/scxml/scxmlglobals.h +++ b/src/scxml/qscxmlglobals.h diff --git a/src/scxml/nulldatamodel.cpp b/src/scxml/qscxmlnulldatamodel.cpp index 0d5f778..00aa247 100644 --- a/src/scxml/nulldatamodel.cpp +++ b/src/scxml/qscxmlnulldatamodel.cpp @@ -16,10 +16,10 @@ ** from Digia Plc. ****************************************************************************/ -#include "nulldatamodel.h" -#include "scxmlevent.h" +#include "qscxmlnulldatamodel.h" +#include "qscxmlevent.h" -#include "scxmlstatemachine.h" +#include "qscxmlstatemachine.h" class QScxmlNullDataModel::Data { diff --git a/src/scxml/nulldatamodel.h b/src/scxml/qscxmlnulldatamodel.h index a44177d..f7b01bc 100644 --- a/src/scxml/nulldatamodel.h +++ b/src/scxml/qscxmlnulldatamodel.h @@ -19,7 +19,7 @@ #ifndef NULLDATAMODEL_H #define NULLDATAMODEL_H -#include <QtScxml/datamodel.h> +#include <QtScxml/qscxmldatamodel.h> QT_BEGIN_NAMESPACE diff --git a/src/scxml/scxmlparser.cpp b/src/scxml/qscxmlparser.cpp index 09ef4d8..a6e9200 100644 --- a/src/scxml/scxmlparser.cpp +++ b/src/scxml/qscxmlparser.cpp @@ -16,12 +16,12 @@ ** from Digia Plc. ****************************************************************************/ -#include "scxmlparser_p.h" -#include "scxmlstatemachine_p.h" -#include "executablecontent_p.h" -#include "nulldatamodel.h" -#include "ecmascriptdatamodel.h" -#include "scxmlqstates.h" +#include "qscxmlparser_p.h" +#include "qscxmlstatemachine_p.h" +#include "qscxmlexecutablecontent_p.h" +#include "qscxmlnulldatamodel.h" +#include "qscxmlecmascriptdatamodel.h" +#include "qscxmlqstates.h" #include <QXmlStreamReader> #include <QLoggingCategory> #include <QState> diff --git a/src/scxml/scxmlparser.h b/src/scxml/qscxmlparser.h index 3b17d96..ea13d17 100644 --- a/src/scxml/scxmlparser.h +++ b/src/scxml/qscxmlparser.h @@ -19,7 +19,7 @@ #ifndef SCXMLPARSER_H #define SCXMLPARSER_H -#include <QtScxml/scxmlstatemachine.h> +#include <QtScxml/qscxmlstatemachine.h> #include <QStringList> #include <QString> diff --git a/src/scxml/scxmlparser_p.h b/src/scxml/qscxmlparser_p.h index 6e36f04..dc1c594 100644 --- a/src/scxml/scxmlparser_p.h +++ b/src/scxml/qscxmlparser_p.h @@ -30,7 +30,7 @@ // We mean it. // -#include "scxmlparser.h" +#include "qscxmlparser.h" #include <QDir> #include <QFileInfo> diff --git a/src/scxml/scxmlqstates.cpp b/src/scxml/qscxmlqstates.cpp index 46ddff2..8c1ff5c 100644 --- a/src/scxml/scxmlqstates.cpp +++ b/src/scxml/qscxmlqstates.cpp @@ -16,12 +16,12 @@ ** from Digia Plc. ****************************************************************************/ -#include "scxmlqstates_p.h" -#include "scxmlstatemachine_p.h" +#include "qscxmlqstates_p.h" +#include "qscxmlstatemachine_p.h" #define DUMP_EVENT #ifdef DUMP_EVENT -#include "ecmascriptdatamodel.h" +#include "qscxmlecmascriptdatamodel.h" #endif QT_BEGIN_NAMESPACE diff --git a/src/scxml/scxmlqstates.h b/src/scxml/qscxmlqstates.h index d14ff2c..52427b0 100644 --- a/src/scxml/scxmlqstates.h +++ b/src/scxml/qscxmlqstates.h @@ -19,7 +19,7 @@ #ifndef SCXMLQSTATES_H #define SCXMLQSTATES_H -#include <QtScxml/scxmlstatemachine.h> +#include <QtScxml/qscxmlstatemachine.h> QT_BEGIN_NAMESPACE diff --git a/src/scxml/scxmlqstates_p.h b/src/scxml/qscxmlqstates_p.h index e6c4c8a..4dcce6f 100644 --- a/src/scxml/scxmlqstates_p.h +++ b/src/scxml/qscxmlqstates_p.h @@ -19,7 +19,7 @@ #ifndef SCXMLQSTATE_P_H #define SCXMLQSTATE_P_H -#include "scxmlqstates.h" +#include <QtScxml/qscxmlqstates.h> QT_BEGIN_NAMESPACE diff --git a/src/scxml/scxmlstatemachine.cpp b/src/scxml/qscxmlstatemachine.cpp index 33ff1a9..6aa053b 100644 --- a/src/scxml/scxmlstatemachine.cpp +++ b/src/scxml/qscxmlstatemachine.cpp @@ -16,10 +16,10 @@ ** from Digia Plc. ****************************************************************************/ -#include "scxmlstatemachine_p.h" -#include "executablecontent_p.h" -#include "scxmlevent_p.h" -#include "scxmlqstates_p.h" +#include "qscxmlstatemachine_p.h" +#include "qscxmlexecutablecontent_p.h" +#include "qscxmlevent_p.h" +#include "qscxmlqstates_p.h" #include <QAbstractState> #include <QAbstractTransition> diff --git a/src/scxml/scxmlstatemachine.h b/src/scxml/qscxmlstatemachine.h index f1c65e6..c67d5fe 100644 --- a/src/scxml/scxmlstatemachine.h +++ b/src/scxml/qscxmlstatemachine.h @@ -19,9 +19,9 @@ #ifndef SCXMLSTATEMACHINE_H #define SCXMLSTATEMACHINE_H -#include <QtScxml/datamodel.h> -#include <QtScxml/executablecontent.h> -#include <QtScxml/scxmlevent.h> +#include <QtScxml/qscxmldatamodel.h> +#include <QtScxml/qscxmlexecutablecontent.h> +#include <QtScxml/qscxmlevent.h> #include <QState> #include <QFinalState> diff --git a/src/scxml/scxmlstatemachine_p.h b/src/scxml/qscxmlstatemachine_p.h index c8dae1e..89ffc8e 100644 --- a/src/scxml/scxmlstatemachine_p.h +++ b/src/scxml/qscxmlstatemachine_p.h @@ -30,8 +30,8 @@ // We mean it. // -#include "executablecontent_p.h" -#include "scxmlstatemachine.h" +#include <QtScxml/private/qscxmlexecutablecontent_p.h> +#include <QtScxml/qscxmlstatemachine.h> #include <QtCore/private/qstatemachine_p.h> diff --git a/src/scxml/scxml.pro b/src/scxml/scxml.pro index ebdd0d8..e01bfd0 100644 --- a/src/scxml/scxml.pro +++ b/src/scxml/scxml.pro @@ -8,32 +8,32 @@ CONFIG += $$MODULE_CONFIG DEFINES += QT_NO_CAST_FROM_ASCII HEADERS += \ - scxmlparser.h \ - scxmlparser_p.h \ - scxmlstatemachine.h \ - scxmlstatemachine_p.h \ - scxmlglobals.h \ - nulldatamodel.h \ - ecmascriptdatamodel.h \ - ecmascriptplatformproperties_p.h \ - executablecontent.h \ - executablecontent_p.h \ - scxmlevent.h \ - scxmlevent_p.h \ - datamodel.h \ - scxmlqstates.h \ - scxmlqstates_p.h \ - cppdatamodel_p.h \ - cppdatamodel.h + qscxmlparser.h \ + qscxmlparser_p.h \ + qscxmlstatemachine.h \ + qscxmlstatemachine_p.h \ + qscxmlglobals.h \ + qscxmlnulldatamodel.h \ + qscxmlecmascriptdatamodel.h \ + qscxmlecmascriptplatformproperties_p.h \ + qscxmlexecutablecontent.h \ + qscxmlexecutablecontent_p.h \ + qscxmlevent.h \ + qscxmlevent_p.h \ + qscxmldatamodel.h \ + qscxmlqstates.h \ + qscxmlqstates_p.h \ + qscxmlcppdatamodel_p.h \ + qscxmlcppdatamodel.h SOURCES += \ - scxmlparser.cpp \ - scxmlstatemachine.cpp \ - nulldatamodel.cpp \ - ecmascriptdatamodel.cpp \ - ecmascriptplatformproperties.cpp \ - executablecontent.cpp \ - scxmlevent.cpp \ - datamodel.cpp \ - scxmlqstates.cpp \ - cppdatamodel.cpp + qscxmlparser.cpp \ + qscxmlstatemachine.cpp \ + qscxmlnulldatamodel.cpp \ + qscxmlecmascriptdatamodel.cpp \ + qscxmlecmascriptplatformproperties.cpp \ + qscxmlexecutablecontent.cpp \ + qscxmlevent.cpp \ + qscxmldatamodel.cpp \ + qscxmlqstates.cpp \ + qscxmlcppdatamodel.cpp diff --git a/tests/auto/scion/tst_scion.cpp b/tests/auto/scion/tst_scion.cpp index 25626db..c7bb5fc 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 <QtScxml/scxmlparser.h> -#include <QtScxml/ecmascriptdatamodel.h> -#include <QtScxml/nulldatamodel.h> +#include <QtScxml/qscxmlparser.h> +#include <QtScxml/qscxmlecmascriptdatamodel.h> +#include <QtScxml/qscxmlnulldatamodel.h> #include "scxml/scion.h" #include "scxml/compiled_tests.h" diff --git a/tools/qscxmlc/qscxmlc.cpp b/tools/qscxmlc/qscxmlc.cpp index 25d169f..c0f0d18 100644 --- a/tools/qscxmlc/qscxmlc.cpp +++ b/tools/qscxmlc/qscxmlc.cpp @@ -16,7 +16,7 @@ ** from Digia Plc. ****************************************************************************/ -#include <QtScxml/private/scxmlparser_p.h> +#include <QtScxml/private/qscxmlparser_p.h> #include "scxmlcppdumper.h" #include <QCoreApplication> diff --git a/tools/qscxmlc/scxmlcppdumper.cpp b/tools/qscxmlc/scxmlcppdumper.cpp index 84aaf8a..6b4ae88 100644 --- a/tools/qscxmlc/scxmlcppdumper.cpp +++ b/tools/qscxmlc/scxmlcppdumper.cpp @@ -16,7 +16,7 @@ ** from Digia Plc. ****************************************************************************/ -#include <QtScxml/private/executablecontent_p.h> +#include <QtScxml/private/qscxmlexecutablecontent_p.h> #include "scxmlcppdumper.h" #include <algorithm> @@ -152,7 +152,7 @@ static QString toHex(const QString &str) } const char *headerStart = - "#include <QtScxml/scxmlstatemachine.h>\n" + "#include <QScxmlStateMachine>\n" "\n"; using namespace DocumentModel; @@ -232,8 +232,7 @@ protected: Q_UNREACHABLE(); } clazz.init.impl << QStringLiteral("stateMachine.setDataBinding(QScxmlStateMachine::%1Binding);").arg(binding); - - clazz.implIncludes << QStringLiteral("QtScxml/executablecontent.h"); + clazz.implIncludes << QStringLiteral("qscxmlexecutablecontent.h"); clazz.init.impl << QStringLiteral("stateMachine.setTableData(this);"); foreach (AbstractState *s, node->initialStates) { @@ -268,11 +267,11 @@ protected: switch (node->dataModel) { case Scxml::NullDataModel: clazz.classFields << QStringLiteral("QScxmlNullDataModel dataModel;"); - clazz.implIncludes << QStringLiteral("QtScxml/nulldatamodel.h"); + clazz.implIncludes << QStringLiteral("QScxmlNullDataModel.h"); break; case Scxml::JSDataModel: clazz.classFields << QStringLiteral("QScxmlEcmaScriptDataModel dataModel;"); - clazz.implIncludes << QStringLiteral("QtScxml/ecmascriptdatamodel.h"); + clazz.implIncludes << QStringLiteral("QScxmlEcmaScriptDataModel"); break; case Scxml::CppDataModel: clazz.implIncludes << node->cppDataModelHeaderName; @@ -1153,7 +1152,7 @@ void CppDumper::writeImplStart(const QVector<ClassDump> &allClazzes) auto headerName = QFileInfo(m_translationUnit->outHFileName).fileName(); cpp << l("#include \"") << headerName << l("\"") << endl; cpp << endl - << QStringLiteral("#include <QtScxml/scxmlqstates.h>") << endl; + << QStringLiteral("#include <qscxmlqstates.h>") << endl; if (!includes.isEmpty()) { includes.write(cpp, QStringLiteral("#include <"), QStringLiteral(">\n")); cpp << endl; diff --git a/tools/qscxmlc/scxmlcppdumper.h b/tools/qscxmlc/scxmlcppdumper.h index 439e092..82f9f74 100644 --- a/tools/qscxmlc/scxmlcppdumper.h +++ b/tools/qscxmlc/scxmlcppdumper.h @@ -19,10 +19,10 @@ #ifndef CPPDUMPER_H #define CPPDUMPER_H -#include "scxmlglobals.h" -#include "scxmlstatemachine.h" +#include "qscxmlglobals.h" +#include "qscxmlstatemachine.h" -#include <QtScxml/private/scxmlparser_p.h> +#include <QtScxml/private/qscxmlparser_p.h> #include <QTextStream> |