Finally drop last references to v8

Move files out of the v8 directory and adapt some comments and member
names.

Change-Id: I36dd9eaf6f51157627327bf46442a54c79a616a5
Reviewed-by: Maximilian Goldstein <[email protected]>

11 files changed, 12 insertions, 12 deletions

diff --git a/src/particles/qquickparticlesystem.cpp b/src/particles/qquickparticlesystem.cpp
index 5806d7914c..5dabe9100a 100644
--- a/src/particles/qquickparticlesystem.cpp
+++ b/src/particles/qquickparticlesystem.cpp
@@ -428,7 +428,7 @@ QQuickParticleData::QQuickParticleData()
     , rotationOwner(nullptr)
     , deformationOwner(nullptr)
     , animationOwner(nullptr)
-    , v8Datum(nullptr)
+    , v4Datum(nullptr)
 {
     x = 0;
     y = 0;
@@ -465,7 +465,7 @@ QQuickParticleData::QQuickParticleData()
 
 QQuickParticleData::~QQuickParticleData()
 {
-    delete v8Datum;
+    delete v4Datum;
 }
 
 QQuickParticleData::QQuickParticleData(const QQuickParticleData &other)
@@ -481,7 +481,7 @@ QQuickParticleData &QQuickParticleData::operator=(const QQuickParticleData &othe
     index = other.index;
     systemIndex = other.systemIndex;
     // Lazily initialized
-    v8Datum = nullptr;
+    v4Datum = nullptr;
 
     return *this;
 }
@@ -524,9 +524,9 @@ void QQuickParticleData::clone(const QQuickParticleData& other)
 
 QV4::ReturnedValue QQuickParticleData::v4Value(QQuickParticleSystem* particleSystem)
 {
-    if (!v8Datum)
-        v8Datum = new QQuickV4ParticleData(qmlEngine(particleSystem)->handle(), this, particleSystem);
-    return v8Datum->v4Value();
+    if (!v4Datum)
+        v4Datum = new QQuickV4ParticleData(qmlEngine(particleSystem)->handle(), this, particleSystem);
+    return v4Datum->v4Value();
 }
 
 void QQuickParticleData::debugDump(QQuickParticleSystem* particleSystem) const
diff --git a/src/particles/qquickparticlesystem_p.h b/src/particles/qquickparticlesystem_p.h
index 0ae2a5f345..660794d454 100644
--- a/src/particles/qquickparticlesystem_p.h
+++ b/src/particles/qquickparticlesystem_p.h
@@ -340,7 +340,7 @@ public:
     static inline constexpr float EPSILON() noexcept { return 0.001f; }
 
 private:
-    QQuickV4ParticleData* v8Datum;
+    QQuickV4ParticleData* v4Datum;
 };
 
 class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickParticleSystem : public QQuickItem
diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt
index f074c9b23e..d12f54d0a4 100644
--- a/src/qml/CMakeLists.txt
+++ b/src/qml/CMakeLists.txt
@@ -149,6 +149,7 @@ qt_internal_add_qml_module(Qml
         jsruntime/qv4dataview.cpp jsruntime/qv4dataview_p.h
         jsruntime/qv4dateobject.cpp jsruntime/qv4dateobject_p.h
         jsruntime/qv4debugging_p.h
+        jsruntime/qv4domerrors.cpp jsruntime/qv4domerrors_p.h
         jsruntime/qv4engine.cpp jsruntime/qv4engine_p.h
         jsruntime/qv4enginebase_p.h
         jsruntime/qv4errorobject.cpp jsruntime/qv4errorobject_p.h
@@ -201,6 +202,7 @@ qt_internal_add_qml_module(Qml
         jsruntime/qv4setiterator.cpp jsruntime/qv4setiterator_p.h
         jsruntime/qv4setobject.cpp jsruntime/qv4setobject_p.h
         jsruntime/qv4sparsearray.cpp jsruntime/qv4sparsearray_p.h
+        jsruntime/qv4sqlerrors.cpp jsruntime/qv4sqlerrors_p.h
         jsruntime/qv4stackframe.cpp jsruntime/qv4stackframe_p.h
         jsruntime/qv4string.cpp jsruntime/qv4string_p.h
         jsruntime/qv4stringiterator.cpp jsruntime/qv4stringiterator_p.h
@@ -246,6 +248,7 @@ qt_internal_add_qml_module(Qml
         qml/qqmlapplicationengine.cpp qml/qqmlapplicationengine.h qml/qqmlapplicationengine_p.h
         qml/qqmlbinding.cpp qml/qqmlbinding_p.h
         qml/qqmlboundsignal.cpp qml/qqmlboundsignal_p.h
+        qml/qqmlbuiltinfunctions.cpp qml/qqmlbuiltinfunctions_p.h
         qml/qqmlcomponent.cpp qml/qqmlcomponent.h qml/qqmlcomponent_p.h
         qml/qqmlcomponentattached_p.h
         qml/qqmlcontext.cpp qml/qqmlcontext.h qml/qqmlcontext_p.h
@@ -324,9 +327,6 @@ qt_internal_add_qml_module(Qml
         qml/qqmlvaluetypewrapper.cpp qml/qqmlvaluetypewrapper_p.h
         qml/qqmlvme.cpp qml/qqmlvme_p.h
         qml/qqmlvmemetaobject.cpp qml/qqmlvmemetaobject_p.h
-        qml/v8/qqmlbuiltinfunctions.cpp qml/v8/qqmlbuiltinfunctions_p.h
-        qml/v8/qv4domerrors.cpp qml/v8/qv4domerrors_p.h
-        qml/v8/qv4sqlerrors.cpp qml/v8/qv4sqlerrors_p.h
         qmldirparser/qqmldirparser.cpp qmldirparser/qqmldirparser_p.h
         qmldirparser/qqmlimportresolver.cpp qmldirparser/qqmlimportresolver_p.h
         qtqmlcompilerglobal.h qtqmlcompilerglobal_p.h
diff --git a/src/qml/qml/v8/qv4domerrors.cpp b/src/qml/jsruntime/qv4domerrors.cpp
index 7ad37d098f..7ad37d098f 100644
--- a/src/qml/qml/v8/qv4domerrors.cpp
+++ b/src/qml/jsruntime/qv4domerrors.cpp
diff --git a/src/qml/qml/v8/qv4domerrors_p.h b/src/qml/jsruntime/qv4domerrors_p.h
index 1842e46a9c..1842e46a9c 100644
--- a/src/qml/qml/v8/qv4domerrors_p.h
+++ b/src/qml/jsruntime/qv4domerrors_p.h
diff --git a/src/qml/qml/v8/qv4sqlerrors.cpp b/src/qml/jsruntime/qv4sqlerrors.cpp
index 3f1744a687..3f1744a687 100644
--- a/src/qml/qml/v8/qv4sqlerrors.cpp
+++ b/src/qml/jsruntime/qv4sqlerrors.cpp
diff --git a/src/qml/qml/v8/qv4sqlerrors_p.h b/src/qml/jsruntime/qv4sqlerrors_p.h
index 51dcb286de..51dcb286de 100644
--- a/src/qml/qml/v8/qv4sqlerrors_p.h
+++ b/src/qml/jsruntime/qv4sqlerrors_p.h
diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp
index 665d4e6c75..32fbe274ab 100644
--- a/src/qml/qml/qqmlboundsignal.cpp
+++ b/src/qml/qml/qqmlboundsignal.cpp
@@ -171,7 +171,7 @@ QString QQmlBoundSignalExpression::expression() const
     return QString();
 }
 
-// Parts of this function mirror code in QQmlExpressionPrivate::value() and v8value().
+// Parts of this function mirror code in QQmlExpressionPrivate::value() and v4Value().
 // Changes made here may need to be made there and vice versa.
 void QQmlBoundSignalExpression::evaluate(void **a)
 {
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/qqmlbuiltinfunctions.cpp
index 388b6153fd..388b6153fd 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/qqmlbuiltinfunctions.cpp
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h b/src/qml/qml/qqmlbuiltinfunctions_p.h
index 972a0d0b31..972a0d0b31 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h
+++ b/src/qml/qml/qqmlbuiltinfunctions_p.h
diff --git a/src/qml/qml/qqmldata_p.h b/src/qml/qml/qqmldata_p.h
index ff55ab49d4..6666df51a2 100644
--- a/src/qml/qml/qqmldata_p.h
+++ b/src/qml/qml/qqmldata_p.h
@@ -132,7 +132,7 @@ public:
     quint32 isQueuedForDeletion:1;
     /*
      * rootObjectInCreation should be true only when creating top level CPP and QML objects,
-     * v8 GC will check this flag, only deletes the objects when rootObjectInCreation is false.
+     * v4 GC will check this flag, only deletes the objects when rootObjectInCreation is false.
      */
     quint32 rootObjectInCreation:1;
     // set when at least one of the object's properties is intercepted