6 files changed, 22 insertions, 26 deletions
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
index cd1c1d5433..4b72888414 100644
--- a/src/gui/image/qpnghandler.cpp
+++ b/src/gui/image/qpnghandler.cpp
@@ -607,7 +607,8 @@ bool QPngHandlerPrivate::readPngHeader()
 #endif
         png_uint_32 profLen;
         png_get_iCCP(png_ptr, info_ptr, &name, &compressionType, &profileData, &profLen);
-        if (!QIcc::fromIccProfile(QByteArray::fromRawData((const char *)profileData, profLen), &colorSpace)) {
+        colorSpace = QColorSpace::fromIccProfile(QByteArray::fromRawData((const char *)profileData, profLen));
+        if (!colorSpace.isValid()) {
             qWarning() << "QPngHandler: Failed to parse ICC profile";
         } else {
             colorSpaceState = Icc;
@@ -677,7 +678,7 @@ bool QPngHandlerPrivate::readPngImage(QImage *outImage)
         // This configuration forces gamma correction and
         // thus changes the output colorspace
         png_set_gamma(png_ptr, 1.0f / gamma, fileGamma);
-        QColorSpacePrivate *csPrivate = colorSpace.d_func();
+        QColorSpacePrivate *csPrivate = QColorSpacePrivate::getWritable(colorSpace);
         csPrivate->transferFunction = QColorSpace::TransferFunction::Gamma;
         csPrivate->gamma = gamma;
         csPrivate->setTransferFunction();
diff --git a/src/gui/painting/qcolorspace.cpp b/src/gui/painting/qcolorspace.cpp
index 881a02ee67..3c336c9fe7 100644
--- a/src/gui/painting/qcolorspace.cpp
+++ b/src/gui/painting/qcolorspace.cpp
@@ -683,20 +683,6 @@ QColorTransform QColorSpace::transformationToColorSpace(const QColorSpace &color
     return d_ptr->transformationToColorSpace(colorspace.d_ptr.constData());
 }
 
-/*!
-    \internal
-*/
-QColorSpacePrivate *QColorSpace::d_func()
-{
-    d_ptr.detach();
-    return d_ptr.data();
-}
-
-/*!
-    \fn const QColorSpacePrivate* QColorSpacePrivate::d_func() const
-    \internal
-*/
-
 /*****************************************************************************
   QColorSpace stream functions
  *****************************************************************************/
diff --git a/src/gui/painting/qcolorspace.h b/src/gui/painting/qcolorspace.h
index 6f1a806b60..709ce38916 100644
--- a/src/gui/painting/qcolorspace.h
+++ b/src/gui/painting/qcolorspace.h
@@ -113,11 +113,9 @@ public:
 
     QColorTransform transformationToColorSpace(const QColorSpace &colorspace) const;
 
-    QColorSpacePrivate *d_func();
-    inline const QColorSpacePrivate *d_func() const { return d_ptr.constData(); }
 
 private:
-    friend class QColorSpacePrivate;
+    Q_DECLARE_PRIVATE(QColorSpace)
     QExplicitlySharedDataPointer<QColorSpacePrivate> d_ptr;
 };
 
diff --git a/src/gui/painting/qcolorspace_p.h b/src/gui/painting/qcolorspace_p.h
index 95e0655d0c..75b74f062f 100644
--- a/src/gui/painting/qcolorspace_p.h
+++ b/src/gui/painting/qcolorspace_p.h
@@ -95,6 +95,17 @@ public:
     QColorSpacePrivate(const QColorSpacePrimaries &primaries, QColorSpace::TransferFunction fun, float gamma);
     QColorSpacePrivate(const QColorSpacePrivate &other) = default;
 
+    static QColorSpacePrivate *getWritable(QColorSpace &colorSpace)
+    {
+        colorSpace.d_ptr.detach();
+        return colorSpace.d_ptr.data();
+    }
+
+    static const QColorSpacePrivate *get(const QColorSpace &colorSpace)
+    {
+        return colorSpace.d_ptr.data();
+    }
+
     void initialize();
     void setToXyzMatrix();
     void setTransferFunction();
diff --git a/src/gui/painting/qicc.cpp b/src/gui/painting/qicc.cpp
index d88b005782..2abb42993b 100644
--- a/src/gui/painting/qicc.cpp
+++ b/src/gui/painting/qicc.cpp
@@ -288,7 +288,7 @@ QByteArray toIccProfile(const QColorSpace &space)
     if (!space.isValid())
         return QByteArray();
 
-    const QColorSpacePrivate *spaceDPtr = space.d_func();
+    const QColorSpacePrivate *spaceDPtr = QColorSpacePrivate::get(space);
 
     constexpr int tagCount = 9;
     constexpr uint profileDataOffset = 128 + 4 + 12 * tagCount;
@@ -569,7 +569,7 @@ bool fromIccProfile(const QByteArray &data, QColorSpace *colorSpace)
         qCWarning(lcIcc) << "fromIccProfile: Bad XYZ data type";
         return false;
     }
-    QColorSpacePrivate *colorspaceDPtr = colorSpace->d_func();
+    QColorSpacePrivate *colorspaceDPtr = QColorSpacePrivate::getWritable(*colorSpace);
 
     colorspaceDPtr->toXyz.r = fromXyzData(rXyz);
     colorspaceDPtr->toXyz.g = fromXyzData(gXyz);
diff --git a/tests/auto/gui/painting/qcolorspace/tst_qcolorspace.cpp b/tests/auto/gui/painting/qcolorspace/tst_qcolorspace.cpp
index 7a88eb18b2..b82a56dbf8 100644
--- a/tests/auto/gui/painting/qcolorspace/tst_qcolorspace.cpp
+++ b/tests/auto/gui/painting/qcolorspace/tst_qcolorspace.cpp
@@ -304,11 +304,11 @@ void tst_QColorSpace::primariesXyz()
     QColorSpace bt2020 = QColorSpace::Bt2020;
 
     // Check if our calculated matrices, match the precalculated ones.
-    QCOMPARE(sRgb.d_func()->toXyz, QColorMatrix::toXyzFromSRgb());
-    QCOMPARE(adobeRgb.d_func()->toXyz, QColorMatrix::toXyzFromAdobeRgb());
-    QCOMPARE(displayP3.d_func()->toXyz, QColorMatrix::toXyzFromDciP3D65());
-    QCOMPARE(proPhotoRgb.d_func()->toXyz, QColorMatrix::toXyzFromProPhotoRgb());
-    QCOMPARE(bt2020.d_func()->toXyz, QColorMatrix::toXyzFromBt2020());
+    QCOMPARE(QColorSpacePrivate::get(sRgb)->toXyz, QColorMatrix::toXyzFromSRgb());
+    QCOMPARE(QColorSpacePrivate::get(adobeRgb)->toXyz, QColorMatrix::toXyzFromAdobeRgb());
+    QCOMPARE(QColorSpacePrivate::get(displayP3)->toXyz, QColorMatrix::toXyzFromDciP3D65());
+    QCOMPARE(QColorSpacePrivate::get(proPhotoRgb)->toXyz, QColorMatrix::toXyzFromProPhotoRgb());
+    QCOMPARE(QColorSpacePrivate::get(bt2020)->toXyz, QColorMatrix::toXyzFromBt2020());
 }
 
 void tst_QColorSpace::primaries2_data()