QSocketDescriptor: use modernize comparisons

Change-Id: Ic0389ab7f8578a0c224072097420cfd8cac508be Reviewed-by: Ivan Solovev <[email protected]>
isolovev · May 7, 2024 · a32c152 · a32c152
1 parent 9928ebd
commit a32c152
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/corelib/kernel/qsocketnotifier.h b/src/corelib/kernel/qsocketnotifier.h
@@ -83,20 +83,20 @@ class QSocketDescriptor
 
     Q_DECL_CONSTEXPR_NOT_WIN bool isValid() const noexcept { return *this != QSocketDescriptor(); }
 
-    friend Q_DECL_CONSTEXPR_NOT_WIN bool operator==(QSocketDescriptor lhs,
-                                                    QSocketDescriptor rhs) noexcept
+private:
+    friend Q_DECL_CONSTEXPR_NOT_WIN bool comparesEqual(const QSocketDescriptor &lhs,
+                                                       const QSocketDescriptor &rhs) noexcept
     {
         return lhs.sockfd == rhs.sockfd;
     }
-    friend Q_DECL_CONSTEXPR_NOT_WIN bool operator!=(QSocketDescriptor lhs,
-                                                    QSocketDescriptor rhs) noexcept
-    {
-        return lhs.sockfd != rhs.sockfd;
-    }
+#if defined(Q_OS_WIN) || defined(Q_QDOC)
+    Q_DECLARE_EQUALITY_COMPARABLE(QSocketDescriptor)
+#else
+    Q_DECLARE_EQUALITY_COMPARABLE_LITERAL_TYPE(QSocketDescriptor)
+#endif
 
 #undef Q_DECL_CONSTEXPR_NOT_WIN
 
-private:
     DescriptorType sockfd;
 };