From 92071fc0b130fb505cf96e5323e1ec576249dbf3 Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Fri, 14 Jun 2024 11:13:54 +0200
Subject: [PATCH] Clean up QColorSpace API based on header review comments

Pass QPointF by value (also in the private API), and mark new
constructors explicit.

Amends 05b84673045a5f4432a6caa9bea08d8fba1e1a03

Change-Id: I461d50d9220404746ee6d3544acdeb0f0956ee2f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 6c2d6cb53a1dc8fb98f7f6447e08762e7e839a23)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/gui/painting/qcolorspace.cpp | 10 +++++-----
 src/gui/painting/qcolorspace.h   |  6 +++---
 src/gui/painting/qcolorspace_p.h |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/gui/painting/qcolorspace.cpp b/src/gui/painting/qcolorspace.cpp
index 3d763d577c9..0a38b2ec140 100644
--- a/src/gui/painting/qcolorspace.cpp
+++ b/src/gui/painting/qcolorspace.cpp
@@ -187,7 +187,7 @@ QColorSpacePrivate::QColorSpacePrivate(const QColorSpacePrimaries &primaries,
     setTransferFunction();
 }
 
-QColorSpacePrivate::QColorSpacePrivate(const QPointF &whitePoint,
+QColorSpacePrivate::QColorSpacePrivate(QPointF whitePoint,
                                        QColorSpace::TransferFunction transferFunction,
                                        float gamma)
         : primaries(QColorSpace::Primaries::Custom)
@@ -201,7 +201,7 @@ QColorSpacePrivate::QColorSpacePrivate(const QPointF &whitePoint,
     setTransferFunction();
 }
 
-QColorSpacePrivate::QColorSpacePrivate(const QPointF &whitePoint, const QList<uint16_t> &transferFunctionTable)
+QColorSpacePrivate::QColorSpacePrivate(QPointF whitePoint, const QList<uint16_t> &transferFunctionTable)
       : primaries(QColorSpace::Primaries::Custom)
       , transferFunction(QColorSpace::TransferFunction::Custom)
       , colorModel(QColorSpace::ColorModel::Gray)
@@ -711,7 +711,7 @@ QColorSpace::QColorSpace(QColorSpace::Primaries gamut, const QList<uint16_t> &tr
 
     \since 6.8
 */
-QColorSpace::QColorSpace(const QPointF &whitePoint, TransferFunction transferFunction, float gamma)
+QColorSpace::QColorSpace(QPointF whitePoint, TransferFunction transferFunction, float gamma)
     : d_ptr(new QColorSpacePrivate(whitePoint, transferFunction, gamma))
 {
 }
@@ -722,7 +722,7 @@ QColorSpace::QColorSpace(const QPointF &whitePoint, TransferFunction transferFun
 
     \since 6.8
 */
-QColorSpace::QColorSpace(const QPointF &whitePoint, const QList<uint16_t> &transferFunctionTable)
+QColorSpace::QColorSpace(QPointF whitePoint, const QList<uint16_t> &transferFunctionTable)
     : d_ptr(new QColorSpacePrivate(whitePoint, transferFunctionTable))
 {
 }
@@ -1037,7 +1037,7 @@ QPointF QColorSpace::whitePoint() const
 
     \since 6.8
 */
-void QColorSpace::setWhitePoint(const QPointF &whitePoint)
+void QColorSpace::setWhitePoint(QPointF whitePoint)
 {
     if (Q_UNLIKELY(!d_ptr)) {
         d_ptr = new QColorSpacePrivate(whitePoint, TransferFunction::Custom, 0.0f);
diff --git a/src/gui/painting/qcolorspace.h b/src/gui/painting/qcolorspace.h
index ecf66145616..e23e995d672 100644
--- a/src/gui/painting/qcolorspace.h
+++ b/src/gui/painting/qcolorspace.h
@@ -67,8 +67,8 @@ public:
 
     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);
+    explicit QColorSpace(QPointF whitePoint, TransferFunction transferFunction, float gamma = 0.0f);
+    explicit QColorSpace(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);
@@ -120,7 +120,7 @@ public:
     void setPrimaries(Primaries primariesId);
     void setPrimaries(const QPointF &whitePoint, const QPointF &redPoint,
                       const QPointF &greenPoint, const QPointF &bluePoint);
-    void setWhitePoint(const QPointF &whitePoint);
+    void setWhitePoint(QPointF whitePoint);
     QPointF whitePoint() const;
 
     TransformModel transformModel() const noexcept;
diff --git a/src/gui/painting/qcolorspace_p.h b/src/gui/painting/qcolorspace_p.h
index 4ec801b16b3..0f5e846d316 100644
--- a/src/gui/painting/qcolorspace_p.h
+++ b/src/gui/painting/qcolorspace_p.h
@@ -66,8 +66,8 @@ public:
                        const QList<uint16_t> &redTransferFunctionTable,
                        const QList<uint16_t> &greenTransferFunctionTable,
                        const QList<uint16_t> &blueRransferFunctionTable);
-    QColorSpacePrivate(const QPointF &whitePoint, QColorSpace::TransferFunction transferFunction, float gamma);
-    QColorSpacePrivate(const QPointF &whitePoint, const QList<uint16_t> &transferFunctionTable);
+    QColorSpacePrivate(QPointF whitePoint, QColorSpace::TransferFunction transferFunction, float gamma);
+    QColorSpacePrivate(QPointF whitePoint, const QList<uint16_t> &transferFunctionTable);
     QColorSpacePrivate(const QColorSpacePrivate &other) = default;
 
     static const QColorSpacePrivate *get(const QColorSpace &colorSpace)