Use QSharedData for QXmppMixIqPrivate

2 files changed, 25 insertions, 9 deletions

diff --git a/src/base/QXmppMixIq.cpp b/src/base/QXmppMixIq.cpp
index 7cc316e2..5659ccf4 100644
--- a/src/base/QXmppMixIq.cpp
+++ b/src/base/QXmppMixIq.cpp
@@ -25,13 +25,23 @@
 #include "QXmppDataForm.h"
 #include "QXmppConstants_p.h"
 #include "QXmppUtils.h"
-#include <QDomElement>
 
-static const QStringList MIX_ACTION_TYPES = QStringList() << ""
-    << "client-join" << "client-leave" << "join" << "leave"
-    << "update-subscription" << "setnick" << "create" << "destroy";
+#include <QDomElement>
+#include <QSharedData>
+
+static const QStringList MIX_ACTION_TYPES = {
+    QString(),
+    QStringLiteral("client-join"),
+    QStringLiteral("client-leave"),
+    QStringLiteral("join"),
+    QStringLiteral("leave"),
+    QStringLiteral("update-subscription"),
+    QStringLiteral("setnick"),
+    QStringLiteral("create"),
+    QStringLiteral("destroy")
+};
 
-class QXmppMixIqPrivate : QSharedData
+class QXmppMixIqPrivate : public QSharedData
 {
 public:
     QString jid;
@@ -46,9 +56,11 @@ QXmppMixIq::QXmppMixIq()
 {
 }
 
-QXmppMixIq::~QXmppMixIq()
-{
-}
+QXmppMixIq::QXmppMixIq(const QXmppMixIq &) = default;
+
+QXmppMixIq::~QXmppMixIq() = default;
+
+QXmppMixIq &QXmppMixIq::operator=(const QXmppMixIq &) = default;
 
 /// Returns the channel JID. It also contains a participant id for Join/
 /// ClientJoin results.
diff --git a/src/base/QXmppMixIq.h b/src/base/QXmppMixIq.h
index 4e3b71f8..14f25026 100644
--- a/src/base/QXmppMixIq.h
+++ b/src/base/QXmppMixIq.h
@@ -25,6 +25,7 @@
 #define QXMPPMIXIQ_H
 
 #include "QXmppIq.h"
+#include <QSharedDataPointer>
 
 class QXmppMixIqPrivate;
 
@@ -51,8 +52,11 @@ public:
     };
 
     QXmppMixIq();
+    QXmppMixIq(const QXmppMixIq &);
     ~QXmppMixIq() override;
 
+    QXmppMixIq &operator=(const QXmppMixIq &);
+
     QXmppMixIq::Type actionType() const;
     void setActionType(QXmppMixIq::Type);
 
@@ -79,7 +83,7 @@ protected:
     /// \endcond
 
 private:
-    QXmppMixIqPrivate *d;
+    QSharedDataPointer<QXmppMixIqPrivate> d;
 };
 
 #endif // QXMPPMIXIQ_H