From 1086d9a5720101c11e9668cc0b5e213d77379e5c Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Thu, 25 Feb 2021 14:11:40 +0100 Subject: Port some value classes away from QScopedPointer In preparation for deprecation of QScopedPointer::swap, port to other established solutions: * QPainterPath was basically a QExplicitlySharedDataPointer re-engineered around a QScopedPointer. Just use the right class for the job... * QBrush is in a similar situation, although its deleter is more complex; port to unique_ptr for that one to minimize the code impact. Change-Id: I7f7c1dd8702f84f5146043347af64dda3c7e6f09 Reviewed-by: Edward Welbourne Reviewed-by: Allan Sandfeld Jensen --- src/gui/painting/qbrush.cpp | 81 ++++++++++++++++++++------------------- src/gui/painting/qbrush.h | 10 +++-- src/gui/painting/qpainterpath.cpp | 21 +--------- src/gui/painting/qpainterpath.h | 5 +-- src/gui/painting/qpainterpath_p.h | 8 ++-- 5 files changed, 55 insertions(+), 70 deletions(-) diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp index 60d0b41624..01a0abbce2 100644 --- a/src/gui/painting/qbrush.cpp +++ b/src/gui/painting/qbrush.cpp @@ -57,6 +57,11 @@ QT_BEGIN_NAMESPACE +#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) +// Avoid an ABI break due to the QScopedPointer->std::unique_ptr change +static_assert(sizeof(QBrush::DataPtr) == sizeof(QScopedPointer)); +#endif + const uchar *qt_patternForBrush(int brushStyle, bool invert) { Q_ASSERT(brushStyle > Qt::SolidPattern && brushStyle < Qt::LinearGradientPattern); @@ -231,7 +236,7 @@ bool Q_GUI_EXPORT qHasPixmapTexture(const QBrush& brush) { if (brush.style() != Qt::TexturePattern) return false; - QTexturedBrushData *tx_data = static_cast(brush.d.data()); + QTexturedBrushData *tx_data = static_cast(brush.d.get()); return tx_data->m_has_pixmap_texture; } @@ -240,31 +245,27 @@ struct QGradientBrushData : public QBrushData QGradient gradient; }; -struct QBrushDataPointerDeleter +static void deleteData(QBrushData *d) { - static inline void deleteData(QBrushData *d) - { - switch (d->style) { - case Qt::TexturePattern: - delete static_cast(d); - break; - case Qt::LinearGradientPattern: - case Qt::RadialGradientPattern: - case Qt::ConicalGradientPattern: - delete static_cast(d); - break; - default: - delete d; - } + switch (d->style) { + case Qt::TexturePattern: + delete static_cast(d); + break; + case Qt::LinearGradientPattern: + case Qt::RadialGradientPattern: + case Qt::ConicalGradientPattern: + delete static_cast(d); + break; + default: + delete d; } +} - static inline void cleanup(QBrushData *d) - { - if (d && !d->ref.deref()) { - deleteData(d); - } - } -}; +void QBrushDataPointerDeleter::operator()(QBrushData *d) const noexcept +{ + if (d && !d->ref.deref()) + deleteData(d); +} /*! \class QBrush @@ -532,7 +533,7 @@ QBrush::QBrush(Qt::GlobalColor color, const QPixmap &pixmap) */ QBrush::QBrush(const QBrush &other) - : d(other.d.data()) + : d(other.d.get()) { d->ref.ref(); } @@ -559,7 +560,7 @@ QBrush::QBrush(const QGradient &gradient) }; init(QColor(), enum_table[gradient.type()]); - QGradientBrushData *grad = static_cast(d.data()); + QGradientBrushData *grad = static_cast(d.get()); grad->gradient = gradient; } @@ -586,12 +587,12 @@ void QBrush::detach(Qt::BrushStyle newStyle) return; } - QScopedPointer x; + DataPtr x; switch(newStyle) { case Qt::TexturePattern: { QTexturedBrushData *tbd = new QTexturedBrushData; if (d->style == Qt::TexturePattern) { - QTexturedBrushData *data = static_cast(d.data()); + QTexturedBrushData *data = static_cast(d.get()); if (data->m_has_pixmap_texture) tbd->setPixmap(data->pixmap()); else @@ -609,7 +610,7 @@ void QBrush::detach(Qt::BrushStyle newStyle) case Qt::RadialGradientPattern: case Qt::ConicalGradientPattern: gbd->gradient = - static_cast(d.data())->gradient; + static_cast(d.get())->gradient; break; default: break; @@ -642,7 +643,7 @@ QBrush &QBrush::operator=(const QBrush &b) return *this; b.d->ref.ref(); - d.reset(b.d.data()); + d.reset(b.d.get()); return *this; } @@ -743,7 +744,7 @@ void QBrush::setColor(const QColor &c) QPixmap QBrush::texture() const { return d->style == Qt::TexturePattern - ? (static_cast(d.data()))->pixmap() + ? (static_cast(d.get()))->pixmap() : QPixmap(); } @@ -761,7 +762,7 @@ void QBrush::setTexture(const QPixmap &pixmap) { if (!pixmap.isNull()) { detach(Qt::TexturePattern); - QTexturedBrushData *data = static_cast(d.data()); + QTexturedBrushData *data = static_cast(d.get()); data->setPixmap(pixmap); } else { detach(Qt::NoBrush); @@ -784,7 +785,7 @@ void QBrush::setTexture(const QPixmap &pixmap) QImage QBrush::textureImage() const { return d->style == Qt::TexturePattern - ? (static_cast(d.data()))->image() + ? (static_cast(d.get()))->image() : QImage(); } @@ -809,7 +810,7 @@ void QBrush::setTextureImage(const QImage &image) { if (!image.isNull()) { detach(Qt::TexturePattern); - QTexturedBrushData *data = static_cast(d.data()); + QTexturedBrushData *data = static_cast(d.get()); data->setImage(image); } else { detach(Qt::NoBrush); @@ -825,7 +826,7 @@ const QGradient *QBrush::gradient() const if (d->style == Qt::LinearGradientPattern || d->style == Qt::RadialGradientPattern || d->style == Qt::ConicalGradientPattern) { - return &static_cast(d.data())->gradient; + return &static_cast(d.get())->gradient; } return nullptr; } @@ -943,16 +944,16 @@ bool QBrush::operator==(const QBrush &b) const const QPixmap *us = nullptr, *them = nullptr; qint64 cacheKey1, cacheKey2; if (qHasPixmapTexture(*this)) { - us = (static_cast(d.data()))->m_pixmap; + us = (static_cast(d.get()))->m_pixmap; cacheKey1 = us->cacheKey(); } else - cacheKey1 = (static_cast(d.data()))->image().cacheKey(); + cacheKey1 = (static_cast(d.get()))->image().cacheKey(); if (qHasPixmapTexture(b)) { - them = (static_cast(b.d.data()))->m_pixmap; + them = (static_cast(b.d.get()))->m_pixmap; cacheKey2 = them->cacheKey(); } else - cacheKey2 = (static_cast(b.d.data()))->image().cacheKey(); + cacheKey2 = (static_cast(b.d.get()))->image().cacheKey(); if (cacheKey1 != cacheKey2) return false; @@ -969,8 +970,8 @@ bool QBrush::operator==(const QBrush &b) const case Qt::RadialGradientPattern: case Qt::ConicalGradientPattern: { - const QGradientBrushData *d1 = static_cast(d.data()); - const QGradientBrushData *d2 = static_cast(b.d.data()); + const QGradientBrushData *d1 = static_cast(d.get()); + const QGradientBrushData *d2 = static_cast(b.d.get()); return d1->gradient == d2->gradient; } default: diff --git a/src/gui/painting/qbrush.h b/src/gui/painting/qbrush.h index 5ab9e88443..b5bdd9fb24 100644 --- a/src/gui/painting/qbrush.h +++ b/src/gui/painting/qbrush.h @@ -57,7 +57,10 @@ struct QBrushData; class QPixmap; class QGradient; class QVariant; -struct QBrushDataPointerDeleter; +struct QBrushDataPointerDeleter +{ + void operator()(QBrushData *d) const noexcept; +}; class Q_GUI_EXPORT QBrush { @@ -107,6 +110,8 @@ public: bool operator==(const QBrush &b) const; inline bool operator!=(const QBrush &b) const { return !(operator==(b)); } + using DataPtr = std::unique_ptr; + private: friend class QRasterPaintEngine; friend class QRasterPaintEnginePrivate; @@ -115,11 +120,10 @@ private: friend bool Q_GUI_EXPORT qHasPixmapTexture(const QBrush& brush); void detach(Qt::BrushStyle newStyle); void init(const QColor &color, Qt::BrushStyle bs); - QScopedPointer d; + DataPtr d; public: inline bool isDetached() const; - typedef QScopedPointer DataPtr; inline DataPtr &data_ptr() { return d; } }; diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp index 38acc66ba4..46a525b7a0 100644 --- a/src/gui/painting/qpainterpath.cpp +++ b/src/gui/painting/qpainterpath.cpp @@ -88,15 +88,6 @@ static bool hasValidCoords(QRectF r) return isValidCoord(r.x()) && isValidCoord(r.y()) && isValidCoord(r.width()) && isValidCoord(r.height()); } -struct QPainterPathPrivateDeleter -{ - static inline void cleanup(QPainterPathPrivate *d) - { - if (d && !d->ref.deref()) - delete d; - } -}; - // This value is used to determine the length of control point vectors // when approximating arc segments as curves. The factor is multiplied // with the radius of the circle. @@ -575,20 +566,10 @@ QPainterPath::QPainterPath(const QPointF &startPoint) void QPainterPath::detach() { - if (d_ptr->ref.loadRelaxed() != 1) - detach_helper(); + d_ptr.detach(); setDirty(true); } -/*! - \internal -*/ -void QPainterPath::detach_helper() -{ - QPainterPathPrivate *data = new QPainterPathPrivate(*d_func()); - d_ptr.reset(data); -} - /*! \internal */ diff --git a/src/gui/painting/qpainterpath.h b/src/gui/painting/qpainterpath.h index 0099a7408a..7dadc4084d 100644 --- a/src/gui/painting/qpainterpath.h +++ b/src/gui/painting/qpainterpath.h @@ -46,7 +46,7 @@ #include #include #include -#include +#include QT_BEGIN_NAMESPACE @@ -197,12 +197,11 @@ public: QPainterPath &operator-=(const QPainterPath &other); private: - QScopedPointer d_ptr; + QExplicitlySharedDataPointer d_ptr; inline void ensureData() { if (!d_ptr) ensureData_helper(); } void ensureData_helper(); void detach(); - void detach_helper(); void setDirty(bool); void computeBoundingRect() const; void computeControlPointRect() const; diff --git a/src/gui/painting/qpainterpath_p.h b/src/gui/painting/qpainterpath_p.h index 24feaf410b..92d0853ba0 100644 --- a/src/gui/painting/qpainterpath_p.h +++ b/src/gui/painting/qpainterpath_p.h @@ -55,6 +55,7 @@ #include "QtGui/qpainterpath.h" #include "QtGui/qregion.h" #include "QtCore/qlist.h" +#include "QtCore/qshareddata.h" #include "QtCore/qvarlengtharray.h" #include @@ -128,7 +129,7 @@ private: Q_DISABLE_COPY_MOVE(QVectorPathConverter) }; -class QPainterPathPrivate +class QPainterPathPrivate : public QSharedData { public: friend class QPainterPath; @@ -143,7 +144,7 @@ public: #endif QPainterPathPrivate() noexcept - : ref(1), + : QSharedData(), cStart(0), fillRule(Qt::OddEvenFill), require_moveTo(false), @@ -155,7 +156,7 @@ public: } QPainterPathPrivate(const QPainterPathPrivate &other) noexcept - : ref(1), + : QSharedData(other), elements(other.elements), cStart(other.cStart), fillRule(other.fillRule), @@ -184,7 +185,6 @@ public: } private: - QAtomicInt ref; QList elements; int cStart; -- cgit v1.2.3