From cd3f82f247f587b16e911483b8d2674874565381 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 27 Aug 2021 09:59:07 +0200 Subject: [PATCH] Pass QFutureInterface by reference No need for a copy. Change-Id: I0308da77199942ef49e36fb04e81713cb9d9a901 Reviewed-by: Qt CI Bot Reviewed-by: Eike Ziller --- src/plugins/autotest/boost/boosttestparser.cpp | 2 +- src/plugins/autotest/boost/boosttestparser.h | 2 +- src/plugins/autotest/catch/catchtestparser.cpp | 2 +- src/plugins/autotest/catch/catchtestparser.h | 2 +- src/plugins/autotest/gtest/gtestparser.cpp | 2 +- src/plugins/autotest/gtest/gtestparser.h | 2 +- src/plugins/autotest/itestparser.h | 2 +- src/plugins/autotest/qtest/qttestparser.cpp | 2 +- src/plugins/autotest/qtest/qttestparser.h | 2 +- src/plugins/autotest/quick/quicktestparser.cpp | 6 +++--- src/plugins/autotest/quick/quicktestparser.h | 4 ++-- src/plugins/qmljseditor/qmljssemantichighlighter.cpp | 4 ++-- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/plugins/autotest/boost/boosttestparser.cpp b/src/plugins/autotest/boost/boosttestparser.cpp index 0b3dbc683bc..a98787a1954 100644 --- a/src/plugins/autotest/boost/boosttestparser.cpp +++ b/src/plugins/autotest/boost/boosttestparser.cpp @@ -118,7 +118,7 @@ static BoostTestParseResult *createParseResult(const QString &name, const Utils: } -bool BoostTestParser::processDocument(QFutureInterface futureInterface, +bool BoostTestParser::processDocument(QFutureInterface &futureInterface, const Utils::FilePath &fileName) { CPlusPlus::Document::Ptr doc = document(fileName); diff --git a/src/plugins/autotest/boost/boosttestparser.h b/src/plugins/autotest/boost/boosttestparser.h index 795a7e4c78a..058fd24e4ba 100644 --- a/src/plugins/autotest/boost/boosttestparser.h +++ b/src/plugins/autotest/boost/boosttestparser.h @@ -44,7 +44,7 @@ class BoostTestParser : public CppParser { public: explicit BoostTestParser(ITestFramework *framework) : CppParser(framework) {} - bool processDocument(QFutureInterface futureInterface, + bool processDocument(QFutureInterface &futureInterface, const Utils::FilePath &fileName) override; }; diff --git a/src/plugins/autotest/catch/catchtestparser.cpp b/src/plugins/autotest/catch/catchtestparser.cpp index 9638f85fd32..d13dfa091ed 100644 --- a/src/plugins/autotest/catch/catchtestparser.cpp +++ b/src/plugins/autotest/catch/catchtestparser.cpp @@ -111,7 +111,7 @@ static bool hasCatchNames(const CPlusPlus::Document::Ptr &document) return false; } -bool CatchTestParser::processDocument(QFutureInterface futureInterface, +bool CatchTestParser::processDocument(QFutureInterface &futureInterface, const Utils::FilePath &fileName) { CPlusPlus::Document::Ptr doc = document(fileName); diff --git a/src/plugins/autotest/catch/catchtestparser.h b/src/plugins/autotest/catch/catchtestparser.h index 3191072f057..5384bf12b15 100644 --- a/src/plugins/autotest/catch/catchtestparser.h +++ b/src/plugins/autotest/catch/catchtestparser.h @@ -44,7 +44,7 @@ class CatchTestParser : public CppParser public: CatchTestParser(ITestFramework *framework) : CppParser(framework) {} - bool processDocument(QFutureInterface futureInterface, + bool processDocument(QFutureInterface &futureInterface, const Utils::FilePath &fileName) override; }; diff --git a/src/plugins/autotest/gtest/gtestparser.cpp b/src/plugins/autotest/gtest/gtestparser.cpp index 8827045b684..6e5dffdca10 100644 --- a/src/plugins/autotest/gtest/gtestparser.cpp +++ b/src/plugins/autotest/gtest/gtestparser.cpp @@ -92,7 +92,7 @@ static bool hasGTestNames(const CPlusPlus::Document::Ptr &document) return false; } -bool GTestParser::processDocument(QFutureInterface futureInterface, +bool GTestParser::processDocument(QFutureInterface &futureInterface, const Utils::FilePath &fileName) { CPlusPlus::Document::Ptr doc = document(fileName); diff --git a/src/plugins/autotest/gtest/gtestparser.h b/src/plugins/autotest/gtest/gtestparser.h index 6f8f87603f5..51a9eb0ba4f 100644 --- a/src/plugins/autotest/gtest/gtestparser.h +++ b/src/plugins/autotest/gtest/gtestparser.h @@ -44,7 +44,7 @@ class GTestParser : public CppParser { public: explicit GTestParser(ITestFramework *framework) : CppParser(framework) {} - bool processDocument(QFutureInterface futureInterface, + bool processDocument(QFutureInterface &futureInterface, const Utils::FilePath &fileName) override; }; diff --git a/src/plugins/autotest/itestparser.h b/src/plugins/autotest/itestparser.h index e59dc6ff9c5..8eb2ba343cf 100644 --- a/src/plugins/autotest/itestparser.h +++ b/src/plugins/autotest/itestparser.h @@ -68,7 +68,7 @@ public: explicit ITestParser(ITestFramework *framework) : m_framework(framework) {} virtual ~ITestParser() { } virtual void init(const Utils::FilePaths &filesToParse, bool fullParse) = 0; - virtual bool processDocument(QFutureInterface futureInterface, + virtual bool processDocument(QFutureInterface &futureInterface, const Utils::FilePath &fileName) = 0; virtual void release() = 0; diff --git a/src/plugins/autotest/qtest/qttestparser.cpp b/src/plugins/autotest/qtest/qttestparser.cpp index 38527babc5b..eb0c04df489 100644 --- a/src/plugins/autotest/qtest/qttestparser.cpp +++ b/src/plugins/autotest/qtest/qttestparser.cpp @@ -302,7 +302,7 @@ static bool isQObject(const CPlusPlus::Document::Ptr &declaringDoc) || file.endsWith("QtCore/qobject.h") || file.endsWith("kernel/qobject.h"); } -bool QtTestParser::processDocument(QFutureInterface futureInterface, +bool QtTestParser::processDocument(QFutureInterface &futureInterface, const Utils::FilePath &fileName) { CPlusPlus::Document::Ptr doc = document(fileName); diff --git a/src/plugins/autotest/qtest/qttestparser.h b/src/plugins/autotest/qtest/qttestparser.h index 2dd8be33a70..58f97f1bef0 100644 --- a/src/plugins/autotest/qtest/qttestparser.h +++ b/src/plugins/autotest/qtest/qttestparser.h @@ -58,7 +58,7 @@ public: void init(const Utils::FilePaths &filesToParse, bool fullParse) override; void release() override; - bool processDocument(QFutureInterface futureInterface, + bool processDocument(QFutureInterface &futureInterface, const Utils::FilePath &fileName) override; private: diff --git a/src/plugins/autotest/quick/quicktestparser.cpp b/src/plugins/autotest/quick/quicktestparser.cpp index 8d2083cd9d4..267c38f131a 100644 --- a/src/plugins/autotest/quick/quicktestparser.cpp +++ b/src/plugins/autotest/quick/quicktestparser.cpp @@ -211,7 +211,7 @@ QList QuickTestParser::scanDirectoryForQuickTestQmlFiles(const QS return foundDocs; } -static bool checkQmlDocumentForQuickTestCode(QFutureInterface futureInterface, +static bool checkQmlDocumentForQuickTestCode(QFutureInterface &futureInterface, const Document::Ptr &qmlJSDoc, ITestFramework *framework, const Utils::FilePath &proFile = Utils::FilePath()) @@ -259,7 +259,7 @@ static bool checkQmlDocumentForQuickTestCode(QFutureInterface futureInterface, +bool QuickTestParser::handleQtQuickTest(QFutureInterface &futureInterface, CPlusPlus::Document::Ptr document, ITestFramework *framework) { @@ -375,7 +375,7 @@ void QuickTestParser::release() CppParser::release(); } -bool QuickTestParser::processDocument(QFutureInterface futureInterface, +bool QuickTestParser::processDocument(QFutureInterface &futureInterface, const Utils::FilePath &fileName) { if (fileName.endsWith(".qml")) { diff --git a/src/plugins/autotest/quick/quicktestparser.h b/src/plugins/autotest/quick/quicktestparser.h index 440e54a73e2..3fb9ec17d94 100644 --- a/src/plugins/autotest/quick/quicktestparser.h +++ b/src/plugins/autotest/quick/quicktestparser.h @@ -48,11 +48,11 @@ public: explicit QuickTestParser(ITestFramework *framework); void init(const Utils::FilePaths &filesToParse, bool fullParse) override; void release() override; - bool processDocument(QFutureInterface futureInterface, + bool processDocument(QFutureInterface &futureInterface, const Utils::FilePath &fileName) override; Utils::FilePath projectFileForMainCppFile(const Utils::FilePath &fileName) const; private: - bool handleQtQuickTest(QFutureInterface futureInterface, + bool handleQtQuickTest(QFutureInterface &futureInterface, CPlusPlus::Document::Ptr document, ITestFramework *framework); void handleDirectoryChanged(const QString &directory); void doUpdateWatchPaths(const QStringList &directories); diff --git a/src/plugins/qmljseditor/qmljssemantichighlighter.cpp b/src/plugins/qmljseditor/qmljssemantichighlighter.cpp index 1236cc1b9f3..1d3e2c13ddf 100644 --- a/src/plugins/qmljseditor/qmljssemantichighlighter.cpp +++ b/src/plugins/qmljseditor/qmljssemantichighlighter.cpp @@ -174,7 +174,7 @@ protected: class CollectionTask : protected Visitor { public: - CollectionTask(QFutureInterface futureInterface, + CollectionTask(QFutureInterface &futureInterface, const QmlJSTools::SemanticInfo &semanticInfo) : m_futureInterface(futureInterface) , m_semanticInfo(semanticInfo) @@ -532,7 +532,7 @@ private: m_uses.reserve(chunkSize); } - QFutureInterface m_futureInterface; + QFutureInterface &m_futureInterface; const QmlJSTools::SemanticInfo &m_semanticInfo; ScopeChain m_scopeChain; ScopeBuilder m_scopeBuilder;