summaryrefslogtreecommitdiff
path: root/src/plugins/autotest/quick/quicktestparser.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/autotest/quick/quicktestparser.cpp')
-rw-r--r--src/plugins/autotest/quick/quicktestparser.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/autotest/quick/quicktestparser.cpp b/src/plugins/autotest/quick/quicktestparser.cpp
index 0aa7d56e3a..2cbb786872 100644
--- a/src/plugins/autotest/quick/quicktestparser.cpp
+++ b/src/plugins/autotest/quick/quicktestparser.cpp
@@ -31,8 +31,8 @@
#include "../testcodeparser.h"
#include "../testtreemodel.h"
-#include <cpptools/cppmodelmanager.h>
-#include <cpptools/projectpart.h>
+#include <cppeditor/cppmodelmanager.h>
+#include <cppeditor/projectpart.h>
#include <projectexplorer/session.h>
#include <qmljs/parser/qmljsast_p.h>
#include <qmljs/qmljsdialect.h>
@@ -98,10 +98,10 @@ static bool includesQtQuickTest(const CPlusPlus::Document::Ptr &doc,
return false;
}
-static QString quickTestSrcDir(const CppTools::CppModelManager *cppMM,
+static QString quickTestSrcDir(const CppEditor::CppModelManager *cppMM,
const Utils::FilePath &fileName)
{
- const QList<CppTools::ProjectPart::Ptr> parts = cppMM->projectPart(fileName);
+ const QList<CppEditor::ProjectPart::ConstPtr> parts = cppMM->projectPart(fileName);
if (parts.size() > 0) {
const ProjectExplorer::Macros &macros = parts.at(0)->projectMacros;
auto found = std::find_if(
@@ -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,15 +259,15 @@ 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)
{
- const CppTools::CppModelManager *modelManager = CppTools::CppModelManager::instance();
+ const CppEditor::CppModelManager *modelManager = CppEditor::CppModelManager::instance();
if (quickTestName(document).isEmpty())
return false;
- QList<CppTools::ProjectPart::Ptr> ppList = modelManager->projectPart(document->fileName());
+ QList<CppEditor::ProjectPart::ConstPtr> ppList = modelManager->projectPart(document->fileName());
if (ppList.isEmpty()) // happens if shutting down while parsing
return false;
const Utils::FilePath cppFileName = Utils::FilePath::fromString(document->fileName());
@@ -376,7 +376,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")) {