1 files changed, 5 insertions, 11 deletions
diff --git a/src/scxml/qscxmldatamodel.h b/src/scxml/qscxmldatamodel.h
index 845d8bf..d34a84a 100644
--- a/src/scxml/qscxmldatamodel.h
+++ b/src/scxml/qscxmldatamodel.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef DATAMODEL_H
-#define DATAMODEL_H
+#ifndef QSCXMLDATAMODEL_H
+#define QSCXMLDATAMODEL_H
 
 #include <QtScxml/qscxmlexecutablecontent.h>
 
@@ -64,27 +64,24 @@ public:
     {
     public:
         virtual ~ForeachLoopBody();
-        virtual bool run() = 0;
+        virtual void run(bool *ok) = 0;
     };
 
 public:
     explicit QScxmlDataModel(QObject *parent = nullptr);
-    ~QScxmlDataModel();
 
     void setStateMachine(QScxmlStateMachine *stateMachine);
     QScxmlStateMachine *stateMachine() const;
 
     Q_INVOKABLE virtual bool setup(const QVariantMap &initialDataValues) = 0;
 
-#ifndef Q_QDOC
     virtual QString evaluateToString(QScxmlExecutableContent::EvaluatorId id, bool *ok) = 0;
     virtual bool evaluateToBool(QScxmlExecutableContent::EvaluatorId id, bool *ok) = 0;
     virtual QVariant evaluateToVariant(QScxmlExecutableContent::EvaluatorId id, bool *ok) = 0;
     virtual void evaluateToVoid(QScxmlExecutableContent::EvaluatorId id, bool *ok) = 0;
     virtual void evaluateAssignment(QScxmlExecutableContent::EvaluatorId id, bool *ok) = 0;
     virtual void evaluateInitialization(QScxmlExecutableContent::EvaluatorId id, bool *ok) = 0;
-    virtual bool evaluateForeach(QScxmlExecutableContent::EvaluatorId id, bool *ok, ForeachLoopBody *body) = 0;
-#endif // Q_QDOC
+    virtual void evaluateForeach(QScxmlExecutableContent::EvaluatorId id, bool *ok, ForeachLoopBody *body) = 0;
 
     virtual void setScxmlEvent(const QScxmlEvent &event) = 0;
 
@@ -97,11 +94,8 @@ Q_SIGNALS:
 
 protected:
     explicit QScxmlDataModel(QScxmlDataModelPrivate &dd, QObject *parent = nullptr);
-#ifndef Q_QDOC
-    QScxmlTableData *tableData() const;
-#endif // Q_QDOC
 };
 
 QT_END_NAMESPACE
 
-#endif // DATAMODEL_H
+#endif // QSCXMLDATAMODEL_H