aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmltypewrapper.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2018-06-23 22:25:53 +0200
committerLars Knoll <lars.knoll@qt.io>2018-07-02 19:29:40 +0000
commit86f88521fbea59e8ec53e50cc1e3e68a61f53c40 (patch)
tree25f72eaf70639409d3c8a8469a05b7be0a0da03b /src/qml/qml/qqmltypewrapper.cpp
parent8728a2b494eb384b65bd4e7c6ec785435a37de9d (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/qml/qqmltypewrapper.cpp')
-rw-r--r--src/qml/qml/qqmltypewrapper.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/qqmltypewrapper.cpp b/src/qml/qml/qqmltypewrapper.cpp
index 2e28a9e222..51df0a1fa6 100644
--- a/src/qml/qml/qqmltypewrapper.cpp
+++ b/src/qml/qml/qqmltypewrapper.cpp
@@ -167,7 +167,7 @@ static ReturnedValue throwLowercaseEnumError(QV4::ExecutionEngine *v4, String *n
return v4->throwTypeError(message);
}
-ReturnedValue QQmlTypeWrapper::get(const Managed *m, Identifier id, const Value *receiver, bool *hasProperty)
+ReturnedValue QQmlTypeWrapper::get(const Managed *m, PropertyKey id, const Value *receiver, bool *hasProperty)
{
Q_ASSERT(m->as<QQmlTypeWrapper>());
@@ -304,7 +304,7 @@ ReturnedValue QQmlTypeWrapper::get(const Managed *m, Identifier id, const Value
}
-bool QQmlTypeWrapper::put(Managed *m, Identifier id, const Value &value, Value *receiver)
+bool QQmlTypeWrapper::put(Managed *m, PropertyKey id, const Value &value, Value *receiver)
{
if (!id.isString())
return Object::put(m, id, value, receiver);
@@ -350,7 +350,7 @@ bool QQmlTypeWrapper::put(Managed *m, Identifier id, const Value &value, Value *
return false;
}
-PropertyAttributes QQmlTypeWrapper::getOwnProperty(Managed *m, Identifier id, Property *p)
+PropertyAttributes QQmlTypeWrapper::getOwnProperty(Managed *m, PropertyKey id, Property *p)
{
if (id.isString()) {
Scope scope(m);
@@ -428,7 +428,7 @@ QQmlType Heap::QQmlScopedEnumWrapper::type() const
return QQmlType(typePrivate);
}
-ReturnedValue QQmlScopedEnumWrapper::get(const Managed *m, Identifier id, const Value *receiver, bool *hasProperty)
+ReturnedValue QQmlScopedEnumWrapper::get(const Managed *m, PropertyKey id, const Value *receiver, bool *hasProperty)
{
Q_ASSERT(m->as<QQmlScopedEnumWrapper>());
if (!id.isString())