diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-06-23 22:25:53 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-07-02 19:29:40 +0000 |
| commit | 86f88521fbea59e8ec53e50cc1e3e68a61f53c40 (patch) | |
| tree | 25f72eaf70639409d3c8a8469a05b7be0a0da03b /src/qml/jsruntime/qv4stringobject.cpp | |
| parent | 8728a2b494eb384b65bd4e7c6ec785435a37de9d (diff) | |
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 <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4stringobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4stringobject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp index b21506b11e..8294e6cf36 100644 --- a/src/qml/jsruntime/qv4stringobject.cpp +++ b/src/qml/jsruntime/qv4stringobject.cpp @@ -97,7 +97,7 @@ uint Heap::StringObject::length() const return string->length(); } -bool StringObject::deleteProperty(Managed *m, Identifier id) +bool StringObject::deleteProperty(Managed *m, PropertyKey id) { Q_ASSERT(m->as<StringObject>()); if (id.isArrayIndex()) { @@ -119,7 +119,7 @@ void StringObject::advanceIterator(Managed *m, ObjectIterator *it, Value *name, *index = it->arrayIndex; ++it->arrayIndex; Property pd; - PropertyAttributes a = s->getOwnProperty(Identifier::fromArrayIndex(*index), &pd); + PropertyAttributes a = s->getOwnProperty(PropertyKey::fromArrayIndex(*index), &pd); if (!(it->flags & ObjectIterator::EnumerableOnly) || a.isEnumerable()) { *attrs = a; p->copy(&pd, a); @@ -137,7 +137,7 @@ void StringObject::advanceIterator(Managed *m, ObjectIterator *it, Value *name, return Object::advanceIterator(m, it, name, index, p, attrs); } -PropertyAttributes StringObject::getOwnProperty(Managed *m, Identifier id, Property *p) +PropertyAttributes StringObject::getOwnProperty(Managed *m, PropertyKey id, Property *p) { PropertyAttributes attributes = Object::getOwnProperty(m, id, p); if (attributes != Attr_Invalid) |