diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-11-01 20:56:47 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-04 20:18:18 +0100 |
| commit | 878b11e0a94e892c0377bca01b49706c150926ed (patch) | |
| tree | 1b4a10f016d208a8514b394087ac18e419fcdc17 /src/qml/jsruntime/qv4object.cpp | |
| parent | 486948817b26da2c62802bb93a0f671715c609d4 (diff) | |
Let markObjects() operate directly on HeapObjects
This decouples things a bit better and helps moving
over to directly store heapobject pointers in other
objects.
Change-Id: I798f922e018b0a3ca6f8768e4a810187f34d82f6
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4object.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4object.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4object.cpp b/src/qml/jsruntime/qv4object.cpp index 5d003ba287..576537dcef 100644 --- a/src/qml/jsruntime/qv4object.cpp +++ b/src/qml/jsruntime/qv4object.cpp @@ -178,13 +178,13 @@ void Object::defineReadonlyProperty(String *name, ValueRef value) insertMember(name, value, Attr_ReadOnly); } -void Object::markObjects(Managed *that, ExecutionEngine *e) +void Object::markObjects(HeapObject *that, ExecutionEngine *e) { - Object *o = static_cast<Object *>(that); + Object::Data *o = static_cast<Object::Data *>(that); - o->memberData().mark(e); - if (o->arrayData()) - o->arrayData()->mark(e); + o->memberData.mark(e); + if (o->arrayData) + o->arrayData->mark(e); } void Object::ensureMemberIndex(uint idx) |