QAbstractFileEngine: remove beginEntryList(QDir::Filters)
It was kept so as not to break compilation of user code (overriding a function that doesn't exist in the base class). But as Marcus Tillmanns pointed out in a qtcreator code review, it can't work because QDirListing calls the virutal engine->beginEntryList(QDirListing::IteratorFlags). Removing beginEntryList(QDir::Filters) and getting a compile-timer error is better than the code failing silently in user code (all sub-classes of QAbstractFileEngine in qtbase have been already ported). QDir::entryList() isn't affected because it calls QAbstractFileEngine::entryList() which has an overload that works with QDir::Filters. Change-Id: I3cb18402f602ac78a6b29be57e59febb2b9db7c0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 4fecfcc867f8215defaa40b50f0340654a36b4c7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
5abc6e9ccb
commit
ff4252b0b6
@ -1034,16 +1034,6 @@ QFileInfo QAbstractFileEngineIterator::currentFileInfo() const
|
|||||||
|
|
||||||
\sa QDirListing
|
\sa QDirListing
|
||||||
*/
|
*/
|
||||||
QAbstractFileEngine::IteratorUniquePtr
|
|
||||||
QAbstractFileEngine::beginEntryList(const QString &path, QDir::Filters filters,
|
|
||||||
const QStringList &filterNames)
|
|
||||||
{
|
|
||||||
Q_UNUSED(path);
|
|
||||||
Q_UNUSED(filters);
|
|
||||||
Q_UNUSED(filterNames);
|
|
||||||
return {};
|
|
||||||
}
|
|
||||||
|
|
||||||
QAbstractFileEngine::IteratorUniquePtr
|
QAbstractFileEngine::IteratorUniquePtr
|
||||||
QAbstractFileEngine::beginEntryList(const QString &path, QDirListing::IteratorFlags filters,
|
QAbstractFileEngine::beginEntryList(const QString &path, QDirListing::IteratorFlags filters,
|
||||||
const QStringList &filterNames)
|
const QStringList &filterNames)
|
||||||
|
@ -127,10 +127,7 @@ public:
|
|||||||
typedef QAbstractFileEngineIterator Iterator;
|
typedef QAbstractFileEngineIterator Iterator;
|
||||||
using IteratorUniquePtr = std::unique_ptr<Iterator>;
|
using IteratorUniquePtr = std::unique_ptr<Iterator>;
|
||||||
|
|
||||||
virtual IteratorUniquePtr
|
|
||||||
beginEntryList(const QString &path, QDir::Filters filters, const QStringList &filterNames);
|
|
||||||
virtual IteratorUniquePtr endEntryList() { return {}; }
|
virtual IteratorUniquePtr endEntryList() { return {}; }
|
||||||
|
|
||||||
virtual IteratorUniquePtr
|
virtual IteratorUniquePtr
|
||||||
beginEntryList(const QString &path, QDirListing::IteratorFlags filters,
|
beginEntryList(const QString &path, QDirListing::IteratorFlags filters,
|
||||||
const QStringList &filterNames);
|
const QStringList &filterNames);
|
||||||
|
@ -791,13 +791,6 @@ qint64 QFSFileEnginePrivate::writeFdFh(const char *data, qint64 len)
|
|||||||
/*!
|
/*!
|
||||||
\internal
|
\internal
|
||||||
*/
|
*/
|
||||||
QAbstractFileEngine::IteratorUniquePtr
|
|
||||||
QFSFileEngine::beginEntryList(const QString &path, QDir::Filters filters,
|
|
||||||
const QStringList &filterNames)
|
|
||||||
{
|
|
||||||
return std::make_unique<QFSFileEngineIterator>(path, filters, filterNames);
|
|
||||||
}
|
|
||||||
|
|
||||||
QAbstractFileEngine::IteratorUniquePtr
|
QAbstractFileEngine::IteratorUniquePtr
|
||||||
QFSFileEngine::beginEntryList(const QString &path, QDirListing::IteratorFlags filters,
|
QFSFileEngine::beginEntryList(const QString &path, QDirListing::IteratorFlags filters,
|
||||||
const QStringList &filterNames)
|
const QStringList &filterNames)
|
||||||
|
@ -86,8 +86,6 @@ public:
|
|||||||
int handle() const override;
|
int handle() const override;
|
||||||
|
|
||||||
#ifndef QT_NO_FILESYSTEMITERATOR
|
#ifndef QT_NO_FILESYSTEMITERATOR
|
||||||
IteratorUniquePtr beginEntryList(const QString &path, QDir::Filters filters,
|
|
||||||
const QStringList &filterNames) override;
|
|
||||||
IteratorUniquePtr beginEntryList(const QString &path, QDirListing::IteratorFlags filters,
|
IteratorUniquePtr beginEntryList(const QString &path, QDirListing::IteratorFlags filters,
|
||||||
const QStringList &filterNames) override;
|
const QStringList &filterNames) override;
|
||||||
#endif
|
#endif
|
||||||
|
@ -1582,13 +1582,6 @@ QDateTime QResourceFileEngine::fileTime(QFile::FileTime time) const
|
|||||||
/*!
|
/*!
|
||||||
\internal
|
\internal
|
||||||
*/
|
*/
|
||||||
QAbstractFileEngine::IteratorUniquePtr
|
|
||||||
QResourceFileEngine::beginEntryList(const QString &path, QDir::Filters filters,
|
|
||||||
const QStringList &filterNames)
|
|
||||||
{
|
|
||||||
return std::make_unique<QResourceFileEngineIterator>(path, filters, filterNames);
|
|
||||||
}
|
|
||||||
|
|
||||||
QAbstractFileEngine::IteratorUniquePtr
|
QAbstractFileEngine::IteratorUniquePtr
|
||||||
QResourceFileEngine::beginEntryList(const QString &path, QDirListing::IteratorFlags filters,
|
QResourceFileEngine::beginEntryList(const QString &path, QDirListing::IteratorFlags filters,
|
||||||
const QStringList &filterNames)
|
const QStringList &filterNames)
|
||||||
|
@ -49,8 +49,6 @@ public:
|
|||||||
|
|
||||||
QDateTime fileTime(QFile::FileTime time) const override;
|
QDateTime fileTime(QFile::FileTime time) const override;
|
||||||
|
|
||||||
IteratorUniquePtr beginEntryList(const QString &path, QDir::Filters filters,
|
|
||||||
const QStringList &filterNames) override;
|
|
||||||
IteratorUniquePtr beginEntryList(const QString &path, QDirListing::IteratorFlags filters,
|
IteratorUniquePtr beginEntryList(const QString &path, QDirListing::IteratorFlags filters,
|
||||||
const QStringList &filterNames) override;
|
const QStringList &filterNames) override;
|
||||||
|
|
||||||
|
@ -439,7 +439,7 @@ public:
|
|||||||
{ }
|
{ }
|
||||||
|
|
||||||
IteratorUniquePtr
|
IteratorUniquePtr
|
||||||
beginEntryList(const QString &, QDir::Filters, const QStringList &) override
|
beginEntryList(const QString &, QDirListing::IteratorFlags, const QStringList &) override
|
||||||
{ return nullptr; }
|
{ return nullptr; }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user