Use standard macros and make move constructor inline

Pick-to: 6.4
Change-Id: I670fe7d2dbd7d723d554155b4a822f0f85688f4c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>

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)