summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qcolor.h
diff options
context:
space:
mode:
authorSven Pauli <sven_pauli@gmx.de>2018-01-20 09:47:38 +0100
committerChristian Ehrlicher <ch.ehrlicher@gmx.de>2018-09-25 14:23:53 +0000
commit264ad32827f3e65bd2730f6e4e6a22d41209b5b9 (patch)
tree4248b3c8bb519d848b6f26e242abd1b1bd97c8d4 /src/gui/painting/qcolor.h
parent7fafeb4a3464f8f5dfaef77d2a0c9544c4600192 (diff)
Add const overloads for QColor::getCmyk and QColor::getCmykF
Align the constness of QColor::getCmyk and QColor::getCmykF with the rest of the family (QColor::getRgb etc.) by adding overloads. The non-const methods could be removed with the next major release as that will break binary compatibility. Task-number: QTBUG-65176 Change-Id: I8579928a43fb59aed3319ff73481994a54b274f8 Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/gui/painting/qcolor.h')
-rw-r--r--src/gui/painting/qcolor.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/painting/qcolor.h b/src/gui/painting/qcolor.h
index f7a9e9db59..a9b05ae7e3 100644
--- a/src/gui/painting/qcolor.h
+++ b/src/gui/painting/qcolor.h
@@ -172,10 +172,12 @@ public:
qreal yellowF() const Q_DECL_NOTHROW;
qreal blackF() const Q_DECL_NOTHROW;
- void getCmyk(int *c, int *m, int *y, int *k, int *a = nullptr);
+ void getCmyk(int *c, int *m, int *y, int *k, int *a = nullptr); // ### Qt 6: remove
+ void getCmyk(int *c, int *m, int *y, int *k, int *a = nullptr) const;
void setCmyk(int c, int m, int y, int k, int a = 255);
- void getCmykF(qreal *c, qreal *m, qreal *y, qreal *k, qreal *a = nullptr);
+ void getCmykF(qreal *c, qreal *m, qreal *y, qreal *k, qreal *a = nullptr); // ### Qt 6: remove
+ void getCmykF(qreal *c, qreal *m, qreal *y, qreal *k, qreal *a = nullptr) const;
void setCmykF(qreal c, qreal m, qreal y, qreal k, qreal a = 1.0);
int hslHue() const Q_DECL_NOTHROW; // 0 <= hue < 360