diff options
Diffstat (limited to 'src/qml/jsruntime/qv4object_p.h')
-rw-r--r-- | src/qml/jsruntime/qv4object_p.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/qml/jsruntime/qv4object_p.h b/src/qml/jsruntime/qv4object_p.h index c28edcae66..77f8d11e4f 100644 --- a/src/qml/jsruntime/qv4object_p.h +++ b/src/qml/jsruntime/qv4object_p.h @@ -49,7 +49,6 @@ #include "qv4managed_p.h" #include "qv4property_p.h" #include "qv4internalclass_p.h" -#include "qv4objectiterator_p.h" #include "qv4sparsearray_p.h" #include <QtCore/QString> @@ -314,7 +313,7 @@ protected: static bool deleteIndexedProperty(Managed *m, uint index); static ReturnedValue getLookup(Managed *m, Lookup *l); static void setLookup(Managed *m, Lookup *l, const ValueRef v); - static Property *advanceIterator(Managed *m, ObjectIterator *it, String **name, uint *index, PropertyAttributes *attributes); + static Property *advanceIterator(Managed *m, ObjectIterator *it, StringRef name, uint *index, PropertyAttributes *attributes); private: @@ -329,21 +328,6 @@ private: friend struct ObjectPrototype; }; -struct ForEachIteratorObject: Object { - Q_MANAGED - ObjectIterator it; - ForEachIteratorObject(ExecutionContext *ctx, Object *o) - : Object(ctx->engine), it(o, ObjectIterator::EnumerableOnly|ObjectIterator::WithProtoChain) { - vtbl = &static_vtbl; - type = Type_ForeachIteratorObject; - } - - ReturnedValue nextPropertyName() { return it.nextPropertyNameAsString(); } - -protected: - static void markObjects(Managed *that); -}; - struct BooleanObject: Object { SafeValue value; BooleanObject(ExecutionEngine *engine, const ValueRef val) |