diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-05-06 09:23:59 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:49:11 +0200 |
| commit | 9744e8bd423d528165f5e78704c6e017852b8e9a (patch) | |
| tree | b1210199c698d3b09d80b9267d9aaab2b12ac5ab /src/qml/jsruntime/qv4lookup.cpp | |
| parent | f3f31957b79c55f3e076473b0d4c41c8872535b3 (diff) | |
Convert ExecutionContext to new storage scheme
Change-Id: I9fcc13da5360f37cef3149b114ed9263b9b74281
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4lookup.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4lookup.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/qml/jsruntime/qv4lookup.cpp b/src/qml/jsruntime/qv4lookup.cpp index 4d56a7de98..ed555b7763 100644 --- a/src/qml/jsruntime/qv4lookup.cpp +++ b/src/qml/jsruntime/qv4lookup.cpp @@ -581,7 +581,7 @@ ReturnedValue Lookup::arrayLengthGetter(Lookup *l, const ValueRef object) ReturnedValue Lookup::globalGetterGeneric(Lookup *l, ExecutionContext *ctx) { - Object *o = ctx->engine->globalObject; + Object *o = ctx->d()->engine->globalObject; PropertyAttributes attrs; ReturnedValue v = l->lookup(o, &attrs); if (v != Primitive::emptyValue().asReturnedValue()) { @@ -610,7 +610,7 @@ ReturnedValue Lookup::globalGetterGeneric(Lookup *l, ExecutionContext *ctx) ReturnedValue Lookup::globalGetter0(Lookup *l, ExecutionContext *ctx) { - Object *o = ctx->engine->globalObject; + Object *o = ctx->d()->engine->globalObject; if (l->classList[0] == o->internalClass()) return o->memberData()[l->index].asReturnedValue(); @@ -620,7 +620,7 @@ ReturnedValue Lookup::globalGetter0(Lookup *l, ExecutionContext *ctx) ReturnedValue Lookup::globalGetter1(Lookup *l, ExecutionContext *ctx) { - Object *o = ctx->engine->globalObject; + Object *o = ctx->d()->engine->globalObject; if (l->classList[0] == o->internalClass() && l->classList[1] == o->prototype()->internalClass()) return o->prototype()->memberData()[l->index].asReturnedValue(); @@ -631,7 +631,7 @@ ReturnedValue Lookup::globalGetter1(Lookup *l, ExecutionContext *ctx) ReturnedValue Lookup::globalGetter2(Lookup *l, ExecutionContext *ctx) { - Object *o = ctx->engine->globalObject; + Object *o = ctx->d()->engine->globalObject; if (l->classList[0] == o->internalClass()) { o = o->prototype(); if (l->classList[1] == o->internalClass()) { @@ -647,7 +647,7 @@ ReturnedValue Lookup::globalGetter2(Lookup *l, ExecutionContext *ctx) ReturnedValue Lookup::globalGetterAccessor0(Lookup *l, ExecutionContext *ctx) { - Object *o = ctx->engine->globalObject; + Object *o = ctx->d()->engine->globalObject; if (l->classList[0] == o->internalClass()) { Scope scope(o->engine()); FunctionObject *getter = o->propertyAt(l->index)->getter(); @@ -664,7 +664,7 @@ ReturnedValue Lookup::globalGetterAccessor0(Lookup *l, ExecutionContext *ctx) ReturnedValue Lookup::globalGetterAccessor1(Lookup *l, ExecutionContext *ctx) { - Object *o = ctx->engine->globalObject; + Object *o = ctx->d()->engine->globalObject; if (l->classList[0] == o->internalClass() && l->classList[1] == o->prototype()->internalClass()) { Scope scope(o->engine()); @@ -682,7 +682,7 @@ ReturnedValue Lookup::globalGetterAccessor1(Lookup *l, ExecutionContext *ctx) ReturnedValue Lookup::globalGetterAccessor2(Lookup *l, ExecutionContext *ctx) { - Object *o = ctx->engine->globalObject; + Object *o = ctx->d()->engine->globalObject; if (l->classList[0] == o->internalClass()) { o = o->prototype(); if (l->classList[1] == o->internalClass()) { |