From 7943dfb5a6e78fc4394e2acc5c87c4fa0a68eaf1 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 12 Apr 2018 12:44:05 +0200 Subject: [PATCH] AutoTest: Use constant for repeated string Change-Id: I72b21c4976cabbcd454b2e9ca5cce93e57af0f20 Reviewed-by: David Schulz --- src/plugins/autotest/gtest/gtestconstants.h | 1 + src/plugins/autotest/gtest/gtestframework.cpp | 2 +- src/plugins/autotest/gtest/gtestsettings.cpp | 4 ++-- src/plugins/autotest/gtest/gtestsettings.h | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/plugins/autotest/gtest/gtestconstants.h b/src/plugins/autotest/gtest/gtestconstants.h index 9df49767946..2b1a878a1f9 100644 --- a/src/plugins/autotest/gtest/gtestconstants.h +++ b/src/plugins/autotest/gtest/gtestconstants.h @@ -34,6 +34,7 @@ namespace Constants { const char FRAMEWORK_NAME[] = "GTest"; const char FRAMEWORK_SETTINGS_CATEGORY[] = QT_TRANSLATE_NOOP("GTestFramework", "Google Test"); const unsigned FRAMEWORK_PRIORITY = 10; +const char DEFAULT_FILTER[] = "*.*"; enum GroupMode { diff --git a/src/plugins/autotest/gtest/gtestframework.cpp b/src/plugins/autotest/gtest/gtestframework.cpp index d173a5ee8db..67258c86ef2 100644 --- a/src/plugins/autotest/gtest/gtestframework.cpp +++ b/src/plugins/autotest/gtest/gtestframework.cpp @@ -78,7 +78,7 @@ QString GTestFramework::currentGTestFilter() const auto manager = TestFrameworkManager::instance(); auto gSettings = qSharedPointerCast(manager->settingsForTestFramework(id)); - return gSettings.isNull() ? QString("*.*") : gSettings->gtestFilter; + return gSettings.isNull() ? QString(GTest::Constants::DEFAULT_FILTER) : gSettings->gtestFilter; } QString GTestFramework::groupingToolTip() const diff --git a/src/plugins/autotest/gtest/gtestsettings.cpp b/src/plugins/autotest/gtest/gtestsettings.cpp index 014d1eb8cd6..599022dee1e 100644 --- a/src/plugins/autotest/gtest/gtestsettings.cpp +++ b/src/plugins/autotest/gtest/gtestsettings.cpp @@ -57,9 +57,9 @@ void GTestSettings::fromFrameworkSettings(const QSettings *s) bool ok = false; const int tmp = s->value(groupModeKey, GTest::Constants::Directory).toInt(&ok); groupMode = ok ? static_cast(tmp) : GTest::Constants::Directory; - gtestFilter = s->value(gtestFilterKey, "*.*").toString(); + gtestFilter = s->value(gtestFilterKey, GTest::Constants::DEFAULT_FILTER).toString(); if (!GTestUtils::isValidGTestFilter(gtestFilter)) - gtestFilter = "*.*"; + gtestFilter = GTest::Constants::DEFAULT_FILTER; } void GTestSettings::toFrameworkSettings(QSettings *s) const diff --git a/src/plugins/autotest/gtest/gtestsettings.h b/src/plugins/autotest/gtest/gtestsettings.h index b7d34684009..2b6250548ea 100644 --- a/src/plugins/autotest/gtest/gtestsettings.h +++ b/src/plugins/autotest/gtest/gtestsettings.h @@ -45,7 +45,7 @@ public: bool throwOnFailure = false; bool breakOnFailure = true; GTest::Constants::GroupMode groupMode = GTest::Constants::Directory; - QString gtestFilter{"*.*"}; + QString gtestFilter{GTest::Constants::DEFAULT_FILTER}; protected: void fromFrameworkSettings(const QSettings *s) override;