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

Rename setProfile to setProFile

Browse Source 
Function sets the path to a *.pro file not a profile.

Change-Id: Ied804df48086695773e25b63a4bd17c76919b01d
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
This commit is contained in:
Christian Stenger
2016-01-12 13:19:41 +01:00
committed by Niels Weber
parent 07ba6bc7e3
commit 97011c6951
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/autotest/testcodeparser.cpp
View File

@@ -970,7 +970,7 @@ void TestCodeParser::updateModelAndCppDocMap(CPlusPlus::Document::Ptr document,
const bool setReferencingFile = (files.size() == 2 && file == declaringFile); const bool setReferencingFile = (files.size() == 2 && file == declaringFile);
TestInfo testInfo(testCaseName, testItem->getChildNames(), TestInfo testInfo(testCaseName, testItem->getChildNames(),
document->revision(), document->editorRevision()); document->revision(), document->editorRevision());
testInfo.setProfile(proFile); testInfo.setProFile(proFile);
if (setReferencingFile) if (setReferencingFile)
testInfo.setReferencingFile(fileName); testInfo.setReferencingFile(fileName);
m_cppDocMap.insert(file, testInfo); m_cppDocMap.insert(file, testInfo);
@@ -980,7 +980,7 @@ void TestCodeParser::updateModelAndCppDocMap(CPlusPlus::Document::Ptr document,
emit testItemCreated(testItem, TestTreeModel::AutoTest); emit testItemCreated(testItem, TestTreeModel::AutoTest);
TestInfo ti(testCaseName, testItem->getChildNames(), TestInfo ti(testCaseName, testItem->getChildNames(),
document->revision(), document->editorRevision()); document->revision(), document->editorRevision());
ti.setProfile(proFile); ti.setProFile(proFile);
m_cppDocMap.insert(fileName, ti); m_cppDocMap.insert(fileName, ti);
if (declaringFile != fileName) { if (declaringFile != fileName) {
ti.setReferencingFile(fileName); ti.setReferencingFile(fileName);
@@ -1003,7 +1003,7 @@ void TestCodeParser::updateModelAndQuickDocMap(QmlJS::Document::Ptr document,
if (m_quickDocMap.contains(fileName)) { if (m_quickDocMap.contains(fileName)) {
TestInfo testInfo(testItem->name(), testItem->getChildNames(), 0, document->editorRevision()); TestInfo testInfo(testItem->name(), testItem->getChildNames(), 0, document->editorRevision());
testInfo.setReferencingFile(referencingFile); testInfo.setReferencingFile(referencingFile);
testInfo.setProfile(proFile); testInfo.setProFile(proFile);
emit testItemModified(testItem, TestTreeModel::QuickTest, { fileName }); emit testItemModified(testItem, TestTreeModel::QuickTest, { fileName });
m_quickDocMap.insert(fileName, testInfo); m_quickDocMap.insert(fileName, testInfo);
} else { } else {
@@ -1013,7 +1013,7 @@ void TestCodeParser::updateModelAndQuickDocMap(QmlJS::Document::Ptr document,
const QString &filePath = testItem->filePath(); const QString &filePath = testItem->filePath();
TestInfo testInfo(testItem->name(), testItem->getChildNames(), 0, document->editorRevision()); TestInfo testInfo(testItem->name(), testItem->getChildNames(), 0, document->editorRevision());
testInfo.setReferencingFile(referencingFile); testInfo.setReferencingFile(referencingFile);
testInfo.setProfile(proFile); testInfo.setProFile(proFile);
emit testItemCreated(testItem, TestTreeModel::QuickTest); emit testItemCreated(testItem, TestTreeModel::QuickTest);
m_quickDocMap.insert(filePath, testInfo); m_quickDocMap.insert(filePath, testInfo);
} }
@@ -1034,7 +1034,7 @@ void TestCodeParser::updateGTests(const CPlusPlus::Document::Ptr &doc,
foreach (const QString &testName, tests.keys()) { foreach (const QString &testName, tests.keys()) {
TestTreeItem *item = constructGTestTreeItem(fileName, testName, proFile, tests.value(testName)); TestTreeItem *item = constructGTestTreeItem(fileName, testName, proFile, tests.value(testName));
TestInfo info(item->name(), item->getChildNames(), doc->revision(), doc->editorRevision()); TestInfo info(item->name(), item->getChildNames(), doc->revision(), doc->editorRevision());
info.setProfile(proFile); info.setProFile(proFile);
foreach (const TestCodeLocationAndType &testSet, tests.value(testName)) { foreach (const TestCodeLocationAndType &testSet, tests.value(testName)) {
GTestInfo gtestInfo(testName, testSet.m_name, fileName); GTestInfo gtestInfo(testName, testSet.m_name, fileName);
if (testSet.m_type == TestTreeItem::GTestNameDisabled) if (testSet.m_type == TestTreeItem::GTestNameDisabled)

2
plugins/autotest/testinfo.h
View File

@@ -44,7 +44,7 @@ public:
const QString referencingFile() const { return m_referencingFile; } const QString referencingFile() const { return m_referencingFile; }
void setReferencingFile(const QString &refFile) { m_referencingFile = refFile; } void setReferencingFile(const QString &refFile) { m_referencingFile = refFile; }
const QString proFile() const { return m_proFile; } const QString proFile() const { return m_proFile; }
void setProfile(const QString &proFile) { m_proFile = proFile; } void setProFile(const QString &proFile) { m_proFile = proFile; }
private: private:
QString m_className; QString m_className;