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

Utils: Remove compat beginEntryList()

Browse Source 
The function it was overriding was removed in qtbase commit
4fecfcc867f8215defaa40b50f0340654a36b4c7.

Amends commit 81d4e8a374.

Change-Id: I41b1f04c9fbd043cb178fffd5f30fb6edeed4945
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
(cherry picked from commit c6a8b5844f)
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Thiago Macieira
2024-10-01 14:16:18 -07:00
committed by Marcus Tillmanns
parent 035d581807
commit f993fb76de
2 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/utils/fsengine/fixedlistfsengine.h
View File

@@ -78,13 +78,6 @@ public:
return std::make_unique<DirIterator>(m_children, path, filters, filterNames); return std::make_unique<DirIterator>(m_children, path, filters, filterNames);
} }
IteratorUniquePtr beginEntryList(const QString &path,
QDir::Filters filters,
const QStringList &filterNames) override
{
return std::make_unique<DirIterator>(m_children, path, filters, filterNames);
}
#else #else
Iterator *beginEntryList(QDir::Filters /*filters*/, const QStringList & /*filterNames*/) override Iterator *beginEntryList(QDir::Filters /*filters*/, const QStringList & /*filterNames*/) override
{ {

19
src/libs/utils/fsengine/fsenginehandler.cpp
View File

@@ -70,8 +70,6 @@ public:
bool cloneTo(QAbstractFileEngine *target) final; bool cloneTo(QAbstractFileEngine *target) final;
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
IteratorUniquePtr beginEntryList(const QString &path, QDir::Filters filters,
const QStringList &filterNames) final;
IteratorUniquePtr beginEntryList( IteratorUniquePtr beginEntryList(
const QString &path, const QString &path,
QDirListing::IteratorFlags filters, QDirListing::IteratorFlags filters,
@@ -404,13 +402,9 @@ QAbstractFileEngine::IteratorUniquePtr FSEngineImpl::beginEntryList(
return std::make_unique<DirIterator>(std::move(paths), path, filters, filterNames); return std::make_unique<DirIterator>(std::move(paths), path, filters, filterNames);
} }
QAbstractFileEngine::IteratorUniquePtr FSEngineImpl::beginEntryList(const QString &path,
QDir::Filters filters,
const QStringList &filterNames)
#else #else
QAbstractFileEngine::Iterator *FSEngineImpl::beginEntryList(QDir::Filters filters, QAbstractFileEngine::Iterator *FSEngineImpl::beginEntryList(QDir::Filters filters,
const QStringList &filterNames) const QStringList &filterNames)
#endif
{ {
FilePaths paths{m_filePath.pathAppended(".")}; FilePaths paths{m_filePath.pathAppended(".")};
m_filePath.iterateDirectory( m_filePath.iterateDirectory(
@@ -424,12 +418,9 @@ QAbstractFileEngine::Iterator *FSEngineImpl::beginEntryList(QDir::Filters filter
}, },
{filterNames, filters}); {filterNames, filters});
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
return std::make_unique<DirIterator>(std::move(paths), path, filters, filterNames);
#else
return new DirIterator(std::move(paths)); return new DirIterator(std::move(paths));
#endif
} }
#endif
qint64 FSEngineImpl::read(char *data, qint64 maxlen) qint64 FSEngineImpl::read(char *data, qint64 maxlen)
{ {
@@ -480,14 +471,6 @@ public:
public: public:
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
IteratorUniquePtr beginEntryList(const QString &path,
QDir::Filters filters,
const QStringList &filterNames) final
{
return std::make_unique<FileIteratorWrapper>(
QFSFileEngine::beginEntryList(path, filters, filterNames));
}
IteratorUniquePtr beginEntryList( IteratorUniquePtr beginEntryList(
const QString &path, const QString &path,
QDirListing::IteratorFlags filters, QDirListing::IteratorFlags filters,