diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-11-21 13:18:23 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-12-11 08:40:48 +0100 |
| commit | 4322c8d7686c7cbbdf348146d32d705007b21d56 (patch) | |
| tree | c60d6568f3b47786b24c0d74eb6e61b7cac18add /src/qml/jsruntime/qv4lookup.cpp | |
| parent | ddfe9defa803fdbfab10ab58b77df242cdb4cedd (diff) | |
Better encapsulate access to the global object
Change-Id: I8a76112d821cb3fc172ba0d16ee8410d39b4422a
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 b93230606f..e6f997d5df 100644 --- a/src/qml/jsruntime/qv4lookup.cpp +++ b/src/qml/jsruntime/qv4lookup.cpp @@ -578,7 +578,7 @@ ReturnedValue Lookup::arrayLengthGetter(Lookup *l, ExecutionEngine *engine, cons ReturnedValue Lookup::globalGetterGeneric(Lookup *l, ExecutionEngine *engine) { - Object *o = engine->globalObject; + Object *o = engine->globalObject(); PropertyAttributes attrs; ReturnedValue v = l->lookup(o, &attrs); if (v != Primitive::emptyValue().asReturnedValue()) { @@ -607,7 +607,7 @@ ReturnedValue Lookup::globalGetterGeneric(Lookup *l, ExecutionEngine *engine) ReturnedValue Lookup::globalGetter0(Lookup *l, ExecutionEngine *engine) { - Object *o = engine->globalObject; + Object *o = engine->globalObject(); if (l->classList[0] == o->internalClass()) return o->memberData()->data[l->index].asReturnedValue(); @@ -617,7 +617,7 @@ ReturnedValue Lookup::globalGetter0(Lookup *l, ExecutionEngine *engine) ReturnedValue Lookup::globalGetter1(Lookup *l, ExecutionEngine *engine) { - Object *o = engine->globalObject; + Object *o = engine->globalObject(); if (l->classList[0] == o->internalClass() && l->classList[1] == o->prototype()->internalClass()) return o->prototype()->memberData()->data[l->index].asReturnedValue(); @@ -628,7 +628,7 @@ ReturnedValue Lookup::globalGetter1(Lookup *l, ExecutionEngine *engine) ReturnedValue Lookup::globalGetter2(Lookup *l, ExecutionEngine *engine) { - Object *o = engine->globalObject; + Object *o = engine->globalObject(); if (l->classList[0] == o->internalClass()) { o = o->prototype(); if (l->classList[1] == o->internalClass()) { @@ -644,7 +644,7 @@ ReturnedValue Lookup::globalGetter2(Lookup *l, ExecutionEngine *engine) ReturnedValue Lookup::globalGetterAccessor0(Lookup *l, ExecutionEngine *engine) { - Object *o = engine->globalObject; + Object *o = engine->globalObject(); if (l->classList[0] == o->internalClass()) { Scope scope(o->engine()); FunctionObject *getter = o->propertyAt(l->index)->getter(); @@ -661,7 +661,7 @@ ReturnedValue Lookup::globalGetterAccessor0(Lookup *l, ExecutionEngine *engine) ReturnedValue Lookup::globalGetterAccessor1(Lookup *l, ExecutionEngine *engine) { - Object *o = engine->globalObject; + Object *o = engine->globalObject(); if (l->classList[0] == o->internalClass() && l->classList[1] == o->prototype()->internalClass()) { Scope scope(o->engine()); @@ -679,7 +679,7 @@ ReturnedValue Lookup::globalGetterAccessor1(Lookup *l, ExecutionEngine *engine) ReturnedValue Lookup::globalGetterAccessor2(Lookup *l, ExecutionEngine *engine) { - Object *o = engine->globalObject; + Object *o = engine->globalObject(); if (l->classList[0] == o->internalClass()) { o = o->prototype(); if (l->classList[1] == o->internalClass()) { |