Enable move semantics for QTemporaryDir

Add move constructor and move assignment operator.

To allow for the the change to be implemented QTemporaryDir, the
internal d_ptr was modified from a QScopedPointer, which is not movable,
to a raw pointer.

Add member + free swap implementations.

Add tests.

[ChangeLog][QtCore][QTemporaryDir] Enabled move semantics.

Change-Id: I9f196a77c70b4ca0b7f0c06505d00fdd87a9785c
Reviewed-by: Marc Mutz <marc.mutz@qt.io>

1 files changed, 55 insertions, 0 deletions

diff --git a/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp b/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
index d4760c0afd..65835ab91a 100644
--- a/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
+++ b/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
@@ -49,6 +49,8 @@
 #include "qplatformdefs.h"
 #endif
 
+#include <optional>
+
 class tst_QTemporaryDir : public QObject
 {
     Q_OBJECT
@@ -59,6 +61,7 @@ public slots:
 
 private slots:
     void construction();
+    void moveSemantics();
     void fileTemplate();
     void fileTemplate_data();
     void getSetCheck();
@@ -105,6 +108,58 @@ void tst_QTemporaryDir::construction()
     QCOMPARE(dir.errorString(), QString());
 }
 
+void tst_QTemporaryDir::moveSemantics()
+{
+    {
+        auto original = std::optional<QTemporaryDir>(std::in_place);
+        QVERIFY(original->isValid());
+
+        original->setAutoRemove(true);
+
+        auto OriginalDirectoryInfo = QFileInfo(original->path());
+        OriginalDirectoryInfo.setCaching(false);
+        QVERIFY(OriginalDirectoryInfo.exists());
+
+        QTemporaryDir movedInto = std::move(*original);
+
+        original.reset();
+
+        QVERIFY(OriginalDirectoryInfo.exists());
+        QVERIFY(movedInto.path() == OriginalDirectoryInfo.filePath());
+    }
+
+    {
+        auto movedInto = QTemporaryDir();
+        QVERIFY(movedInto.isValid());
+
+        movedInto.setAutoRemove(true);
+
+        auto movedIntoInitialDirectoryInfo = QFileInfo(movedInto.path());
+        movedIntoInitialDirectoryInfo.setCaching(false);
+        QVERIFY(movedIntoInitialDirectoryInfo.exists());
+
+        auto OriginalDirectoryInfo = QFileInfo();
+        OriginalDirectoryInfo.setCaching(false);
+
+        {
+            auto original = QTemporaryDir();
+            QVERIFY(original.isValid());
+
+            original.setAutoRemove(true);
+
+            OriginalDirectoryInfo.setFile(original.path());
+            QVERIFY(OriginalDirectoryInfo.exists());
+
+            movedInto = std::move(original);
+        }
+
+        QVERIFY(!movedIntoInitialDirectoryInfo.exists());
+        QVERIFY(OriginalDirectoryInfo.exists());
+
+        QVERIFY(movedInto.path() == OriginalDirectoryInfo.filePath());
+    }
+}
+
 // Testing get/set functions
 void tst_QTemporaryDir::getSetCheck()
 {