Remove double indirection between QJSEngine and QV4::ExecutionEngine

As QJSEngine's handle() method is internal, we can redefine it to return
a pointer to an ExecutionEngine. That makes many things easier.

Change-Id: Ie3df99e0bad5f00ad4fe73182896cd135fa82994
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

3 files changed, 6 insertions, 7 deletions

diff --git a/src/imports/statemachine/signaltransition.cpp b/src/imports/statemachine/signaltransition.cpp
index aaf32f6d19..3c3142cce8 100644
--- a/src/imports/statemachine/signaltransition.cpp
+++ b/src/imports/statemachine/signaltransition.cpp
@@ -109,7 +109,7 @@ void SignalTransition::setSignal(const QJSValue &signal)
 
     m_signal = signal;
 
-    QV4::ExecutionEngine *jsEngine = QV8Engine::getV4(QQmlEngine::contextForObject(this)->engine());
+    QV4::ExecutionEngine *jsEngine = QQmlEngine::contextForObject(this)->engine()->handle();
     QV4::Scope scope(jsEngine);
 
     QObject *sender;
@@ -169,7 +169,7 @@ void SignalTransition::connectTriggered()
     const QV4::CompiledData::Binding *binding = m_bindings.at(0);
     Q_ASSERT(binding->type == QV4::CompiledData::Binding::Type_Script);
 
-    QV4::ExecutionEngine *jsEngine = QV8Engine::getV4(QQmlEngine::contextForObject(this)->engine());
+    QV4::ExecutionEngine *jsEngine = QQmlEngine::contextForObject(this)->engine()->handle();
     QV4::Scope scope(jsEngine);
     QV4::Scoped<QV4::QObjectMethod> qobjectSignal(scope, QJSValuePrivate::convertedToValue(jsEngine, m_signal));
     Q_ASSERT(qobjectSignal);
diff --git a/src/imports/testlib/main.cpp b/src/imports/testlib/main.cpp
index 00e9592557..ab84d83ff7 100644
--- a/src/imports/testlib/main.cpp
+++ b/src/imports/testlib/main.cpp
@@ -103,7 +103,7 @@ public Q_SLOTS:
         }
 
         QQmlEngine *engine = qmlEngine(this);
-        QV4::ExecutionEngine *v4 = QV8Engine::getV4(engine->handle());
+        QV4::ExecutionEngine *v4 = engine->handle();
         QV4::Scope scope(v4);
         QV4::ScopedValue s(scope, v4->newString(name));
         return QQmlV4Handle(s);
@@ -116,7 +116,7 @@ public Q_SLOTS:
     QQmlV4Handle callerFile(int frameIndex = 0) const
     {
         QQmlEngine *engine = qmlEngine(this);
-        QV4::ExecutionEngine *v4 = QV8Engine::getV4(engine->handle());
+        QV4::ExecutionEngine *v4 = engine->handle();
         QV4::Scope scope(v4);
 
         QVector<QV4::StackFrame> stack = v4->stackTrace(frameIndex + 2);
@@ -129,7 +129,7 @@ public Q_SLOTS:
     int callerLine(int frameIndex = 0) const
     {
         QQmlEngine *engine = qmlEngine(this);
-        QV4::ExecutionEngine *v4 = QV8Engine::getV4(engine->handle());
+        QV4::ExecutionEngine *v4 = engine->handle();
 
         QVector<QV4::StackFrame> stack = v4->stackTrace(frameIndex + 2);
         if (stack.size() > frameIndex + 1)
diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
index a013e8cf69..d14810a01b 100644
--- a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
+++ b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
@@ -923,8 +923,7 @@ QQmlV4Handle QQuickXmlListModel::get(int index) const
         return QQmlV4Handle(Encode::undefined());
 
     QQmlEngine *engine = qmlContext(this)->engine();
-    QV8Engine *v8engine = QQmlEnginePrivate::getV8Engine(engine);
-    ExecutionEngine *v4engine = QV8Engine::getV4(v8engine);
+    ExecutionEngine *v4engine = engine->handle();
     Scope scope(v4engine);
     Scoped<Object> o(scope, v4engine->newObject());
     ScopedString name(scope);