Use QSharedData for QXmppHttpUploadIq private classes

2 files changed, 26 insertions, 15 deletions

diff --git a/src/base/QXmppHttpUploadIq.cpp b/src/base/QXmppHttpUploadIq.cpp
index 4754cd3e..4529a413 100644
--- a/src/base/QXmppHttpUploadIq.cpp
+++ b/src/base/QXmppHttpUploadIq.cpp
@@ -23,11 +23,13 @@
 
 #include <QDomElement>
 #include <QMimeDatabase>
+#include <QSharedData>
+#include <QUrl>
 
 #include "QXmppHttpUploadIq.h"
 #include "QXmppConstants_p.h"
 
-class QXmppHttpUploadRequestIqPrivate
+class QXmppHttpUploadRequestIqPrivate : public QSharedData
 {
 public:
     QString fileName;
@@ -40,10 +42,11 @@ QXmppHttpUploadRequestIq::QXmppHttpUploadRequestIq()
 {
 }
 
-QXmppHttpUploadRequestIq::~QXmppHttpUploadRequestIq()
-{
-    delete d;
-}
+QXmppHttpUploadRequestIq::QXmppHttpUploadRequestIq(const QXmppHttpUploadRequestIq &) = default;
+
+QXmppHttpUploadRequestIq::~QXmppHttpUploadRequestIq() = default;
+
+QXmppHttpUploadRequestIq &QXmppHttpUploadRequestIq::operator=(const QXmppHttpUploadRequestIq &) = default;
 
 /// Returns the file name of the file to be uploaded.
 
@@ -127,7 +130,7 @@ void QXmppHttpUploadRequestIq::toXmlElementFromChild(QXmlStreamWriter *writer) c
 }
 /// \endcond
 
-class QXmppHttpUploadSlotIqPrivate
+class QXmppHttpUploadSlotIqPrivate : public QSharedData
 {
 public:
     QUrl putUrl;
@@ -140,10 +143,11 @@ QXmppHttpUploadSlotIq::QXmppHttpUploadSlotIq()
 {
 }
 
-QXmppHttpUploadSlotIq::~QXmppHttpUploadSlotIq()
-{
-    delete d;
-}
+QXmppHttpUploadSlotIq::QXmppHttpUploadSlotIq(const QXmppHttpUploadSlotIq &) = default;
+
+QXmppHttpUploadSlotIq::~QXmppHttpUploadSlotIq() = default;
+
+QXmppHttpUploadSlotIq &QXmppHttpUploadSlotIq::operator=(const QXmppHttpUploadSlotIq &) = default;
 
 /// Returns the URL for uploading via. HTTP PUT.
 
diff --git a/src/base/QXmppHttpUploadIq.h b/src/base/QXmppHttpUploadIq.h
index 63c2da23..064ce850 100644
--- a/src/base/QXmppHttpUploadIq.h
+++ b/src/base/QXmppHttpUploadIq.h
@@ -24,12 +24,13 @@
 #ifndef QXMPPHTTPUPLOADIQ_H
 #define QXMPPHTTPUPLOADIQ_H
 
-#include <QMap>
-#include <QMimeType>
-#include <QUrl>
+#include <QSharedDataPointer>
 
 #include "QXmppIq.h"
 
+class QUrl;
+class QMimeType;
+
 class QXmppHttpUploadRequestIqPrivate;
 class QXmppHttpUploadSlotIqPrivate;
 
@@ -42,8 +43,11 @@ class QXMPP_EXPORT QXmppHttpUploadRequestIq : public QXmppIq
 {
 public:
     QXmppHttpUploadRequestIq();
+    QXmppHttpUploadRequestIq(const QXmppHttpUploadRequestIq &);
     ~QXmppHttpUploadRequestIq() override;
 
+    QXmppHttpUploadRequestIq &operator=(const QXmppHttpUploadRequestIq &);
+
     QString fileName() const;
     void setFileName(const QString &filename);
 
@@ -62,7 +66,7 @@ protected:
     /// \endcond
 
 private:
-    QXmppHttpUploadRequestIqPrivate* const d;
+    QSharedDataPointer<QXmppHttpUploadRequestIqPrivate> d;
 };
 
 /// \brief Represents an HTTP File Upload IQ result for receiving an upload slot as
@@ -74,8 +78,11 @@ class QXMPP_EXPORT QXmppHttpUploadSlotIq : public QXmppIq
 {
 public:
     QXmppHttpUploadSlotIq();
+    QXmppHttpUploadSlotIq(const QXmppHttpUploadSlotIq &);
     ~QXmppHttpUploadSlotIq() override;
 
+    QXmppHttpUploadSlotIq &operator=(const QXmppHttpUploadSlotIq &);
+
     QUrl putUrl() const;
     void setPutUrl(const QUrl &putUrl);
 
@@ -94,7 +101,7 @@ protected:
     /// \endcond
 
 private:
-    QXmppHttpUploadSlotIqPrivate* const d;
+    QSharedDataPointer<QXmppHttpUploadSlotIqPrivate> d;
 };
 
 #endif // QXMPPHTTPUPLOADIQ_H