diff options
Diffstat (limited to 'src/scxml/qscxmlstatemachine.h')
| -rw-r--r-- | src/scxml/qscxmlstatemachine.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/scxml/qscxmlstatemachine.h b/src/scxml/qscxmlstatemachine.h index 2dea079..d4435f7 100644 --- a/src/scxml/qscxmlstatemachine.h +++ b/src/scxml/qscxmlstatemachine.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef SCXMLSTATEMACHINE_H -#define SCXMLSTATEMACHINE_H +#ifndef QSCXMLSTATEMACHINE_H +#define QSCXMLSTATEMACHINE_H #include <QtScxml/qscxmldatamodel.h> #include <QtScxml/qscxmlexecutablecontent.h> @@ -75,12 +75,11 @@ class Q_SCXML_EXPORT QScxmlStateMachine: public QObject Q_PROPERTY(bool invoked READ isInvoked CONSTANT) Q_PROPERTY(QVector<QScxmlError> parseErrors READ parseErrors CONSTANT) Q_PROPERTY(QScxmlCompiler::Loader *loader READ loader WRITE setLoader NOTIFY loaderChanged) + Q_PROPERTY(QScxmlTableData *tableData READ tableData WRITE setTableData NOTIFY tableDataChanged) protected: -#ifndef Q_QDOC explicit QScxmlStateMachine(const QMetaObject *metaObject, QObject *parent = nullptr); QScxmlStateMachine(QScxmlStateMachinePrivate &dd, QObject *parent = nullptr); -#endif // Q_QDOC public: static QScxmlStateMachine *fromFile(const QString &fileName); @@ -314,6 +313,9 @@ public: QVector<QScxmlInvokableService *> invokedServices() const; + QScxmlTableData *tableData() const; + void setTableData(QScxmlTableData *tableData); + Q_SIGNALS: void runningChanged(bool running); void invokedServicesChanged(const QVector<QScxmlInvokableService *> &invokedServices); @@ -324,6 +326,7 @@ Q_SIGNALS: void initialValuesChanged(const QVariantMap &initialValues); void initializedChanged(bool initialized); void loaderChanged(QScxmlCompiler::Loader *loader); + void tableDataChanged(QScxmlTableData *tableData); public Q_SLOTS: void start(); @@ -336,12 +339,8 @@ protected: // methods for friends: friend class QScxmlInvokableServicePrivate; friend class QScxmlExecutionEngine; -#ifndef Q_QDOC // The methods below are used by the compiled state machines. bool isActive(int stateIndex) const; - QScxmlTableData *tableData() const; - void setTableData(QScxmlTableData *tableData); -#endif // Q_QDOC private: QMetaObject::Connection connectToStateImpl(const QString &scxmlStateName, @@ -356,4 +355,4 @@ private: QT_END_NAMESPACE -#endif // SCXMLSTATEMACHINE_H +#endif // QSCXMLSTATEMACHINE_H |