diff options
| author | Lars Knoll <[email protected]> | 2014-11-01 23:04:20 +0100 |
|---|---|---|
| committer | Simon Hausmann <[email protected]> | 2014-11-08 16:39:07 +0100 |
| commit | ec8f1f68d623ae68cc7d79e19067884532e3db6f (patch) | |
| tree | ccf08fdf46e677931ba839228c444f24bcbb202e /src/qml/jsruntime/qv4objectiterator.cpp | |
| parent | 9d1cd3098a066c7b6689d4776bfd3a25621a26fc (diff) | |
Begin moving the data out of Managed objects
We need to move the Data objects out of the Managed
objects, to avoid lots of trouble because inner classes
can't be forward declared in C++.
Instead move them all into a Heap namespace.
Change-Id: I736af60702b68a1759f4643aa16d64108693dea2
Reviewed-by: Simon Hausmann <[email protected]>
Diffstat (limited to 'src/qml/jsruntime/qv4objectiterator.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4objectiterator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4objectiterator.cpp b/src/qml/jsruntime/qv4objectiterator.cpp index e0f7087437..dfe37dfd53 100644 --- a/src/qml/jsruntime/qv4objectiterator.cpp +++ b/src/qml/jsruntime/qv4objectiterator.cpp @@ -129,7 +129,7 @@ void ObjectIterator::next(String *&name, uint *index, Property *pd, PropertyAttr Object *proto = current->objectValue()->prototype(); current->m = proto ? &proto->data : 0; } else - current->m = (HeapObject *)0; + current->m = (Heap::Base *)0; arrayIndex = 0; memberIndex = 0; @@ -210,7 +210,7 @@ ReturnedValue ObjectIterator::nextPropertyNameAsString() DEFINE_OBJECT_VTABLE(ForEachIteratorObject); -void ForEachIteratorObject::markObjects(HeapObject *that, ExecutionEngine *e) +void ForEachIteratorObject::markObjects(Heap::Base *that, ExecutionEngine *e) { ForEachIteratorObject::Data *o = static_cast<ForEachIteratorObject::Data *>(that); o->workArea[0].mark(e); |