From ebbc645029400733530553e301e8dcf6de42e7bf Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 12 Jul 2022 15:18:46 +0200 Subject: Inline move assign and add swap From API review Change-Id: I7c24d4736a14d9b8af52de556523986eea99bc34 Reviewed-by: Marc Mutz (cherry picked from commit 8b6edc76b45bb444ca01a1bee7854e1b417e56f5) Reviewed-by: Qt Cherry-pick Bot --- src/core/api/qwebenginefilesystemaccessrequest.cpp | 2 -- src/core/api/qwebenginefilesystemaccessrequest.h | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/api/qwebenginefilesystemaccessrequest.cpp b/src/core/api/qwebenginefilesystemaccessrequest.cpp index 68bf05a68..d2cb1cf7c 100644 --- a/src/core/api/qwebenginefilesystemaccessrequest.cpp +++ b/src/core/api/qwebenginefilesystemaccessrequest.cpp @@ -33,8 +33,6 @@ QWebEngineFileSystemAccessRequest &QWebEngineFileSystemAccessRequest::operator=( const QWebEngineFileSystemAccessRequest &other) = default; QWebEngineFileSystemAccessRequest::QWebEngineFileSystemAccessRequest( QWebEngineFileSystemAccessRequest &&other) = default; -QWebEngineFileSystemAccessRequest & -QWebEngineFileSystemAccessRequest::operator=(QWebEngineFileSystemAccessRequest &&other) = default; QWebEngineFileSystemAccessRequest::~QWebEngineFileSystemAccessRequest() = default; /*! \fn bool QWebEngineFileSystemAccessRequest::operator==(const QWebEngineFileSystemAccessRequest &that) const diff --git a/src/core/api/qwebenginefilesystemaccessrequest.h b/src/core/api/qwebenginefilesystemaccessrequest.h index ade737652..d53cb4ec5 100644 --- a/src/core/api/qwebenginefilesystemaccessrequest.h +++ b/src/core/api/qwebenginefilesystemaccessrequest.h @@ -28,9 +28,11 @@ public: QWebEngineFileSystemAccessRequest(const QWebEngineFileSystemAccessRequest &other); QWebEngineFileSystemAccessRequest &operator=(const QWebEngineFileSystemAccessRequest &other); QWebEngineFileSystemAccessRequest(QWebEngineFileSystemAccessRequest &&other); - QWebEngineFileSystemAccessRequest &operator=(QWebEngineFileSystemAccessRequest &&other); + QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QWebEngineFileSystemAccessRequest) ~QWebEngineFileSystemAccessRequest(); + void swap(QWebEngineFileSystemAccessRequest &other) noexcept { d_ptr.swap(other.d_ptr); } + enum HandleType { File, Directory }; Q_ENUM(HandleType) -- cgit v1.2.3