diff options
| author | Øystein Heskestad <oystein.heskestad@qt.io> | 2023-01-11 10:54:04 +0100 |
|---|---|---|
| committer | Øystein Heskestad <oystein.heskestad@qt.io> | 2023-01-16 13:17:42 +0100 |
| commit | a5387f3c1663be15395fbbd574d74c13e22171b6 (patch) | |
| tree | 097b6d4b0ce9598f1fb0d424533c7b192c3aa220 /src/corelib/io/qdir.cpp | |
| parent | c146d25a87bcb94ed4eefae749a96ed3550b7af2 (diff) | |
QDir: Refactor separate cache clearing functions into a single function
Task-number: QTBUG-105753
Change-Id: I7f3473ce21e71ccd04ff9f2575244167b5c3e3a4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qdir.cpp')
| -rw-r--r-- | src/corelib/io/qdir.cpp | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index 2d6b6e6f22f..8529cf1dd22 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -153,19 +153,10 @@ inline void QDirPrivate::setPath(const QString &path) } dirEntry = QFileSystemEntry(p, QFileSystemEntry::FromInternalPath()); - metaData.clear(); - initFileEngine(); - clearFileLists(); + clearCache(IncludingMetaData); absoluteDirEntry = QFileSystemEntry(); } -inline void QDirPrivate::clearFileLists() -{ - fileListsInitialized = false; - files.clear(); - fileInfos.clear(); -} - inline void QDirPrivate::resolveAbsoluteEntry() const { if (!absoluteDirEntry.isEmpty() || dirEntry.isEmpty()) @@ -316,8 +307,13 @@ inline void QDirPrivate::initFileLists(const QDir &dir) const } } -inline void QDirPrivate::initFileEngine() +inline void QDirPrivate::clearCache(MetaDataClearing mode) { + if (mode == IncludingMetaData) + metaData.clear(); + fileListsInitialized = false; + files.clear(); + fileInfos.clear(); fileEngine.reset(QFileSystemEngine::resolveEntryAndCreateLegacyEngine(dirEntry, metaData)); } @@ -1014,9 +1010,7 @@ QStringList QDir::nameFilters() const void QDir::setNameFilters(const QStringList &nameFilters) { Q_D(QDir); - d->initFileEngine(); - d->clearFileLists(); - + d->clearCache(QDirPrivate::KeepMetaData); d->nameFilters = nameFilters; } @@ -1195,9 +1189,7 @@ QDir::Filters QDir::filter() const void QDir::setFilter(Filters filters) { Q_D(QDir); - d->initFileEngine(); - d->clearFileLists(); - + d->clearCache(QDirPrivate::KeepMetaData); d->filters = filters; } @@ -1252,9 +1244,7 @@ QDir::SortFlags QDir::sorting() const void QDir::setSorting(SortFlags sort) { Q_D(QDir); - d->initFileEngine(); - d->clearFileLists(); - + d->clearCache(QDirPrivate::KeepMetaData); d->sort = sort; } @@ -2352,9 +2342,7 @@ bool QDir::isRelativePath(const QString &path) void QDir::refresh() const { QDirPrivate *d = const_cast<QDir *>(this)->d_func(); - d->metaData.clear(); - d->initFileEngine(); - d->clearFileLists(); + d->clearCache(QDirPrivate::IncludingMetaData); } /*! |