1 files changed, 19 insertions, 57 deletions

diff --git a/src/gui/painting/qbrush.h b/src/gui/painting/qbrush.h
index 1d7199782f..ca8112ff31 100644
--- a/src/gui/painting/qbrush.h
+++ b/src/gui/painting/qbrush.h
@@ -1,55 +1,18 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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) 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
 
 #ifndef QBRUSH_H
 #define QBRUSH_H
 
 #include <QtGui/qtguiglobal.h>
+#include <QtCore/qlist.h>
 #include <QtCore/qpair.h>
 #include <QtCore/qpoint.h>
-#include <QtCore/qvector.h>
 #include <QtCore/qscopedpointer.h>
 #include <QtGui/qcolor.h>
-#include <QtGui/qmatrix.h>
-#include <QtGui/qtransform.h>
 #include <QtGui/qimage.h>
 #include <QtGui/qpixmap.h>
+#include <QtGui/qtransform.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -58,7 +21,10 @@ struct QBrushData;
 class QPixmap;
 class QGradient;
 class QVariant;
-struct QBrushDataPointerDeleter;
+struct QBrushDataPointerDeleter
+{
+    void operator()(QBrushData *d) const noexcept;
+};
 
 class Q_GUI_EXPORT QBrush
 {
@@ -79,19 +45,15 @@ public:
 
     ~QBrush();
     QBrush &operator=(const QBrush &brush);
-    inline QBrush &operator=(QBrush &&other) noexcept
-    { qSwap(d, other.d); return *this; }
+    QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QBrush)
     inline void swap(QBrush &other) noexcept
-    { qSwap(d, other.d); }
+    { d.swap(other.d); }
 
     operator QVariant() const;
 
     inline Qt::BrushStyle style() const;
     void setStyle(Qt::BrushStyle);
 
-    inline const QMatrix &matrix() const;
-    void setMatrix(const QMatrix &mat);
-
     inline QTransform transform() const;
     void setTransform(const QTransform &);
 
@@ -112,6 +74,8 @@ public:
     bool operator==(const QBrush &b) const;
     inline bool operator!=(const QBrush &b) const { return !(operator==(b)); }
 
+    using DataPtr = std::unique_ptr<QBrushData, QBrushDataPointerDeleter>;
+
 private:
     friend class QRasterPaintEngine;
     friend class QRasterPaintEnginePrivate;
@@ -120,12 +84,10 @@ private:
     friend bool Q_GUI_EXPORT qHasPixmapTexture(const QBrush& brush);
     void detach(Qt::BrushStyle newStyle);
     void init(const QColor &color, Qt::BrushStyle bs);
-    QScopedPointer<QBrushData, QBrushDataPointerDeleter> d;
-    void cleanUp(QBrushData *x);
+    DataPtr d;
 
 public:
     inline bool isDetached() const;
-    typedef QScopedPointer<QBrushData, QBrushDataPointerDeleter> DataPtr;
     inline DataPtr &data_ptr() { return d; }
 };
 
@@ -157,7 +119,6 @@ struct QBrushData
 
 inline Qt::BrushStyle QBrush::style() const { return d->style; }
 inline const QColor &QBrush::color() const { return d->color; }
-inline const QMatrix &QBrush::matrix() const { return d->transform.toAffine(); }
 inline QTransform QBrush::transform() const { return d->transform; }
 inline bool QBrush::isDetached() const { return d->ref.loadRelaxed() == 1; }
 
@@ -168,7 +129,7 @@ inline bool QBrush::isDetached() const { return d->ref.loadRelaxed() == 1; }
 class QGradientPrivate;
 
 typedef QPair<qreal, QColor> QGradientStop;
-typedef QVector<QGradientStop> QGradientStops;
+typedef QList<QGradientStop> QGradientStops;
 
 class Q_GUI_EXPORT QGradient
 {
@@ -405,7 +366,7 @@ public:
             qreal x1, y1, x2, y2;
         } linear;
         struct {
-            qreal cx, cy, fx, fy, cradius;
+            qreal cx, cy, fx, fy, cradius, fradius;
         } radial;
         struct {
             qreal cx, cy, angle;
@@ -418,11 +379,12 @@ private:
     friend class QConicalGradient;
     friend class QBrush;
 
-    Type m_type;
-    Spread m_spread;
+    Type m_type = NoGradient;
+    Spread m_spread = PadSpread;
     QGradientStops m_stops;
     QGradientData m_data;
-    void *dummy; // ### Qt 6: replace with actual content (CoordinateMode, InterpolationMode, ...)
+    CoordinateMode m_coordinateMode = LogicalMode;
+    InterpolationMode m_interpolationMode = ColorInterpolation;
 };
 
 inline void QGradient::setSpread(Spread aspread)