1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ABI fixups for QColorSpace

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

Change-Id: I25d5d255d300fda109ffa1a08e1849b15e9ff29c
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Allan Sandfeld Jensen 2019-07-12 11:15:41 +02:00
parent 0fec7417ca
commit 4c61544aa8
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/painting/qcolorspace.cpp
View File

@ -502,7 +502,7 @@ QColorSpace::~QColorSpace()
{ {
} }
QColorSpace::QColorSpace(QColorSpace &&colorSpace) QColorSpace::QColorSpace(QColorSpace &&colorSpace) noexcept
: d_ptr(std::move(colorSpace.d_ptr)) : 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); d_ptr = std::move(colorSpace.d_ptr);
return *this; return *this;
@ -524,6 +524,12 @@ QColorSpace &QColorSpace::operator=(const QColorSpace &colorSpace)
return *this; 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 Returns the id of the predefined color space this object
represents or \c Unknown if it doesn't match any of them. represents or \c Unknown if it doesn't match any of them.

9
src/gui/painting/qcolorspace.h
View File

@ -90,11 +90,14 @@ public:
TransferFunction fun, float gamma = 0.0f); TransferFunction fun, float gamma = 0.0f);
~QColorSpace(); ~QColorSpace();
QColorSpace(QColorSpace &&colorSpace); QColorSpace(QColorSpace &&colorSpace) noexcept;
QColorSpace(const QColorSpace &colorSpace); QColorSpace(const QColorSpace &colorSpace);
QColorSpace &operator=(QColorSpace &&colorSpace); QColorSpace &operator=(QColorSpace &&colorSpace) noexcept;
QColorSpace &operator=(const QColorSpace &colorSpace); QColorSpace &operator=(const QColorSpace &colorSpace);
void swap(QColorSpace &colorSpace) noexcept
{ qSwap(d_ptr, colorSpace.d_ptr); }
ColorSpaceId colorSpaceId() const noexcept; ColorSpaceId colorSpaceId() const noexcept;
Gamut gamut() const noexcept; Gamut gamut() const noexcept;
TransferFunction transferFunction() const noexcept; TransferFunction transferFunction() const noexcept;
@ -124,6 +127,8 @@ inline bool operator!=(const QColorSpace &colorSpace1, const QColorSpace &colorS
return !(colorSpace1 == colorSpace2); return !(colorSpace1 == colorSpace2);
} }
Q_DECLARE_SHARED(QColorSpace)
// QColorSpace stream functions // QColorSpace stream functions
#if !defined(QT_NO_DATASTREAM) #if !defined(QT_NO_DATASTREAM)
Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QColorSpace &); Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QColorSpace &);