From 67fdb0fe6afbd36902a6fbffcb1f5c20fa53c59b Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Thu, 18 Jun 2020 20:04:20 +0200 Subject: 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 --- src/corelib/tools/qrect.cpp | 28 ---------------------------- src/corelib/tools/qrect.h | 10 ---------- 2 files changed, 38 deletions(-) diff --git a/src/corelib/tools/qrect.cpp b/src/corelib/tools/qrect.cpp index cd20102a2b..4aa9897b5d 100644 --- a/src/corelib/tools/qrect.cpp +++ b/src/corelib/tools/qrect.cpp @@ -1005,13 +1005,6 @@ QRect QRect::operator|(const QRect &r) const noexcept return tmp; } -/*! - \fn QRect QRect::unite(const QRect &rectangle) const - \obsolete - - Use united(\a rectangle) instead. -*/ - /*! \fn QRect QRect::united(const QRect &rectangle) const \since 4.2 @@ -1080,13 +1073,6 @@ QRect QRect::operator&(const QRect &r) const noexcept return tmp; } -/*! - \fn QRect QRect::intersect(const QRect &rectangle) const - \obsolete - - Use intersected(\a rectangle) instead. -*/ - /*! \fn QRect QRect::intersected(const QRect &rectangle) const \since 4.2 @@ -2188,13 +2174,6 @@ QRectF QRectF::operator|(const QRectF &r) const noexcept return QRectF(left, top, right - left, bottom - top); } -/*! - \fn QRectF QRectF::unite(const QRectF &rectangle) const - \obsolete - - Use united(\a rectangle) instead. -*/ - /*! \fn QRectF QRectF::united(const QRectF &rectangle) const \since 4.2 @@ -2269,13 +2248,6 @@ QRectF QRectF::operator&(const QRectF &r) const noexcept return tmp; } -/*! - \fn QRectF QRectF::intersect(const QRectF &rectangle) const - \obsolete - - Use intersected(\a rectangle) instead. -*/ - /*! \fn QRectF QRectF::intersected(const QRectF &rectangle) const \since 4.2 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; -- cgit v1.2.3