diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-10 18:48:34 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-10 19:32:20 +0200 |
commit | 38f88ebfebeccc1a6c2b41f885b2a6a8fa74a447 (patch) | |
tree | ea41f372d11b04919b50e95bfcd66a2a62fffe6f /src/scxml/qscxmltabledata.cpp | |
parent | b63320b5eb7296699b3ff77bf4befe73e908e04e (diff) |
Bump Qt version to Qt 6
Also fix usages of text stream operators.
Change-Id: I53cf87bb4bb055d56f2332d7737f205ec9560774
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/scxml/qscxmltabledata.cpp')
-rw-r--r-- | src/scxml/qscxmltabledata.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/scxml/qscxmltabledata.cpp b/src/scxml/qscxmltabledata.cpp index aa9a35e..ab63696 100644 --- a/src/scxml/qscxmltabledata.cpp +++ b/src/scxml/qscxmltabledata.cpp @@ -991,23 +991,23 @@ QString GeneratedTableData::toString(const int *stateMachineTable) const StateTable *st = reinterpret_cast<const StateTable *>(stateMachineTable); - out << "{" << endl - << "\t0x" << hex << st->version << dec << ", // version" << endl - << "\t" << st->name << ", // name" << endl - << "\t" << st->dataModel << ", // data-model" << endl - << "\t" << st->childStates << ", // child states array offset" << endl - << "\t" << st->initialTransition << ", // transition to initial states" << endl - << "\t" << st->initialSetup << ", // initial setup" << endl - << "\t" << st->binding << ", // binding" << endl - << "\t" << st->maxServiceId << ", // maxServiceId" << endl + out << "{" << Qt::endl + << "\t0x" << Qt::hex << st->version << Qt::dec << ", // version" << Qt::endl + << "\t" << st->name << ", // name" << Qt::endl + << "\t" << st->dataModel << ", // data-model" << Qt::endl + << "\t" << st->childStates << ", // child states array offset" << Qt::endl + << "\t" << st->initialTransition << ", // transition to initial states" << Qt::endl + << "\t" << st->initialSetup << ", // initial setup" << Qt::endl + << "\t" << st->binding << ", // binding" << Qt::endl + << "\t" << st->maxServiceId << ", // maxServiceId" << Qt::endl << "\t" << st->stateOffset << ", " << st->stateCount - << ", // state offset and count" << endl + << ", // state offset and count" << Qt::endl << "\t" << st->transitionOffset << ", " << st->transitionCount - << ", // transition offset and count" << endl - << "\t" << st->arrayOffset << ", " << st->arraySize << ", // array offset and size" << endl - << endl; + << ", // transition offset and count" << Qt::endl + << "\t" << st->arrayOffset << ", " << st->arraySize << ", // array offset and size" << Qt::endl + << Qt::endl; - out << "\t// States:" << endl; + out << "\t// States:" << Qt::endl; for (int i = 0; i < st->stateCount; ++i) { const StateTable::State &s = st->state(i); out << "\t" @@ -1022,11 +1022,11 @@ QString GeneratedTableData::toString(const int *stateMachineTable) << s.childStates << ", " << s.transitions << ", " << s.serviceFactoryIds << "," - << endl; + << Qt::endl; } - out << endl - << "\t// Transitions:" << endl; + out << Qt::endl + << "\t// Transitions:" << Qt::endl; for (int i = 0; i < st->transitionCount; ++i) { auto t = st->transition(i); out << "\t" @@ -1036,11 +1036,11 @@ QString GeneratedTableData::toString(const int *stateMachineTable) << t.source << ", " << t.targets << ", " << t.transitionInstructions << ", " - << endl ; + << Qt::endl ; } - out << endl - << "\t// Arrays:" << endl; + out << Qt::endl + << "\t// Arrays:" << Qt::endl; int nextStart = 0; while (nextStart < st->arraySize) { const StateTable::Array a = st->array(nextStart); @@ -1048,13 +1048,13 @@ QString GeneratedTableData::toString(const int *stateMachineTable) for (int j = 0; j < a.size(); ++j) { out << a[j] << ", "; } - out << endl; + out << Qt::endl; nextStart += a.size() + 1; } - out << hex; - out << endl - << "\t0x" << StateTable::terminator << " // terminator" << endl + out << Qt::hex; + out << Qt::endl + << "\t0x" << StateTable::terminator << " // terminator" << Qt::endl << "}"; return result; |