diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-04-05 20:47:36 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:48:54 +0200 |
| commit | 393c92a82170260fc322f7fc389a5594d71a8876 (patch) | |
| tree | daa493130b95a53313f830b657f24859f8b5bfa5 /src/qml/jsruntime/qv4objectproto.cpp | |
| parent | 6452f7a57452dc35c414d7e3c13c79115dd145ed (diff) | |
Move object data into internal structure
Change-Id: I1fcccd535ed356e736468337bd450270cd290044
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4objectproto.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4objectproto.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/qml/jsruntime/qv4objectproto.cpp b/src/qml/jsruntime/qv4objectproto.cpp index 92c62d4cfd..a8b107e9f2 100644 --- a/src/qml/jsruntime/qv4objectproto.cpp +++ b/src/qml/jsruntime/qv4objectproto.cpp @@ -272,11 +272,11 @@ ReturnedValue ObjectPrototype::method_seal(CallContext *ctx) o->setInternalClass(o->internalClass()->sealed()); - if (o->arrayData) { + if (o->arrayData()) { ArrayData::ensureAttributes(o.getPointer()); - for (uint i = 0; i < o->arrayData->alloc; ++i) { - if (!o->arrayData->isEmpty(i)) - o->arrayData->attrs[i].setConfigurable(false); + for (uint i = 0; i < o->arrayData()->alloc; ++i) { + if (!o->arrayData()->isEmpty(i)) + o->arrayData()->attrs[i].setConfigurable(false); } } @@ -297,13 +297,13 @@ ReturnedValue ObjectPrototype::method_freeze(CallContext *ctx) o->setInternalClass(o->internalClass()->frozen()); - if (o->arrayData) { + if (o->arrayData()) { ArrayData::ensureAttributes(o.getPointer()); - for (uint i = 0; i < o->arrayData->alloc; ++i) { - if (!o->arrayData->isEmpty(i)) - o->arrayData->attrs[i].setConfigurable(false); - if (o->arrayData->attrs[i].isData()) - o->arrayData->attrs[i].setWritable(false); + for (uint i = 0; i < o->arrayData()->alloc; ++i) { + if (!o->arrayData()->isEmpty(i)) + o->arrayData()->attrs[i].setConfigurable(false); + if (o->arrayData()->attrs[i].isData()) + o->arrayData()->attrs[i].setWritable(false); } } return o.asReturnedValue(); @@ -333,16 +333,16 @@ ReturnedValue ObjectPrototype::method_isSealed(CallContext *ctx) if (o->internalClass() != o->internalClass()->sealed()) return Encode(false); - if (!o->arrayData || !o->arrayData->length()) + if (!o->arrayData() || !o->arrayData()->length()) return Encode(true); - if (o->arrayData->length() && !o->arrayData->attrs) + if (o->arrayData()->length() && !o->arrayData()->attrs) return Encode(false); - for (uint i = 0; i < o->arrayData->alloc; ++i) { + for (uint i = 0; i < o->arrayData()->alloc; ++i) { // ### Fix for sparse arrays - if (!o->arrayData->isEmpty(i)) - if (o->arrayData->attributes(i).isConfigurable()) + if (!o->arrayData()->isEmpty(i)) + if (o->arrayData()->attributes(i).isConfigurable()) return Encode(false); } @@ -362,16 +362,16 @@ ReturnedValue ObjectPrototype::method_isFrozen(CallContext *ctx) if (o->internalClass() != o->internalClass()->frozen()) return Encode(false); - if (!o->arrayData->length()) + if (!o->arrayData()->length()) return Encode(true); - if (o->arrayData->length() && !o->arrayData->attrs) + if (o->arrayData()->length() && !o->arrayData()->attrs) return Encode(false); - for (uint i = 0; i < o->arrayData->alloc; ++i) { + for (uint i = 0; i < o->arrayData()->alloc; ++i) { // ### Fix for sparse arrays - if (!o->arrayData->isEmpty(i)) - if (o->arrayData->attributes(i).isConfigurable() || o->arrayData->attributes(i).isWritable()) + if (!o->arrayData()->isEmpty(i)) + if (o->arrayData()->attributes(i).isConfigurable() || o->arrayData()->attributes(i).isWritable()) return Encode(false); } |