aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util/qquickstate_p_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick/util/qquickstate_p_p.h')
-rw-r--r--src/quick/util/qquickstate_p_p.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/util/qquickstate_p_p.h b/src/quick/util/qquickstate_p_p.h
index 61472b4d06..2fa5321165 100644
--- a/src/quick/util/qquickstate_p_p.h
+++ b/src/quick/util/qquickstate_p_p.h
@@ -203,12 +203,13 @@ class QQuickStatePrivate : public QObjectPrivate
public:
QQuickStatePrivate()
- : named(false), inState(false), group(nullptr) {}
+ : when(false), whenKnown(false), named(false), inState(false), group(nullptr) {}
typedef QList<QQuickSimpleAction> SimpleActionList;
QString name;
- QQmlBinding::Ptr when;
+ bool when;
+ bool whenKnown;
bool named;
struct OperationGuard : public QQmlGuard<QQuickStateOperation>
@@ -231,9 +232,8 @@ public:
}
static void operations_clear(QQmlListProperty<QQuickStateOperation> *prop) {
QList<OperationGuard> *list = static_cast<QList<OperationGuard> *>(prop->data);
- QMutableListIterator<OperationGuard> listIterator(*list);
- while(listIterator.hasNext())
- listIterator.next()->setState(nullptr);
+ for (auto &e : *list)
+ e->setState(nullptr);
list->clear();
}
static int operations_count(QQmlListProperty<QQuickStateOperation> *prop) {