From b0112afc64848f840b6daf37ef51657b77027c13 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 7 Jan 2020 02:52:01 +0000 Subject: [PATCH] avoid temporaries in QDir::mkdir(), QDir::rmdir(), QDir::mkpath() and QDir::rmpath() Signed-off-by: Ivailo Monev --- src/core/io/qdir.cpp | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/core/io/qdir.cpp b/src/core/io/qdir.cpp index 41da26c2e..fb584ebf6 100644 --- a/src/core/io/qdir.cpp +++ b/src/core/io/qdir.cpp @@ -1260,10 +1260,9 @@ bool QDir::mkdir(const QString &dirName) const const QDirPrivate* d = d_ptr.constData(); - QString fn = filePath(dirName); if (!d->fileEngine) - return QFileSystemEngine::createDirectory(QFileSystemEntry(fn), false); - return d->fileEngine->mkdir(fn, false); + return QFileSystemEngine::createDirectory(QFileSystemEntry(dirName), false); + return d->fileEngine->mkdir(dirName, false); } /*! @@ -1284,11 +1283,9 @@ bool QDir::rmdir(const QString &dirName) const const QDirPrivate* d = d_ptr.constData(); - QString fn = filePath(dirName); if (!d->fileEngine) - return QFileSystemEngine::removeDirectory(QFileSystemEntry(fn), false); - - return d->fileEngine->rmdir(fn, false); + return QFileSystemEngine::removeDirectory(QFileSystemEntry(dirName), false); + return d->fileEngine->rmdir(dirName, false); } /*! @@ -1313,10 +1310,9 @@ bool QDir::mkpath(const QString &dirPath) const const QDirPrivate* d = d_ptr.constData(); - QString fn = filePath(dirPath); if (!d->fileEngine) - return QFileSystemEngine::createDirectory(QFileSystemEntry(fn), true); - return d->fileEngine->mkdir(fn, true); + return QFileSystemEngine::createDirectory(QFileSystemEntry(dirPath), true); + return d->fileEngine->mkdir(dirPath, true); } /*! @@ -1339,10 +1335,9 @@ bool QDir::rmpath(const QString &dirPath) const const QDirPrivate* d = d_ptr.constData(); - QString fn = filePath(dirPath); if (!d->fileEngine) - return QFileSystemEngine::removeDirectory(QFileSystemEntry(fn), true); - return d->fileEngine->rmdir(fn, true); + return QFileSystemEngine::removeDirectory(QFileSystemEntry(dirPath), true); + return d->fileEngine->rmdir(dirPath, true); } /*! -- 2.11.0