From 3c63ac03ed262b59962b45ac974b82edc7c83880 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 13 Aug 2015 08:14:37 +0200 Subject: Remove unused pointer to the context wrapper THe binding wrapper doesn't use that pointer anymore. Change-Id: Ie04fff448b9647927219936a62c67ac0b4853eec Reviewed-by: Simon Hausmann --- src/qml/jsruntime/qv4script.cpp | 10 ---------- src/qml/jsruntime/qv4script_p.h | 2 -- 2 files changed, 12 deletions(-) (limited to 'src/qml') diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp index d619c1a7c8..14b8b878bd 100644 --- a/src/qml/jsruntime/qv4script.cpp +++ b/src/qml/jsruntime/qv4script.cpp @@ -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(m); - if (wrapper->qml) - wrapper->qml->mark(e); - FunctionObject::markObjects(m, e); -} - static ReturnedValue signalParameterGetter(QV4::CallContext *ctx, uint parameterIndex) { QV4::Scope scope(ctx); diff --git a/src/qml/jsruntime/qv4script_p.h b/src/qml/jsruntime/qv4script_p.h index 77784dfc4f..22714496f8 100644 --- a/src/qml/jsruntime/qv4script_p.h +++ b/src/qml/jsruntime/qv4script_p.h @@ -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 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(d()->scope.ptr); } -- cgit v1.2.3