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/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp
index 5800b08ef4..52be2079cb 100644
--- a/src/qml/jsruntime/qv4qobjectwrapper.cpp
+++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp
@@ -2003,7 +2003,7 @@ ReturnedValue QObjectMethod::callInternal(const Value *thisObject, const Value *
     CallData *callData = cData.callData();
 
     if (method.isV4Function()) {
-        QV4::ScopedValue rv(scope, QV4::Primitive::undefinedValue());
+        QV4::ScopedValue rv(scope, QV4::Value::undefinedValue());
         QQmlV4Function func(callData, rv, v4);
         QQmlV4Function *funcptr = &func;
 
@@ -2074,7 +2074,7 @@ void QMetaObjectWrapper::init(ExecutionEngine *) {
         for (int k = 0; k < Enum.keyCount(); k++) {
             const char* key = Enum.key(k);
             const int value = Enum.value(k);
-            defineReadonlyProperty(QLatin1String(key), Primitive::fromInt32(value));
+            defineReadonlyProperty(QLatin1String(key), Value::fromInt32(value));
         }
     }
 }