Get rid of simpleCall

After the recent changes this can easily be unified with
the call method without loss of performance.

Change-Id: I0385b47b6a86e890f97dcbada3a1be1129ae0b84
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 3 insertions, 7 deletions

diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp
index 417698b5e8..614ec46afb 100644
--- a/src/qml/qml/qqmljavascriptexpression.cpp
+++ b/src/qml/qml/qqmljavascriptexpression.cpp
@@ -227,11 +227,7 @@ QV4::ReturnedValue QQmlJavaScriptExpression::evaluate(QV4::CallData *callData, b
     }
 
     QV4::ExecutionContext *outer = static_cast<QV4::ExecutionContext *>(m_qmlScope.valueRef());
-    if (v4Function->canUseSimpleFunction()) {
-        result = outer->simpleCall(scope.engine, callData, v4Function);
-    } else {
-        result = outer->call(scope.engine, callData, v4Function);
-    }
+    result = QV4::ExecutionContext::call(outer->d(), callData, v4Function);
 
     if (scope.hasException()) {
         if (watcher.wasDeleted())
@@ -339,7 +335,7 @@ void QQmlPropertyCapture::captureProperty(QObject *o, int c, int n, Duration dur
     }
 }
 
-void QQmlPropertyCapture::registerQmlDependencies(QV4::QmlContext *context, const QV4::ExecutionEngine *engine, const QV4::CompiledData::Function *compiledFunction)
+void QQmlPropertyCapture::registerQmlDependencies(QV4::Heap::QmlContext *context, const QV4::ExecutionEngine *engine, const QV4::CompiledData::Function *compiledFunction)
 {
     // Let the caller check and avoid the function call :)
     Q_ASSERT(compiledFunction->hasQmlDependencies());
@@ -356,7 +352,7 @@ void QQmlPropertyCapture::registerQmlDependencies(QV4::QmlContext *context, cons
 
     capture->expression->m_permanentDependenciesRegistered = true;
 
-    QV4::Heap::QQmlContextWrapper *wrapper = context->d()->qml();
+    QV4::Heap::QQmlContextWrapper *wrapper = context->qml();
     QQmlContextData *qmlContext = wrapper->context->contextData();
 
     const QV4::CompiledData::LEUInt32 *idObjectDependency = compiledFunction->qmlIdObjectDependencyTable();