diff options
Diffstat (limited to 'src/qml/qml/qqmltypenamecache.cpp')
-rw-r--r-- | src/qml/qml/qqmltypenamecache.cpp | 169 |
1 files changed, 4 insertions, 165 deletions
diff --git a/src/qml/qml/qqmltypenamecache.cpp b/src/qml/qml/qqmltypenamecache.cpp index 45333668e3..7d3c81cfd7 100644 --- a/src/qml/qml/qqmltypenamecache.cpp +++ b/src/qml/qml/qqmltypenamecache.cpp @@ -1,60 +1,13 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qqmltypenamecache_p.h" -#include "qqmlengine_p.h" - QT_BEGIN_NAMESPACE -QQmlTypeNameCache::QQmlTypeNameCache(const QQmlImports &importCache) - : m_imports(importCache) -{ -} - -QQmlTypeNameCache::~QQmlTypeNameCache() -{ -} - void QQmlTypeNameCache::add(const QHashedString &name, const QUrl &url, const QHashedString &nameSpace) { - if (nameSpace.length() != 0) { + if (nameSpace.size() != 0) { QQmlImportRef *i = m_namedImports.value(nameSpace); Q_ASSERT(i != nullptr); i->compositeSingletons.insert(name, url); @@ -73,7 +26,7 @@ void QQmlTypeNameCache::add(const QHashedString &name, int importedScriptIndex, import.scriptIndex = importedScriptIndex; import.m_qualifier = name; - if (nameSpace.length() != 0) { + if (nameSpace.size() != 0) { QQmlImportRef *i = m_namedImports.value(nameSpace); Q_ASSERT(i != nullptr); m_namespacedImports[i].insert(name, import); @@ -86,119 +39,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 |