Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 19:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "avoid temporaries in QDir::mkdir(), QDir::rmdir(), QDir::mkpath() and QDir::rmpath()"

Browse source 
This reverts commit b0112afc64.
This commit is contained in:
Ivailo Monev 2020-01-07 22:59:01 +00:00
parent 2233f7db2f
commit 78547c1787
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/core/io/qdir.cpp
View file

@ -1260,9 +1260,10 @@ bool QDir::mkdir(const QString &dirName) const
const QDirPrivate* d = d_ptr.constData();
QString fn = filePath(dirName);
if (!d->fileEngine)
return QFileSystemEngine::createDirectory(QFileSystemEntry(dirName), false);
return d->fileEngine->mkdir(dirName, false);
return QFileSystemEngine::createDirectory(QFileSystemEntry(fn), false);
return d->fileEngine->mkdir(fn, false);
}
/*!
@ -1283,9 +1284,11 @@ bool QDir::rmdir(const QString &dirName) const
const QDirPrivate* d = d_ptr.constData();
QString fn = filePath(dirName);
if (!d->fileEngine)
return QFileSystemEngine::removeDirectory(QFileSystemEntry(dirName), false);
return d->fileEngine->rmdir(dirName, false);
return QFileSystemEngine::removeDirectory(QFileSystemEntry(fn), false);
return d->fileEngine->rmdir(fn, false);
}
/*!
@ -1310,9 +1313,10 @@ bool QDir::mkpath(const QString &dirPath) const
const QDirPrivate* d = d_ptr.constData();
QString fn = filePath(dirPath);
if (!d->fileEngine)
return QFileSystemEngine::createDirectory(QFileSystemEntry(dirPath), true);
return d->fileEngine->mkdir(dirPath, true);
return QFileSystemEngine::createDirectory(QFileSystemEntry(fn), true);
return d->fileEngine->mkdir(fn, true);
}
/*!
@ -1335,9 +1339,10 @@ bool QDir::rmpath(const QString &dirPath) const
const QDirPrivate* d = d_ptr.constData();
QString fn = filePath(dirPath);
if (!d->fileEngine)
return QFileSystemEngine::removeDirectory(QFileSystemEntry(dirPath), true);
return d->fileEngine->rmdir(dirPath, true);
return QFileSystemEngine::removeDirectory(QFileSystemEntry(fn), true);
return d->fileEngine->rmdir(fn, true);
}
/*!