Make QWebEngineFileSystemAccessRequest comparisons hidden friends

From API review

Pick-to: 6.4
Change-Id: I567767b95852048f56d3ff5b5d0df2b91358f8b1
Reviewed-by: Marc Mutz <marc.mutz@qt.io>

2 files changed, 12 insertions, 16 deletions

diff --git a/src/core/api/qwebenginefilesystemaccessrequest.cpp b/src/core/api/qwebenginefilesystemaccessrequest.cpp
index e9851909f..6527e1766 100644
--- a/src/core/api/qwebenginefilesystemaccessrequest.cpp
+++ b/src/core/api/qwebenginefilesystemaccessrequest.cpp
@@ -33,23 +33,13 @@ QWebEngineFileSystemAccessRequest &QWebEngineFileSystemAccessRequest::operator=(
         const QWebEngineFileSystemAccessRequest &other) = default;
 QWebEngineFileSystemAccessRequest::~QWebEngineFileSystemAccessRequest() = default;
 
-/*! \fn bool QWebEngineFileSystemAccessRequest::operator==(const QWebEngineFileSystemAccessRequest &that) const
-    Returns \c true if \a that points to the same object as this request.
+/*! \fn bool QWebEngineFileSystemAccessRequest::operator==(const QWebEngineFileSystemAccessRequest &lhs, const QWebEngineFileSystemAccessRequest &rhs)
+    Returns \c true if \a lhs and \a rhs both point to the same request.
 */
-bool QWebEngineFileSystemAccessRequest::operator==(
-        const QWebEngineFileSystemAccessRequest &that) const
-{
-    return d_ptr == that.d_ptr;
-}
 
-/*! \fn bool QWebEngineFileSystemAccessRequest::operator!=(const QWebEngineFileSystemAccessRequest &that) const
-    Returns \c true if \a that points to a different object than this request.
+/*! \fn bool QWebEngineFileSystemAccessRequest::operator!=(const QWebEngineFileSystemAccessRequest &lhs, const QWebEngineFileSystemAccessRequest &rhs)
+    Returns \c true if \a lhs and \a rhs point to different requests.
 */
-bool QWebEngineFileSystemAccessRequest::operator!=(
-        const QWebEngineFileSystemAccessRequest &that) const
-{
-    return d_ptr != that.d_ptr;
-}
 
 /*! \internal */
 QWebEngineFileSystemAccessRequest::QWebEngineFileSystemAccessRequest(
diff --git a/src/core/api/qwebenginefilesystemaccessrequest.h b/src/core/api/qwebenginefilesystemaccessrequest.h
index 67912f7ef..37b1e1861 100644
--- a/src/core/api/qwebenginefilesystemaccessrequest.h
+++ b/src/core/api/qwebenginefilesystemaccessrequest.h
@@ -46,8 +46,12 @@ public:
     HandleType handleType() const;
     AccessFlags accessFlags() const;
 
-    bool operator==(const QWebEngineFileSystemAccessRequest &that) const;
-    bool operator!=(const QWebEngineFileSystemAccessRequest &that) const;
+    inline friend bool operator==(const QWebEngineFileSystemAccessRequest &lhs,
+                                  const QWebEngineFileSystemAccessRequest &rhs) noexcept
+    { return lhs.d_ptr == rhs.d_ptr; }
+    inline friend bool operator!=(const QWebEngineFileSystemAccessRequest &lhs,
+                                  const QWebEngineFileSystemAccessRequest &rhs) noexcept
+    { return lhs.d_ptr != rhs.d_ptr; }
 
 private:
     QWebEngineFileSystemAccessRequest(
@@ -57,6 +61,8 @@ private:
     std::shared_ptr<QtWebEngineCore::FileSystemAccessPermissionRequestController> d_ptr;
 };
 
+Q_DECLARE_SHARED(QWebEngineFileSystemAccessRequest)
+
 Q_DECLARE_OPERATORS_FOR_FLAGS(QWebEngineFileSystemAccessRequest::AccessFlags)
 
 QT_END_NAMESPACE