1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QFileSystemEngine: use nativeFilePath()

Browse Source 
Instead of filePath() then converting to QByteArray.

Change-Id: I6f656774979bedde5c657613303518750ab06855
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Ahmad Samir 2023-12-18 18:11:19 +02:00
parent 5e0475f88a
commit 6d9185c0e6
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/io/qfilesystemengine_unix.cpp
View File

@ -1124,7 +1124,7 @@ static bool createDirectoryWithParents(const QByteArray &nativeName, mode_t mode
bool QFileSystemEngine::createDirectory(const QFileSystemEntry &entry, bool createParents, bool QFileSystemEngine::createDirectory(const QFileSystemEntry &entry, bool createParents,
std::optional<QFile::Permissions> permissions) std::optional<QFile::Permissions> permissions)
{ {
QString dirName = entry.filePath(); QByteArray dirName = entry.nativeFilePath();
Q_CHECK_FILE_NAME(dirName, false); Q_CHECK_FILE_NAME(dirName, false);
// Darwin doesn't support trailing /'s, so remove for everyone // Darwin doesn't support trailing /'s, so remove for everyone
@ -1132,14 +1132,13 @@ bool QFileSystemEngine::createDirectory(const QFileSystemEntry &entry, bool crea
dirName.chop(1); dirName.chop(1);
// try to mkdir this directory // try to mkdir this directory
QByteArray nativeName = QFile::encodeName(dirName);
mode_t mode = permissions ? QtPrivate::toMode_t(*permissions) : 0777; mode_t mode = permissions ? QtPrivate::toMode_t(*permissions) : 0777;
if (QT_MKDIR(nativeName, mode) == 0) if (QT_MKDIR(dirName, mode) == 0)
return true; return true;
if (!createParents) if (!createParents)
return false; return false;
return createDirectoryWithParents(nativeName, mode, false); return createDirectoryWithParents(dirName, mode, false);
} }
//static //static