summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2015-08-13 08:14:37 +0200
committerLars Knoll <lars.knoll@theqtcompany.com>2015-08-20 20:01:34 +0000
commit3c63ac03ed262b59962b45ac974b82edc7c83880 (patch)
tree1617838e4591ae4668a61a4e2859a6f3e90fccf1
parent88cc9b233435f5e9085faefa6e671f1c5e4d2b95 (diff)
downloadqtdeclarative-3c63ac03ed262b59962b45ac974b82edc7c83880.tar.gz
qtdeclarative-3c63ac03ed262b59962b45ac974b82edc7c83880.tar.bz2
qtdeclarative-3c63ac03ed262b59962b45ac974b82edc7c83880.zip
Remove unused pointer to the context wrapper
THe binding wrapper doesn't use that pointer anymore. Change-Id: Ie04fff448b9647927219936a62c67ac0b4853eec Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
-rw-r--r--src/qml/jsruntime/qv4script.cpp10
-rw-r--r--src/qml/jsruntime/qv4script_p.h2
2 files changed, 0 insertions, 12 deletions
diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp
index d619c1a7c..14b8b878b 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<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);
diff --git a/src/qml/jsruntime/qv4script_p.h b/src/qml/jsruntime/qv4script_p.h
index 77784dfc4..22714496f 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<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); }