diff options
| author | Ahmad Samir <a.samirh78@gmail.com> | 2023-12-21 21:40:40 +0200 |
|---|---|---|
| committer | Ahmad Samir <a.samirh78@gmail.com> | 2024-03-03 14:02:07 +0200 |
| commit | 7cf39bd785e8ba817960d48b120983cafcc539f3 (patch) | |
| tree | fcacf3e25829e2fcba93e8bf6699ed2f85678905 /src/gui | |
| parent | d5eb5d2f8dc25ed06f87042b8bc230bbcffc5da3 (diff) | |
Port to QDirListing
Use QDirListing in the Bootstrap build instead of QDirIterator.
Drive-by changes:
- more const variables
- use emplace_back() instead of append() where appropriate
Change-Id: Ie1f0d03856e557c4bfabfff38a87edc7da86d091
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/itemmodels/qfileinfogatherer.cpp | 10 | ||||
| -rw-r--r-- | src/gui/itemmodels/qfilesystemmodel.h | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/gui/itemmodels/qfileinfogatherer.cpp b/src/gui/itemmodels/qfileinfogatherer.cpp index be4d828b99..41fb0a0db5 100644 --- a/src/gui/itemmodels/qfileinfogatherer.cpp +++ b/src/gui/itemmodels/qfileinfogatherer.cpp @@ -4,7 +4,7 @@ #include "qfileinfogatherer_p.h" #include <qcoreapplication.h> #include <qdebug.h> -#include <qdiriterator.h> +#include <qdirlisting.h> #include <private/qabstractfileiconprovider_p.h> #include <private/qfileinfo_p.h> #ifndef Q_OS_WIN @@ -419,9 +419,11 @@ void QFileInfoGatherer::getFileInfos(const QString &path, const QStringList &fil QStringList allFiles; if (files.isEmpty()) { - QDirIterator dirIt(path, QDir::AllEntries | QDir::System | QDir::Hidden); - while (!isInterruptionRequested() && dirIt.hasNext()) { - fileInfo = dirIt.nextFileInfo(); + constexpr auto dirFilters = QDir::AllEntries | QDir::System | QDir::Hidden; + for (const auto &dirEntry : QDirListing(path, dirFilters)) { + if (isInterruptionRequested()) + break; + fileInfo = dirEntry.fileInfo(); fileInfo.stat(); allFiles.append(fileInfo.fileName()); fetch(fileInfo, base, firstTime, updatedFiles, path); diff --git a/src/gui/itemmodels/qfilesystemmodel.h b/src/gui/itemmodels/qfilesystemmodel.h index 70e5cc2024..17bce1946f 100644 --- a/src/gui/itemmodels/qfilesystemmodel.h +++ b/src/gui/itemmodels/qfilesystemmodel.h @@ -9,7 +9,6 @@ #include <QtCore/qpair.h> #include <QtCore/qdir.h> #include <QtGui/qicon.h> -#include <QtCore/qdiriterator.h> QT_REQUIRE_CONFIG(filesystemmodel); |