summaryrefslogtreecommitdiffstats
path: root/src/scxml/qscxmlnulldatamodel.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/scxml/qscxmlnulldatamodel.h')
-rw-r--r--src/scxml/qscxmlnulldatamodel.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/scxml/qscxmlnulldatamodel.h b/src/scxml/qscxmlnulldatamodel.h
index e4f7942..830162f 100644
--- a/src/scxml/qscxmlnulldatamodel.h
+++ b/src/scxml/qscxmlnulldatamodel.h
@@ -37,8 +37,8 @@
**
****************************************************************************/
-#ifndef NULLDATAMODEL_H
-#define NULLDATAMODEL_H
+#ifndef QSCXMLNULLDATAMODEL_H
+#define QSCXMLNULLDATAMODEL_H
#include <QtScxml/qscxmldatamodel.h>
@@ -55,15 +55,13 @@ public:
Q_INVOKABLE bool setup(const QVariantMap &initialDataValues) Q_DECL_OVERRIDE;
-#ifndef Q_QDOC
QString evaluateToString(QScxmlExecutableContent::EvaluatorId id, bool *ok) Q_DECL_OVERRIDE Q_DECL_FINAL;
bool evaluateToBool(QScxmlExecutableContent::EvaluatorId id, bool *ok) Q_DECL_OVERRIDE Q_DECL_FINAL;
QVariant evaluateToVariant(QScxmlExecutableContent::EvaluatorId id, bool *ok) Q_DECL_OVERRIDE Q_DECL_FINAL;
void evaluateToVoid(QScxmlExecutableContent::EvaluatorId id, bool *ok) Q_DECL_OVERRIDE Q_DECL_FINAL;
void evaluateAssignment(QScxmlExecutableContent::EvaluatorId id, bool *ok) Q_DECL_OVERRIDE Q_DECL_FINAL;
void evaluateInitialization(QScxmlExecutableContent::EvaluatorId id, bool *ok) Q_DECL_OVERRIDE Q_DECL_FINAL;
- bool evaluateForeach(QScxmlExecutableContent::EvaluatorId id, bool *ok, ForeachLoopBody *body) Q_DECL_OVERRIDE Q_DECL_FINAL;
-#endif // Q_QDOC
+ void evaluateForeach(QScxmlExecutableContent::EvaluatorId id, bool *ok, ForeachLoopBody *body) Q_DECL_OVERRIDE Q_DECL_FINAL;
void setScxmlEvent(const QScxmlEvent &event) Q_DECL_OVERRIDE;
@@ -74,4 +72,4 @@ public:
QT_END_NAMESPACE
-#endif // NULLDATAMODEL_H
+#endif // QSCXMLNULLDATAMODEL_H