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

diff --git a/src/qml/qml/qqmltypewrapper.cpp b/src/qml/qml/qqmltypewrapper.cpp
index c6affcb79c..cb4df7d912 100644
--- a/src/qml/qml/qqmltypewrapper.cpp
+++ b/src/qml/qml/qqmltypewrapper.cpp
@@ -205,7 +205,7 @@ ReturnedValue QQmlTypeWrapper::virtualGet(const Managed *m, PropertyKey id, cons
                     bool ok = false;
                     const int value = enumForSingleton(v4, name, qobjectSingleton, type, &ok);
                     if (ok)
-                        return QV4::Primitive::fromInt32(value).asReturnedValue();
+                        return QV4::Value::fromInt32(value).asReturnedValue();
                 }
 
                 // check for property.
@@ -237,7 +237,7 @@ ReturnedValue QQmlTypeWrapper::virtualGet(const Managed *m, PropertyKey id, cons
                 bool ok = false;
                 int value = type.enumValue(QQmlEnginePrivate::get(v4->qmlEngine()), name, &ok);
                 if (ok)
-                    return QV4::Primitive::fromInt32(value).asReturnedValue();
+                    return QV4::Value::fromInt32(value).asReturnedValue();
 
                 value = type.scopedEnumIndex(QQmlEnginePrivate::get(v4->qmlEngine()), name, &ok);
                 if (ok) {
@@ -447,7 +447,7 @@ ReturnedValue QQmlScopedEnumWrapper::virtualGet(const Managed *m, PropertyKey id
     if (hasProperty)
         *hasProperty = ok;
     if (ok)
-        return QV4::Primitive::fromInt32(value).asReturnedValue();
+        return QV4::Value::fromInt32(value).asReturnedValue();
 
     return Encode::undefined();
 }