Aspects: Remove some more default values

Change-Id: Iadee8b8f1eeb3ff009a667d45a51f6f5a94329ca
Reviewed-by: hjk <hjk@qt.io>

src/libs/utils/aspects.cpp

@@ -131,14 +131,16 @@ void BaseAspect::addToLayout(LayoutBuilder &)
 {
 }
 
-void BaseAspect::saveToMap(QVariantMap &data, const QVariant &value, const QVariant &defaultValue) const
+void BaseAspect::saveToMap(QVariantMap &data, const QVariant &value,
+                           const QVariant &defaultValue, const QString &keyExtension) const
 {
     if (settingsKey().isEmpty())
         return;
+    const QString key = settingsKey() + keyExtension;
     if (value == defaultValue)
-        data.remove(settingsKey());
+        data.remove(key);
     else
-        data.insert(settingsKey(), value);
+        data.insert(key, value);
 }
 
 /*!

src/libs/utils/aspects.h

@@ -84,7 +84,8 @@ signals:
 
 protected:
     virtual void setVisibleDynamic(bool visible) { Q_UNUSED(visible) } // TODO: Better name? Merge with setVisible() somehow?
-    void saveToMap(QVariantMap &data, const QVariant &value, const QVariant &defaultValue) const;
+    void saveToMap(QVariantMap &data, const QVariant &value,
+                   const QVariant &defaultValue, const QString &keyExtension = {}) const;
 
     Utils::Id m_id;
     QString m_displayName;

src/plugins/android/androidrunconfiguration.cpp

@@ -85,7 +85,7 @@ void BaseStringListAspect::fromMap(const QVariantMap &map)
 
 void BaseStringListAspect::toMap(QVariantMap &data) const
 {
-    data.insert(settingsKey(), m_value);
+    saveToMap(data, m_value, QStringList());
 }
 
 QStringList BaseStringListAspect::value() const

src/plugins/projectexplorer/buildaspects.cpp

@@ -83,7 +83,7 @@ void BuildDirectoryAspect::toMap(QVariantMap &map) const
     StringAspect::toMap(map);
     if (!d->sourceDir.isEmpty()) {
         const FilePath shadowDir = isChecked() ? filePath() : d->savedShadowBuildDir;
-        map.insert(settingsKey() + ".shadowDir", shadowDir.toString());
+        saveToMap(map, shadowDir.toString(), QString(), ".shadowDir");
     }
 }
 

src/plugins/projectexplorer/project.cpp

@@ -654,6 +654,7 @@ QVariantMap Project::toMap() const
         map.insert(QString::fromLatin1(TARGET_KEY_PREFIX) + QString::number(i), ts.at(i)->toMap());
 
     map.insert(QLatin1String(EDITOR_SETTINGS_KEY), d->m_editorConfiguration.toMap());
+    if (!d->m_pluginSettings.isEmpty())
         map.insert(QLatin1String(PLUGIN_SETTINGS_KEY), d->m_pluginSettings);
 
     return map;

src/plugins/projectexplorer/runconfigurationaspects.cpp

@@ -208,11 +208,6 @@ void WorkingDirectoryAspect::acquaintSiblings(const BaseAspects &siblings)
     m_envAspect = siblings.aspect<EnvironmentAspect>();
 }
 
-QString WorkingDirectoryAspect::keyForDefaultWd() const
-{
-    return settingsKey() + ".default";
-}
-
 void WorkingDirectoryAspect::resetPath()
 {
     m_chooser->setFilePath(m_defaultWorkingDirectory);
@@ -224,7 +219,7 @@ void WorkingDirectoryAspect::resetPath()
 void WorkingDirectoryAspect::fromMap(const QVariantMap &map)
 {
     m_workingDirectory = FilePath::fromString(map.value(settingsKey()).toString());
-    m_defaultWorkingDirectory = FilePath::fromString(map.value(keyForDefaultWd()).toString());
+    m_defaultWorkingDirectory = FilePath::fromString(map.value(settingsKey() + ".default").toString());
 
     if (m_workingDirectory.isEmpty())
         m_workingDirectory = m_defaultWorkingDirectory;
@@ -240,8 +235,8 @@ void WorkingDirectoryAspect::toMap(QVariantMap &data) const
 {
     const QString wd = m_workingDirectory == m_defaultWorkingDirectory
         ? QString() : m_workingDirectory.toString();
-    data.insert(settingsKey(), wd);
+    saveToMap(data, wd, QString());
-    data.insert(keyForDefaultWd(), m_defaultWorkingDirectory.toString());
+    saveToMap(data, m_defaultWorkingDirectory.toString(), QString(), ".default");
 }
 
 /*!
@@ -416,8 +411,8 @@ void ArgumentsAspect::fromMap(const QVariantMap &map)
 */
 void ArgumentsAspect::toMap(QVariantMap &map) const
 {
-    map.insert(settingsKey(), m_arguments);
+    saveToMap(map, m_arguments, QString());
-    map.insert(settingsKey() + ".multi", m_multiLine);
+    saveToMap(map, m_multiLine, false, ".multi");
 }
 
 /*!

src/plugins/projectexplorer/runconfigurationaspects.h

@@ -89,7 +89,6 @@ private:
     void toMap(QVariantMap &map) const override;
 
     void resetPath();
-    QString keyForDefaultWd() const;
 
     EnvironmentAspect *m_envAspect = nullptr;
     Utils::FilePath m_workingDirectory;

src/plugins/projectexplorer/target.cpp

@@ -579,6 +579,7 @@ QVariantMap Target::toMap() const
     for (int i = 0; i < rcs.size(); ++i)
         map.insert(QString::fromLatin1(RC_KEY_PREFIX) + QString::number(i), rcs.at(i)->toMap());
 
+    if (!d->m_pluginSettings.isEmpty())
         map.insert(QLatin1String(PLUGIN_SETTINGS_KEY), d->m_pluginSettings);
 
     return map;

src/plugins/python/pythonrunconfiguration.cpp

@@ -177,7 +177,7 @@ void InterpreterAspect::fromMap(const QVariantMap &map)
 
 void InterpreterAspect::toMap(QVariantMap &map) const
 {
-    map.insert(settingsKey(), m_currentId);
+    saveToMap(map, m_currentId, QString());
 }
 
 void InterpreterAspect::addToLayout(LayoutBuilder &builder)