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/qv4lookup.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/qv4lookup.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4lookup.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4lookup.cpp b/src/qml/jsruntime/qv4lookup.cpp index 9d4649b287..d14898d8f7 100644 --- a/src/qml/jsruntime/qv4lookup.cpp +++ b/src/qml/jsruntime/qv4lookup.cpp @@ -163,7 +163,7 @@ ReturnedValue Lookup::indexedGetterObjectInt(Lookup *l, const ValueRef object, c return indexedGetterGeneric(l, object, index); Object *o = object->objectValue(); - if (o->arrayData() && o->arrayData()->type() == ArrayData::Simple) { + if (o->arrayData() && o->arrayData()->type() == Heap::ArrayData::Simple) { SimpleArrayData *s = static_cast<SimpleArrayData *>(o->arrayData()); if (idx < s->len()) if (!s->data(idx).isEmpty()) @@ -177,7 +177,7 @@ void Lookup::indexedSetterGeneric(Lookup *l, const ValueRef object, const ValueR { if (object->isObject()) { Object *o = object->objectValue(); - if (o->arrayData() && o->arrayData()->type() == ArrayData::Simple && index->asArrayIndex() < UINT_MAX) { + if (o->arrayData() && o->arrayData()->type() == Heap::ArrayData::Simple && index->asArrayIndex() < UINT_MAX) { l->indexedSetter = indexedSetterObjectInt; indexedSetterObjectInt(l, object, index, v); return; @@ -196,7 +196,7 @@ void Lookup::indexedSetterFallback(Lookup *l, const ValueRef object, const Value uint idx = index->asArrayIndex(); if (idx < UINT_MAX) { - if (o->arrayData() && o->arrayData()->type() == ArrayData::Simple) { + if (o->arrayData() && o->arrayData()->type() == Heap::ArrayData::Simple) { SimpleArrayData *s = static_cast<SimpleArrayData *>(o->arrayData()); if (idx < s->len() && !s->data(idx).isEmpty()) { s->data(idx) = value; @@ -220,7 +220,7 @@ void Lookup::indexedSetterObjectInt(Lookup *l, const ValueRef object, const Valu } Object *o = object->objectValue(); - if (o->arrayData() && o->arrayData()->type() == ArrayData::Simple) { + if (o->arrayData() && o->arrayData()->type() == Heap::ArrayData::Simple) { SimpleArrayData *s = static_cast<SimpleArrayData *>(o->arrayData()); if (idx < s->len() && !s->data(idx).isEmpty()) { s->data(idx) = v; |