From 4c61544aa84f08a28829abe8db28dd23a178c0cb Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Fri, 12 Jul 2019 11:15:41 +0200
Subject: [PATCH] ABI fixups for QColorSpace

Declare it shared to Qt and make the move method noexcept.

Change-Id: I25d5d255d300fda109ffa1a08e1849b15e9ff29c
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
---
 src/gui/painting/qcolorspace.cpp | 10 ++++++++--
 src/gui/painting/qcolorspace.h   |  9 +++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/gui/painting/qcolorspace.cpp b/src/gui/painting/qcolorspace.cpp
index 72c236bc50e..881a02ee67f 100644
--- a/src/gui/painting/qcolorspace.cpp
+++ b/src/gui/painting/qcolorspace.cpp
@@ -502,7 +502,7 @@ QColorSpace::~QColorSpace()
 {
 }
 
-QColorSpace::QColorSpace(QColorSpace &&colorSpace)
+QColorSpace::QColorSpace(QColorSpace &&colorSpace) noexcept
         : d_ptr(std::move(colorSpace.d_ptr))
 {
 }
@@ -512,7 +512,7 @@ QColorSpace::QColorSpace(const QColorSpace &colorSpace)
 {
 }
 
-QColorSpace &QColorSpace::operator=(QColorSpace &&colorSpace)
+QColorSpace &QColorSpace::operator=(QColorSpace &&colorSpace) noexcept
 {
     d_ptr = std::move(colorSpace.d_ptr);
     return *this;
@@ -524,6 +524,12 @@ QColorSpace &QColorSpace::operator=(const QColorSpace &colorSpace)
     return *this;
 }
 
+/*! \fn void QColorSpace::swap(QColorSpace &other)
+
+    Swaps color space \a other with this color space. This operation is very fast and
+    never fails.
+*/
+
 /*!
     Returns the id of the predefined color space this object
     represents or \c Unknown if it doesn't match any of them.
diff --git a/src/gui/painting/qcolorspace.h b/src/gui/painting/qcolorspace.h
index 56676826a9a..6f1a806b602 100644
--- a/src/gui/painting/qcolorspace.h
+++ b/src/gui/painting/qcolorspace.h
@@ -90,11 +90,14 @@ public:
                 TransferFunction fun, float gamma = 0.0f);
     ~QColorSpace();
 
-    QColorSpace(QColorSpace &&colorSpace);
+    QColorSpace(QColorSpace &&colorSpace) noexcept;
     QColorSpace(const QColorSpace &colorSpace);
-    QColorSpace &operator=(QColorSpace &&colorSpace);
+    QColorSpace &operator=(QColorSpace &&colorSpace) noexcept;
     QColorSpace &operator=(const QColorSpace &colorSpace);
 
+    void swap(QColorSpace &colorSpace) noexcept
+    { qSwap(d_ptr, colorSpace.d_ptr); }
+
     ColorSpaceId colorSpaceId() const noexcept;
     Gamut gamut() const noexcept;
     TransferFunction transferFunction() const noexcept;
@@ -124,6 +127,8 @@ inline bool operator!=(const QColorSpace &colorSpace1, const QColorSpace &colorS
     return !(colorSpace1 == colorSpace2);
 }
 
+Q_DECLARE_SHARED(QColorSpace)
+
 // QColorSpace stream functions
 #if !defined(QT_NO_DATASTREAM)
 Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QColorSpace &);