diff options
Diffstat (limited to 'src/qml/qml/qqmltypemodule.cpp')
| -rw-r--r-- | src/qml/qml/qqmltypemodule.cpp | 61 |
1 files changed, 5 insertions, 56 deletions
diff --git a/src/qml/qml/qqmltypemodule.cpp b/src/qml/qml/qqmltypemodule.cpp index 5120728031..b188b7fb90 100644 --- a/src/qml/qml/qqmltypemodule.cpp +++ b/src/qml/qml/qqmltypemodule.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2019 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) 2019 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 "qqmltypemodule_p.h" @@ -66,7 +30,7 @@ void QQmlTypeModule::add(QQmlTypePrivate *type) addMinorVersion(type->version.minorVersion()); QList<QQmlTypePrivate *> &list = m_typeHash[type->elementName]; - for (int ii = 0; ii < list.count(); ++ii) { + for (int ii = 0; ii < list.size(); ++ii) { QQmlTypePrivate *in_list = list.at(ii); Q_ASSERT(in_list); if (in_list->version.minorVersion() < type->version.minorVersion()) { @@ -87,25 +51,10 @@ void QQmlTypeModule::remove(const QQmlTypePrivate *type) QQmlMetaType::removeQQmlTypePrivate(elementIt.value(), type); } -QQmlType QQmlTypeModule::type(const QHashedStringRef &name, QTypeRevision version) const +QQmlType QQmlTypeModule::findType(const QList<QQmlTypePrivate *> *types, QTypeRevision version) { - QMutexLocker lock(&m_mutex); - QList<QQmlTypePrivate *> *types = m_typeHash.value(name); - if (types) { - for (int ii = 0; ii < types->count(); ++ii) - if (types->at(ii)->version.minorVersion() <= version.minorVersion()) - return QQmlType(types->at(ii)); - } - - return QQmlType(); -} - -QQmlType QQmlTypeModule::type(const QV4::String *name, QTypeRevision version) const -{ - QMutexLocker lock(&m_mutex); - QList<QQmlTypePrivate *> *types = m_typeHash.value(name); if (types) { - for (int ii = 0; ii < types->count(); ++ii) + for (int ii = 0; ii < types->size(); ++ii) if (types->at(ii)->version.minorVersion() <= version.minorVersion()) return QQmlType(types->at(ii)); } |