diff options
author | Lars Knoll <lars.knoll@qt.io> | 2018-09-11 11:07:32 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2018-09-17 07:47:09 +0000 |
commit | 1dac47c1418b44cf4a56b42bfca2b277795fd213 (patch) | |
tree | 26727943c30628340662a66d7cbe9f52d75c5b58 /src/qml/jsruntime/qv4arraydata.cpp | |
parent | d89d5cffe79bd060a1b04a2c47a3d728bffbe195 (diff) |
Cleanups in Value/Primitive
Get rid of Primitive and move the corresponding methods
directly into Value. Mark many methods in Value as
constexpr and turn Value into a POD type again.
Keep Primitive as a pure alias to Value for source
compatibility of other modules that might be using it.
Change-Id: Icb47458947dd3482c8852e95782123ea4346f5ec
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4arraydata.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4arraydata.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4arraydata.cpp b/src/qml/jsruntime/qv4arraydata.cpp index ce1d0503df..b11521f2d9 100644 --- a/src/qml/jsruntime/qv4arraydata.cpp +++ b/src/qml/jsruntime/qv4arraydata.cpp @@ -221,7 +221,7 @@ ReturnedValue SimpleArrayData::get(const Heap::ArrayData *d, uint index) { const Heap::SimpleArrayData *dd = static_cast<const Heap::SimpleArrayData *>(d); if (index >= dd->values.size) - return Primitive::emptyValue().asReturnedValue(); + return Value::emptyValue().asReturnedValue(); return dd->data(index).asReturnedValue(); } @@ -246,7 +246,7 @@ bool SimpleArrayData::del(Object *o, uint index) return true; if (!dd->attrs || dd->attrs[index].isConfigurable()) { - dd->setData(o->engine(), index, Primitive::emptyValue()); + dd->setData(o->engine(), index, Value::emptyValue()); if (dd->attrs) dd->attrs[index] = Attr_Data; return true; @@ -328,7 +328,7 @@ bool SimpleArrayData::putArray(Object *o, uint index, const Value *values, uint } QV4::ExecutionEngine *e = o->engine(); for (uint i = dd->values.size; i < index; ++i) - dd->setData(e, i, Primitive::emptyValue()); + dd->setData(e, i, Value::emptyValue()); for (uint i = 0; i < n; ++i) dd->setData(e, index + i, values[i]); dd->values.size = qMax(dd->values.size, index + n); @@ -402,7 +402,7 @@ ReturnedValue SparseArrayData::get(const Heap::ArrayData *d, uint index) const Heap::SparseArrayData *s = static_cast<const Heap::SparseArrayData *>(d); index = s->mappedIndex(index); if (index == UINT_MAX) - return Primitive::emptyValue().asReturnedValue(); + return Value::emptyValue().asReturnedValue(); return s->values[index].asReturnedValue(); } @@ -606,7 +606,7 @@ void ArrayData::insert(Object *o, uint index, const Value *v, bool isAccessor) if (index >= d->values.size) { // mark possible hole in the array for (uint i = d->values.size; i < index; ++i) - d->setData(o->engine(), i, Primitive::emptyValue()); + d->setData(o->engine(), i, Value::emptyValue()); d->values.size = index + 1; } d->setData(o->engine(), index, *v); @@ -799,7 +799,7 @@ void ArrayData::sort(ExecutionEngine *engine, Object *thisObject, const Value &c break; Q_ASSERT(!d->attrs || !d->attrs[len].isAccessor()); d->setData(engine, i, d->data(len)); - d->setData(engine, len, Primitive::emptyValue()); + d->setData(engine, len, Value::emptyValue()); } } |