Standardize on unique_ptr to hold QAbstractFileEngine

This will make it possible to return it from functions in an owner,
as exemplified in the QFileInfoPrivate ctor, unlike QScopedPointer,
which lacks move special member functions.

Change-Id: I179ffa4f656e1b83c23e0f67d1542834460ff382
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

1 files changed, 3 insertions, 1 deletions

diff --git a/src/corelib/io/qdir_p.h b/src/corelib/io/qdir_p.h
index 42218e1ccf..af105de8db 100644
--- a/src/corelib/io/qdir_p.h
+++ b/src/corelib/io/qdir_p.h
@@ -54,6 +54,8 @@
 #include "qfilesystementry_p.h"
 #include "qfilesystemmetadata_p.h"
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 
 class QDirPrivate : public QSharedData
@@ -98,7 +100,7 @@ public:
     QDir::SortFlags sort;
     QDir::Filters filters;
 
-    QScopedPointer<QAbstractFileEngine> fileEngine;
+    std::unique_ptr<QAbstractFileEngine> fileEngine;
 
     QFileSystemEntry dirEntry;
     mutable QFileSystemEntry absoluteDirEntry;