1 files changed, 8 insertions, 51 deletions

diff --git a/src/corelib/kernel/qsequentialiterable.cpp b/src/corelib/kernel/qsequentialiterable.cpp
index 6ce41a1edf..c331f1de63 100644
--- a/src/corelib/kernel/qsequentialiterable.cpp
+++ b/src/corelib/kernel/qsequentialiterable.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtCore 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) 2020 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 <QtCore/qsequentialiterable.h>
 #include <QtCore/qvariant.h>
@@ -106,8 +70,8 @@ QT_BEGIN_NAMESPACE
  */
 void QSequentialIterable::addValue(const QVariant &value, Position position)
 {
-    QVariant converted = value;
-    const void *valuePtr = QIterablePrivate::coerceType(converted, metaContainer().valueMetaType());
+    QtPrivate::QVariantTypeCoercer coercer;
+    const void *valuePtr = coercer.coerce(value, metaContainer().valueMetaType());
 
     switch (position) {
     case AtBegin:
@@ -181,8 +145,8 @@ QVariant QSequentialIterable::at(qsizetype idx) const
 */
 void QSequentialIterable::set(qsizetype idx, const QVariant &value)
 {
-    QVariant converted = value;
-    const void *dataPtr = QIterablePrivate::coerceType(converted, metaContainer().valueMetaType());
+    QtPrivate::QVariantTypeCoercer coercer;
+    const void *dataPtr = coercer.coerce(value, metaContainer().valueMetaType());
 
     const QMetaSequence meta = metaContainer();
     if (meta.canSetValueAtIndex()) {
@@ -196,29 +160,22 @@ void QSequentialIterable::set(qsizetype idx, const QVariant &value)
 }
 
 /*!
-    \class QSequentialIterable::const_iterator
-    \since 5.2
-    \inmodule QtCore
+    \typealias QSequentialIterable::const_iterator
     \brief The QSequentialIterable::const_iterator allows iteration over a container in a QVariant.
 
     A QSequentialIterable::const_iterator can only be created by a QSequentialIterable instance,
     and can be used in a way similar to other stl-style iterators.
 
     \snippet code/src_corelib_kernel_qvariant.cpp 9
-
-    \sa QSequentialIterable
 */
 
 /*!
-    \class QSequentialIterable::iterator
+    \typealias QSequentialIterable::iterator
     \since 6.0
-    \inmodule QtCore
     \brief The QSequentialIterable::iterator allows iteration over a container in a QVariant.
 
     A QSequentialIterable::iterator can only be created by a QSequentialIterable instance,
     and can be used in a way similar to other stl-style iterators.
-
-    \sa QSequentialIterable
 */
 
 /*!