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/types | |
| 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/types')
| -rw-r--r-- | src/qml/types/qqmldelegatemodel.cpp | 2 | ||||
| -rw-r--r-- | src/qml/types/qqmllistmodel.cpp | 4 | ||||
| -rw-r--r-- | src/qml/types/qqmllistmodel_p_p.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp index 030f924e2a..7f3b850e4e 100644 --- a/src/qml/types/qqmldelegatemodel.cpp +++ b/src/qml/types/qqmldelegatemodel.cpp @@ -3383,7 +3383,7 @@ public: quint32 count() const { return d()->changes->count(); } const QQmlChangeSet::Change &at(int index) const { return d()->changes->at(index); } - static QV4::ReturnedValue get(const QV4::Managed *m, QV4::Identifier id, const QV4::Value *receiver, bool *hasProperty) + static QV4::ReturnedValue get(const QV4::Managed *m, QV4::PropertyKey id, const QV4::Value *receiver, bool *hasProperty) { if (id.isArrayIndex()) { uint index = id.asArrayIndex(); diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp index 6933f1e432..27e9df0c0b 100644 --- a/src/qml/types/qqmllistmodel.cpp +++ b/src/qml/types/qqmllistmodel.cpp @@ -1564,7 +1564,7 @@ void ModelNodeMetaObject::emitDirectNotifies(const int *changedRoles, int roleCo namespace QV4 { -bool ModelObject::put(Managed *m, Identifier id, const Value &value, Value *receiver) +bool ModelObject::put(Managed *m, PropertyKey id, const Value &value, Value *receiver) { if (!id.isString()) return Object::put(m, id, value, receiver); @@ -1584,7 +1584,7 @@ bool ModelObject::put(Managed *m, Identifier id, const Value &value, Value *rece return true; } -ReturnedValue ModelObject::get(const Managed *m, Identifier id, const Value *receiver, bool *hasProperty) +ReturnedValue ModelObject::get(const Managed *m, PropertyKey id, const Value *receiver, bool *hasProperty) { if (!id.isString()) return Object::get(m, id, receiver, hasProperty); diff --git a/src/qml/types/qqmllistmodel_p_p.h b/src/qml/types/qqmllistmodel_p_p.h index a0fd4a3310..fe88877837 100644 --- a/src/qml/types/qqmllistmodel_p_p.h +++ b/src/qml/types/qqmllistmodel_p_p.h @@ -173,8 +173,8 @@ struct ModelObject : public QObjectWrapper { struct ModelObject : public QObjectWrapper { - static bool put(Managed *m, Identifier id, const Value& value, Value *receiver); - static ReturnedValue get(const Managed *m, Identifier id, const Value *receiver, bool *hasProperty); + static bool put(Managed *m, PropertyKey id, const Value& value, Value *receiver); + static ReturnedValue get(const Managed *m, PropertyKey id, const Value *receiver, bool *hasProperty); static void advanceIterator(Managed *m, ObjectIterator *it, Value *name, uint *index, Property *p, PropertyAttributes *attributes); V4_OBJECT2(ModelObject, QObjectWrapper) |