diff options
| author | Ahmad Samir <a.samirh78@gmail.com> | 2024-02-28 23:02:33 +0200 |
|---|---|---|
| committer | Ahmad Samir <a.samirh78@gmail.com> | 2024-03-03 20:28:54 +0200 |
| commit | 269919fa1ea23513a8e36912d06f413e3baefa5d (patch) | |
| tree | 1e7669a654d2639805ae3bd363ea105bf4da118b /src/corelib | |
| parent | d89c32140a0f9b0bd5de113762c28d7861d4a928 (diff) | |
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>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qabstractfileengine.cpp | 8 | ||||
| -rw-r--r-- | src/corelib/io/qabstractfileengine_p.h | 2 | ||||
| -rw-r--r-- | src/corelib/io/qfsfileengine.cpp | 7 | ||||
| -rw-r--r-- | src/corelib/io/qfsfileengine_p.h | 1 | ||||
| -rw-r--r-- | src/corelib/io/qresource.cpp | 7 | ||||
| -rw-r--r-- | src/corelib/io/qresource_p.h | 1 |
6 files changed, 1 insertions, 25 deletions
diff --git a/src/corelib/io/qabstractfileengine.cpp b/src/corelib/io/qabstractfileengine.cpp index 1ab51949135..ef0482e1542 100644 --- a/src/corelib/io/qabstractfileengine.cpp +++ b/src/corelib/io/qabstractfileengine.cpp @@ -1030,14 +1030,6 @@ QAbstractFileEngine::Iterator *QAbstractFileEngine::beginEntryList(QDir::Filters } /*! - \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. diff --git a/src/corelib/io/qabstractfileengine_p.h b/src/corelib/io/qabstractfileengine_p.h index 6bb15567e98..b6ef42399d5 100644 --- a/src/corelib/io/qabstractfileengine_p.h +++ b/src/corelib/io/qabstractfileengine_p.h @@ -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); diff --git a/src/corelib/io/qfsfileengine.cpp b/src/corelib/io/qfsfileengine.cpp index 66026356de4..d4fcf7d8625 100644 --- a/src/corelib/io/qfsfileengine.cpp +++ b/src/corelib/io/qfsfileengine.cpp @@ -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 /*! diff --git a/src/corelib/io/qfsfileengine_p.h b/src/corelib/io/qfsfileengine_p.h index 3cc58ea993e..9cbe3fc96bd 100644 --- a/src/corelib/io/qfsfileengine_p.h +++ b/src/corelib/io/qfsfileengine_p.h @@ -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; diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index e3b09e7cbd6..d16b799754c 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -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) diff --git a/src/corelib/io/qresource_p.h b/src/corelib/io/qresource_p.h index 0844e6579a6..2439695ab9c 100644 --- a/src/corelib/io/qresource_p.h +++ b/src/corelib/io/qresource_p.h @@ -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; |