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/qv4object_p.h | |
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/qv4object_p.h')
-rw-r--r-- | src/qml/jsruntime/qv4object_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4object_p.h b/src/qml/jsruntime/qv4object_p.h index 991c0591a5..aca4f99750 100644 --- a/src/qml/jsruntime/qv4object_p.h +++ b/src/qml/jsruntime/qv4object_p.h @@ -440,7 +440,7 @@ struct ArrayObject : Object { private: void commonInit() - { setProperty(internalClass->engine, LengthPropertyIndex, Primitive::fromInt32(0)); } + { setProperty(internalClass->engine, LengthPropertyIndex, Value::fromInt32(0)); } }; } @@ -481,7 +481,7 @@ protected: inline void Object::setArrayLengthUnchecked(uint l) { if (isArrayObject()) - setProperty(Heap::ArrayObject::LengthPropertyIndex, Primitive::fromUInt32(l)); + setProperty(Heap::ArrayObject::LengthPropertyIndex, Value::fromUInt32(l)); } inline void Object::push_back(const Value &v) |