From a6da3b26f5959986010deb85703cd51a0edb48e0 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Wed, 20 Jul 2011 14:03:03 +1000
Subject: Optimizations to imports.

Change-Id: If4a51ad3b7c0ecc2261eea1d07a949119c3ad860
Reviewed-on: http://codereview.qt.nokia.com/3754
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
---
 src/declarative/qml/qdeclarativemetatype.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/declarative/qml/qdeclarativemetatype.cpp')

diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp
index bd4b935483..e0bef56426 100644
--- a/src/declarative/qml/qdeclarativemetatype.cpp
+++ b/src/declarative/qml/qdeclarativemetatype.cpp
@@ -1250,12 +1250,14 @@ QDeclarativeType *QDeclarativeMetaType::qmlType(const QByteArray &name, int vers
     QReadLocker lock(metaTypeDataLock());
     QDeclarativeMetaTypeData *data = metaTypeData();
 
-    QList<QDeclarativeType*> types = data->nameToType.values(name);
-    foreach (QDeclarativeType *t, types) {
+    QDeclarativeMetaTypeData::Names::ConstIterator it = data->nameToType.find(name);
+    while (it != data->nameToType.end()) {
         // XXX version_major<0 just a kludge for QDeclarativePropertyPrivate::initProperty
-        if (version_major<0 || t->availableInVersion(version_major,version_minor))
-            return t;
+        if (version_major<0 || (*it)->availableInVersion(version_major,version_minor))
+            return (*it);
+        ++it;
     }
+
     return 0;
 }
 
-- 
cgit v1.2.3