QRect(F): use comparison helper macros

Also explicitly add QRectF vs QRect comparison. Previously such
comparison was implicitly converting QRect to QRectF, and doing the
fuzzy comparison.
The new operators are directly calling operator==(QPointF, QPoint),
which also does the fuzzy comparison, so the old behavior is preserved.

As a drive-by: move the operators into the private section.

Task-number: QTBUG-120308
Change-Id: I9b96ed4266e6a6c02a52c8cfff6ec1b2d036a7ca
Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io>

1 files changed, 18 insertions, 10 deletions

diff --git a/src/corelib/tools/qrect.cpp b/src/corelib/tools/qrect.cpp
index 6d345ce543..c0e5127c6e 100644
--- a/src/corelib/tools/qrect.cpp
+++ b/src/corelib/tools/qrect.cpp
@@ -15,6 +15,10 @@ QT_BEGIN_NAMESPACE
     \ingroup painting
     \reentrant
 
+    \compares equality
+    \compareswith equality QRectF
+    \endcompareswith
+
     \brief The QRect class defines a rectangle in the plane using
     integer precision.
 
@@ -1105,18 +1109,18 @@ bool QRect::intersects(const QRect &r) const noexcept
 }
 
 /*!
-    \fn bool QRect::operator==(const QRect &r1, const QRect &r2)
+    \fn bool QRect::operator==(const QRect &lhs, const QRect &rhs)
 
-    Returns \c true if the rectangles \a r1 and \a r2 are equal,
+    Returns \c true if the rectangles \a lhs and \a rhs are equal,
     otherwise returns \c false.
 */
 
 
 /*!
-    \fn bool QRect::operator!=(const QRect &r1, const QRect &r2)
+    \fn bool QRect::operator!=(const QRect &lhs, const QRect &rhs)
 
-    Returns \c true if the rectangles \a r1 and \a r2 are different, otherwise
-    returns \c false.
+    Returns \c true if the rectangles \a lhs and \a rhs are different,
+    otherwise returns \c false.
 */
 
 /*!
@@ -1279,6 +1283,10 @@ QDebug operator<<(QDebug dbg, const QRect &r)
     \ingroup painting
     \reentrant
 
+    \compares equality
+    \compareswith equality QRect
+    \endcompareswith
+
     \brief The QRectF class defines a finite rectangle in the plane using
     floating point precision.
 
@@ -2346,10 +2354,10 @@ QRect QRectF::toAlignedRect() const noexcept
 */
 
 /*!
-    \fn bool QRectF::operator==(const QRectF &r1, const QRectF &r2)
+    \fn bool QRectF::operator==(const QRectF &lhs, const QRectF &rhs)
 
-    Returns \c true if the rectangles \a r1 and \a r2 are \b approximately equal,
-    otherwise returns \c false.
+    Returns \c true if the rectangles \a lhs and \a rhs are \b approximately
+    equal, otherwise returns \c false.
 
     \warning This function does not check for strict equality; instead,
     it uses a fuzzy comparison to compare the rectangles' coordinates.
@@ -2359,9 +2367,9 @@ QRect QRectF::toAlignedRect() const noexcept
 
 
 /*!
-    \fn bool QRectF::operator!=(const QRectF &r1, const QRectF &r2)
+    \fn bool QRectF::operator!=(const QRectF &lhs, const QRectF &rhs)
 
-    Returns \c true if the rectangles \a r1 and \a r2 are sufficiently
+    Returns \c true if the rectangles \a lhs and \a rhs are sufficiently
     different, otherwise returns \c false.
 
     \warning This function does not check for strict inequality; instead,