diff options
author | Lars Knoll <lars.knoll@qt.io> | 2018-01-02 14:23:46 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2018-01-10 07:53:26 +0000 |
commit | ebf024a136b5d9950c0b17ce64363bd23be2f637 (patch) | |
tree | 7014afc7cdc9b33a7511cf582676a0cba9eb6f3e /src/qml/qml/qqmlcontext.cpp | |
parent | bc8f9f28a3aaba7c9708720cfac632700bc66c18 (diff) |
Cleanup IdentifierHash
This class is only used in one place, so there's no
point in it being a template.
Change-Id: Ibbbed8d5be1d02015339c9b39cd1b167f36b8885
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlcontext.cpp')
-rw-r--r-- | src/qml/qml/qqmlcontext.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlcontext.cpp b/src/qml/qml/qqmlcontext.cpp index fbf73a944c..a32ed6e998 100644 --- a/src/qml/qml/qqmlcontext.cpp +++ b/src/qml/qml/qqmlcontext.cpp @@ -306,7 +306,7 @@ void QQmlContext::setContextProperty(const QString &name, const QVariant &value) return; } - QV4::IdentifierHash<int> &properties = data->detachedPropertyNames(); + QV4::IdentifierHash &properties = data->detachedPropertyNames(); int idx = properties.value(name); if (idx == -1) { properties.add(name, data->idValueCount + d->propertyValues.count()); @@ -341,7 +341,7 @@ QVariant QQmlContext::contextProperty(const QString &name) const QQmlContextData *data = d->data; - const QV4::IdentifierHash<int> &properties = data->propertyNames(); + const QV4::IdentifierHash &properties = data->propertyNames(); if (properties.count()) idx = properties.value(name); @@ -746,7 +746,7 @@ void QQmlContextData::setIdProperty(int idx, QObject *obj) QString QQmlContextData::findObjectId(const QObject *obj) const { - const QV4::IdentifierHash<int> &properties = propertyNames(); + const QV4::IdentifierHash &properties = propertyNames(); if (propertyNameCache.isEmpty()) return QString(); @@ -788,18 +788,18 @@ void QQmlContextData::initFromTypeCompilationUnit(const QQmlRefPointer<QV4::Comp idValues = new ContextGuard[idValueCount]; } -const QV4::IdentifierHash<int> &QQmlContextData::propertyNames() const +const QV4::IdentifierHash &QQmlContextData::propertyNames() const { if (propertyNameCache.isEmpty()) { if (typeCompilationUnit) propertyNameCache = typeCompilationUnit->namedObjectsPerComponent(componentObjectIndex); else - propertyNameCache = QV4::IdentifierHash<int>(QV8Engine::getV4(engine)); + propertyNameCache = QV4::IdentifierHash(QV8Engine::getV4(engine)); } return propertyNameCache; } -QV4::IdentifierHash<int> &QQmlContextData::detachedPropertyNames() +QV4::IdentifierHash &QQmlContextData::detachedPropertyNames() { propertyNames(); propertyNameCache.detach(); |