diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-06-19 21:29:01 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-06-26 10:03:46 +0000 |
| commit | 53adb5bbc659f4ae78427b0b1925bf9732d8a6e5 (patch) | |
| tree | c45d87219ef000d09c514b3800564d896ce4b95f /src/qml/jsruntime/qv4runtime.cpp | |
| parent | 89f585157af905d45012dbd9c079c48491e5211d (diff) | |
Unify deleteProperty and deleteIndexedProperty vtable methods
Change-Id: I25245818c6ff2104642594476cb9684bac824f29
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4runtime.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4runtime.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp index a5249fcc7e..04aff9cad0 100644 --- a/src/qml/jsruntime/qv4runtime.cpp +++ b/src/qml/jsruntime/qv4runtime.cpp @@ -331,12 +331,13 @@ bool Runtime::method_deleteProperty(ExecutionEngine *engine, const Value &base, uint n = index.asArrayIndex(); if (n < UINT_MAX) - return o->deleteIndexedProperty(n); + return o->deleteProperty(Identifier::fromArrayIndex(n)); - ScopedStringOrSymbol name(scope, index.toPropertyKey(engine)); + Scoped<StringOrSymbol> key(scope, index.toPropertyKey(engine)); if (engine->hasException) return false; - return o->deleteProperty(name); + Identifier id = key->toPropertyKey(); + return o->deleteProperty(id); } bool Runtime::method_deleteName(ExecutionEngine *engine, int nameIndex) |