Make QMediaFormat movable

The d-pointer is only a reserved placeholder, but make it a
QExplicitlySharedDataPointer anyway. The default constructor just
initializes to zero, so the overhead is marginal, but makes it safe to
extend in the future if needed.

Change-Id: Ib6269f59b59af05647c0f9295ce634d5c327339e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 10 insertions, 3 deletions

diff --git a/src/multimedia/qmediaformat.h b/src/multimedia/qmediaformat.h
index addd25a51..c8bfaf6c5 100644
--- a/src/multimedia/qmediaformat.h
+++ b/src/multimedia/qmediaformat.h
@@ -50,6 +50,8 @@ class QMediaFormat;
 class QMediaEncoderSettings;
 class QMediaFormatPrivate;
 
+QT_DECLARE_QESDP_SPECIALIZATION_DTOR_WITH_EXPORT(QMediaFormatPrivate, Q_MULTIMEDIA_EXPORT)
+
 class Q_MULTIMEDIA_EXPORT QMediaFormat
 {
 public:
@@ -110,8 +112,13 @@ public:
 
     QMediaFormat(FileFormat format = UnspecifiedFormat);
     ~QMediaFormat();
-    QMediaFormat(const QMediaFormat &other);
-    QMediaFormat &operator=(const QMediaFormat &other);
+    QMediaFormat(const QMediaFormat &other) noexcept;
+    QMediaFormat &operator=(const QMediaFormat &other) noexcept;
+
+    QMediaFormat(QMediaFormat &&other) noexcept = default;
+    QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QMediaFormat)
+    void swap(QMediaFormat &other) noexcept
+    { qSwap(d, other.d); }
 
     FileFormat format() const { return fmt; }
     void setFormat(FileFormat f) { fmt = f; }
@@ -147,7 +154,7 @@ protected:
     FileFormat fmt;
     AudioCodec audio = AudioCodec::Unspecified;
     VideoCodec video = VideoCodec::Unspecified;
-    QMediaFormatPrivate *d = nullptr;
+    QExplicitlySharedDataPointer<QMediaFormatPrivate> d;
 };
 
 QT_END_NAMESPACE