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

Fix few QFileInfo and QDir calls

Browse Source 
Return the file engine impl of QFileInfo::completeBaseName() and
QDir::absolutePath() and QFileInfo::fileName() (based on
QAbstractFileEngine::BaseName) if the file engine impl is valid.

Amends f77668ffec48d8aaad7c74069c6f3e770a305ae1.

Task-number: QTBUG-98974
Change-Id: I28a8c75a6f25e30012b0791c12dbde51bfe8f62c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 249d613a60aa6a1347ebc1c29902049247b93324)
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Assam Boudjelthia 2023-01-16 21:03:19 +02:00
parent 7cf7fe93ef
commit 19160fb46a
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/io/qdir.cpp
View File

@ -630,8 +630,12 @@ QString QDir::path() const
QString QDir::absolutePath() const QString QDir::absolutePath() const
{ {
Q_D(const QDir); Q_D(const QDir);
if (!d->fileEngine) {
d->resolveAbsoluteEntry(); d->resolveAbsoluteEntry();
return d->absoluteDirEntry.filePath(); return d->absoluteDirEntry.filePath();
}
return d->fileEngine->fileName(QAbstractFileEngine::AbsoluteName);
} }
/*! /*!

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

@ -748,7 +748,9 @@ QString QFileInfo::fileName() const
Q_D(const QFileInfo); Q_D(const QFileInfo);
if (d->isDefaultConstructed) if (d->isDefaultConstructed)
return ""_L1; return ""_L1;
if (!d->fileEngine)
return d->fileEntry.fileName(); return d->fileEntry.fileName();
return d->fileEngine->fileName(QAbstractFileEngine::BaseName);
} }
/*! /*!
@ -792,7 +794,7 @@ QString QFileInfo::baseName() const
Q_D(const QFileInfo); Q_D(const QFileInfo);
if (d->isDefaultConstructed) if (d->isDefaultConstructed)
return ""_L1; return ""_L1;
if (!d_ptr->fileEngine) if (!d->fileEngine)
return d->fileEntry.baseName(); return d->fileEntry.baseName();
return QFileSystemEntry(d->fileEngine->fileName(QAbstractFileEngine::BaseName)).baseName(); return QFileSystemEntry(d->fileEngine->fileName(QAbstractFileEngine::BaseName)).baseName();
} }
@ -813,7 +815,10 @@ QString QFileInfo::completeBaseName() const
Q_D(const QFileInfo); Q_D(const QFileInfo);
if (d->isDefaultConstructed) if (d->isDefaultConstructed)
return ""_L1; return ""_L1;
if (!d->fileEngine)
return d->fileEntry.completeBaseName(); return d->fileEntry.completeBaseName();
const QString fileEngineBaseName = d->fileEngine->fileName(QAbstractFileEngine::BaseName);
return QFileSystemEntry(fileEngineBaseName).completeBaseName();
} }
/*! /*!

4
tests/manual/android_content_uri/tst_content_uris.cpp
View File

@ -53,7 +53,6 @@ void tst_ContentUris::dirFacilities()
const QDir subDir = dirList.first(); const QDir subDir = dirList.first();
QVERIFY(subDir.dirName() == "Sub"_L1); QVERIFY(subDir.dirName() == "Sub"_L1);
QEXPECT_FAIL("", "absolutePath() is returning wrong path, cutting from 'primary' onward", Continue);
qWarning() << "subDir.absolutePath()" << subDir.absolutePath() << dirList.first(); qWarning() << "subDir.absolutePath()" << subDir.absolutePath() << dirList.first();
QVERIFY(subDir.absolutePath() == dirList.first()); QVERIFY(subDir.absolutePath() == dirList.first());
QVERIFY(subDir.path() == dirList.first()); QVERIFY(subDir.path() == dirList.first());
@ -67,7 +66,6 @@ void tst_ContentUris::dirFacilities()
QVERIFY(listFiles(dir, QDirIterator::Subdirectories).size() == 3); QVERIFY(listFiles(dir, QDirIterator::Subdirectories).size() == 3);
QVERIFY(dir.mkpath("Sub/Sub2/Sub3")); // Create an existing dir hierarchy QVERIFY(dir.mkpath("Sub/Sub2/Sub3")); // Create an existing dir hierarchy
QVERIFY(dir.rmdir("Sub")); QVERIFY(dir.rmdir("Sub"));
} }
void tst_ContentUris::readWriteFile() void tst_ContentUris::readWriteFile()
@ -83,7 +81,7 @@ void tst_ContentUris::readWriteFile()
QVERIFY(file.exists()); QVERIFY(file.exists());
QVERIFY(file.size() == 0); QVERIFY(file.size() == 0);
QVERIFY(file.fileName() == url); QVERIFY(file.fileName() == url);
QVERIFY(QFileInfo(url).baseName() == fileName); QVERIFY(QFileInfo(url).completeBaseName() == fileName);
QVERIFY(file.open(QFile::WriteOnly)); QVERIFY(file.open(QFile::WriteOnly));
QVERIFY(file.isOpen()); QVERIFY(file.isOpen());