diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2016-09-20 18:10:22 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-10-14 10:53:05 +0000 |
| commit | 1080cf471231fdde6daca775bbf77a04620f89e7 (patch) | |
| tree | fbd0a736628b560d15a1f08dba08dafa3b197be7 /tests | |
| parent | bde17badd31d4990b1cc57f155c74c62b2ec9c72 (diff) | |
Rename QScxmlParser to QScxmlCompiler
It creates an executable representation from an XML description, so
it is a compiler and not merely a parser. The name should reflect this.
Change-Id: I459445706207b3afae64b3f803c9beae83114bb6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/compiled/tst_compiled.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/parser/tst_parser.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/scion/tst_scion.cpp | 14 | ||||
| -rw-r--r-- | tests/auto/statemachine/tst_statemachine.cpp | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/compiled/tst_compiled.cpp b/tests/auto/compiled/tst_compiled.cpp index 6ee181d..ab590f7 100644 --- a/tests/auto/compiled/tst_compiled.cpp +++ b/tests/auto/compiled/tst_compiled.cpp @@ -29,7 +29,7 @@ #include <QtTest> #include <QObject> #include <QXmlStreamReader> -#include <QtScxml/qscxmlparser.h> +#include <QtScxml/qscxmlcompiler.h> #include <QtScxml/qscxmlstatemachine.h> #include <QtScxml/qscxmlinvokableservice.h> #include "ids1.h" diff --git a/tests/auto/parser/tst_parser.cpp b/tests/auto/parser/tst_parser.cpp index 0a0c287..202e783 100644 --- a/tests/auto/parser/tst_parser.cpp +++ b/tests/auto/parser/tst_parser.cpp @@ -29,7 +29,7 @@ #include <QtTest> #include <QObject> #include <QXmlStreamReader> -#include <QtScxml/qscxmlparser.h> +#include <QtScxml/qscxmlcompiler.h> #include <QtScxml/qscxmlstatemachine.h> Q_DECLARE_METATYPE(QScxmlError); diff --git a/tests/auto/scion/tst_scion.cpp b/tests/auto/scion/tst_scion.cpp index 1adf0b7..a068005 100644 --- a/tests/auto/scion/tst_scion.cpp +++ b/tests/auto/scion/tst_scion.cpp @@ -30,7 +30,7 @@ #include <QCoreApplication> #include <QJsonDocument> -#include <QtScxml/qscxmlparser.h> +#include <QtScxml/qscxmlcompiler.h> #include <QtScxml/qscxmlecmascriptdatamodel.h> #include <functional> @@ -86,7 +86,7 @@ public: } }; -class DynamicLoader: public QScxmlParser::Loader +class DynamicLoader: public QScxmlCompiler::Loader { public: DynamicLoader(); @@ -201,12 +201,12 @@ void TestScion::dynamic() QFile scxmlFile(QLatin1String(":/") + scxml); QVERIFY(scxmlFile.open(QIODevice::ReadOnly)); QXmlStreamReader xmlReader(&scxmlFile); - QScxmlParser parser(&xmlReader); - parser.setFileName(scxml); + QScxmlCompiler compiler(&xmlReader); + compiler.setFileName(scxml); DynamicLoader loader; - parser.setLoader(&loader); - QScopedPointer<QScxmlStateMachine> stateMachine(parser.parse()); - QVERIFY(parser.errors().isEmpty()); + compiler.setLoader(&loader); + QScopedPointer<QScxmlStateMachine> stateMachine(compiler.compile()); + QVERIFY(compiler.errors().isEmpty()); scxmlFile.close(); QVERIFY(stateMachine != Q_NULLPTR); diff --git a/tests/auto/statemachine/tst_statemachine.cpp b/tests/auto/statemachine/tst_statemachine.cpp index 9c757e7..f09ad42 100644 --- a/tests/auto/statemachine/tst_statemachine.cpp +++ b/tests/auto/statemachine/tst_statemachine.cpp @@ -29,7 +29,7 @@ #include <QtTest> #include <QObject> #include <QXmlStreamReader> -#include <QtScxml/qscxmlparser.h> +#include <QtScxml/qscxmlcompiler.h> #include <QtScxml/qscxmlstatemachine.h> #include <QtScxml/private/qscxmlstatemachine_p.h> |