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/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp
index bf8000bdd8..9671e82187 100644
--- a/src/qml/jsapi/qjsvalue.cpp
+++ b/src/qml/jsapi/qjsvalue.cpp
@@ -569,7 +569,7 @@ qint32 QJSValue::toInt() const
     if (!val) {
         QVariant *variant = QJSValuePrivate::getVariant(this);
         if (variant->userType() == QMetaType::QString)
-            return QV4::Primitive::toInt32(RuntimeHelpers::stringToNumber(variant->toString()));
+            return QV4::Value::toInt32(RuntimeHelpers::stringToNumber(variant->toString()));
         else
             return variant->toInt();
     }
@@ -603,7 +603,7 @@ quint32 QJSValue::toUInt() const
     if (!val) {
         QVariant *variant = QJSValuePrivate::getVariant(this);
         if (variant->userType() == QMetaType::QString)
-            return QV4::Primitive::toUInt32(RuntimeHelpers::stringToNumber(variant->toString()));
+            return QV4::Value::toUInt32(RuntimeHelpers::stringToNumber(variant->toString()));
         else
             return variant->toUInt();
     }