whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QFileInfoGatherer: don't create a redundant QFileInfoList 

It's only needed for the QDir::drives() code path, for the other one
create a QFileInfo and use it directly.

Change-Id: I82f9f070ee64d208f2877595d9c17cabb7219e02
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
bb10
Ahmad Samir 2024-01-04 20:27:26 +02:00
parent d9d4828012
commit 1dac909b50
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/gui/itemmodels/qfileinfogatherer.cpp
View File

@ -383,21 +383,23 @@ void QFileInfoGatherer::getFileInfos(const QString &path, const QStringList &fil
#ifdef QT_BUILD_INTERNAL
fetchedRoot.storeRelaxed(true);
#endif
QFileInfoList infoList;
if (files.isEmpty()) {
infoList = QDir::drives();
} else {
infoList.reserve(files.size());
for (const auto &file : files)
infoList << QFileInfo(file);
}
QList<std::pair<QString, QFileInfo>> updatedFiles;
updatedFiles.reserve(infoList.size());
const auto rend = infoList.rend();
for (auto rit = infoList.rbegin(); rit != rend; ++rit) {
QFileInfo &driveInfo = *rit;
driveInfo.stat();
updatedFiles.emplace_back(std::pair{translateDriveName(driveInfo), std::move(driveInfo)});
auto addToUpdatedFiles = [&updatedFiles](QFileInfo &&fileInfo) {
fileInfo.stat();
updatedFiles.emplace_back(std::pair{translateDriveName(fileInfo), fileInfo});
};
if (files.isEmpty()) {
// QDir::drives() calls QFSFileEngine::drives() which creates the QFileInfoList on
// the stack and return it, so this list is not shared, so no detaching.
QFileInfoList infoList = QDir::drives();
updatedFiles.reserve(infoList.size());
for (auto rit = infoList.rbegin(), rend = infoList.rend(); rit != rend; ++rit)
addToUpdatedFiles(std::move(*rit));
} else {
updatedFiles.reserve(files.size());
for (auto rit = files.crbegin(), rend = files.crend(); rit != rend; ++rit)
addToUpdatedFiles(QFileInfo(*rit));
}
emit updates(path, updatedFiles);
return;