diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-11-01 23:04:20 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-08 16:39:07 +0100 |
| commit | ec8f1f68d623ae68cc7d79e19067884532e3db6f (patch) | |
| tree | ccf08fdf46e677931ba839228c444f24bcbb202e /src/qml/jsruntime/qv4object.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 <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 f8b0c9f0a0..0859537c58 100644 --- a/src/qml/jsruntime/qv4object.cpp +++ b/src/qml/jsruntime/qv4object.cpp @@ -50,7 +50,7 @@ using namespace QV4; DEFINE_OBJECT_VTABLE(Object); Object::Data::Data(InternalClass *internalClass) - : Managed::Data(internalClass) + : Heap::Base(internalClass) { if (internalClass->size) { Scope scope(internalClass->engine); @@ -178,7 +178,7 @@ void Object::defineReadonlyProperty(String *name, ValueRef value) insertMember(name, value, Attr_ReadOnly); } -void Object::markObjects(HeapObject *that, ExecutionEngine *e) +void Object::markObjects(Heap::Base *that, ExecutionEngine *e) { Object::Data *o = static_cast<Object::Data *>(that); @@ -1072,7 +1072,7 @@ void Object::copyArrayData(Object *other) } else { Q_ASSERT(!arrayData() && other->arrayData()); ArrayData::realloc(this, other->arrayData()->type(), other->arrayData()->alloc(), false); - if (other->arrayType() == ArrayData::Sparse) { + if (other->arrayType() == Heap::ArrayData::Sparse) { SparseArrayData *od = static_cast<SparseArrayData *>(other->arrayData()); SparseArrayData *dd = static_cast<SparseArrayData *>(arrayData()); dd->setSparse(new SparseArray(*od->sparse())); @@ -1120,10 +1120,10 @@ bool Object::setArrayLength(uint newLen) void Object::initSparseArray() { - if (arrayType() == ArrayData::Sparse) + if (arrayType() == Heap::ArrayData::Sparse) return; - ArrayData::realloc(this, ArrayData::Sparse, 0, false); + ArrayData::realloc(this, Heap::ArrayData::Sparse, 0, false); } |