mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-28 14:21:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename Rect comparison operands to avoid confusion

Browse Source
This commit is contained in:
kimci86 2024-05-04 22:28:08 +02:00 committed by Vittorio Romeo
parent 58e83056bb
commit f96bf1f300
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/SFML/Graphics/Rect.hpp
View File

@ -125,14 +125,14 @@ public:
/// ///
/// This operator compares strict equality between two rectangles. /// This operator compares strict equality between two rectangles.
/// ///
/// \param left Left operand (a rectangle) /// \param lhs Left operand (a rectangle)
/// \param right Right operand (a rectangle) /// \param rhs Right operand (a rectangle)
/// ///
/// \return True if \a left is equal to \a right /// \return True if \a lhs is equal to \a rhs
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
template <typename T> template <typename T>
[[nodiscard]] constexpr bool operator==(const Rect<T>& left, const Rect<T>& right); [[nodiscard]] constexpr bool operator==(const Rect<T>& lhs, const Rect<T>& rhs);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \relates Rect /// \relates Rect
@ -140,14 +140,14 @@ template <typename T>
/// ///
/// This operator compares strict difference between two rectangles. /// This operator compares strict difference between two rectangles.
/// ///
/// \param left Left operand (a rectangle) /// \param lhs Left operand (a rectangle)
/// \param right Right operand (a rectangle) /// \param rhs Right operand (a rectangle)
/// ///
/// \return True if \a left is not equal to \a right /// \return True if \a lhs is not equal to \a rhs
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
template <typename T> template <typename T>
[[nodiscard]] constexpr bool operator!=(const Rect<T>& left, const Rect<T>& right); [[nodiscard]] constexpr bool operator!=(const Rect<T>& lhs, const Rect<T>& rhs);
// Create type aliases for the most common types // Create type aliases for the most common types
using IntRect = Rect<int>; using IntRect = Rect<int>;

8
include/SFML/Graphics/Rect.inl
View File

@ -120,17 +120,17 @@ constexpr Vector2<T> Rect<T>::getCenter() const
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
template <typename T> template <typename T>
constexpr bool operator==(const Rect<T>& left, const Rect<T>& right) constexpr bool operator==(const Rect<T>& lhs, const Rect<T>& rhs)
{ {
return (left.position == right.position) && (left.size == right.size); return (lhs.position == rhs.position) && (lhs.size == rhs.size);
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
template <typename T> template <typename T>
constexpr bool operator!=(const Rect<T>& left, const Rect<T>& right) constexpr bool operator!=(const Rect<T>& lhs, const Rect<T>& rhs)
{ {
return !(left == right); return !(lhs == rhs);
} }
} // namespace sf } // namespace sf