Remove unused pointer to the context wrapper
authorLars Knoll <lars.knoll@theqtcompany.com>
Thu, 13 Aug 2015 06:14:37 +0000 (08:14 +0200)
committerLars Knoll <lars.knoll@theqtcompany.com>
Thu, 20 Aug 2015 20:01:34 +0000 (20:01 +0000)
THe binding wrapper doesn't use that pointer anymore.

Change-Id: Ie04fff448b9647927219936a62c67ac0b4853eec
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
src/qml/jsruntime/qv4script.cpp
src/qml/jsruntime/qv4script_p.h

index d619c1a..14b8b87 100644 (file)
@@ -90,7 +90,6 @@ DEFINE_OBJECT_VTABLE(CompilationUnitHolder);
 
 Heap::QmlBindingWrapper::QmlBindingWrapper(QV4::ExecutionContext *scope, Function *f, QV4::QmlContextWrapper *qml)
     : Heap::FunctionObject(scope, scope->d()->engine->id_eval(), /*createProto = */ false)
-    , qml(qml->d())
 {
     Q_ASSERT(scope->inUse());
 
@@ -107,7 +106,6 @@ Heap::QmlBindingWrapper::QmlBindingWrapper(QV4::ExecutionContext *scope, Functio
 
 Heap::QmlBindingWrapper::QmlBindingWrapper(QV4::ExecutionContext *scope, QV4::QmlContextWrapper *qml)
     : Heap::FunctionObject(scope, scope->d()->engine->id_eval(), /*createProto = */ false)
-    , qml(qml->d())
 {
     Q_ASSERT(scope->inUse());
 
@@ -140,14 +138,6 @@ ReturnedValue QmlBindingWrapper::call(const Managed *that, CallData *callData)
     return result->asReturnedValue();
 }
 
-void QmlBindingWrapper::markObjects(Heap::Base *m, ExecutionEngine *e)
-{
-    QmlBindingWrapper::Data *wrapper = static_cast<QmlBindingWrapper::Data *>(m);
-    if (wrapper->qml)
-        wrapper->qml->mark(e);
-    FunctionObject::markObjects(m, e);
-}
-
 static ReturnedValue signalParameterGetter(QV4::CallContext *ctx, uint parameterIndex)
 {
     QV4::Scope scope(ctx);
index 77784df..2271449 100644 (file)
@@ -90,7 +90,6 @@ struct QmlBindingWrapper : Heap::FunctionObject {
     QmlBindingWrapper(QV4::ExecutionContext *scope, Function *f, QV4::QmlContextWrapper *qml);
     // Constructor for QML functions and signal handlers, resulting binding wrapper is not callable!
     QmlBindingWrapper(QV4::ExecutionContext *scope, QV4::QmlContextWrapper *qml);
-    Pointer<Object> qml;
 };
 
 }
@@ -99,7 +98,6 @@ struct Q_QML_EXPORT QmlBindingWrapper : FunctionObject {
     V4_OBJECT2(QmlBindingWrapper, FunctionObject)
 
     static ReturnedValue call(const Managed *that, CallData *callData);
-    static void markObjects(Heap::Base *m, ExecutionEngine *e);
 
     Heap::QmlContext *context() const { return static_cast<Heap::QmlContext *>(d()->scope.ptr); }