diff --git a/src/plugins/autotest/testsettings.cpp b/src/plugins/autotest/testsettings.cpp index 18c38f44478..94c8f024e1f 100644 --- a/src/plugins/autotest/testsettings.cpp +++ b/src/plugins/autotest/testsettings.cpp @@ -128,23 +128,6 @@ void TestSettings::fromSettings(const QSettings *s) } } -bool TestSettings::equals(const TestSettings &rhs) const -{ - return timeout == rhs.timeout && metrics == rhs.metrics - && omitInternalMssg == rhs.omitInternalMssg - && omitRunConfigWarn == rhs.omitRunConfigWarn - && limitResultOutput == rhs.limitResultOutput - && autoScroll == rhs.autoScroll - && alwaysParse == rhs.alwaysParse - && qtestNoCrashHandler == rhs.qtestNoCrashHandler - && gtestRunDisabled == rhs.gtestRunDisabled - && gtestRepeat == rhs.gtestRepeat && gtestIterations == rhs.gtestIterations - && gtestShuffle == rhs.gtestShuffle && gtestSeed == rhs.gtestSeed - && gtestBreakOnFailure == rhs.gtestBreakOnFailure - && gtestThrowOnFailure == rhs.gtestThrowOnFailure - && frameworks == rhs.frameworks; -} - QString TestSettings::metricsTypeToOption(const MetricsType type) { switch (type) { diff --git a/src/plugins/autotest/testsettings.h b/src/plugins/autotest/testsettings.h index 505b282996d..08b4c4bb9ba 100644 --- a/src/plugins/autotest/testsettings.h +++ b/src/plugins/autotest/testsettings.h @@ -49,7 +49,6 @@ struct TestSettings TestSettings(); void toSettings(QSettings *s) const; void fromSettings(const QSettings *s); - bool equals(const TestSettings &rhs) const; static QString metricsTypeToOption(const MetricsType type); int timeout; @@ -70,8 +69,5 @@ struct TestSettings QHash frameworks; }; -inline bool operator==(const TestSettings &s1, const TestSettings &s2) { return s1.equals(s2); } -inline bool operator!=(const TestSettings &s1, const TestSettings &s2) { return !s1.equals(s2); } - } // namespace Internal } // namespace Autotest diff --git a/src/plugins/autotest/testsettingspage.cpp b/src/plugins/autotest/testsettingspage.cpp index ee5a6ab46b4..a298b729e6c 100644 --- a/src/plugins/autotest/testsettingspage.cpp +++ b/src/plugins/autotest/testsettingspage.cpp @@ -197,18 +197,16 @@ void TestSettingsPage::apply() if (!m_widget) // page was not shown at all return; const TestSettings newSettings = m_widget->settings(); - if (newSettings != *m_settings) { - bool frameworkSyncNecessary = newSettings.frameworks != m_settings->frameworks; - *m_settings = newSettings; - m_settings->toSettings(Core::ICore::settings()); - if (m_settings->alwaysParse) - TestTreeModel::instance()->enableParsingFromSettings(); - else - TestTreeModel::instance()->disableParsingFromSettings(); - TestFrameworkManager::instance()->activateFrameworksFromSettings(m_settings); - if (frameworkSyncNecessary) - TestTreeModel::instance()->syncTestFrameworks(); - } + bool frameworkSyncNecessary = newSettings.frameworks != m_settings->frameworks; + *m_settings = newSettings; + m_settings->toSettings(Core::ICore::settings()); + if (m_settings->alwaysParse) + TestTreeModel::instance()->enableParsingFromSettings(); + else + TestTreeModel::instance()->disableParsingFromSettings(); + TestFrameworkManager::instance()->activateFrameworksFromSettings(m_settings); + if (frameworkSyncNecessary) + TestTreeModel::instance()->syncTestFrameworks(); } } // namespace Internal