diff options
Diffstat (limited to 'src/qml/qml/qqmltypemodule.cpp')
-rw-r--r-- | src/qml/qml/qqmltypemodule.cpp | 155 |
1 files changed, 29 insertions, 126 deletions
diff --git a/src/qml/qml/qqmltypemodule.cpp b/src/qml/qml/qqmltypemodule.cpp index 9c9bf3e48f..b188b7fb90 100644 --- a/src/qml/qml/qqmltypemodule.cpp +++ b/src/qml/qml/qqmltypemodule.cpp @@ -1,43 +1,7 @@ -/**************************************************************************** -** -** 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_p.h" +#include "qqmltypemodule_p.h" #include <private/qqmltype_p_p.h> @@ -45,62 +9,36 @@ QT_BEGIN_NAMESPACE -QQmlTypeModule::QQmlTypeModule(const QString &module, int majorVersion) - : d(new QQmlTypeModulePrivate(module, majorVersion)) +void QQmlTypeModule::addMinorVersion(quint8 version) { -} - -QQmlTypeModule::~QQmlTypeModule() -{ - delete d; -} - -QString QQmlTypeModule::module() const -{ - // No need to lock. d->module is const - return d->module; -} - -int QQmlTypeModule::majorVersion() const -{ - // No need to lock. d->majorVersion is const - return d->majorVersion; -} - -int QQmlTypeModule::minimumMinorVersion() const -{ - return d->minMinorVersion.loadRelaxed(); -} - -int QQmlTypeModule::maximumMinorVersion() const -{ - return d->maxMinorVersion.loadRelaxed(); -} - -void QQmlTypeModule::addMinorVersion(int version) -{ - for (int oldVersion = d->minMinorVersion.loadRelaxed(); - oldVersion > version && !d->minMinorVersion.testAndSetOrdered(oldVersion, version); - oldVersion = d->minMinorVersion.loadRelaxed()) { + for (int oldVersion = m_minMinorVersion.loadRelaxed(); + oldVersion > version && !m_minMinorVersion.testAndSetOrdered(oldVersion, version); + oldVersion = m_minMinorVersion.loadRelaxed()) { } - for (int oldVersion = d->maxMinorVersion.loadRelaxed(); - oldVersion < version && !d->maxMinorVersion.testAndSetOrdered(oldVersion, version); - oldVersion = d->maxMinorVersion.loadRelaxed()) { + for (int oldVersion = m_maxMinorVersion.loadRelaxed(); + oldVersion < version && !m_maxMinorVersion.testAndSetOrdered(oldVersion, version); + oldVersion = m_maxMinorVersion.loadRelaxed()) { } } void QQmlTypeModule::add(QQmlTypePrivate *type) { - QMutexLocker lock(&d->mutex); - addMinorVersion(type->version_min); + QMutexLocker lock(&m_mutex); - QList<QQmlTypePrivate *> &list = d->typeHash[type->elementName]; - for (int ii = 0; ii < list.count(); ++ii) { - Q_ASSERT(list.at(ii)); - if (list.at(ii)->version_min < type->version_min) { + if (type->version.hasMinorVersion()) + addMinorVersion(type->version.minorVersion()); + + QList<QQmlTypePrivate *> &list = m_typeHash[type->elementName]; + 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()) { list.insert(ii, type); return; + } else if (in_list->version.minorVersion() == type->version.minorVersion()) { + list[ii] = type; + return; } } list.append(type); @@ -108,51 +46,16 @@ void QQmlTypeModule::add(QQmlTypePrivate *type) void QQmlTypeModule::remove(const QQmlTypePrivate *type) { - QMutexLocker lock(&d->mutex); - for (auto elementIt = d->typeHash.begin(); elementIt != d->typeHash.end();) { + QMutexLocker lock(&m_mutex); + for (auto elementIt = m_typeHash.begin(); elementIt != m_typeHash.end(); ++elementIt) QQmlMetaType::removeQQmlTypePrivate(elementIt.value(), type); - -#if 0 - if (list.isEmpty()) - elementIt = typeHash.erase(elementIt); - else - ++elementIt; -#else - ++elementIt; -#endif - } -} - -bool QQmlTypeModule::isLocked() const -{ - return d->locked.loadRelaxed() != 0; -} - -void QQmlTypeModule::lock() -{ - d->locked.storeRelaxed(1); -} - -QQmlType QQmlTypeModule::type(const QHashedStringRef &name, int minor) const -{ - QMutexLocker lock(&d->mutex); - QList<QQmlTypePrivate *> *types = d->typeHash.value(name); - if (types) { - for (int ii = 0; ii < types->count(); ++ii) - if (types->at(ii)->version_min <= minor) - return QQmlType(types->at(ii)); - } - - return QQmlType(); } -QQmlType QQmlTypeModule::type(const QV4::String *name, int minor) const +QQmlType QQmlTypeModule::findType(const QList<QQmlTypePrivate *> *types, QTypeRevision version) { - QMutexLocker lock(&d->mutex); - QList<QQmlTypePrivate *> *types = d->typeHash.value(name); if (types) { - for (int ii = 0; ii < types->count(); ++ii) - if (types->at(ii)->version_min <= minor) + for (int ii = 0; ii < types->size(); ++ii) + if (types->at(ii)->version.minorVersion() <= version.minorVersion()) return QQmlType(types->at(ii)); } @@ -161,8 +64,8 @@ QQmlType QQmlTypeModule::type(const QV4::String *name, int minor) const void QQmlTypeModule::walkCompositeSingletons(const std::function<void(const QQmlType &)> &callback) const { - QMutexLocker lock(&d->mutex); - for (auto typeCandidates = d->typeHash.begin(), end = d->typeHash.end(); + QMutexLocker lock(&m_mutex); + for (auto typeCandidates = m_typeHash.begin(), end = m_typeHash.end(); typeCandidates != end; ++typeCandidates) { for (auto type: typeCandidates.value()) { if (type->regType == QQmlType::CompositeSingletonType) |