diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2023-05-24 17:20:27 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2023-06-23 13:04:05 +0000 |
| commit | 27302694ab794d8437b6feac4095ad34fa43ed24 (patch) | |
| tree | e31b19ff39a55e612fb10c083e5129b83680d861 /src/plugins/texteditor/findinopenfiles.cpp | |
| parent | 8c9683a627dbc863c406de30afd1595e38fa266b (diff) | |
BaseFileFind: Reuse FileContainer
Reuse it in BaseFileFind::files() and in
InternalEngine::executeSearch().
Change-Id: I2fed4e6af37e83d76deaa8d847564aa4950fc223
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/texteditor/findinopenfiles.cpp')
| -rw-r--r-- | src/plugins/texteditor/findinopenfiles.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/plugins/texteditor/findinopenfiles.cpp b/src/plugins/texteditor/findinopenfiles.cpp index 12fb45eb3c..6bfdd1b04e 100644 --- a/src/plugins/texteditor/findinopenfiles.cpp +++ b/src/plugins/texteditor/findinopenfiles.cpp @@ -14,6 +14,8 @@ #include <QSettings> +using namespace Utils; + namespace TextEditor::Internal { FindInOpenFiles::FindInOpenFiles() @@ -34,20 +36,20 @@ QString FindInOpenFiles::displayName() const return Tr::tr("Open Documents"); } -Utils::FileIterator *FindInOpenFiles::files(const QStringList &nameFilters, - const QStringList &exclusionFilters, - const QVariant &additionalParameters) const +FileContainer FindInOpenFiles::files(const QStringList &nameFilters, + const QStringList &exclusionFilters, + const QVariant &additionalParameters) const { Q_UNUSED(nameFilters) Q_UNUSED(exclusionFilters) Q_UNUSED(additionalParameters) - QMap<Utils::FilePath, QTextCodec *> openEditorEncodings + QMap<FilePath, QTextCodec *> openEditorEncodings = TextDocument::openedTextDocumentEncodings(); - Utils::FilePaths fileNames; + FilePaths fileNames; QList<QTextCodec *> codecs; const QList<Core::DocumentModel::Entry *> entries = Core::DocumentModel::entries(); for (Core::DocumentModel::Entry *entry : entries) { - const Utils::FilePath fileName = entry->filePath(); + const FilePath fileName = entry->filePath(); if (!fileName.isEmpty()) { fileNames.append(fileName); QTextCodec *codec = openEditorEncodings.value(fileName); @@ -57,12 +59,12 @@ Utils::FileIterator *FindInOpenFiles::files(const QStringList &nameFilters, } } - return new Utils::FileListIterator(fileNames, codecs); + return FileListContainer(fileNames, codecs); } QVariant FindInOpenFiles::additionalParameters() const { - return QVariant(); + return {}; } QString FindInOpenFiles::label() const |