summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@theqtcompany.com>2015-09-17 13:44:45 +0200
committerErik Verbruggen <erik.verbruggen@theqtcompany.com>2015-09-17 16:21:09 +0300
commit7b6ff93736bad6ddf69734bb115e2ec550bf43fe (patch)
tree9b1169b902915fcb8f32a377deeb6a1178faae48 /tools
parent1d6df4ffe806698b28d80eb9f9aa51e03c44dd41 (diff)
Renamed TableData to QScxmlTableData and ScxmlError to QScxmlError.
Change-Id: I47fce45d787402f615ae200ef60f9226e367e448 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/qscxmlc/qscxmlc.cpp4
-rw-r--r--tools/qscxmlc/scxmlcppdumper.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/qscxmlc/qscxmlc.cpp b/tools/qscxmlc/qscxmlc.cpp
index 069ff38..72c6d8f 100644
--- a/tools/qscxmlc/qscxmlc.cpp
+++ b/tools/qscxmlc/qscxmlc.cpp
@@ -120,7 +120,7 @@ int main(int argc, char *argv[])
parser.setFileName(file.fileName());
parser.parse();
if (!parser.errors().isEmpty()) {
- foreach (const ScxmlError &error, parser.errors()) {
+ foreach (const QScxmlError &error, parser.errors()) {
errs << error.toString() << endl;
}
return ParseError;
@@ -129,7 +129,7 @@ int main(int argc, char *argv[])
auto mainDoc = QScxmlParserPrivate::get(&parser)->scxmlDocument();
if (mainDoc == nullptr) {
Q_ASSERT(!parser.errors().isEmpty());
- foreach (const ScxmlError &error, parser.errors()) {
+ foreach (const QScxmlError &error, parser.errors()) {
errs << error.toString() << endl;
}
return ScxmlVerificationError;
diff --git a/tools/qscxmlc/scxmlcppdumper.cpp b/tools/qscxmlc/scxmlcppdumper.cpp
index 9d9b02c..3e485ca 100644
--- a/tools/qscxmlc/scxmlcppdumper.cpp
+++ b/tools/qscxmlc/scxmlcppdumper.cpp
@@ -1166,7 +1166,7 @@ void CppDumper::writeImplStart(const QVector<ClassDump> &allClazzes)
void CppDumper::writeImplBody(const ClassDump &clazz)
{
- cpp << l("struct ") << clazz.className << l("::Data: private Scxml::TableData");
+ cpp << l("struct ") << clazz.className << l("::Data: private Scxml::QScxmlTableData");
if (!clazz.signalMethods.isEmpty()) {
cpp << QStringLiteral(", public Scxml::ScxmlEventFilter");
}