From 7c070ac95979609e6ba33b829dc4a2a373ef26b5 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 18 May 2020 14:43:25 +0200 Subject: Sweep Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6 -> Q_DECLARE_SHARED This is Qt 6, so Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6 is the same as Q_DECLARE_SHARED. Let's hope we'll collectively get better at detecting missing Q_DECLARE_SHARED so we won't need a Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT7 in the future. Change-Id: I3da9faff4c66b64a3b257309012a2a10a6c6d027 Reviewed-by: Lars Knoll --- src/gui/painting/qpainterpath.h | 2 +- src/gui/painting/qpolygon.h | 4 ++-- src/gui/painting/qregion.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gui/painting') diff --git a/src/gui/painting/qpainterpath.h b/src/gui/painting/qpainterpath.h index 0b006d466c..b72a5d3298 100644 --- a/src/gui/painting/qpainterpath.h +++ b/src/gui/painting/qpainterpath.h @@ -224,7 +224,7 @@ private: #endif }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QPainterPath) +Q_DECLARE_SHARED(QPainterPath) Q_DECLARE_TYPEINFO(QPainterPath::Element, Q_PRIMITIVE_TYPE); #ifndef QT_NO_DATASTREAM diff --git a/src/gui/painting/qpolygon.h b/src/gui/painting/qpolygon.h index 584965af3b..8812cb6a93 100644 --- a/src/gui/painting/qpolygon.h +++ b/src/gui/painting/qpolygon.h @@ -95,7 +95,7 @@ public: bool intersects(const QPolygon &r) const; }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QPolygon) +Q_DECLARE_SHARED(QPolygon) inline QPolygon::QPolygon(int asize) : QVector(asize) {} @@ -170,7 +170,7 @@ public: bool intersects(const QPolygonF &r) const; }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QPolygonF) +Q_DECLARE_SHARED(QPolygonF) inline QPolygonF::QPolygonF(int asize) : QVector(asize) {} diff --git a/src/gui/painting/qregion.h b/src/gui/painting/qregion.h index dac58bd2eb..b4d79462d4 100644 --- a/src/gui/painting/qregion.h +++ b/src/gui/painting/qregion.h @@ -157,7 +157,7 @@ Q_GUI_EXPORT static const struct QRegionData shared_empty; static void cleanUp(QRegionData *x); }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QRegion) +Q_DECLARE_SHARED(QRegion) /***************************************************************************** QRegion stream functions -- cgit v1.2.3