1 files changed, 26 insertions, 29 deletions

diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp
index 37de4450cc..95f03ef816 100644
--- a/src/corelib/io/qfile.cpp
+++ b/src/corelib/io/qfile.cpp
@@ -55,12 +55,21 @@
 # include "qcoreapplication.h"
 #endif
 
+#include <private/qmemory_p.h>
+
 #ifdef QT_NO_QOBJECT
 #define tr(X) QString::fromLatin1(X)
 #endif
 
 QT_BEGIN_NAMESPACE
 
+Q_DECL_COLD_FUNCTION
+static bool file_already_open(QFile &file, const char *where = nullptr)
+{
+    qWarning("QFile::%s: File (%ls) already open", where ? where : "open", qUtf16Printable(file.fileName()));
+    return false;
+}
+
 //************* QFilePrivate
 QFilePrivate::QFilePrivate()
 {
@@ -78,10 +87,9 @@ QFilePrivate::openExternalFile(int flags, int fd, QFile::FileHandleFlags handleF
     Q_UNUSED(fd);
     return false;
 #else
-    delete fileEngine;
-    fileEngine = 0;
-    QFSFileEngine *fe = new QFSFileEngine;
-    fileEngine = fe;
+    auto fs = qt_make_unique<QFSFileEngine>();
+    auto fe = fs.get();
+    fileEngine = std::move(fs);
     return fe->open(QIODevice::OpenMode(flags), fd, handleFlags);
 #endif
 }
@@ -94,10 +102,9 @@ QFilePrivate::openExternalFile(int flags, FILE *fh, QFile::FileHandleFlags handl
     Q_UNUSED(fh);
     return false;
 #else
-    delete fileEngine;
-    fileEngine = 0;
-    QFSFileEngine *fe = new QFSFileEngine;
-    fileEngine = fe;
+    auto fs = qt_make_unique<QFSFileEngine>();
+    auto fe = fs.get();
+    fileEngine = std::move(fs);
     return fe->open(QIODevice::OpenMode(flags), fh, handleFlags);
 #endif
 }
@@ -105,8 +112,8 @@ QFilePrivate::openExternalFile(int flags, FILE *fh, QFile::FileHandleFlags handl
 QAbstractFileEngine *QFilePrivate::engine() const
 {
     if (!fileEngine)
-        fileEngine = QAbstractFileEngine::create(fileName);
-    return fileEngine;
+        fileEngine.reset(QAbstractFileEngine::create(fileName));
+    return fileEngine.get();
 }
 
 //************* QFile
@@ -324,14 +331,10 @@ QFile::setFileName(const QString &name)
 {
     Q_D(QFile);
     if (isOpen()) {
-        qWarning("QFile::setFileName: File (%s) is already opened",
-                 qPrintable(fileName()));
+        file_already_open(*this, "setFileName");
         close();
     }
-    if(d->fileEngine) { //get a new file engine later
-        delete d->fileEngine;
-        d->fileEngine = 0;
-    }
+    d->fileEngine.reset(); //get a new file engine later
     d->fileName = name;
 }
 
@@ -804,7 +807,7 @@ QFile::copy(const QString &newName)
                 error = true;
                 d->setError(QFile::CopyError, tr("Cannot open %1 for input").arg(d->fileName));
             } else {
-                QString fileTemplate = QLatin1String("%1/qt_temp.XXXXXX");
+                const auto fileTemplate = QLatin1String("%1/qt_temp.XXXXXX");
 #ifdef QT_NO_TEMPORARYFILE
                 QFile out(fileTemplate.arg(QFileInfo(newName).path()));
                 if (!out.open(QIODevice::ReadWrite))
@@ -910,10 +913,8 @@ QFile::copy(const QString &fileName, const QString &newName)
 bool QFile::open(OpenMode mode)
 {
     Q_D(QFile);
-    if (isOpen()) {
-        qWarning("QFile::open: File (%s) already open", qPrintable(fileName()));
-        return false;
-    }
+    if (isOpen())
+        return file_already_open(*this);
     // Either Append or NewOnly implies WriteOnly
     if (mode & (Append | NewOnly))
         mode |= WriteOnly;
@@ -982,10 +983,8 @@ bool QFile::open(OpenMode mode)
 bool QFile::open(FILE *fh, OpenMode mode, FileHandleFlags handleFlags)
 {
     Q_D(QFile);
-    if (isOpen()) {
-        qWarning("QFile::open: File (%s) already open", qPrintable(fileName()));
-        return false;
-    }
+    if (isOpen())
+        return file_already_open(*this);
     // Either Append or NewOnly implies WriteOnly
     if (mode & (Append | NewOnly))
         mode |= WriteOnly;
@@ -1041,10 +1040,8 @@ bool QFile::open(FILE *fh, OpenMode mode, FileHandleFlags handleFlags)
 bool QFile::open(int fd, OpenMode mode, FileHandleFlags handleFlags)
 {
     Q_D(QFile);
-    if (isOpen()) {
-        qWarning("QFile::open: File (%s) already open", qPrintable(fileName()));
-        return false;
-    }
+    if (isOpen())
+        return file_already_open(*this);
     // Either Append or NewOnly implies WriteOnly
     if (mode & (Append | NewOnly))
         mode |= WriteOnly;