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/qv4scopedvalue_p.h b/src/qml/jsruntime/qv4scopedvalue_p.h
index 8ac2213492..c28a3ffa2d 100644
--- a/src/qml/jsruntime/qv4scopedvalue_p.h
+++ b/src/qml/jsruntime/qv4scopedvalue_p.h
@@ -131,11 +131,11 @@ struct Scope {
         switch (mode) {
         case Undefined:
             for (int i = 0; i < nValues; ++i)
-                ptr[i] = Primitive::undefinedValue();
+                ptr[i] = Value::undefinedValue();
             break;
         case Empty:
             for (int i = 0; i < nValues; ++i)
-                ptr[i] = Primitive::emptyValue();
+                ptr[i] = Value::emptyValue();
             break;
         case Uninitialized:
             break;
@@ -148,10 +148,10 @@ struct Scope {
         Value *ptr = engine->jsAlloca(1);
         switch (mode) {
         case Undefined:
-            *ptr = Primitive::undefinedValue();
+            *ptr = Value::undefinedValue();
             break;
         case Empty:
-            *ptr = Primitive::emptyValue();
+            *ptr = Value::emptyValue();
             break;
         case Uninitialized:
             break;