diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-01-13 17:22:08 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2015-01-16 21:12:57 +0100 |
| commit | 498d4322ce87b20a798d4c9fbf4f7d84c1730486 (patch) | |
| tree | f2bd8763b894d3a50f2007a1af8df03a0c3fa83d /src/qml/jsruntime/qv4object.cpp | |
| parent | 8ffb79bbd214c239e414dc4e9cf4569b3219bdab (diff) | |
Don't require an ExecutionEngine member in String anymore
Change-Id: I7c1a5471507669871564d79dc17d1026c268b6d0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4object.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4object.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4object.cpp b/src/qml/jsruntime/qv4object.cpp index d30c113c32..77ac2a6049 100644 --- a/src/qml/jsruntime/qv4object.cpp +++ b/src/qml/jsruntime/qv4object.cpp @@ -591,9 +591,9 @@ ReturnedValue Object::internalGet(String *name, bool *hasProperty) if (idx != UINT_MAX) return getIndexed(idx, hasProperty); - name->makeIdentifier(); - Scope scope(engine()); + name->makeIdentifier(scope.engine); + ScopedObject o(scope, this); while (o) { uint idx = o->internalClass()->find(name); @@ -656,7 +656,7 @@ void Object::internalPut(String *name, const ValueRef value) if (idx != UINT_MAX) return putIndexed(idx, value); - name->makeIdentifier(); + name->makeIdentifier(engine()); uint member = internalClass()->find(name); Property *pd = 0; @@ -813,7 +813,7 @@ bool Object::internalDeleteProperty(String *name) if (idx != UINT_MAX) return deleteIndexedProperty(idx); - name->makeIdentifier(); + name->makeIdentifier(engine()); uint memberIdx = internalClass()->find(name); if (memberIdx != UINT_MAX) { @@ -851,9 +851,9 @@ bool Object::__defineOwnProperty__(ExecutionEngine *engine, String *name, const if (idx != UINT_MAX) return __defineOwnProperty__(engine, idx, p, attrs); - name->makeIdentifier(); - Scope scope(engine); + name->makeIdentifier(scope.engine); + Property *current; PropertyAttributes *cattrs; uint memberIndex; |