diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-05-09 15:23:18 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:49:19 +0200 |
| commit | 2eb5416f5465d0e9b4377b1f57d3b888201d519b (patch) | |
| tree | ec352316a9e3c76f7bc0f5de3aa106c81086a17e /src/qml/jsruntime/qv4objectiterator_p.h | |
| parent | 903e04deadb4b8f13a77c8a741c0f937beca0640 (diff) | |
Convert the last Managed types to the new constructor syntax
Change-Id: I11701c586d4715c08feba4650e12904c3fa7ca27
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4objectiterator_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4objectiterator_p.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/qml/jsruntime/qv4objectiterator_p.h b/src/qml/jsruntime/qv4objectiterator_p.h index 6a8431913d..fa2b2b725f 100644 --- a/src/qml/jsruntime/qv4objectiterator_p.h +++ b/src/qml/jsruntime/qv4objectiterator_p.h @@ -84,8 +84,11 @@ struct Q_QML_EXPORT ObjectIterator struct ForEachIteratorObject: Object { struct Data : Object::Data { - Data(Object *o, uint flags) - : it(workArea, workArea + 1, o, flags) {} + Data(ExecutionContext *ctx, Object *o) + : Object::Data(ctx->engine()) + , it(workArea, workArea + 1, o, ObjectIterator::EnumerableOnly|ObjectIterator::WithProtoChain) { + setVTable(staticVTable()); + } ObjectIterator it; Value workArea[2]; }; @@ -98,12 +101,6 @@ struct ForEachIteratorObject: Object { V4_OBJECT Q_MANAGED_TYPE(ForeachIteratorObject) - ForEachIteratorObject(ExecutionContext *ctx, Object *o) - : Object(ctx->d()->engine) - , __data(o, ObjectIterator::EnumerableOnly|ObjectIterator::WithProtoChain) { - setVTable(staticVTable()); - } - ReturnedValue nextPropertyName() { return d()->it.nextPropertyNameAsString(); } protected: |