feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Pass QFutureInterface by reference

Browse Source 
No need for a copy.

Change-Id: I0308da77199942ef49e36fb04e81713cb9d9a901
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2021-08-27 09:59:07 +02:00
parent 390b214198
commit cd3f82f247
12 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/autotest/boost/boosttestparser.cpp
View File

@@ -118,7 +118,7 @@ static BoostTestParseResult *createParseResult(const QString &name, const Utils:
} }
bool BoostTestParser::processDocument(QFutureInterface<TestParseResultPtr> futureInterface, bool BoostTestParser::processDocument(QFutureInterface<TestParseResultPtr> &futureInterface,
const Utils::FilePath &fileName) const Utils::FilePath &fileName)
{ {
CPlusPlus::Document::Ptr doc = document(fileName); CPlusPlus::Document::Ptr doc = document(fileName);

2
src/plugins/autotest/boost/boosttestparser.h
View File

@@ -44,7 +44,7 @@ class BoostTestParser : public CppParser
{ {
public: public:
explicit BoostTestParser(ITestFramework *framework) : CppParser(framework) {} explicit BoostTestParser(ITestFramework *framework) : CppParser(framework) {}
bool processDocument(QFutureInterface<TestParseResultPtr> futureInterface, bool processDocument(QFutureInterface<TestParseResultPtr> &futureInterface,
const Utils::FilePath &fileName) override; const Utils::FilePath &fileName) override;
}; };

2
src/plugins/autotest/catch/catchtestparser.cpp
View File

@@ -111,7 +111,7 @@ static bool hasCatchNames(const CPlusPlus::Document::Ptr &document)
return false; return false;
} }
bool CatchTestParser::processDocument(QFutureInterface<TestParseResultPtr> futureInterface, bool CatchTestParser::processDocument(QFutureInterface<TestParseResultPtr> &futureInterface,
const Utils::FilePath &fileName) const Utils::FilePath &fileName)
{ {
CPlusPlus::Document::Ptr doc = document(fileName); CPlusPlus::Document::Ptr doc = document(fileName);

2
src/plugins/autotest/catch/catchtestparser.h
View File

@@ -44,7 +44,7 @@ class CatchTestParser : public CppParser
public: public:
CatchTestParser(ITestFramework *framework) CatchTestParser(ITestFramework *framework)
: CppParser(framework) {} : CppParser(framework) {}
bool processDocument(QFutureInterface<TestParseResultPtr> futureInterface, bool processDocument(QFutureInterface<TestParseResultPtr> &futureInterface,
const Utils::FilePath &fileName) override; const Utils::FilePath &fileName) override;
}; };

2
src/plugins/autotest/gtest/gtestparser.cpp
View File

