Fix after merging changes from upstream

datasources/buildcountsource.cpp

@@ -68,26 +68,26 @@ QVariant BuildCountSource::data()
                        {totalKey(), m_succeededBuildsCount + m_failedBuildsCount}};
 }
 
-void BuildCountSource::load(QSettings *settings)
+void BuildCountSource::loadImpl(QSettings *settings)
 {
     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)
+void BuildCountSource::storeImpl(QSettings *settings)
 {
     auto setter = ScopedSettingsGroupSetter::forDataSource(*this, *settings);
     settings->setValue(succeededKey(), m_succeededBuildsCount);
     settings->setValue(failedKey(), m_failedBuildsCount);
 }
 
-void BuildCountSource::reset(QSettings *settings)
+void BuildCountSource::resetImpl(QSettings *settings)
 {
     m_succeededBuildsCount = succeededCountDflt();
     m_failedBuildsCount = failedCountDflt();
 
-    store(settings);
+    storeImpl(settings);
 }
 
 } // namespace Internal

datasources/buildcountsource.h

@@ -45,9 +45,9 @@ public: // AbstractDataSource interface
     QString description() const override;
     QVariant data() override;
 
-    void load(QSettings *settings) override;
-    void store(QSettings *settings) override;
-    void reset(QSettings *settings) override;
+    void loadImpl(QSettings *settings) override;
+    void storeImpl(QSettings *settings) override;
+    void resetImpl(QSettings *settings) override;
 
 private:
     static constexpr quint64 succeededCountDflt() { return 0; }

datasources/buildsystemsource.cpp

@@ -98,7 +98,7 @@ QVariant BuildSystemSource::data()
     return result;
 }
 
-void BuildSystemSource::load(QSettings *settings)
+void BuildSystemSource::loadImpl(QSettings *settings)
 {
     auto setter = ScopedSettingsGroupSetter::forDataSource(*this, *settings);
     for (int i = QMake; i < Count; ++i) {
@@ -107,7 +107,7 @@ void BuildSystemSource::load(QSettings *settings)
     }
 }
 
-void BuildSystemSource::store(QSettings *settings)
+void BuildSystemSource::storeImpl(QSettings *settings)
 {
     auto setter = ScopedSettingsGroupSetter::forDataSource(*this, *settings);
     for (int i = QMake; i < Count; ++i) {
@@ -116,10 +116,10 @@ void BuildSystemSource::store(QSettings *settings)
     }
 }
 
-void BuildSystemSource::reset(QSettings *settings)
+void BuildSystemSource::resetImpl(QSettings *settings)
 {
     ProjectsByBuildSystem().swap(m_projectsByBuildSystem);
-    store(settings);
+    storeImpl(settings);
 }
 
 void BuildSystemSource::updateProjects()

datasources/buildsystemsource.h

@@ -52,9 +52,9 @@ public: // AbstractDataSource interface
     QString description() const override;
     QVariant data() override;
 
-    void load(QSettings *settings) override;
-    void store(QSettings *settings) override;
-    void reset(QSettings *settings) override;
+    void loadImpl(QSettings *settings) override;
+    void storeImpl(QSettings *settings) override;
+    void resetImpl(QSettings *settings) override;
 
 private:
     void updateProjects();

datasources/examplesdatasource.cpp

@@ -76,22 +76,22 @@ QVariant ExamplesDataSource::data()
     return QVariantMap{{examplesKey(), QVariant(m_examplePaths.toList())}};
 }
 
-void ExamplesDataSource::load(QSettings *settings)
+void ExamplesDataSource::loadImpl(QSettings *settings)
 {
     auto setter = ScopedSettingsGroupSetter::forDataSource(*this, *settings);
     m_examplePaths = settings->value(examplesKey()).toStringList().toSet();
 }
 
-void ExamplesDataSource::store(QSettings *settings)
+void ExamplesDataSource::storeImpl(QSettings *settings)
 {
     auto setter = ScopedSettingsGroupSetter::forDataSource(*this, *settings);
     settings->setValue(examplesKey(), QStringList(m_examplePaths.toList()));
 }
 
-void ExamplesDataSource::reset(QSettings *settings)
+void ExamplesDataSource::resetImpl(QSettings *settings)
 {
     m_examplePaths.clear();
-    store(settings);
+    storeImpl(settings);
 }
 
 static QString examplePathGroupName() { return QStringLiteral("exmaplePathGroup"); }

datasources/examplesdatasource.h

@@ -45,9 +45,9 @@ public: // AbstractDataSource interface
     QString name() const override;
     QString description() const override;
     QVariant data() override;
