1 files changed, 14 insertions, 34 deletions
diff --git a/src/plugins/autotest/gtest/gtestframework.cpp b/src/plugins/autotest/gtest/gtestframework.cpp
index 7e5ea7b681..c97f209b6c 100644
--- a/src/plugins/autotest/gtest/gtestframework.cpp
+++ b/src/plugins/autotest/gtest/gtestframework.cpp
@@ -24,8 +24,6 @@
 ****************************************************************************/
 
 #include "gtestframework.h"
-#include "gtestsettings.h"
-#include "gtestsettingspage.h"
 #include "gtesttreeitem.h"
 #include "gtestparser.h"
 #include "../testframeworkmanager.h"
@@ -33,14 +31,23 @@
 namespace Autotest {
 namespace Internal {
 
-ITestParser *GTestFramework::createTestParser() const
+static GTestSettings *g_settings;
+
+GTestFramework::GTestFramework()
+    : ITestFramework(true)
+{
+    g_settings = &m_settings;
+}
+
+ITestParser *GTestFramework::createTestParser()
 {
-    return new GTestParser;
+    return new GTestParser(this);
 }
 
-TestTreeItem *GTestFramework::createRootNode() const
+TestTreeItem *GTestFramework::createRootNode()
 {
     return new GTestTreeItem(
+                this,
                 QCoreApplication::translate("GTestFramework",
                                             GTest::Constants::FRAMEWORK_SETTINGS_CATEGORY),
                 QString(), TestTreeItem::Root);
@@ -56,29 +63,9 @@ unsigned GTestFramework::priority() const
     return GTest::Constants::FRAMEWORK_PRIORITY;
 }
 
-IFrameworkSettings *GTestFramework::createFrameworkSettings() const
-{
-    return new GTestSettings;
-}
-
-Core::IOptionsPage *GTestFramework::createSettingsPage(QSharedPointer<IFrameworkSettings> settings) const
-{
-    return new GTestSettingsPage(settings, settingsId());
-}
-
-bool GTestFramework::hasFrameworkSettings() const
-{
-    return true;
-}
-
 QString GTestFramework::currentGTestFilter()
 {
-    static const Core::Id id
-            = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix(GTest::Constants::FRAMEWORK_NAME);
-    const auto manager = TestFrameworkManager::instance();
-
-    auto gSettings = qSharedPointerCast<GTestSettings>(manager->settingsForTestFramework(id));
-    return gSettings.isNull() ? QString(GTest::Constants::DEFAULT_FILTER) : gSettings->gtestFilter;
+    return g_settings->gtestFilter;
 }
 
 QString GTestFramework::groupingToolTip() const
@@ -90,14 +77,7 @@ QString GTestFramework::groupingToolTip() const
 
 GTest::Constants::GroupMode GTestFramework::groupMode()
 {
-    static const Core::Id id
-            = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix(GTest::Constants::FRAMEWORK_NAME);
-    const auto manager = TestFrameworkManager::instance();
-    if (!manager->groupingEnabled(id))
-        return GTest::Constants::None;
-
-    auto gSettings = qSharedPointerCast<GTestSettings>(manager->settingsForTestFramework(id));
-    return gSettings.isNull() ? GTest::Constants::Directory : gSettings->groupMode;
+    return g_settings->groupMode;
 }
 
 } // namespace Internal