QAbstractFileEngine: remove redundant endEntryList() overrides

QAFE sub-classes endEntryList() overrides returned nullptr, which is
exactly what the base class implementation does.

Change-Id: I2e901647cd087c3b8ba674db6e7b371e620af340
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Ahmad Samir 2024-02-28 23:02:33 +02:00
parent d89c32140a
commit 269919fa1e
10 changed files with 1 additions and 37 deletions

View File

@ -1029,14 +1029,6 @@ QAbstractFileEngine::Iterator *QAbstractFileEngine::beginEntryList(QDir::Filters
return nullptr;
}
/*!
\internal
*/
QAbstractFileEngine::Iterator *QAbstractFileEngine::endEntryList()
{
return nullptr;
}
/*!
Reads a number of characters from the file into \a data. At most
\a maxlen characters will be read.

View File

@ -127,7 +127,7 @@ public:
typedef QAbstractFileEngineIterator Iterator;
virtual Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames);
virtual Iterator *endEntryList();
virtual Iterator* endEntryList() { return nullptr; }
virtual qint64 read(char *data, qint64 maxlen);
virtual qint64 readLine(char *data, qint64 maxlen);

View File

@ -796,13 +796,6 @@ QAbstractFileEngine::Iterator *QFSFileEngine::beginEntryList(QDir::Filters filte
return new QFSFileEngineIterator(filters, filterNames);
}
/*!
\internal
*/
QAbstractFileEngine::Iterator *QFSFileEngine::endEntryList()
{
return nullptr;
}
#endif // QT_NO_FILESYSTEMITERATOR
/*!

View File

@ -83,7 +83,6 @@ public:
#ifndef QT_NO_FILESYSTEMITERATOR
Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override;
Iterator *endEntryList() override;
#endif
qint64 read(char *data, qint64 maxlen) override;

View File

@ -1538,14 +1538,7 @@ QAbstractFileEngine::Iterator *QResourceFileEngine::beginEntryList(QDir::Filters
const QStringList &filterNames)
{
return new QResourceFileEngineIterator(filters, filterNames);
}
/*!
\internal
*/
QAbstractFileEngine::Iterator *QResourceFileEngine::endEntryList()
{
return nullptr;
}
bool QResourceFileEngine::extension(Extension extension, const ExtensionOption *option, ExtensionReturn *output)

View File

@ -50,7 +50,6 @@ public:
QDateTime fileTime(FileTime time) const override;
Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override;
Iterator *endEntryList() override;
bool extension(Extension extension, const ExtensionOption *option = nullptr, ExtensionReturn *output = nullptr) override;
bool supportsExtension(Extension extension) const override;

View File

@ -254,11 +254,6 @@ QAbstractFileEngine::Iterator *AndroidContentFileEngine::beginEntryList(QDir::Fi
return new AndroidContentFileEngineIterator(filters, filterNames);
}
QAbstractFileEngine::Iterator *AndroidContentFileEngine::endEntryList()
{
return nullptr;
}
AndroidContentFileEngineHandler::AndroidContentFileEngineHandler() = default;
AndroidContentFileEngineHandler::~AndroidContentFileEngineHandler() = default;

View File

@ -31,7 +31,6 @@ public:
FileFlags fileFlags(FileFlags type = FileInfoAll) const override;
QString fileName(FileName file = DefaultName) const override;
QAbstractFileEngine::Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override;
QAbstractFileEngine::Iterator *endEntryList() override;
private:
void closeNativeFileDescriptor();

View File

@ -30,7 +30,6 @@ public:
#ifndef QT_NO_FILESYSTEMITERATOR
Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override;
Iterator *endEntryList() override;
#endif
void setError(QFile::FileError error, const QString &str) { QAbstractFileEngine::setError(error, str); }

View File

@ -446,11 +446,6 @@ QAbstractFileEngine::Iterator *QIOSFileEngineAssetsLibrary::beginEntryList(
return new QIOSFileEngineIteratorAssetsLibrary(filters, filterNames);
}
QAbstractFileEngine::Iterator *QIOSFileEngineAssetsLibrary::endEntryList()
{
return 0;
}
QT_END_NAMESPACE
#endif