Optimize type resolution

Faster qmlType() and resolveType() lookup.

Change-Id: I096439f23bf6071e8bfdf0cda366cc71e00293ba
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>

1 files changed, 7 insertions, 8 deletions

diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h
index 03017cafab..fbbc410c07 100644
--- a/src/qml/qml/qqmlmetatype_p.h
+++ b/src/qml/qml/qqmlmetatype_p.h
@@ -67,6 +67,8 @@ class QQmlType;
 class QQmlCustomParser;
 class QQmlTypePrivate;
 class QQmlTypeModule;
+class QHashedString;
+class QHashedStringRef;
 
 class Q_QML_PRIVATE_EXPORT QQmlMetaType
 {
@@ -74,9 +76,10 @@ public:
     static QList<QString> qmlTypeNames();
     static QList<QQmlType*> qmlTypes();
 
-    static QQmlType *qmlType(const QString &, int, int);
+    static QQmlType *qmlType(const QString &qualifiedName, int, int);
+    static QQmlType *qmlType(const QHashedStringRef &name, const QHashedStringRef &module, int, int);
     static QQmlType *qmlType(const QMetaObject *);
-    static QQmlType *qmlType(const QMetaObject *metaObject, const QString &module, int version_major, int version_minor);
+    static QQmlType *qmlType(const QMetaObject *metaObject, const QHashedStringRef &module, int version_major, int version_minor);
     static QQmlType *qmlType(int);
 
     static QMetaProperty defaultProperty(const QMetaObject *);
@@ -140,7 +143,6 @@ private:
     static CompareFunction anchorLineCompareFunction;
 };
 
-class QHashedStringRef;
 class QHashedV8String;
 class Q_QML_PRIVATE_EXPORT QQmlType
 {
@@ -149,12 +151,12 @@ public:
     const QString &qmlTypeName() const;
     const QString &elementName() const;
 
-    QString module() const;
+    const QHashedString &module() const;
     int majorVersion() const;
     int minorVersion() const;
 
     bool availableInVersion(int vmajor, int vminor) const;
-    bool availableInVersion(const QString &module, int vmajor, int vminor) const;
+    bool availableInVersion(const QHashedStringRef &module, int vmajor, int vminor) const;
 
     QObject *create() const;
     void create(QObject **, void **, size_t) const;
@@ -214,9 +216,6 @@ public:
     int minimumMinorVersion() const;
     int maximumMinorVersion() const;
 
-    QList<QQmlType *> types();
-    QList<QQmlType *> type(const QString &);
-
     QQmlType *type(const QHashedStringRef &, int);
     QQmlType *type(const QHashedV8String &, int);