diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-06-15 21:03:59 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-06-21 18:15:30 +0000 |
commit | dc255e4673aec10a3b04245ae56015d0df84b6a8 (patch) | |
tree | 0999c2be9f2a9dd21900103cd6b96ec22e3c936d | |
parent | 992034b60825c6e13970917f84227d0e6a386860 (diff) | |
download | qtwebsockets-dc255e4673aec10a3b04245ae56015d0df84b6a8.tar.gz |
Use standard macros and make move constructor inline
Change-Id: I670fe7d2dbd7d723d554155b4a822f0f85688f4c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit b4d35eed35d0cb6617c8240b72e0dc1fe6a405b3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/websockets/qwebsockethandshakeoptions.cpp | 10 | ||||
-rw-r--r-- | src/websockets/qwebsockethandshakeoptions.h | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/websockets/qwebsockethandshakeoptions.cpp b/src/websockets/qwebsockethandshakeoptions.cpp index 7848d17..8dcc3e0 100644 --- a/src/websockets/qwebsockethandshakeoptions.cpp +++ b/src/websockets/qwebsockethandshakeoptions.cpp @@ -38,12 +38,9 @@ QWebSocketHandshakeOptions::QWebSocketHandshakeOptions(const QWebSocketHandshake } /*! + \fn QWebSocketHandshakeOptions::QWebSocketHandshakeOptions(QWebSocketHandshakeOptions &&other) noexcept \brief Constructs a QWebSocketHandshakeOptions that is moved from \a other. */ -QWebSocketHandshakeOptions::QWebSocketHandshakeOptions(QWebSocketHandshakeOptions &&other) noexcept - : d(std::move(other.d)) -{ -} /*! \brief Destroys this object. @@ -53,7 +50,7 @@ QWebSocketHandshakeOptions::~QWebSocketHandshakeOptions() } /*! - \fn QWebSocketHandshakeOptions &QWebSocketHandshakeOptions::operator=(QWebSocketHandshakeOptions &&other) + \fn QWebSocketHandshakeOptions &QWebSocketHandshakeOptions::operator=(QWebSocketHandshakeOptions &&other) noexcept \brief Moves \a other to this object. */ @@ -105,4 +102,7 @@ bool QWebSocketHandshakeOptions::equals(const QWebSocketHandshakeOptions &other) \fn QWebSocketHandshakeOptions::operator!=(const QWebSocketHandshakeOptions &lhs, const QWebSocketHandshakeOptions &rhs) \brief Compares \a lhs for equality with \a rhs. */ + +QT_DEFINE_QSDP_SPECIALIZATION_DTOR(QWebSocketHandshakeOptionsPrivate) + QT_END_NAMESPACE diff --git a/src/websockets/qwebsockethandshakeoptions.h b/src/websockets/qwebsockethandshakeoptions.h index 8a50f5b..eac3344 100644 --- a/src/websockets/qwebsockethandshakeoptions.h +++ b/src/websockets/qwebsockethandshakeoptions.h @@ -14,12 +14,14 @@ QT_BEGIN_NAMESPACE class QWebSocketHandshakeOptionsPrivate; +QT_DECLARE_QSDP_SPECIALIZATION_DTOR_WITH_EXPORT(QWebSocketHandshakeOptionsPrivate, Q_WEBSOCKETS_EXPORT) + class Q_WEBSOCKETS_EXPORT QWebSocketHandshakeOptions { public: QWebSocketHandshakeOptions(); QWebSocketHandshakeOptions(const QWebSocketHandshakeOptions &other); - QWebSocketHandshakeOptions(QWebSocketHandshakeOptions &&other) noexcept; + QWebSocketHandshakeOptions(QWebSocketHandshakeOptions &&other) noexcept = default; ~QWebSocketHandshakeOptions(); QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QWebSocketHandshakeOptions) |