1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QRect(F): remove deprecated functions

Browse Source 
They were deprecated since Qt5.0 so it's time to go away.

Change-Id: Ib0192f9048ff15c9d47fb1a23046ccfe0ee7d807
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Christian Ehrlicher 2020-06-18 20:04:20 +02:00 committed by Lars Knoll
parent 7ff26c7762
commit 67fdb0fe6a
2 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/corelib/tools/qrect.cpp
View File

@ -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

10
src/corelib/tools/qrect.h
View File

@ -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;