diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-08-08 13:00:08 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-08-09 03:30:34 +0000 |
| commit | 90b8fcfa6a0c6b9f890c535f84d78d541f55e78c (patch) | |
| tree | 1bdcacacc96203146e9d8cb9658f55cc08b4dc9a | |
| parent | c72bf08dfd23c5f2cfb0856d6c787469bb47edb8 (diff) | |
Make QWebEngineFileSystemAccessRequest comparisons hidden friends
From API review
Change-Id: I567767b95852048f56d3ff5b5d0df2b91358f8b1
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit d94a7242d59eb4c688f3bcab77ca5fb17a0caf00)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/core/api/qwebenginefilesystemaccessrequest.cpp | 18 | ||||
| -rw-r--r-- | src/core/api/qwebenginefilesystemaccessrequest.h | 10 |
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 |