Remove QQmlCompiledData in favor of QV4::CompiledData::CompilationUnit

QQmlCompiledData used to contain the binary data for instantiating QML types in
the QML VME. Nowadays the QML type compiler as well as the JavaScript compiler
create a QV4::CompiledData::CompilationUnit.

Change-Id: I155f62a5ecfb55a3fe230520231b6d8fd5b28ac9
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>

1 files changed, 13 insertions, 14 deletions

diff --git a/src/qml/qml/qqmlincubator.cpp b/src/qml/qml/qqmlincubator.cpp
index d0991f51fe..c52b5014ca 100644
--- a/src/qml/qml/qqmlincubator.cpp
+++ b/src/qml/qml/qqmlincubator.cpp
@@ -41,7 +41,6 @@
 #include "qqmlcomponent.h"
 #include "qqmlincubator_p.h"
 
-#include "qqmlcompiler_p.h"
 #include "qqmlexpression_p.h"
 #include "qqmlmemoryprofiler_p.h"
 #include "qqmlobjectcreator_p.h"
@@ -132,7 +131,7 @@ QQmlIncubationController *QQmlEngine::incubationController() const
 
 QQmlIncubatorPrivate::QQmlIncubatorPrivate(QQmlIncubator *q, QQmlIncubator::IncubationMode m)
     : q(q), status(QQmlIncubator::Null), mode(m), isAsynchronous(false), progress(Execute),
-      result(0), enginePriv(0), compiledData(0), waitingOnMe(0)
+      result(0), enginePriv(0), compilationUnit(0), waitingOnMe(0)
 {
 }
 
@@ -145,16 +144,16 @@ void QQmlIncubatorPrivate::clear()
 {
     if (next.isInList()) {
         next.remove();
-        Q_ASSERT(compiledData);
-        compiledData->release();
-        compiledData = 0;
+        Q_ASSERT(compilationUnit);
+        compilationUnit->release();
+        compilationUnit = 0;
         enginePriv->incubatorCount--;
         QQmlIncubationController *controller = enginePriv->incubationController;
         if (controller)
              controller->incubatingObjectCountChanged(enginePriv->incubatorCount);
-    } else if (compiledData) {
-        compiledData->release();
-        compiledData = 0;
+    } else if (compilationUnit) {
+        compilationUnit->release();
+        compilationUnit = 0;
     }
     enginePriv = 0;
     if (!rootContext.isNull()) {
@@ -278,10 +277,10 @@ void QQmlIncubatorPrivate::forceCompletion(QQmlInstantiationInterrupt &i)
 
 void QQmlIncubatorPrivate::incubate(QQmlInstantiationInterrupt &i)
 {
-    if (!compiledData)
+    if (!compilationUnit)
         return;
 
-    QML_MEMORY_SCOPE_URL(compiledData->compilationUnit->url());
+    QML_MEMORY_SCOPE_URL(compilationUnit->url());
 
     QExplicitlySharedDataPointer<QQmlIncubatorPrivate> protectThis(this);
 
@@ -291,7 +290,7 @@ void QQmlIncubatorPrivate::incubate(QQmlInstantiationInterrupt &i)
 
     if (!vmeGuard.isOK()) {
         QQmlError error;
-        error.setUrl(compiledData->compilationUnit->url());
+        error.setUrl(compilationUnit->url());
         error.setDescription(QQmlComponent::tr("Object destroyed during incubation"));
         errors << error;
         progress = QQmlIncubatorPrivate::Completed;
@@ -564,14 +563,14 @@ void QQmlIncubator::clear()
 
     QQmlEnginePrivate *enginePriv = d->enginePriv;
     if (s == Loading) {
-        Q_ASSERT(d->compiledData);
+        Q_ASSERT(d->compilationUnit);
         if (d->result) d->result->deleteLater();
         d->result = 0;
     }
 
     d->clear();
 
-    Q_ASSERT(d->compiledData == 0);
+    Q_ASSERT(d->compilationUnit == 0);
     Q_ASSERT(d->waitingOnMe.data() == 0);
     Q_ASSERT(d->waitingFor.isEmpty());
 
@@ -711,7 +710,7 @@ QQmlIncubator::Status QQmlIncubatorPrivate::calculateStatus() const
         return QQmlIncubator::Error;
     else if (result && progress == QQmlIncubatorPrivate::Completed && waitingFor.isEmpty())
         return QQmlIncubator::Ready;
-    else if (compiledData)
+    else if (compilationUnit)
         return QQmlIncubator::Loading;
     else
         return QQmlIncubator::Null;