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>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/qml/jsruntime/qv4arrayiterator.cpp b/src/qml/jsruntime/qv4arrayiterator.cpp
index 650f58463e..199b1a728a 100644
--- a/src/qml/jsruntime/qv4arrayiterator.cpp
+++ b/src/qml/jsruntime/qv4arrayiterator.cpp
@@ -65,7 +65,7 @@ ReturnedValue ArrayIteratorPrototype::method_next(const FunctionObject *b, const
 
     ScopedObject a(scope, thisObject->d()->iteratedObject);
     if (!a) {
-        QV4::Value undefined = Primitive::undefinedValue();
+        QV4::Value undefined = Value::undefinedValue();
         return IteratorPrototype::createIterResultObject(scope.engine, undefined, true);
     }
 
@@ -77,13 +77,13 @@ ReturnedValue ArrayIteratorPrototype::method_next(const FunctionObject *b, const
 
     if (index >= len) {
         thisObject->d()->iteratedObject.set(scope.engine, nullptr);
-        QV4::Value undefined = Primitive::undefinedValue();
+        QV4::Value undefined = Value::undefinedValue();
         return IteratorPrototype::createIterResultObject(scope.engine, undefined, true);
     }
 
     thisObject->d()->nextIndex = index + 1;
     if (itemKind == KeyIteratorKind) {
-        return IteratorPrototype::createIterResultObject(scope.engine, Primitive::fromInt32(index), false);
+        return IteratorPrototype::createIterResultObject(scope.engine, Value::fromInt32(index), false);
     }
 
     ReturnedValue elementValue = a->get(index);
@@ -96,7 +96,7 @@ ReturnedValue ArrayIteratorPrototype::method_next(const FunctionObject *b, const
 
         ScopedArrayObject resultArray(scope, scope.engine->newArrayObject());
         resultArray->arrayReserve(2);
-        resultArray->arrayPut(0, Primitive::fromInt32(index));
+        resultArray->arrayPut(0, Value::fromInt32(index));
         resultArray->arrayPut(1, Value::fromReturnedValue(elementValue));
         resultArray->setArrayLengthUnchecked(2);