1 files changed, 0 insertions, 114 deletions
diff --git a/src/qml/qml/qqmltypenamecache.cpp b/src/qml/qml/qqmltypenamecache.cpp
index 45333668e3..0f23b3190e 100644
--- a/src/qml/qml/qqmltypenamecache.cpp
+++ b/src/qml/qml/qqmltypenamecache.cpp
@@ -86,119 +86,5 @@ void QQmlTypeNameCache::add(const QHashedString &name, int importedScriptIndex,
     m_namedImports.insert(name, import);
 }
 
-QQmlTypeNameCache::Result QQmlTypeNameCache::query(const QHashedStringRef &name) const
-{
-    Result result = query(m_namedImports, name);
-
-    if (!result.isValid())
-        result = typeSearch(m_anonymousImports, name);
-
-    if (!result.isValid())
-        result = query(m_anonymousCompositeSingletons, name);
-
-    if (!result.isValid()) {
-        // Look up anonymous types from the imports of this document
-        QQmlImportNamespace *typeNamespace = nullptr;
-        QList<QQmlError> errors;
-        QQmlType t;
-        bool typeFound = m_imports.resolveType(name, &t, nullptr, &typeNamespace, &errors);
-        if (typeFound) {
-            return Result(t);
-        }
-
-    }
-
-    return result;
-}
-
-QQmlTypeNameCache::Result QQmlTypeNameCache::query(const QHashedStringRef &name,
-                                                   const QQmlImportRef *importNamespace) const
-{
-    Q_ASSERT(importNamespace && importNamespace->scriptIndex == -1);
-
-    Result result = typeSearch(importNamespace->modules, name);
-
-    if (!result.isValid())
-        result = query(importNamespace->compositeSingletons, name);
-
-    if (!result.isValid()) {
-        // Look up types from the imports of this document
-        // ### it would be nice if QQmlImports allowed us to resolve a namespace
-        // first, and then types on it.
-        QString qualifiedTypeName = importNamespace->m_qualifier + QLatin1Char('.') + name.toString();
-        QQmlImportNamespace *typeNamespace = nullptr;
-        QList<QQmlError> errors;
-        QQmlType t;
-        bool typeFound = m_imports.resolveType(qualifiedTypeName, &t, nullptr, &typeNamespace, &errors);
-        if (typeFound) {
-            return Result(t);
-        }
-    }
-
-    return result;
-}
-
-QQmlTypeNameCache::Result QQmlTypeNameCache::query(const QV4::String *name, QQmlImport::RecursionRestriction recursionRestriction) const
-{
-    Result result = query(m_namedImports, name);
-
-    if (!result.isValid())
-        result = typeSearch(m_anonymousImports, name);
-
-    if (!result.isValid())
-        result = query(m_anonymousCompositeSingletons, name);
-
-    if (!result.isValid()) {
-        // Look up anonymous types from the imports of this document
-        QString typeName = name->toQStringNoThrow();
-        QQmlImportNamespace *typeNamespace = nullptr;
-        QList<QQmlError> errors;
-        QQmlType t;
-        bool typeRecursionDetected = false;
-        bool typeFound = m_imports.resolveType(typeName, &t, nullptr, &typeNamespace, &errors,
-                                               QQmlType::AnyRegistrationType,
-                                               recursionRestriction == QQmlImport::AllowRecursion ? &typeRecursionDetected : nullptr);
-        if (typeFound) {
-            return Result(t);
-        }
-
-    }
-
-    return result;
-}
-
-QQmlTypeNameCache::Result QQmlTypeNameCache::query(const QV4::String *name, const QQmlImportRef *importNamespace) const
-{
-    Q_ASSERT(importNamespace && importNamespace->scriptIndex == -1);
-
-    QMap<const QQmlImportRef *, QStringHash<QQmlImportRef> >::const_iterator it = m_namespacedImports.constFind(importNamespace);
-    if (it != m_namespacedImports.constEnd()) {
-        Result r = query(*it, name);
-        if (r.isValid())
-            return r;
-    }
-
-    Result r = typeSearch(importNamespace->modules, name);
-
-    if (!r.isValid())
-        r = query(importNamespace->compositeSingletons, name);
-
-    if (!r.isValid()) {
-        // Look up types from the imports of this document
-        // ### it would be nice if QQmlImports allowed us to resolve a namespace
-        // first, and then types on it.
-        QString qualifiedTypeName = importNamespace->m_qualifier + QLatin1Char('.') + name->toQStringNoThrow();
-        QQmlImportNamespace *typeNamespace = nullptr;
-        QList<QQmlError> errors;
-        QQmlType t;
-        bool typeFound = m_imports.resolveType(qualifiedTypeName, &t, nullptr, &typeNamespace, &errors);
-        if (typeFound) {
-            return Result(t);
-        }
-    }
-
-    return r;
-}
-
 QT_END_NAMESPACE