QtHelp: Add move operators to QHelpFilterData, QHelpCollectionDetails

Add move constructors and move assignment operators to QHelpFilterData,
QHelpCollectionDetails. Both classes are implemented in terms of a
QSharedDataPointer, which offers a move constructor and move assignment
operator, so it makes sense to just 'export' this to the class API.

In addition, let the compiler create the implementations of the normal
copy constructor and assignment operator.

Change-Id: Id2d8a86b0b1e0a2e75fec989ae1f5442ead50410
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

4 files changed, 24 insertions, 21 deletions

diff --git a/src/assistant/help/qhelpcollectiondetails.cpp b/src/assistant/help/qhelpcollectiondetails.cpp
index 76d52c2ea..135b1df37 100644
--- a/src/assistant/help/qhelpcollectiondetails.cpp
+++ b/src/assistant/help/qhelpcollectiondetails.cpp
@@ -67,20 +67,15 @@ QHelpCollectionDetails::QHelpCollectionDetails()
 {
 }
 
-QHelpCollectionDetails::QHelpCollectionDetails(const QHelpCollectionDetails &other)
-    : d(other.d)
-{
-}
+QHelpCollectionDetails::QHelpCollectionDetails(const QHelpCollectionDetails &) = default;
 
-QHelpCollectionDetails::~QHelpCollectionDetails()
-{
-}
+QHelpCollectionDetails::QHelpCollectionDetails(QHelpCollectionDetails &&) = default;
 
-QHelpCollectionDetails &QHelpCollectionDetails::operator=(const QHelpCollectionDetails &other)
-{
-    d = other.d;
-    return *this;
-}
+QHelpCollectionDetails::~QHelpCollectionDetails() = default;
+
+QHelpCollectionDetails &QHelpCollectionDetails::operator=(const QHelpCollectionDetails &) = default;
+
+QHelpCollectionDetails &QHelpCollectionDetails::operator=(QHelpCollectionDetails &&) = default;
 
 void QHelpCollectionDetails::setNamespaceName(const QString &namespaceName)
 {
diff --git a/src/assistant/help/qhelpcollectiondetails.h b/src/assistant/help/qhelpcollectiondetails.h
index af95a73d7..df9dfa7d8 100644
--- a/src/assistant/help/qhelpcollectiondetails.h
+++ b/src/assistant/help/qhelpcollectiondetails.h
@@ -53,9 +53,11 @@ class QHELP_EXPORT QHelpCollectionDetails
 public:
     QHelpCollectionDetails();
     QHelpCollectionDetails(const QHelpCollectionDetails &other);
+    QHelpCollectionDetails(QHelpCollectionDetails &&other);
     ~QHelpCollectionDetails();
 
     QHelpCollectionDetails &operator=(const QHelpCollectionDetails &other);
+    QHelpCollectionDetails &operator=(QHelpCollectionDetails &&other);
 
     void setNamespaceName(const QString &ns);
     void setComponent(const QString &component);
diff --git a/src/assistant/help/qhelpfilterdata.cpp b/src/assistant/help/qhelpfilterdata.cpp
index 3063136ed..a2c1f0ea8 100644
--- a/src/assistant/help/qhelpfilterdata.cpp
+++ b/src/assistant/help/qhelpfilterdata.cpp
@@ -78,10 +78,12 @@ QHelpFilterData::QHelpFilterData()
 /*!
     Constructs a copy of \a other.
 */
-QHelpFilterData::QHelpFilterData(const QHelpFilterData &other)
-    : d(other.d)
-{
-}
+QHelpFilterData::QHelpFilterData(const QHelpFilterData &) = default;
+
+/*!
+    Move-constructs a QHelpFilterData instance, making it point at the same object that \a other was pointing to.
+*/
+QHelpFilterData::QHelpFilterData(QHelpFilterData &&) = default;
 
 /*!
     Destroys the filter.
@@ -93,11 +95,13 @@ QHelpFilterData::~QHelpFilterData()
 /*!
     Assigns \a other to this filter and returns a reference to this filter.
 */
-QHelpFilterData &QHelpFilterData::operator=(const QHelpFilterData &other)
-{
-    d = other.d;
-    return *this;
-}
+QHelpFilterData &QHelpFilterData::operator=(const QHelpFilterData &) = default;
+
+
+/*!
+    Move-assigns \a other to this QHelpFilterData instance.
+*/
+QHelpFilterData &QHelpFilterData::operator=(QHelpFilterData &&) = default;
 
 /*!
     Specifies the component list that is used for filtering
diff --git a/src/assistant/help/qhelpfilterdata.h b/src/assistant/help/qhelpfilterdata.h
index 12187237b..089eb0059 100644
--- a/src/assistant/help/qhelpfilterdata.h
+++ b/src/assistant/help/qhelpfilterdata.h
@@ -53,9 +53,11 @@ class QHELP_EXPORT QHelpFilterData
 public:
     QHelpFilterData();
     QHelpFilterData(const QHelpFilterData &other);
+    QHelpFilterData(QHelpFilterData &&other);
     ~QHelpFilterData();
 
     QHelpFilterData &operator=(const QHelpFilterData &other);
+    QHelpFilterData &operator=(QHelpFilterData &&other);
 
     void setComponents(const QStringList &components);