diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2020-06-18 20:04:20 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-06-20 07:58:35 +0000 |
| commit | 67fdb0fe6afbd36902a6fbffcb1f5c20fa53c59b (patch) | |
| tree | 5c8ee399c01ff7cb043b99a88ddad49759e8f806 /src/corelib/tools/qrect.h | |
| parent | 7ff26c776201141e5be87ce24c3c1b1ee96aefcc (diff) | |
QRect(F): remove deprecated functions
They were deprecated since Qt5.0 so it's time to go away.
Change-Id: Ib0192f9048ff15c9d47fb1a23046ccfe0ee7d807
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/tools/qrect.h')
| -rw-r--r-- | src/corelib/tools/qrect.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/corelib/tools/qrect.h b/src/corelib/tools/qrect.h index 1530ed2623..4fd9e7c0c9 100644 --- a/src/corelib/tools/qrect.h +++ b/src/corelib/tools/qrect.h @@ -145,11 +145,6 @@ public: Q_DECL_RELAXED_CONSTEXPR inline QRect &operator+=(const QMargins &margins) noexcept; Q_DECL_RELAXED_CONSTEXPR inline QRect &operator-=(const QMargins &margins) noexcept; -#if QT_DEPRECATED_SINCE(5, 0) - Q_REQUIRED_RESULT QT_DEPRECATED QRect unite(const QRect &r) const noexcept { return united(r); } - Q_REQUIRED_RESULT QT_DEPRECATED QRect intersect(const QRect &r) const noexcept { return intersected(r); } -#endif - friend Q_DECL_CONSTEXPR inline bool operator==(const QRect &, const QRect &) noexcept; friend Q_DECL_CONSTEXPR inline bool operator!=(const QRect &, const QRect &) noexcept; @@ -601,11 +596,6 @@ public: Q_DECL_RELAXED_CONSTEXPR inline QRectF &operator+=(const QMarginsF &margins) noexcept; Q_DECL_RELAXED_CONSTEXPR inline QRectF &operator-=(const QMarginsF &margins) noexcept; -#if QT_DEPRECATED_SINCE(5, 0) - Q_REQUIRED_RESULT QT_DEPRECATED QRectF unite(const QRectF &r) const noexcept { return united(r); } - Q_REQUIRED_RESULT QT_DEPRECATED QRectF intersect(const QRectF &r) const noexcept { return intersected(r); } -#endif - friend Q_DECL_CONSTEXPR inline bool operator==(const QRectF &, const QRectF &) noexcept; friend Q_DECL_CONSTEXPR inline bool operator!=(const QRectF &, const QRectF &) noexcept; |