From 86f88521fbea59e8ec53e50cc1e3e68a61f53c40 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Sat, 23 Jun 2018 22:25:53 +0200 Subject: Replace Identifier by PropertyKey Change all uses of Identifier to use the new PropertyKey class and get rid of Identifier. Change-Id: Ib7e83b06a3c923235e145b6e083fe980dc240452 Reviewed-by: Simon Hausmann --- src/qml/jsruntime/qv4reflect.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/qml/jsruntime/qv4reflect.cpp') diff --git a/src/qml/jsruntime/qv4reflect.cpp b/src/qml/jsruntime/qv4reflect.cpp index 41aa4b402e..2bfd2bc401 100644 --- a/src/qml/jsruntime/qv4reflect.cpp +++ b/src/qml/jsruntime/qv4reflect.cpp @@ -132,7 +132,7 @@ ReturnedValue Reflect::method_defineProperty(const FunctionObject *f, const Valu if (scope.engine->hasException) return QV4::Encode::undefined(); - bool result = O->defineOwnProperty(name->toIdentifier(), pd, attrs); + bool result = O->defineOwnProperty(name, pd, attrs); return Encode(result); } @@ -161,7 +161,7 @@ ReturnedValue Reflect::method_get(const FunctionObject *f, const Value *, const return Encode::undefined(); ScopedValue receiver(scope, argc > 2 ? argv[2] : *o); - return Encode(o->get(name->toIdentifier(), receiver)); + return Encode(o->get(name, receiver)); } ReturnedValue Reflect::method_getOwnPropertyDescriptor(const FunctionObject *f, const Value *thisObject, const Value *argv, int argc) @@ -202,7 +202,7 @@ ReturnedValue Reflect::method_has(const FunctionObject *f, const Value *, const ScopedPropertyKey name(scope, index->toPropertyKey(scope.engine)); if (scope.engine->hasException) return false; - (void) o->get(name->toIdentifier(), nullptr, &hasProperty); + (void) o->get(name, nullptr, &hasProperty); return Encode(hasProperty); } @@ -249,7 +249,7 @@ ReturnedValue Reflect::method_set(const FunctionObject *f, const Value *, const ScopedPropertyKey propertyKey(scope, index->toPropertyKey(scope.engine)); if (scope.engine->hasException) return false; - bool result = o->put(propertyKey->toIdentifier(), val, receiver); + bool result = o->put(propertyKey, val, receiver); return Encode(result); } -- cgit v1.2.3