From 48554cab2540f401f26132d30339b3a006c60fcb Mon Sep 17 00:00:00 2001
From: Linus Jahn <lnj@kaidan.im>
Date: Mon, 14 Oct 2019 18:53:25 +0200
Subject: Use QSharedData for QXmppMixItem private classes

---
 src/base/QXmppMixItem.cpp | 20 +++++++++++++++++---
 src/base/QXmppMixItem.h   | 14 ++++++++++++--
 2 files changed, 29 insertions(+), 5 deletions(-)

(limited to 'src/base')

diff --git a/src/base/QXmppMixItem.cpp b/src/base/QXmppMixItem.cpp
index 5b1d7c00..ddb5a3be 100644
--- a/src/base/QXmppMixItem.cpp
+++ b/src/base/QXmppMixItem.cpp
@@ -25,10 +25,12 @@
 #include "QXmppDataForm.h"
 #include "QXmppConstants_p.h"
 #include "QXmppUtils.h"
-#include <QDomElement>
+
 #include <QBuffer>
+#include <QDomElement>
+#include <QSharedData>
 
-class QXmppMixInfoItemPrivate : QSharedData
+class QXmppMixInfoItemPrivate : public QSharedData
 {
 public:
     QString name;
@@ -41,6 +43,12 @@ QXmppMixInfoItem::QXmppMixInfoItem()
 {
 }
 
+QXmppMixInfoItem::QXmppMixInfoItem(const QXmppMixInfoItem &) = default;
+
+QXmppMixInfoItem &QXmppMixInfoItem::operator=(const QXmppMixInfoItem &) = default;
+
+QXmppMixInfoItem::~QXmppMixInfoItem() = default;
+
 /// Returns the user-specified name of the MIX channel. This is not the name
 /// part of the channel's JID.
 
@@ -153,7 +161,7 @@ QXmppElement QXmppMixInfoItem::toElement() const
     return QXmppElement(doc.documentElement());
 }
 
-class QXmppMixParticipantItemPrivate : QSharedData
+class QXmppMixParticipantItemPrivate : public QSharedData
 {
 public:
     QString nick;
@@ -165,6 +173,12 @@ QXmppMixParticipantItem::QXmppMixParticipantItem()
 {
 }
 
+QXmppMixParticipantItem::QXmppMixParticipantItem(const QXmppMixParticipantItem &) = default;
+
+QXmppMixParticipantItem &QXmppMixParticipantItem::operator=(const QXmppMixParticipantItem &) = default;
+
+QXmppMixParticipantItem::~QXmppMixParticipantItem() = default;
+
 /// Returns the participant's nickname.
 
 QString QXmppMixParticipantItem::nick() const
diff --git a/src/base/QXmppMixItem.h b/src/base/QXmppMixItem.h
index d4f046c1..fd4f1764 100644
--- a/src/base/QXmppMixItem.h
+++ b/src/base/QXmppMixItem.h
@@ -24,6 +24,8 @@
 #ifndef QXMPPMIXITEM_H
 #define QXMPPMIXITEM_H
 
+#include <QSharedDataPointer>
+
 #include "QXmppElement.h"
 
 class QXmppMixInfoItemPrivate;
@@ -39,6 +41,10 @@ class QXMPP_EXPORT QXmppMixInfoItem
 {
 public:
     QXmppMixInfoItem();
+    QXmppMixInfoItem(const QXmppMixInfoItem &);
+    ~QXmppMixInfoItem();
+
+    QXmppMixInfoItem &operator=(const QXmppMixInfoItem &);
 
     QString name() const;
     void setName(const QString&);
@@ -55,7 +61,7 @@ public:
     static bool isMixChannelInfo(const QDomElement&);
 
 private:
-    QXmppMixInfoItemPrivate *d;
+    QSharedDataPointer<QXmppMixInfoItemPrivate> d;
 };
 
 /// \brief The QXmppMixParticipantItem class represents a PubSub item of a MIX
@@ -68,6 +74,10 @@ class QXMPP_EXPORT QXmppMixParticipantItem
 {
 public:
     QXmppMixParticipantItem();
+    QXmppMixParticipantItem(const QXmppMixParticipantItem &);
+    ~QXmppMixParticipantItem();
+
+    QXmppMixParticipantItem &operator=(const QXmppMixParticipantItem &);
 
     QString nick() const;
     void setNick(const QString&);
@@ -81,7 +91,7 @@ public:
     static bool isMixParticipantItem(const QDomElement&);
 
 private:
-    QXmppMixParticipantItemPrivate *d;
+    QSharedDataPointer<QXmppMixParticipantItemPrivate> d;
 };
 
 #endif // QXMPPMIXITEM_H
-- 
cgit v1.2.3