@@ -92,7 +92,7 @@ static bool hasGTestNames(const CPlusPlus::Document::Ptr &document)
return false; return false;
} }
bool GTestParser::processDocument(QFutureInterface<TestParseResultPtr> futureInterface, bool GTestParser::processDocument(QFutureInterface<TestParseResultPtr> &futureInterface,
const Utils::FilePath &fileName) const Utils::FilePath &fileName)
{ {
CPlusPlus::Document::Ptr doc = document(fileName); CPlusPlus::Document::Ptr doc = document(fileName);

2
src/plugins/autotest/gtest/gtestparser.h
View File

@@ -44,7 +44,7 @@ class GTestParser : public CppParser
{ {
public: public:
explicit GTestParser(ITestFramework *framework) : CppParser(framework) {} explicit GTestParser(ITestFramework *framework) : CppParser(framework) {}
bool processDocument(QFutureInterface<TestParseResultPtr> futureInterface, bool processDocument(QFutureInterface<TestParseResultPtr> &futureInterface,
const Utils::FilePath &fileName) override; const Utils::FilePath &fileName) override;
}; };

2
src/plugins/autotest/itestparser.h
View File

@@ -68,7 +68,7 @@ public:
explicit ITestParser(ITestFramework *framework) : m_framework(framework) {} explicit ITestParser(ITestFramework *framework) : m_framework(framework) {}
virtual ~ITestParser() { } virtual ~ITestParser() { }
virtual void init(const Utils::FilePaths &filesToParse, bool fullParse) = 0; virtual void init(const Utils::FilePaths &filesToParse, bool fullParse) = 0;
virtual bool processDocument(QFutureInterface<TestParseResultPtr> futureInterface, virtual bool processDocument(QFutureInterface<TestParseResultPtr> &futureInterface,
const Utils::FilePath &fileName) = 0; const Utils::FilePath &fileName) = 0;
virtual void release() = 0; virtual void release() = 0;

2
src/plugins/autotest/qtest/qttestparser.cpp
View File

@@ -302,7 +302,7 @@ static bool isQObject(const CPlusPlus::Document::Ptr &declaringDoc)
|| file.endsWith("QtCore/qobject.h") || file.endsWith("kernel/qobject.h"); || file.endsWith("QtCore/qobject.h") || file.endsWith("kernel/qobject.h");
} }
bool QtTestParser::processDocument(QFutureInterface<TestParseResultPtr> futureInterface, bool QtTestParser::processDocument(QFutureInterface<TestParseResultPtr> &futureInterface,
const Utils::FilePath &fileName) const Utils::FilePath &fileName)
{ {
CPlusPlus::Document::Ptr doc = document(fileName); CPlusPlus::Document::Ptr doc = document(fileName);

2
src/plugins/autotest/qtest/qttestparser.h
View File

@@ -58,7 +58,7 @@ public:
void init(const Utils::FilePaths &filesToParse, bool fullParse) override; void init(const Utils::FilePaths &filesToParse, bool fullParse) override;
void release() override; void release() override;
bool processDocument(QFutureInterface<TestParseResultPtr> futureInterface, bool processDocument(QFutureInterface<TestParseResultPtr> &futureInterface,
const Utils::FilePath &fileName) override; const Utils::FilePath &fileName) override;
private: private:

6
src/plugins/autotest/quick/quicktestparser.cpp
View File

@@ -211,7 +211,7 @@ QList<Document::Ptr> QuickTestParser::scanDirectoryForQuickTestQmlFiles(const QS
return foundDocs; return foundDocs;
} }
static bool checkQmlDocumentForQuickTestCode(QFutureInterface<TestParseResultPtr> futureInterface, static bool checkQmlDocumentForQuickTestCode(QFutureInterface<TestParseResultPtr> &futureInterface,
const Document::Ptr &qmlJSDoc, const Document::Ptr &qmlJSDoc,
ITestFramework *framework, ITestFramework *framework,
const Utils::FilePath &proFile = Utils::FilePath()) const Utils::FilePath &proFile = Utils::FilePath())
@@ -259,7 +259,7 @@ static bool checkQmlDocumentForQuickTestCode(QFutureInterface<TestParseResultPtr
return true; return true;
} }
bool QuickTestParser::handleQtQuickTest(QFutureInterface<TestParseResultPtr> futureInterface, bool QuickTestParser::handleQtQuickTest(QFutureInterface<TestParseResultPtr> &futureInterface,
CPlusPlus::Document::Ptr document, CPlusPlus::Document::Ptr document,
ITestFramework *framework) ITestFramework *framework)
{ {
@@ -375,7 +375,7 @@ void QuickTestParser::release()
CppParser::release(); CppParser::release();
} }
bool QuickTestParser::processDocument(QFutureInterface<TestParseResultPtr> futureInterface, bool QuickTestParser::processDocument(QFutureInterface<TestParseResultPtr> &futureInterface,
const Utils::FilePath &fileName) const Utils::FilePath &fileName)
{ {
if (fileName.endsWith(".qml")) { if (fileName.endsWith(".qml")) {

4
src/plugins/autotest/quick/quicktestparser.h
View File

@@ -48,11 +48,11 @@ public:
explicit QuickTestParser(ITestFramework *framework); explicit QuickTestParser(ITestFramework *framework);
void init(const Utils::FilePaths &filesToParse, bool fullParse) override; void init(const Utils::FilePaths &filesToParse, bool fullParse) override;
void release() override; void release() override;
bool processDocument(QFutureInterface<TestParseResultPtr> futureInterface, bool processDocument(QFutureInterface<TestParseResultPtr> &futureInterface,
const Utils::FilePath &fileName) override; const Utils::FilePath &fileName) override;
Utils::FilePath projectFileForMainCppFile(const Utils::FilePath &fileName) const; Utils::FilePath projectFileForMainCppFile(const Utils::FilePath &fileName) const;
private: private:
bool handleQtQuickTest(QFutureInterface<TestParseResultPtr> futureInterface, bool handleQtQuickTest(QFutureInterface<TestParseResultPtr> &futureInterface,
CPlusPlus::Document::Ptr document, ITestFramework *framework); CPlusPlus::Document::Ptr document, ITestFramework *framework);
void handleDirectoryChanged(const QString &directory); void handleDirectoryChanged(const QString &directory);
void doUpdateWatchPaths(const QStringList &directories); void doUpdateWatchPaths(const QStringList &directories);

4
src/plugins/qmljseditor/qmljssemantichighlighter.cpp
View File

@@ -174,7 +174,7 @@ protected:
class CollectionTask : protected Visitor class CollectionTask : protected Visitor
{ {
public: public:
CollectionTask(QFutureInterface<SemanticHighlighter::Use> futureInterface, CollectionTask(QFutureInterface<SemanticHighlighter::Use> &futureInterface,
const QmlJSTools::SemanticInfo &semanticInfo) const QmlJSTools::SemanticInfo &semanticInfo)
: m_futureInterface(futureInterface) : m_futureInterface(futureInterface)
, m_semanticInfo(semanticInfo) , m_semanticInfo(semanticInfo)
@@ -532,7 +532,7 @@ private:
m_uses.reserve(chunkSize); m_uses.reserve(chunkSize);
} }
QFutureInterface<SemanticHighlighter::Use> m_futureInterface; QFutureInterface<SemanticHighlighter::Use> &m_futureInterface;
const QmlJSTools::SemanticInfo &m_semanticInfo; const QmlJSTools::SemanticInfo &m_semanticInfo;
ScopeChain m_scopeChain; ScopeChain m_scopeChain;
ScopeBuilder m_scopeBuilder; ScopeBuilder m_scopeBuilder;