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>

3 files changed, 5 insertions, 5 deletions

diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp
index 015458169a..4f7f92aca8 100644
--- a/src/qml/types/qqmldelegatemodel.cpp
+++ b/src/qml/types/qqmldelegatemodel.cpp
@@ -105,7 +105,7 @@ struct DelegateModelGroupFunction : QV4::FunctionObject
         if (!o)
             return scope.engine->throwTypeError(QStringLiteral("Not a valid VisualData object"));
 
-        QV4::ScopedValue v(scope, argc ? argv[0] : Primitive::undefinedValue());
+        QV4::ScopedValue v(scope, argc ? argv[0] : Value::undefinedValue());
         return f->d()->code(o->d()->item, f->d()->flag, v);
     }
 };
@@ -3476,7 +3476,7 @@ public:
             if (index >= array->count()) {
                 if (hasProperty)
                     *hasProperty = false;
-                return QV4::Primitive::undefinedValue().asReturnedValue();
+                return QV4::Value::undefinedValue().asReturnedValue();
             }
 
             const QQmlChangeSet::Change &change = array->at(index);
diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp
index 71b7328411..debf14df97 100644
--- a/src/qml/types/qqmllistmodel.cpp
+++ b/src/qml/types/qqmllistmodel.cpp
@@ -2542,7 +2542,7 @@ void QQmlListModel::append(QQmlV4Function *args)
 QQmlV4Handle QQmlListModel::get(int index) const
 {
     QV4::Scope scope(engine());
-    QV4::ScopedValue result(scope, QV4::Primitive::undefinedValue());
+    QV4::ScopedValue result(scope, QV4::Value::undefinedValue());
 
     if (index >= 0 && index < count()) {
 
diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp
index cf3bead048..fe51f8ec47 100644
--- a/src/qml/types/qquickworkerscript.cpp
+++ b/src/qml/types/qquickworkerscript.cpp
@@ -191,7 +191,7 @@ QV4::ReturnedValue QQuickWorkerScriptEnginePrivate::method_sendMessage(const QV4
     QV4::Scope scope(b);
     WorkerScript *script = static_cast<WorkerScript *>(scope.engine->v8Engine);
 
-    QV4::ScopedValue v(scope, argc > 0 ? argv[0] : QV4::Primitive::undefinedValue());
+    QV4::ScopedValue v(scope, argc > 0 ? argv[0] : QV4::Value::undefinedValue());
     QByteArray data = QV4::Serialize::serialize(v, scope.engine);
 
     QMutexLocker locker(&script->p->m_lock);
@@ -600,7 +600,7 @@ void QQuickWorkerScript::sendMessage(QQmlV4Function *args)
     }
 
     QV4::Scope scope(args->v4engine());
-    QV4::ScopedValue argument(scope, QV4::Primitive::undefinedValue());
+    QV4::ScopedValue argument(scope, QV4::Value::undefinedValue());
     if (args->length() != 0)
         argument = (*args)[0];