From 186bdec01a62dcc407e21873a6c6a0c484d5df62 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Sat, 25 May 2019 23:42:45 +0200
Subject: Standardize on unique_ptr to hold QAbstractFileEngine
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/corelib/io/qfileinfo_p.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/corelib/io/qfileinfo_p.h')

diff --git a/src/corelib/io/qfileinfo_p.h b/src/corelib/io/qfileinfo_p.h
index 36f440812f..333ea70adc 100644
--- a/src/corelib/io/qfileinfo_p.h
+++ b/src/corelib/io/qfileinfo_p.h
@@ -61,6 +61,8 @@
 #include <QtCore/private/qfilesystementry_p.h>
 #include <QtCore/private/qfilesystemmetadata_p.h>
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 
 class QFileInfoPrivate : public QSharedData
@@ -126,10 +128,10 @@ public:
             metaData = QFileSystemMetaData();
     }
 
-    inline QFileInfoPrivate(const QFileSystemEntry &file, const QFileSystemMetaData &data, QAbstractFileEngine *engine)
+    inline QFileInfoPrivate(const QFileSystemEntry &file, const QFileSystemMetaData &data, std::unique_ptr<QAbstractFileEngine> engine)
         : fileEntry(file),
         metaData(data),
-        fileEngine(engine),
+        fileEngine{std::move(engine)},
         cachedFlags(0),
 #ifndef QT_NO_FSFILEENGINE
         isDefaultConstructed(false),
@@ -163,7 +165,7 @@ public:
     QFileSystemEntry fileEntry;
     mutable QFileSystemMetaData metaData;
 
-    QScopedPointer<QAbstractFileEngine> const fileEngine;
+    std::unique_ptr<QAbstractFileEngine> const fileEngine;
 
     mutable QString fileNames[QAbstractFileEngine::NFileNames];
     mutable QString fileOwners[2];  // QAbstractFileEngine::FileOwner: OwnerUser and OwnerGroup
-- 
cgit v1.2.3