1 files changed, 25 insertions, 39 deletions

diff --git a/src/gui/painting/qcolorspace.h b/src/gui/painting/qcolorspace.h
index 1620c75473..488cbd6a53 100644
--- a/src/gui/painting/qcolorspace.h
+++ b/src/gui/painting/qcolorspace.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 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) 2018 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 QCOLORSPACE_H
 #define QCOLORSPACE_H
@@ -81,9 +45,23 @@ public:
         ProPhotoRgb
     };
     Q_ENUM(TransferFunction)
+    enum class TransformModel : uint8_t {
+        ThreeComponentMatrix = 0,
+        ElementListProcessing,
+    };
+    Q_ENUM(TransformModel)
+    enum class ColorModel : uint8_t {
+        Undefined = 0,
+        Rgb = 1,
+        Gray = 2,
+        Cmyk = 3,
+    };
+    Q_ENUM(ColorModel)
 
     QColorSpace() noexcept = default;
     QColorSpace(NamedColorSpace namedColorSpace);
+    QColorSpace(const QPointF &whitePoint, TransferFunction transferFunction, float gamma = 0.0f);
+    QColorSpace(const QPointF &whitePoint, const QList<uint16_t> &transferFunctionTable);
     QColorSpace(Primaries primaries, TransferFunction transferFunction, float gamma = 0.0f);
     QColorSpace(Primaries primaries, float gamma);
     QColorSpace(Primaries primaries, const QList<uint16_t> &transferFunctionTable);
@@ -112,12 +90,15 @@ public:
     QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_MOVE_AND_SWAP(QColorSpace)
 
     void swap(QColorSpace &colorSpace) noexcept
-    { qSwap(d_ptr, colorSpace.d_ptr); }
+    { d_ptr.swap(colorSpace.d_ptr); }
 
     Primaries primaries() const noexcept;
     TransferFunction transferFunction() const noexcept;
     float gamma() const noexcept;
 
+    QString description() const noexcept;
+    void setDescription(const QString &description);
+
     void setTransferFunction(TransferFunction transferFunction, float gamma = 0.0f);
     void setTransferFunction(const QList<uint16_t> &transferFunctionTable);
     void setTransferFunctions(const QList<uint16_t> &redTransferFunctionTable,
@@ -132,9 +113,14 @@ public:
     void setPrimaries(Primaries primariesId);
     void setPrimaries(const QPointF &whitePoint, const QPointF &redPoint,
                       const QPointF &greenPoint, const QPointF &bluePoint);
+    void setWhitePoint(const QPointF &whitePoint);
+    QPointF whitePoint() const;
 
+    TransformModel transformModel() const noexcept;
+    ColorModel colorModel() const noexcept;
     void detach();
     bool isValid() const noexcept;
+    bool isValidTarget() const noexcept;
 
     friend inline bool operator==(const QColorSpace &colorSpace1, const QColorSpace &colorSpace2)
     { return colorSpace1.equals(colorSpace2); }