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

diff --git a/src/qml/jsruntime/qv4math_p.h b/src/qml/jsruntime/qv4math_p.h
index 67c963622f..90246c4229 100644
--- a/src/qml/jsruntime/qv4math_p.h
+++ b/src/qml/jsruntime/qv4math_p.h
@@ -70,24 +70,24 @@ static inline QMLJS_READONLY ReturnedValue add_int32(int a, int b)
 {
     int result;
     if (Q_UNLIKELY(add_overflow(a, b, &result)))
-        return Primitive::fromDouble(static_cast<double>(a) + b).asReturnedValue();
-    return Primitive::fromInt32(result).asReturnedValue();
+        return Value::fromDouble(static_cast<double>(a) + b).asReturnedValue();
+    return Value::fromInt32(result).asReturnedValue();
 }
 
 static inline QMLJS_READONLY ReturnedValue sub_int32(int a, int b)
 {
     int result;
     if (Q_UNLIKELY(sub_overflow(a, b, &result)))
-        return Primitive::fromDouble(static_cast<double>(a) - b).asReturnedValue();
-    return Primitive::fromInt32(result).asReturnedValue();
+        return Value::fromDouble(static_cast<double>(a) - b).asReturnedValue();
+    return Value::fromInt32(result).asReturnedValue();
 }
 
 static inline QMLJS_READONLY ReturnedValue mul_int32(int a, int b)
 {
     int result;
     if (Q_UNLIKELY(mul_overflow(a, b, &result)))
-        return Primitive::fromDouble(static_cast<double>(a) * b).asReturnedValue();
-    return Primitive::fromInt32(result).asReturnedValue();
+        return Value::fromDouble(static_cast<double>(a) * b).asReturnedValue();
+    return Value::fromInt32(result).asReturnedValue();
 }
 
 }