diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2015-01-23 13:09:03 +0400 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-02-13 16:29:25 +0000 |
| commit | 651329adb5e64b18a005e900e1b9c5e95d70258c (patch) | |
| tree | 94e8eace0a8e39390191eb37ddb4e5a89e434507 /src/gui | |
| parent | 9b67d89c24666d405dd00e63bb56c924738aa002 (diff) | |
Pass params of shareable type by const-ref rather than by value
Instead of leaving a note for Qt6 and then forget to do
the actual change once again, change APIs now inside
QT_VERSION >= QT_VERSION_CHECK(6,0,0) blocks.
Change-Id: Ifa769904e304358a9c2accfd6c9f86eeb342f9dc
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/image/qimage.cpp | 8 | ||||
| -rw-r--r-- | src/gui/image/qimage.h | 6 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 57e7c9a7ab..e6f86fceaa 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -1351,7 +1351,11 @@ int QImage::colorCount() const \sa colorTable(), setColor(), {QImage#Image Transformations}{Image Transformations} */ +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) +void QImage::setColorTable(const QVector<QRgb> &colors) +#else void QImage::setColorTable(const QVector<QRgb> colors) +#endif { if (!d) return; @@ -1361,7 +1365,11 @@ void QImage::setColorTable(const QVector<QRgb> colors) if (!d) return; +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + d->colortable = colors; +#else d->colortable = qMove(const_cast<QVector<QRgb>&>(colors)); +#endif d->has_alpha_clut = false; for (int i = 0; i < d->colortable.size(); ++i) { if (qAlpha(d->colortable.at(i)) != 255) { diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index acfdc6fd7b..4ce99b9ab1 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -220,7 +220,11 @@ public: void setPixel(const QPoint &pt, uint index_or_rgb); QVector<QRgb> colorTable() const; - void setColorTable(const QVector<QRgb> colors); // ### Qt 6: remove const +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + void setColorTable(const QVector<QRgb> &colors); +#else + void setColorTable(const QVector<QRgb> colors); +#endif qreal devicePixelRatio() const; void setDevicePixelRatio(qreal scaleFactor); |