diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-17 13:40:00 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-23 09:50:21 +0100 |
| commit | f61f8bb966fdc04662fb4e6597698b573fcb8b94 (patch) | |
| tree | 80871d6271c059376edb205b8aa69d0b4621c9a3 /src/corelib/io/qfile.cpp | |
| parent | 03ab48657d0486bd0e3754f1447a6fcd05846a5d (diff) | |
Replace qt_make_unique with std::make_unique
We can depend on C++14 now.
Change-Id: Iee9796cd22dbfbb70d4bdb25f0eee1662a026d6d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/io/qfile.cpp')
| -rw-r--r-- | src/corelib/io/qfile.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp index 36e2b4476a..223745b73c 100644 --- a/src/corelib/io/qfile.cpp +++ b/src/corelib/io/qfile.cpp @@ -55,8 +55,6 @@ # include "qcoreapplication.h" #endif -#include <private/qmemory_p.h> - #ifdef QT_NO_QOBJECT #define tr(X) QString::fromLatin1(X) #endif @@ -87,7 +85,7 @@ QFilePrivate::openExternalFile(int flags, int fd, QFile::FileHandleFlags handleF Q_UNUSED(fd); return false; #else - auto fs = qt_make_unique<QFSFileEngine>(); + auto fs = std::make_unique<QFSFileEngine>(); auto fe = fs.get(); fileEngine = std::move(fs); return fe->open(QIODevice::OpenMode(flags), fd, handleFlags); @@ -102,7 +100,7 @@ QFilePrivate::openExternalFile(int flags, FILE *fh, QFile::FileHandleFlags handl Q_UNUSED(fh); return false; #else - auto fs = qt_make_unique<QFSFileEngine>(); + auto fs = std::make_unique<QFSFileEngine>(); auto fe = fs.get(); fileEngine = std::move(fs); return fe->open(QIODevice::OpenMode(flags), fh, handleFlags); |