feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Add DirsFirst filter processing in dirEntries

Browse Source 
Change-Id: I4211a38874095e4965180e7fd3bf5c8a54cd2f53
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Artem Sokolovskii
2024-09-03 11:20:26 +02:00
parent e81f50ad66
commit bfcf546675
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/libs/utils/filepath.cpp
View File

@@ -640,10 +640,31 @@ FilePaths FilePath::dirEntries(const FileFilter &filter, QDir::SortFlags sort) c
// FIXME: Not all flags supported here.
const QDir::SortFlags sortBy = (sort & QDir::SortByMask);
using Predicate = std::function<bool(const FilePath &, const FilePath &)>;
std::function<void(FilePaths &, Predicate)> sortWithFolders =
[](FilePaths &result, Predicate predicate) { Utils::sort(result, predicate); };
if (sort & QDir::DirsFirst) {
sortWithFolders = [](FilePaths &result, Predicate predicate) {
Predicate folderFilter = [predicate](const FilePath &path1, const FilePath &path2) {
if (path1.isDir() && !path2.isDir())
return true;
if (!path1.isDir() && path2.isDir())
return false;
return predicate(path1, path2);
};
Utils::sort(result, folderFilter);
};
}
if (sortBy == QDir::Name) {
Utils::sort(result);
sortWithFolders(result, [](const FilePath &path1, const FilePath &path2) {
return path1.fileName() < path2.fileName();
});
} else if (sortBy == QDir::Time) {
Utils::sort(result, [](const FilePath &path1, const FilePath &path2) {
sortWithFolders(result, [](const FilePath &path1, const FilePath &path2) {
return path1.lastModified() < path2.lastModified();
});
}