diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2020-05-18 14:43:25 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2020-05-19 23:45:54 +0200 |
| commit | 7c070ac95979609e6ba33b829dc4a2a373ef26b5 (patch) | |
| tree | 9edc4cc4876a28ac45aeb0a3f036242b075c1092 /src/gui | |
| parent | 857722ed8f16bb5b9e64154690f6b0bf3f880dd7 (diff) | |
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 <lars.knoll@qt.io>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/image/qpixmapcache.h | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qcursor.h | 2 | ||||
| -rw-r--r-- | src/gui/painting/qpainterpath.h | 2 | ||||
| -rw-r--r-- | src/gui/painting/qpolygon.h | 4 | ||||
| -rw-r--r-- | src/gui/painting/qregion.h | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/image/qpixmapcache.h b/src/gui/image/qpixmapcache.h index 757e024808..33021d1773 100644 --- a/src/gui/image/qpixmapcache.h +++ b/src/gui/image/qpixmapcache.h @@ -88,7 +88,7 @@ public: static int totalUsed(); #endif }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QPixmapCache::Key) +Q_DECLARE_SHARED(QPixmapCache::Key) QT_END_NAMESPACE diff --git a/src/gui/kernel/qcursor.h b/src/gui/kernel/qcursor.h index d3b4140ec7..21ea13c0d7 100644 --- a/src/gui/kernel/qcursor.h +++ b/src/gui/kernel/qcursor.h @@ -119,7 +119,7 @@ private: friend Q_GUI_EXPORT bool operator==(const QCursor &lhs, const QCursor &rhs) noexcept; QCursorData *d; }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QCursor) +Q_DECLARE_SHARED(QCursor) Q_GUI_EXPORT bool operator==(const QCursor &lhs, const QCursor &rhs) noexcept; inline bool operator!=(const QCursor &lhs, const QCursor &rhs) noexcept { return !(lhs == rhs); } 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<QPoint>(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<QPointF>(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 |