diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2016-08-22 16:04:11 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2016-08-23 08:12:10 +0000 |
| commit | 78693ba8b671134e058b799005b8f5dd4f3fc1b3 (patch) | |
| tree | 18e42427ae7dee3d5e8076e57f7514d02b13cc28 /src/scxml/qscxmltabledata.cpp | |
| parent | 7baaedf871739beb584c0a0cd7e0af72310a58c4 (diff) | |
Get rid of qt mode
Change-Id: Id8cc29a9a27f571f063b1cec51e534a3c762f2c6
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/scxml/qscxmltabledata.cpp')
| -rw-r--r-- | src/scxml/qscxmltabledata.cpp | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/src/scxml/qscxmltabledata.cpp b/src/scxml/qscxmltabledata.cpp index 8bcf086..5e1c628 100644 --- a/src/scxml/qscxmltabledata.cpp +++ b/src/scxml/qscxmltabledata.cpp @@ -64,9 +64,7 @@ public: , m_assignments(tableData.theAssignments) , m_foreaches(tableData.theForeaches) , m_dataIds(tableData.theDataNameIds) - , m_outgoingEvents(metaDataInfo.outgoingEvents) , m_stateNames(metaDataInfo.stateNames) - , m_incomingEvents(metaDataInfo.incomingEvents) { m_activeSequences.reserve(4); @@ -75,7 +73,6 @@ public: void buildTableData(DocumentModel::ScxmlDocument *doc) { - m_qtMode = doc->qtMode; m_isCppDataModel = doc->root->dataModel == DocumentModel::Scxml::CppDataModel; m_parents.reserve(32); m_allTransitions.resize(doc->allTransitions.size()); @@ -346,12 +343,9 @@ protected: // visitor addStates(&newTransition.targets, transition->targetStates); QVector<int> eventIds; - foreach (const QString &event, transition->events) { + foreach (const QString &event, transition->events) eventIds.push_back(addString(event)); - if (m_qtMode) { - m_incomingEvents.add(event); - } - } + addArray(&newTransition.events, eventIds); return false; @@ -385,10 +379,6 @@ protected: // visitor bool visit(DocumentModel::Send *node) Q_DECL_OVERRIDE Q_DECL_FINAL { - if (m_qtMode && node->type == QStringLiteral("qt:signal")) { - m_outgoingEvents.add(m_stringTable.item(addString(node->event))); - } - auto instr = m_instructions.add<Send>(Send::calculateExtraSize(node->params.size(), node->namelist.size())); instr->instructionLocation = createContext(QStringLiteral("send")); @@ -893,11 +883,8 @@ private: int m_currentTransition = StateTable::InvalidIndex; bool m_bindLate = false; - bool m_qtMode = false; QVector<DocumentModel::DataElement *> m_dataElements; - Table<QStringList, QString, int> m_outgoingEvents; Table<QStringList, QString, int> m_stateNames; - Table<QStringList, QString, int> m_incomingEvents; }; } // anonymous namespace @@ -1043,9 +1030,3 @@ QScxmlInvokableServiceFactory *GeneratedTableData::serviceFactory(int id) const Q_UNUSED(id); return nullptr; } - -int GeneratedTableData::signalIndexForEvent(const QString &event) const -{ - Q_UNUSED(event); - return -1; -} |