Analyzer: Rename AbstractAnalyzerSubConfig to ISettingsAspect

More in line with IRunConfigurationAspect

Change-Id: I50a038de004733b6b19d345b30a63cc2db02875a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

4 files changed, 28 insertions, 34 deletions

diff --git a/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp b/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp
index 9b107672d1..88a8103cae 100644
--- a/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp
+++ b/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp
@@ -46,7 +46,7 @@ namespace Internal {
 AnalyzerRunConfigWidget::AnalyzerRunConfigWidget(AnalyzerRunConfigurationAspect *aspect)
 {
     m_aspect = aspect;
-    m_config = aspect->customSubConfig();
+    m_config = aspect->projectSettings();
 
     QWidget *globalSetting = new QWidget;
     QHBoxLayout *globalSettingLayout = new QHBoxLayout(globalSetting);
diff --git a/src/plugins/analyzerbase/analyzerrunconfigwidget.h b/src/plugins/analyzerbase/analyzerrunconfigwidget.h
index 8224ce8fdc..101647cc15 100644
--- a/src/plugins/analyzerbase/analyzerrunconfigwidget.h
+++ b/src/plugins/analyzerbase/analyzerrunconfigwidget.h
@@ -59,7 +59,7 @@ private slots:
 private:
     QWidget *m_configWidget;
     AnalyzerRunConfigurationAspect *m_aspect;
-    AbstractAnalyzerSubConfig *m_config;
+    ISettingsAspect *m_config;
     QComboBox *m_settingsCombo;
     QPushButton *m_restoreButton;
     Utils::DetailsWidget *m_details;
diff --git a/src/plugins/analyzerbase/analyzersettings.cpp b/src/plugins/analyzerbase/analyzersettings.cpp
index 6aeedf2a6a..6244eda84f 100644
--- a/src/plugins/analyzerbase/analyzersettings.cpp
+++ b/src/plugins/analyzerbase/analyzersettings.cpp
@@ -46,34 +46,33 @@ static const char useGlobalC[] = "Analyzer.Project.UseGlobal";
 
 namespace Analyzer {
 
-AnalyzerRunConfigurationAspect::AnalyzerRunConfigurationAspect(
-    AbstractAnalyzerSubConfig *customConfiguration,
-    AbstractAnalyzerSubConfig *globalConfiguration)
+AnalyzerRunConfigurationAspect::AnalyzerRunConfigurationAspect(ISettingsAspect *projectSettings,
+    ISettingsAspect *globalSettings)
 {
     m_useGlobalSettings = true;
-    m_customConfiguration = customConfiguration;
-    m_globalConfiguration = globalConfiguration;
+    m_projectSettings = projectSettings;
+    m_globalSettings = globalSettings;
 }
 
-AbstractAnalyzerSubConfig *AnalyzerRunConfigurationAspect::currentConfig() const
+ISettingsAspect *AnalyzerRunConfigurationAspect::currentSettings() const
 {
-   return m_useGlobalSettings ? m_globalConfiguration : m_customConfiguration;
+   return m_useGlobalSettings ? m_globalSettings : m_projectSettings;
 }
 
 AnalyzerRunConfigurationAspect::~AnalyzerRunConfigurationAspect()
 {
-    delete m_customConfiguration;
+    delete m_projectSettings;
 }
 
 void AnalyzerRunConfigurationAspect::fromMap(const QVariantMap &map)
 {
-    m_customConfiguration->fromMap(map);
+    m_projectSettings->fromMap(map);
     m_useGlobalSettings = map.value(QLatin1String(useGlobalC), true).toBool();
 }
 
 void AnalyzerRunConfigurationAspect::toMap(QVariantMap &map) const
 {
-    m_customConfiguration->toMap(map);
+    m_projectSettings->toMap(map);
     map.insert(QLatin1String(useGlobalC), m_useGlobalSettings);
 }
 
@@ -82,7 +81,7 @@ AnalyzerRunConfigurationAspect *AnalyzerRunConfigurationAspect::clone(
 {
     Q_UNUSED(parent)
     AnalyzerRunConfigurationAspect *other
-            = new AnalyzerRunConfigurationAspect(m_customConfiguration->clone(), m_globalConfiguration);
+            = new AnalyzerRunConfigurationAspect(m_projectSettings->clone(), m_globalSettings);
     other->m_useGlobalSettings = m_useGlobalSettings;
     return other;
 }
@@ -94,11 +93,11 @@ void AnalyzerRunConfigurationAspect::setUsingGlobalSettings(bool value)
 
 void AnalyzerRunConfigurationAspect::resetCustomToGlobalSettings()
 {
-    AbstractAnalyzerSubConfig *global = globalSubConfig();
+    ISettingsAspect *global = globalSettings();
     QTC_ASSERT(global, return);
     QVariantMap map;
     global->toMap(map);
-    m_customConfiguration->fromMap(map);
+    m_projectSettings->fromMap(map);
 }
 
 ProjectExplorer::RunConfigWidget *AnalyzerRunConfigurationAspect::createConfigurationWidget()
diff --git a/src/plugins/analyzerbase/analyzersettings.h b/src/plugins/analyzerbase/analyzersettings.h
index 51bfebd143..7b05bab8bd 100644
--- a/src/plugins/analyzerbase/analyzersettings.h
+++ b/src/plugins/analyzerbase/analyzersettings.h
@@ -45,33 +45,28 @@ namespace Analyzer {
  * If global and project-specific settings differ for your tool,
  * create one subclass for each.
  */
-class ANALYZER_EXPORT AbstractAnalyzerSubConfig : public QObject
+class ANALYZER_EXPORT ISettingsAspect : public QObject
 {
     Q_OBJECT
 
 public:
-    AbstractAnalyzerSubConfig() {}
+    ISettingsAspect() {}
 
-    /// convert current configuration into map for storage
+    /// Converts current object into map for storage.
     virtual void toMap(QVariantMap &map) const = 0;
-    /// read configuration from @p map
+    /// Read object state from @p map.
     virtual void fromMap(const QVariantMap &map) = 0;
 
-    /// create a configuration widget for this configuration
+    /// Create a configuration widget for this settings aspect.
     virtual QWidget *createConfigWidget(QWidget *parent) = 0;
-    /// clones s AbstractAnalyzerSubConfig
-    virtual AbstractAnalyzerSubConfig *clone() = 0;
+    /// Clones the object.
+    virtual ISettingsAspect *clone() = 0;
 };
 
 
 /**
  * Settings associated with a single project/run configuration
  *
- * To access your custom configuration use:
- * @code
- * ProjectExplorer::RunConfiguration *rc = ...;
- * rc->extraAspect<AnalyzerRunConfigurationAspect>()->subConfig<YourProjectConfig>()->...
- * @endcode
  */
 class ANALYZER_EXPORT AnalyzerRunConfigurationAspect
     : public ProjectExplorer::IRunConfigurationAspect
@@ -79,8 +74,8 @@ class ANALYZER_EXPORT AnalyzerRunConfigurationAspect
     Q_OBJECT
 
 public:
-    AnalyzerRunConfigurationAspect(AbstractAnalyzerSubConfig *customConfiguration,
-                                   AbstractAnalyzerSubConfig *globalConfiguration);
+    AnalyzerRunConfigurationAspect(ISettingsAspect *projectSettings,
+                                   ISettingsAspect *globalSettings);
 
     ~AnalyzerRunConfigurationAspect();
 
@@ -90,9 +85,9 @@ public:
     void setUsingGlobalSettings(bool value);
     void resetCustomToGlobalSettings();
 
-    AbstractAnalyzerSubConfig *customSubConfig() const { return m_customConfiguration; }
-    AbstractAnalyzerSubConfig *globalSubConfig() const { return m_globalConfiguration; }
-    AbstractAnalyzerSubConfig *currentConfig() const;
+    ISettingsAspect *projectSettings() const { return m_projectSettings; }
+    ISettingsAspect *globalSettings() const { return m_globalSettings; }
+    ISettingsAspect *currentSettings() const;
     ProjectExplorer::RunConfigWidget *createConfigurationWidget();
 
 protected:
@@ -101,8 +96,8 @@ protected:
 
 private:
     bool m_useGlobalSettings;
-    AbstractAnalyzerSubConfig *m_customConfiguration;
-    AbstractAnalyzerSubConfig *m_globalConfiguration;
+    ISettingsAspect *m_projectSettings;
+    ISettingsAspect *m_globalSettings;
 };
 
 } // namespace Analyzer