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, 2 insertions, 2 deletions

diff --git a/src/qml/jsruntime/qv4propertykey.cpp b/src/qml/jsruntime/qv4propertykey.cpp
index 361ade17c2..064d030b83 100644
--- a/src/qml/jsruntime/qv4propertykey.cpp
+++ b/src/qml/jsruntime/qv4propertykey.cpp
@@ -47,7 +47,7 @@
 QV4::Heap::StringOrSymbol *QV4::PropertyKey::toStringOrSymbol(QV4::ExecutionEngine *e)
 {
     if (isArrayIndex())
-        return Primitive::fromUInt32(asArrayIndex()).toString(e);
+        return Value::fromUInt32(asArrayIndex()).toString(e);
     return static_cast<Heap::StringOrSymbol *>(asStringOrSymbol());
 }
 
@@ -73,7 +73,7 @@ bool QV4::PropertyKey::isCanonicalNumericIndexString() const
     double d = str->toNumber();
     if (d == 0. && std::signbit(d))
         return true;
-    ScopedString converted(scope, Primitive::fromDouble(d).toString(scope.engine));
+    ScopedString converted(scope, Value::fromDouble(d).toString(scope.engine));
     if (converted->equals(str))
         return true;
     return false;