diff --git a/src/plugins/silversearcher/findinfilessilversearcher.cpp b/src/plugins/silversearcher/findinfilessilversearcher.cpp index 97076f8ab58..9e78b731095 100644 --- a/src/plugins/silversearcher/findinfilessilversearcher.cpp +++ b/src/plugins/silversearcher/findinfilessilversearcher.cpp @@ -113,7 +113,6 @@ void runSilverSeacher(FutureInterfaceType &fi, FileFindParameters parameters) process.setCommand({"ag", arguments}); process.start(); if (process.waitForFinished()) { - typedef QList FileSearchResultList; QRegularExpression regexp; if (parameters.flags & FindRegularExpression) { const QRegularExpression::PatternOptions patternOptions diff --git a/src/plugins/silversearcher/outputparser_test.cpp b/src/plugins/silversearcher/outputparser_test.cpp index 5a216af7053..90834acd5f4 100644 --- a/src/plugins/silversearcher/outputparser_test.cpp +++ b/src/plugins/silversearcher/outputparser_test.cpp @@ -51,7 +51,7 @@ void OutputParserTest::test() QFETCH(QString, parserOutput); QFETCH(FileSearchResultList, results); SilverSearcher::SilverSearcherOutputParser ssop(parserOutput); - const QList items = ssop.parse(); + const FileSearchResultList items = ssop.parse(); QCOMPARE(items, results); } diff --git a/src/plugins/silversearcher/silversearcheroutputparser.cpp b/src/plugins/silversearcher/silversearcheroutputparser.cpp index 19dec6b8010..acc50fac7e5 100644 --- a/src/plugins/silversearcher/silversearcheroutputparser.cpp +++ b/src/plugins/silversearcher/silversearcheroutputparser.cpp @@ -16,7 +16,7 @@ SilverSearcherOutputParser::SilverSearcherOutputParser( hasRegexp = !regexp.pattern().isEmpty(); } -QList SilverSearcherOutputParser::parse() +Utils::FileSearchResultList SilverSearcherOutputParser::parse() { while (index < outputSize - 1) { if (output[index] == '\n') { diff --git a/src/plugins/silversearcher/silversearcheroutputparser.h b/src/plugins/silversearcher/silversearcheroutputparser.h index af7f254c9b0..4e36ac1ccf0 100644 --- a/src/plugins/silversearcher/silversearcheroutputparser.h +++ b/src/plugins/silversearcher/silversearcheroutputparser.h @@ -16,7 +16,7 @@ class SilverSearcherOutputParser public: SilverSearcherOutputParser(const QString &output, const QRegularExpression ®exp = {}); - QList parse(); + Utils::FileSearchResultList parse(); private: int parseMatches(); @@ -32,7 +32,7 @@ private: int outputSize = 0; int index = 0; Utils::FileSearchResult item; - QList items; + Utils::FileSearchResultList items; }; } // namespace SilverSearcher diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index af29361ccb8..22585ae6b37 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -6304,8 +6304,8 @@ void TextEditorWidgetPrivate::searchResultsReady(int beginIndex, int endIndex) { QVector results; for (int index = beginIndex; index < endIndex; ++index) { - const QList resultList = m_searchWatcher->resultAt(index); - for (Utils::FileSearchResult result : resultList) { + const FileSearchResultList resultList = m_searchWatcher->resultAt(index); + for (FileSearchResult result : resultList) { const QTextBlock &block = q->document()->findBlockByNumber(result.lineNumber - 1); const int matchStart = block.position() + result.matchStart; QTextCursor cursor(block); @@ -6360,9 +6360,9 @@ void TextEditorWidgetPrivate::highlightSearchResultsInScrollBar() adjustScrollBarRanges(); m_searchWatcher = new QFutureWatcher(); - connect(m_searchWatcher, &QFutureWatcher::resultsReadyAt, + connect(m_searchWatcher, &QFutureWatcher::resultsReadyAt, this, &TextEditorWidgetPrivate::searchResultsReady); - connect(m_searchWatcher, &QFutureWatcher::finished, + connect(m_searchWatcher, &QFutureWatcher::finished, this, &TextEditorWidgetPrivate::searchFinished); m_searchWatcher->setPendingResultsLimit(10);