-    void load(QSettings *settings) override;
-    void store(QSettings *settings) override;
-    void reset(QSettings *settings) override;
+    void loadImpl(QSettings *settings) override;
+    void storeImpl(QSettings *settings) override;
+    void resetImpl(QSettings *settings) override;
 
 private: // Methods
     void updateOpenedExamples();

datasources/modeusagetimesource.cpp

@@ -90,7 +90,7 @@ QVariant ModeUsageTimeSource::data()
     return result;
 }
 
-void ModeUsageTimeSource::load(QSettings *settings)
+void ModeUsageTimeSource::loadImpl(QSettings *settings)
 {
     auto setter = ScopedSettingsGroupSetter::forDataSource(*this, *settings);
     for (std::size_t i = Welcome; i < ModesCount; ++i) {
@@ -98,7 +98,7 @@ void ModeUsageTimeSource::load(QSettings *settings)
     }
 }
 
-void ModeUsageTimeSource::store(QSettings *settings)
+void ModeUsageTimeSource::storeImpl(QSettings *settings)
 {
     storeCurrentTimerValue();
 
@@ -108,10 +108,10 @@ void ModeUsageTimeSource::store(QSettings *settings)
     }
 }
 
-void ModeUsageTimeSource::reset(QSettings *settings)
+void ModeUsageTimeSource::resetImpl(QSettings *settings)
 {
     std::fill(std::begin(m_timeByModes), std::end(m_timeByModes), timeDflt());
-    store(settings);
+    storeImpl(settings);
 }
 
 void ModeUsageTimeSource::setCurrentMode(ModeUsageTimeSource::Mode mode)

datasources/modeusagetimesource.h

@@ -51,9 +51,9 @@ public: // AbstractDataSource interface
     QString description() const override;
     QVariant data() override;
 
-    void load(QSettings *settings) override;
-    void store(QSettings *settings) override;
-    void reset(QSettings *settings) override;
+    void loadImpl(QSettings *settings) override;
+    void storeImpl(QSettings *settings) override;
+    void resetImpl(QSettings *settings) override;
 
 private: // Data
     Mode m_currentMode = ModesCount;

datasources/timeusagesourcebase.cpp

@@ -76,25 +76,25 @@ QVariant TimeUsageSourceBase::data()
     return QVariantMap{{usageTimeKey(), m_usageTime}, {startCountKey(), m_startCount}};
 }
 
-void TimeUsageSourceBase::load(QSettings *settings)
+void TimeUsageSourceBase::loadImpl(QSettings *settings)
 {
     auto setter = ScopedSettingsGroupSetter::forDataSource(*this, *settings);
     m_usageTime = settings->value(usageTimeKey(), usageTimeDflt()).toLongLong();
     m_startCount = settings->value(startCountKey(), startCountDflt()).toLongLong();
 }
 
-void TimeUsageSourceBase::store(QSettings *settings)
+void TimeUsageSourceBase::storeImpl(QSettings *settings)
 {
     auto setter = ScopedSettingsGroupSetter::forDataSource(*this, *settings);
     settings->setValue(usageTimeKey(), m_usageTime);
     settings->setValue(startCountKey(), m_startCount);
 }
 
-void TimeUsageSourceBase::reset(QSettings *settings)
+void TimeUsageSourceBase::resetImpl(QSettings *settings)
 {
     m_usageTime = usageTimeDflt();
     m_startCount = startCountDflt();
-    store(settings);
+    storeImpl(settings);
 }
 
 TimeUsageSourceBase::~TimeUsageSourceBase() = default;

datasources/timeusagesourcebase.h

@@ -44,9 +44,9 @@ public:
 
 public:  // AbstractDataSource interface
     QVariant data() override;
-    void load(QSettings *settings) override;
-    void store(QSettings *settings) override;
-    void reset(QSettings *settings) override;
+    void loadImpl(QSettings *settings) override;
+    void storeImpl(QSettings *settings) override;
+    void resetImpl(QSettings *settings) override;
 
 protected:
     TimeUsageSourceBase(const QString &id);

ui/usagestatisticwidget.cpp

@@ -143,7 +143,7 @@ void UsageStatisticWidget::updateDataSource(QListWidgetItem *item)
     if (item) {
         m_currentItemId = item->data(dataSourceIDRole).toString();
 
-        if (auto ds = m_provider->findSource(m_currentItemId)) {
+        if (auto ds = m_provider->dataSource(m_currentItemId)) {
             ui->pteDataSourceDescription->setPlainText(ds->description());
             ui->pteCollectedData->setPlainText(collectedData(*ds));
         }