summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/plugins/autotest/gtest/gtestparser.cpp19
-rw-r--r--src/plugins/autotest/gtest/gtesttreeitem.cpp20
-rw-r--r--src/plugins/autotest/gtest/gtesttreeitem.h2
-rw-r--r--src/plugins/autotest/qtest/qttestparser.cpp13
-rw-r--r--src/plugins/autotest/qtest/qttesttreeitem.cpp15
-rw-r--r--src/plugins/autotest/qtest/qttesttreeitem.h2
-rw-r--r--src/plugins/autotest/quick/quicktestparser.cpp11
-rw-r--r--src/plugins/autotest/quick/quicktesttreeitem.cpp12
-rw-r--r--src/plugins/autotest/quick/quicktesttreeitem.h2
9 files changed, 37 insertions, 59 deletions
diff --git a/src/plugins/autotest/gtest/gtestparser.cpp b/src/plugins/autotest/gtest/gtestparser.cpp
index fee536e674..414356267b 100644
--- a/src/plugins/autotest/gtest/gtestparser.cpp
+++ b/src/plugins/autotest/gtest/gtestparser.cpp
@@ -34,9 +34,22 @@ namespace Internal {
TestTreeItem *GTestParseResult::createTestTreeItem() const
{
- if (itemType == TestTreeItem::TestCase || itemType == TestTreeItem::TestFunctionOrSet)
- return GTestTreeItem::createTestItem(this);
- return 0;
+ if (itemType != TestTreeItem::TestCase && itemType != TestTreeItem::TestFunctionOrSet)
+ return nullptr;
+ GTestTreeItem *item = new GTestTreeItem(name, fileName, itemType);
+ item->setProFile(proFile);
+ item->setLine(line);
+ item->setColumn(column);
+
+ if (parameterized)
+ item->setState(GTestTreeItem::Parameterized);
+ if (typed)
+ item->setState(GTestTreeItem::Typed);
+ if (disabled)
+ item->setState(GTestTreeItem::Disabled);
+ foreach (const TestParseResult *testSet, children)
+ item->appendChild(testSet->createTestTreeItem());
+ return item;
}
static bool includesGTest(const CPlusPlus::Document::Ptr &doc,
diff --git a/src/plugins/autotest/gtest/gtesttreeitem.cpp b/src/plugins/autotest/gtest/gtesttreeitem.cpp
index 9f4863d126..59c7e7e7c4 100644
--- a/src/plugins/autotest/gtest/gtesttreeitem.cpp
+++ b/src/plugins/autotest/gtest/gtesttreeitem.cpp
@@ -45,26 +45,6 @@ static QString gtestFilter(GTestTreeItem::TestStates states)
return QLatin1String("%1.%2");
}
-GTestTreeItem *GTestTreeItem::createTestItem(const TestParseResult *result)
-{
- const GTestParseResult *parseResult = static_cast<const GTestParseResult *>(result);
- GTestTreeItem *item = new GTestTreeItem(parseResult->name, parseResult->fileName,
- parseResult->itemType);
- item->setProFile(parseResult->proFile);
- item->setLine(parseResult->line);
- item->setColumn(parseResult->column);
-
- if (parseResult->parameterized)
- item->setState(Parameterized);
- if (parseResult->typed)
- item->setState(Typed);
- if (parseResult->disabled)
- item->setState(Disabled);
- foreach (const TestParseResult *testSet, parseResult->children)
- item->appendChild(createTestItem(testSet));
- return item;
-}
-
QVariant GTestTreeItem::data(int column, int role) const
{
switch (role) {
diff --git a/src/plugins/autotest/gtest/gtesttreeitem.h b/src/plugins/autotest/gtest/gtesttreeitem.h
index dd70eca49f..67973771dd 100644
--- a/src/plugins/autotest/gtest/gtesttreeitem.h
+++ b/src/plugins/autotest/gtest/gtesttreeitem.h
@@ -49,8 +49,6 @@ public:
explicit GTestTreeItem(const QString &name = QString(), const QString &filePath = QString(),
Type type = Root) : TestTreeItem(name, filePath, type), m_state(Enabled) {}
- static GTestTreeItem *createTestItem(const TestParseResult *result);
-
QVariant data(int column, int role) const override;
bool canProvideTestConfiguration() const override { return type() != Root; }
bool canProvideDebugConfiguration() const override { return type() != Root; }
diff --git a/src/plugins/autotest/qtest/qttestparser.cpp b/src/plugins/autotest/qtest/qttestparser.cpp
index 35b82fa62e..3119e0943c 100644
--- a/src/plugins/autotest/qtest/qttestparser.cpp
+++ b/src/plugins/autotest/qtest/qttestparser.cpp
@@ -37,7 +37,18 @@ namespace Internal {
TestTreeItem *QtTestParseResult::createTestTreeItem() const
{
- return itemType == TestTreeItem::Root ? 0 : QtTestTreeItem::createTestItem(this);
+ if (itemType == TestTreeItem::Root)
+ return nullptr;
+
+ QtTestTreeItem *item = new QtTestTreeItem(displayName, fileName, itemType);
+ item->setProFile(proFile);
+ item->setLine(line);
+ item->setColumn(column);
+ item->setInherited(m_inherited);
+
+ foreach (const TestParseResult *funcParseResult, children)
+ item->appendChild(funcParseResult->createTestTreeItem());
+ return item;
}
static bool includesQtTest(const CPlusPlus::Document::Ptr &doc, const CPlusPlus::Snapshot &snapshot)
diff --git a/src/plugins/autotest/qtest/qttesttreeitem.cpp b/src/plugins/autotest/qtest/qttesttreeitem.cpp
index 9f7ba29edc..fab44905ea 100644
--- a/src/plugins/autotest/qtest/qttesttreeitem.cpp
+++ b/src/plugins/autotest/qtest/qttesttreeitem.cpp
@@ -41,21 +41,6 @@ QtTestTreeItem::QtTestTreeItem(const QString &name, const QString &filePath, Tes
setChecked(Qt::Checked);
}
-QtTestTreeItem *QtTestTreeItem::createTestItem(const TestParseResult *result)
-{
- const QtTestParseResult *qtResult = static_cast<const QtTestParseResult *>(result);
- QtTestTreeItem *item = new QtTestTreeItem(result->displayName, result->fileName,
- result->itemType);
- item->setProFile(result->proFile);
- item->setLine(result->line);
- item->setColumn(result->column);
- item->setInherited(qtResult->inherited());
-
- foreach (const TestParseResult *funcParseResult, result->children)
- item->appendChild(createTestItem(funcParseResult));
- return item;
-}
-
QVariant QtTestTreeItem::data(int column, int role) const
{
switch (role) {
diff --git a/src/plugins/autotest/qtest/qttesttreeitem.h b/src/plugins/autotest/qtest/qttesttreeitem.h
index 42b1efddbd..1f25bfb839 100644
--- a/src/plugins/autotest/qtest/qttesttreeitem.h
+++ b/src/plugins/autotest/qtest/qttesttreeitem.h
@@ -36,8 +36,6 @@ public:
explicit QtTestTreeItem(const QString &name = QString(), const QString &filePath = QString(),
Type type = Root);
- static QtTestTreeItem *createTestItem(const TestParseResult *result);
-
QVariant data(int column, int role) const override;
Qt::ItemFlags flags(int column) const override;
bool canProvideTestConfiguration() const override;
diff --git a/src/plugins/autotest/quick/quicktestparser.cpp b/src/plugins/autotest/quick/quicktestparser.cpp
index f2db5d101f..f237501946 100644
--- a/src/plugins/autotest/quick/quicktestparser.cpp
+++ b/src/plugins/autotest/quick/quicktestparser.cpp
@@ -41,8 +41,15 @@ namespace Internal {
TestTreeItem *QuickTestParseResult::createTestTreeItem() const
{
if (itemType == TestTreeItem::Root || itemType == TestTreeItem::TestDataTag)
- return 0;
- return QuickTestTreeItem::createTestItem(this);
+ return nullptr;
+
+ QuickTestTreeItem *item = new QuickTestTreeItem(name, fileName, itemType);
+ item->setProFile(proFile);
+ item->setLine(line);
+ item->setColumn(column);
+ foreach (const TestParseResult *funcResult, children)
+ item->appendChild(funcResult->createTestTreeItem());
+ return item;
}
static bool includesQtQuickTest(const CPlusPlus::Document::Ptr &doc,
diff --git a/src/plugins/autotest/quick/quicktesttreeitem.cpp b/src/plugins/autotest/quick/quicktesttreeitem.cpp
index 5ddcf67219..f517c8a1e4 100644
--- a/src/plugins/autotest/quick/quicktesttreeitem.cpp
+++ b/src/plugins/autotest/quick/quicktesttreeitem.cpp
@@ -33,18 +33,6 @@
namespace Autotest {
namespace Internal {
-QuickTestTreeItem *QuickTestTreeItem::createTestItem(const TestParseResult *result)
-{
- QuickTestTreeItem *item = new QuickTestTreeItem(result->name, result->fileName,
- result->itemType);
- item->setProFile(result->proFile);
- item->setLine(result->line);
- item->setColumn(result->column);
- foreach (const TestParseResult *funcResult, result->children)
- item->appendChild(createTestItem(funcResult));
- return item;
-}
-
QVariant QuickTestTreeItem::data(int column, int role) const
{
switch (role) {
diff --git a/src/plugins/autotest/quick/quicktesttreeitem.h b/src/plugins/autotest/quick/quicktesttreeitem.h
index 9f2cf2b6b6..64f1cf0fb9 100644
--- a/src/plugins/autotest/quick/quicktesttreeitem.h
+++ b/src/plugins/autotest/quick/quicktesttreeitem.h
@@ -36,8 +36,6 @@ public:
explicit QuickTestTreeItem(const QString &name = QString(), const QString &filePath = QString(),
Type type = Root) : TestTreeItem(name, filePath, type) {}
- static QuickTestTreeItem *createTestItem(const TestParseResult *result);
-
QVariant data(int column, int role) const override;
Qt::ItemFlags flags(int column) const override;
bool canProvideTestConfiguration() const override;
View Lorry Controller Status