1 files changed, 11 insertions, 44 deletions

diff --git a/src/gui/painting/qpageranges.cpp b/src/gui/painting/qpageranges.cpp
index dc43143d9c..99a0009883 100644
--- a/src/gui/painting/qpageranges.cpp
+++ b/src/gui/painting/qpageranges.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui 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 "qpageranges.h"
 #include "qpageranges_p.h"
@@ -46,9 +10,11 @@
 
 QT_BEGIN_NAMESPACE
 
+QT_IMPL_METATYPE_EXTERN(QPageRanges)
+
 void QPageRangesPrivate::mergeIntervals()
 {
-    const int count = intervals.count();
+    const int count = intervals.size();
 
     if (count <= 1)
         return;
@@ -194,9 +160,9 @@ QPageRanges QPageRanges::fromString(const QString &ranges)
         if (item.isEmpty())
             return QPageRanges();
 
-        if (item.contains(QLatin1Char('-'))) {
+        if (item.contains(u'-')) {
             const QStringList rangeItems = item.split(u'-');
-            if (rangeItems.count() != 2)
+            if (rangeItems.size() != 2)
                 return QPageRanges();
 
             bool ok;
@@ -244,7 +210,7 @@ QString QPageRanges::toString() const
     QString result;
     for (const Range &range : d->intervals) {
         if (!result.isEmpty())
-            result += QLatin1Char(',');
+            result += u',';
 
         if (range.from == range.to)
             result += QString::number(range.from);
@@ -289,7 +255,7 @@ int QPageRanges::firstPage() const
 {
     if (isEmpty())
         return 0;
-    return d->intervals.first().from;
+    return d->intervals.constFirst().from;
 }
 
 /*!
@@ -300,7 +266,7 @@ int QPageRanges::lastPage() const
 {
     if (isEmpty())
         return 0;
-    return d->intervals.last().to;
+    return d->intervals.constLast().to;
 }
 
 /*!
@@ -374,6 +340,7 @@ QDebug operator<<(QDebug dbg, const QPageRanges &pageRanges)
 
 /*!
     \struct QPageRanges::Range
+    \inmodule QtGui
     \brief The QPageRanges::Range struct holds the \c from and \c to endpoints of a range.
 
     \sa QPageRanges::toRangeList()