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/qv4object.cpp b/src/qml/jsruntime/qv4object.cpp
index 4c36d24c1a..7ea91c441d 100644
--- a/src/qml/jsruntime/qv4object.cpp
+++ b/src/qml/jsruntime/qv4object.cpp
@@ -456,7 +456,7 @@ ReturnedValue Object::internalGet(PropertyKey id, const Value *receiver, bool *h
     }
 
     if (o) {
-        const Value v = Primitive::fromHeapObject(o);
+        const Value v = Value::fromHeapObject(o);
         const Object &obj = static_cast<const Object &>(v);
         return obj.get(id, receiver, hasProperty);
     }
@@ -658,7 +658,7 @@ bool Object::internalDefineOwnProperty(ExecutionEngine *engine, uint index, Stri
                 // need to convert the array and the slot
                 setArrayAttributes(index, cattrs);
             }
-            current->value = Primitive::undefinedValue();
+            current->value = Value::undefinedValue();
         }
     } else if (cattrs.isData() && attrs.isData()) { // clause 10
         if (!cattrs.isConfigurable() && !cattrs.isWritable()) {