From 4d1918c93f439ad7c7db085ed7b36eeb37fc08cb Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 15 Jun 2016 09:07:39 +0200 Subject: [PATCH] AutoTest: Remove indirection when retrieving configuration Change-Id: Ia77dd1880da9b4b8d83456af231fe32724427552 Reviewed-by: David Schulz --- src/plugins/autotest/testnavigationwidget.cpp | 2 +- src/plugins/autotest/testtreemodel.cpp | 6 ------ src/plugins/autotest/testtreemodel.h | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/plugins/autotest/testnavigationwidget.cpp b/src/plugins/autotest/testnavigationwidget.cpp index 743ea7e0cdb..92182cc04a4 100644 --- a/src/plugins/autotest/testnavigationwidget.cpp +++ b/src/plugins/autotest/testnavigationwidget.cpp @@ -271,7 +271,7 @@ void TestNavigationWidget::onRunThisTestTriggered() return; TestTreeItem *item = static_cast(sourceIndex.internalPointer()); - if (TestConfiguration *configuration = m_model->getTestConfiguration(item)) { + if (TestConfiguration *configuration = item->testConfiguration()) { TestRunner *runner = TestRunner::instance(); runner->setSelectedTests( {configuration} ); runner->prepareToRunTests(); diff --git a/src/plugins/autotest/testtreemodel.cpp b/src/plugins/autotest/testtreemodel.cpp index e03888ccefb..11165ae0824 100644 --- a/src/plugins/autotest/testtreemodel.cpp +++ b/src/plugins/autotest/testtreemodel.cpp @@ -187,12 +187,6 @@ QList TestTreeModel::getSelectedTests() const return result; } -TestConfiguration *TestTreeModel::getTestConfiguration(const TestTreeItem *item) const -{ - QTC_ASSERT(item != 0, return 0); - return item->testConfiguration(); -} - void TestTreeModel::syncTestFrameworks() { // remove all currently registered diff --git a/src/plugins/autotest/testtreemodel.h b/src/plugins/autotest/testtreemodel.h index 6f5e064ff6e..d2c3467ce32 100644 --- a/src/plugins/autotest/testtreemodel.h +++ b/src/plugins/autotest/testtreemodel.h @@ -58,7 +58,6 @@ public: bool hasTests() const; QList getAllTestCases() const; QList getSelectedTests() const; - TestConfiguration *getTestConfiguration(const TestTreeItem *item) const; void syncTestFrameworks();