Speed up composite type instantiation with lots of IDs

We don't need to convert from a QHash to a QVector in order to populate the
property name cache in QQmlContextData.

Change-Id: Ifa8e4f64a1e174907e92684b2d38abaf0a4a705c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 2 insertions, 10 deletions

diff --git a/src/qml/qml/qqmlcontext_p.h b/src/qml/qml/qqmlcontext_p.h
index 40bd310cb7..f5fd7d0a5c 100644
--- a/src/qml/qml/qqmlcontext_p.h
+++ b/src/qml/qml/qqmlcontext_p.h
@@ -144,15 +144,7 @@ public:
     // Compilation unit for contexts that belong to a compiled type.
     QQmlRefPointer<QV4::CompiledData::CompilationUnit> typeCompilationUnit;
 
-    struct ObjectIdMapping {
-        ObjectIdMapping() : id(-1) {}
-        ObjectIdMapping(const QString &name, int id)
-            : name(name), id(id) {}
-        QString name;
-        int id;
-    };
-
-    mutable QVector<ObjectIdMapping> idObjectNames;
+    mutable QHash<int, int> objectIndexToId;
     mutable QV4::IdentifierHash<int> propertyNameCache;
     QV4::IdentifierHash<int> &propertyNames() const;
 
@@ -202,7 +194,7 @@ public:
     ContextGuard *idValues;
     int idValueCount;
     void setIdProperty(int, QObject *);
-    void setIdPropertyData(const QVector<ObjectIdMapping> &);
+    void setIdPropertyData(const QHash<int, int> &);
 
     // Linked contexts. this owns linkedContext.
     QQmlContextData *linkedContext;