refactoring

Author: igagis

src/ruis/util/sides.hpp

@@ -139,28 +139,30 @@ class sides : public std::array<component_type, 4>
 	}
 
 	/**
-	 * @brief Comparator functor.
+	 * @brief Operator less than.
 	 * Implements operation < for sides.
 	 * For use with std::map, etc.
+	 * @param lhs - left hand side operand.
+	 * @param rhs - right hand side operand.
+	 * @return true if lhs < rhs.
+	 * @return false otherwise.
 	 */
-	struct comparator {
-		bool operator()(
-			const sides& lhs, //
-			const sides& rhs
-		) const
-		{
-			if (lhs.left() == rhs.left()) {
-				if (lhs.top() == rhs.top()) {
-					if (lhs.right() == rhs.right()) {
-						return lhs.bottom() < rhs.bottom();
-					}
-					return lhs.right() < rhs.right();
+	friend bool operator<(
+		const sides& lhs, //
+		const sides& rhs
+	)
+	{
+		if (lhs.left() == rhs.left()) {
+			if (lhs.top() == rhs.top()) {
+				if (lhs.right() == rhs.right()) {
+					return lhs.bottom() < rhs.bottom();
 				}
-				return lhs.top() < rhs.top();
+				return lhs.right() < rhs.right();
 			}
-			return lhs.left() < rhs.left();
+			return lhs.top() < rhs.top();
 		}
-	};
+		return lhs.left() < rhs.left();
+	}
 };
 
 } // namespace ruis

src/ruis/widget/label/rectangle.cpp

@@ -30,8 +30,7 @@ using namespace ruis;
 
 std::map<
 	sides<real>, //
-	std::weak_ptr<rectangle::rounded_corners_texture>,
-	sides<real>::comparator //
+	std::weak_ptr<rectangle::rounded_corners_texture>
 	>
 	// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables, "false-positive")
 	rectangle::cache;

src/ruis/widget/label/rectangle.hpp

@@ -99,8 +99,7 @@ class rectangle :
 
 	static std::map<
 		sides<real>, //
-		std::weak_ptr<rounded_corners_texture>,
-		sides<real>::comparator //
+		std::weak_ptr<rounded_corners_texture>
 		>
 		// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables, "false-positive")
 		cache;