ScopedSettingsGroupSetter::forDataSource is used for data sources

datasources/buildcountsource.cpp

@@ -34,8 +34,6 @@
 
 #include <KUserFeedback/Provider>
 
-#include "usagestatisticconstants.h"
-
 namespace UsageStatistic {
 namespace Internal {
 
@@ -72,14 +70,14 @@ QVariant BuildCountSource::data()
 
 void BuildCountSource::load(QSettings *settings)
 {
-    ScopedSettingsGroupSetter setter(*settings, {Constants::DATA_SOURCES_SETTINGS_GROUP, id()});
+    auto setter = ScopedSettingsGroupSetter::forDataSource(*this, *settings);
     m_succeededBuildsCount = qvariant_cast<quint64>(settings->value(succeededKey(), succeededCountDflt()));
     m_failedBuildsCount = qvariant_cast<quint64>(settings->value(failedKey(), failedCountDflt()));
 }
 
 void BuildCountSource::store(QSettings *settings)
 {
-    ScopedSettingsGroupSetter setter(*settings, {Constants::DATA_SOURCES_SETTINGS_GROUP, id()});
+    auto setter = ScopedSettingsGroupSetter::forDataSource(*this, *settings);
     settings->setValue(succeededKey(), m_succeededBuildsCount);
     settings->setValue(failedKey(), m_failedBuildsCount);
 }

datasources/buildsystemsource.cpp

@@ -35,8 +35,6 @@
 
 #include "common/scopedsettingsgroupsetter.h"
 
-#include "usagestatisticconstants.h"
-
 namespace UsageStatistic {
 namespace Internal {
 
@@ -102,7 +100,7 @@ QVariant BuildSystemSource::data()
 
 void BuildSystemSource::load(QSettings *settings)
 {
-    ScopedSettingsGroupSetter setter(*settings, {Constants::DATA_SOURCES_SETTINGS_GROUP, id()});
+    auto setter = ScopedSettingsGroupSetter::forDataSource(*this, *settings);
     for (int i = QMake; i < Count; ++i) {
         m_projectsByBuildSystem[size_t(i)] =
             settings->value(buildSystemKeys()[i]).toStringList().toSet();
@@ -111,7 +109,7 @@ void BuildSystemSource::load(QSettings *settings)
 
 void BuildSystemSource::store(QSettings *settings)
 {
-    ScopedSettingsGroupSetter setter(*settings, {Constants::DATA_SOURCES_SETTINGS_GROUP, id()});
+    auto setter = ScopedSettingsGroupSetter::forDataSource(*this, *settings);
     for (int i = QMake; i < Count; ++i) {
         settings->setValue(
             buildSystemKeys()[i], QStringList(m_projectsByBuildSystem[size_t(i)].toList()));

datasources/modeusagetimesource.cpp

@@ -35,8 +35,6 @@
 
 #include "common/scopedsettingsgroupsetter.h"
 
-#include "usagestatisticconstants.h"
-
 namespace UsageStatistic {
 namespace Internal {
 
@@ -94,7 +92,7 @@ QVariant ModeUsageTimeSource::data()
 
 void ModeUsageTimeSource::load(QSettings *settings)
 {
-    ScopedSettingsGroupSetter setter(*settings, {Constants::DATA_SOURCES_SETTINGS_GROUP, id()});
+    auto setter = ScopedSettingsGroupSetter::forDataSource(*this, *settings);
     for (std::size_t i = Welcome; i < ModesCount; ++i) {
         m_timeByModes[i] = qvariant_cast<qint64>(settings->value(modeMarks()[i], timeDflt()));
     }
@@ -104,7 +102,7 @@ void ModeUsageTimeSource::store(QSettings *settings)
 {
     storeCurrentTimerValue();
 
-    ScopedSettingsGroupSetter setter(*settings, {Constants::DATA_SOURCES_SETTINGS_GROUP, id()});
+    auto setter = ScopedSettingsGroupSetter::forDataSource(*this, *settings);
     for (std::size_t i = Welcome; i < ModesCount; ++i) {
         settings->setValue(modeMarks()[i], m_timeByModes[i]);
     }

datasources/timeusagesourcebase.cpp

@@ -33,8 +33,6 @@
 
 #include <common/scopedsettingsgroupsetter.h>
 
-#include "usagestatisticconstants.h"
-
 namespace UsageStatistic {
 namespace Internal {
 
@@ -73,14 +71,14 @@ QVariant TimeUsageSourceBase::data()
 
 void TimeUsageSourceBase::load(QSettings *settings)
 {
-    ScopedSettingsGroupSetter setter(*settings, {Constants::DATA_SOURCES_SETTINGS_GROUP, id()});
+    auto setter = ScopedSettingsGroupSetter::forDataSource(*this, *settings);
     m_usageTime = settings->value(usageTimeKey()).toLongLong();
     m_startCount = settings->value(startCountKey()).toLongLong();
 }
 
 void TimeUsageSourceBase::store(QSettings *settings)
 {
-    ScopedSettingsGroupSetter setter(*settings, {Constants::DATA_SOURCES_SETTINGS_GROUP, id()});
+    auto setter = ScopedSettingsGroupSetter::forDataSource(*this, *settings);
     settings->setValue(usageTimeKey(), m_usageTime);
     settings->setValue(startCountKey(), m_startCount);
 }

[Ghost User]

11.pdf)

[Ghost User]

22.pdf

[Ghost User]

33.pdf