forked from qt-creator/qt-creator
Pass QFutureInterface by reference
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:
@@ -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)
|
||||
{
|
||||
CPlusPlus::Document::Ptr doc = document(fileName);
|
||||
|
@@ -44,7 +44,7 @@ class BoostTestParser : public CppParser
|
||||
{
|
||||
public:
|
||||
explicit BoostTestParser(ITestFramework *framework) : CppParser(framework) {}
|
||||
bool processDocument(QFutureInterface<TestParseResultPtr> futureInterface,
|
||||
bool processDocument(QFutureInterface<TestParseResultPtr> &futureInterface,
|
||||
const Utils::FilePath &fileName) override;
|
||||
};
|
||||
|
||||
|
@@ -111,7 +111,7 @@ static bool hasCatchNames(const CPlusPlus::Document::Ptr &document)
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CatchTestParser::processDocument(QFutureInterface<TestParseResultPtr> futureInterface,
|
||||
bool CatchTestParser::processDocument(QFutureInterface<TestParseResultPtr> &futureInterface,
|
||||
const Utils::FilePath &fileName)
|
||||
{
|
||||
CPlusPlus::Document::Ptr doc = document(fileName);
|
||||
|
@@ -44,7 +44,7 @@ class CatchTestParser : public CppParser
|
||||
public:
|
||||
CatchTestParser(ITestFramework *framework)
|
||||
: CppParser(framework) {}
|
||||
bool processDocument(QFutureInterface<TestParseResultPtr> futureInterface,
|
||||
bool processDocument(QFutureInterface<TestParseResultPtr> &futureInterface,
|
||||
const Utils::FilePath &fileName) override;
|
||||
};
|
||||
|
||||
|
@@ -92,7 +92,7 @@ static bool hasGTestNames(const CPlusPlus::Document::Ptr &document)
|
||||
return false;
|
||||
}
|
||||
|
||||
bool GTestParser::processDocument(QFutureInterface<TestParseResultPtr> futureInterface,
|
||||
bool GTestParser::processDocument(QFutureInterface<TestParseResultPtr> &futureInterface,
|
||||
const Utils::FilePath &fileName)
|
||||
{
|
||||
CPlusPlus::Document::Ptr doc = document(fileName);
|
||||
|
@@ -44,7 +44,7 @@ class GTestParser : public CppParser
|
||||
{
|
||||
public:
|
||||
explicit GTestParser(ITestFramework *framework) : CppParser(framework) {}
|
||||
bool processDocument(QFutureInterface<TestParseResultPtr> futureInterface,
|
||||
bool processDocument(QFutureInterface<TestParseResultPtr> &futureInterface,
|
||||
const Utils::FilePath &fileName) override;
|
||||
};
|
||||
|
||||
|
@@ -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<TestParseResultPtr> futureInterface,
|
||||
virtual bool processDocument(QFutureInterface<TestParseResultPtr> &futureInterface,
|
||||
const Utils::FilePath &fileName) = 0;
|
||||
virtual void release() = 0;
|
||||
|
||||
|
@@ -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<TestParseResultPtr> futureInterface,
|
||||
bool QtTestParser::processDocument(QFutureInterface<TestParseResultPtr> &futureInterface,
|
||||
const Utils::FilePath &fileName)
|
||||
{
|
||||
CPlusPlus::Document::Ptr doc = document(fileName);
|
||||
|
@@ -58,7 +58,7 @@ public:
|
||||
|
||||
void init(const Utils::FilePaths &filesToParse, bool fullParse) override;
|
||||
void release() override;
|
||||
bool processDocument(QFutureInterface<TestParseResultPtr> futureInterface,
|
||||
bool processDocument(QFutureInterface<TestParseResultPtr> &futureInterface,
|
||||
const Utils::FilePath &fileName) override;
|
||||
|
||||
private:
|
||||
|
@@ -211,7 +211,7 @@ QList<Document::Ptr> QuickTestParser::scanDirectoryForQuickTestQmlFiles(const QS
|
||||
return foundDocs;
|
||||
}
|
||||
|
||||
static bool checkQmlDocumentForQuickTestCode(QFutureInterface<TestParseResultPtr> futureInterface,
|
||||
static bool checkQmlDocumentForQuickTestCode(QFutureInterface<TestParseResultPtr> &futureInterface,
|
||||
const Document::Ptr &qmlJSDoc,
|
||||
ITestFramework *framework,
|
||||
const Utils::FilePath &proFile = Utils::FilePath())
|
||||
@@ -259,7 +259,7 @@ static bool checkQmlDocumentForQuickTestCode(QFutureInterface<TestParseResultPtr
|
||||
return true;
|
||||
}
|
||||
|
||||
bool QuickTestParser::handleQtQuickTest(QFutureInterface<TestParseResultPtr> futureInterface,
|
||||
bool QuickTestParser::handleQtQuickTest(QFutureInterface<TestParseResultPtr> &futureInterface,
|
||||
CPlusPlus::Document::Ptr document,
|
||||
ITestFramework *framework)
|
||||
{
|
||||
@@ -375,7 +375,7 @@ void QuickTestParser::release()
|
||||
CppParser::release();
|
||||
}
|
||||
|
||||
bool QuickTestParser::processDocument(QFutureInterface<TestParseResultPtr> futureInterface,
|
||||
bool QuickTestParser::processDocument(QFutureInterface<TestParseResultPtr> &futureInterface,
|
||||
const Utils::FilePath &fileName)
|
||||
{
|
||||
if (fileName.endsWith(".qml")) {
|
||||
|
@@ -48,11 +48,11 @@ public:
|
||||
explicit QuickTestParser(ITestFramework *framework);
|
||||
void init(const Utils::FilePaths &filesToParse, bool fullParse) override;
|
||||
void release() override;
|
||||
bool processDocument(QFutureInterface<TestParseResultPtr> futureInterface,
|
||||
bool processDocument(QFutureInterface<TestParseResultPtr> &futureInterface,
|
||||
const Utils::FilePath &fileName) override;
|
||||
Utils::FilePath projectFileForMainCppFile(const Utils::FilePath &fileName) const;
|
||||
private:
|
||||
bool handleQtQuickTest(QFutureInterface<TestParseResultPtr> futureInterface,
|
||||
bool handleQtQuickTest(QFutureInterface<TestParseResultPtr> &futureInterface,
|
||||
CPlusPlus::Document::Ptr document, ITestFramework *framework);
|
||||
void handleDirectoryChanged(const QString &directory);
|
||||
void doUpdateWatchPaths(const QStringList &directories);
|
||||
|
@@ -174,7 +174,7 @@ protected:
|
||||
class CollectionTask : protected Visitor
|
||||
{
|
||||
public:
|
||||
CollectionTask(QFutureInterface<SemanticHighlighter::Use> futureInterface,
|
||||
CollectionTask(QFutureInterface<SemanticHighlighter::Use> &futureInterface,
|
||||
const QmlJSTools::SemanticInfo &semanticInfo)
|
||||
: m_futureInterface(futureInterface)
|
||||
, m_semanticInfo(semanticInfo)
|
||||
@@ -532,7 +532,7 @@ private:
|
||||
m_uses.reserve(chunkSize);
|
||||
}
|
||||
|
||||
QFutureInterface<SemanticHighlighter::Use> m_futureInterface;
|
||||
QFutureInterface<SemanticHighlighter::Use> &m_futureInterface;
|
||||
const QmlJSTools::SemanticInfo &m_semanticInfo;
|
||||
ScopeChain m_scopeChain;
|
||||
ScopeBuilder m_scopeBuilder;
|
||||
|
Reference in New Issue
Block a user