From d5dec088931749f10fd4169219794cb379ef036d Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 11 Mar 2021 16:52:22 +0100 Subject: [PATCH] Utils: Pass settings key to BaseAspect::saveToMap Makes the code on the user side somewhat more symmetric and is a bit more flexible, even if that's not used right now. Change-Id: I29a5182463ead0e4a39fcb51ecf4fdd5adf2a203 Reviewed-by: Christian Stenger --- src/libs/utils/aspects.cpp | 9 ++++----- src/libs/utils/aspects.h | 4 ++-- src/plugins/android/androidrunconfiguration.cpp | 2 +- src/plugins/projectexplorer/buildaspects.cpp | 2 +- src/plugins/projectexplorer/runconfigurationaspects.cpp | 8 ++++---- src/plugins/python/pythonrunconfiguration.cpp | 2 +- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp index da092aa960c..49848a1c65d 100644 --- a/src/libs/utils/aspects.cpp +++ b/src/libs/utils/aspects.cpp @@ -462,11 +462,10 @@ void BaseAspect::registerSubWidget(QWidget *widget) } void BaseAspect::saveToMap(QVariantMap &data, const QVariant &value, - const QVariant &defaultValue, const QString &keyExtension) const + const QVariant &defaultValue, const QString &key) { - if (settingsKey().isEmpty()) + if (key.isEmpty()) return; - const QString key = settingsKey() + keyExtension; if (value == defaultValue) data.remove(key); else @@ -486,7 +485,7 @@ void BaseAspect::fromMap(const QVariantMap &map) */ void BaseAspect::toMap(QVariantMap &map) const { - saveToMap(map, d->m_value, d->m_defaultValue); + saveToMap(map, d->m_value, d->m_defaultValue, settingsKey()); } void BaseAspect::readSettings(const QSettings *settings) @@ -802,7 +801,7 @@ void StringAspect::fromMap(const QVariantMap &map) */ void StringAspect::toMap(QVariantMap &map) const { - saveToMap(map, value(), defaultValue()); + saveToMap(map, value(), defaultValue(), settingsKey()); if (d->m_checker) d->m_checker->toMap(map); } diff --git a/src/libs/utils/aspects.h b/src/libs/utils/aspects.h index e286daa9ac4..a742644576c 100644 --- a/src/libs/utils/aspects.h +++ b/src/libs/utils/aspects.h @@ -142,8 +142,8 @@ protected: } void registerSubWidget(QWidget *widget); - void saveToMap(QVariantMap &data, const QVariant &value, - const QVariant &defaultValue, const QString &keyExtension = {}) const; + static void saveToMap(QVariantMap &data, const QVariant &value, + const QVariant &defaultValue, const QString &key); private: std::unique_ptr d; diff --git a/src/plugins/android/androidrunconfiguration.cpp b/src/plugins/android/androidrunconfiguration.cpp index 58b2e2813b1..b9bc65466cb 100644 --- a/src/plugins/android/androidrunconfiguration.cpp +++ b/src/plugins/android/androidrunconfiguration.cpp @@ -85,7 +85,7 @@ void BaseStringListAspect::fromMap(const QVariantMap &map) void BaseStringListAspect::toMap(QVariantMap &data) const { - saveToMap(data, m_value, QStringList()); + saveToMap(data, m_value, QStringList(), settingsKey()); } QStringList BaseStringListAspect::value() const diff --git a/src/plugins/projectexplorer/buildaspects.cpp b/src/plugins/projectexplorer/buildaspects.cpp index c8f51a4dffa..84bc0456a25 100644 --- a/src/plugins/projectexplorer/buildaspects.cpp +++ b/src/plugins/projectexplorer/buildaspects.cpp @@ -89,7 +89,7 @@ void BuildDirectoryAspect::toMap(QVariantMap &map) const StringAspect::toMap(map); if (!d->sourceDir.isEmpty()) { const FilePath shadowDir = isChecked() ? filePath() : d->savedShadowBuildDir; - saveToMap(map, shadowDir.toString(), QString(), ".shadowDir"); + saveToMap(map, shadowDir.toString(), QString(), settingsKey() + ".shadowDir"); } } diff --git a/src/plugins/projectexplorer/runconfigurationaspects.cpp b/src/plugins/projectexplorer/runconfigurationaspects.cpp index 6aca37d98c1..6bce414c7c3 100644 --- a/src/plugins/projectexplorer/runconfigurationaspects.cpp +++ b/src/plugins/projectexplorer/runconfigurationaspects.cpp @@ -235,8 +235,8 @@ void WorkingDirectoryAspect::toMap(QVariantMap &data) const { const QString wd = m_workingDirectory == m_defaultWorkingDirectory ? QString() : m_workingDirectory.toString(); - saveToMap(data, wd, QString()); - saveToMap(data, m_defaultWorkingDirectory.toString(), QString(), ".default"); + saveToMap(data, wd, QString(), settingsKey()); + saveToMap(data, m_defaultWorkingDirectory.toString(), QString(), settingsKey() + ".default"); } /*! @@ -411,8 +411,8 @@ void ArgumentsAspect::fromMap(const QVariantMap &map) */ void ArgumentsAspect::toMap(QVariantMap &map) const { - saveToMap(map, m_arguments, QString()); - saveToMap(map, m_multiLine, false, ".multi"); + saveToMap(map, m_arguments, QString(), settingsKey()); + saveToMap(map, m_multiLine, false, settingsKey() + ".multi"); } /*! diff --git a/src/plugins/python/pythonrunconfiguration.cpp b/src/plugins/python/pythonrunconfiguration.cpp index 866116ff14c..47af192c931 100644 --- a/src/plugins/python/pythonrunconfiguration.cpp +++ b/src/plugins/python/pythonrunconfiguration.cpp @@ -177,7 +177,7 @@ void InterpreterAspect::fromMap(const QVariantMap &map) void InterpreterAspect::toMap(QVariantMap &map) const { - saveToMap(map, m_currentId, QString()); + saveToMap(map, m_currentId, QString(), settingsKey()); } void InterpreterAspect::addToLayout(LayoutBuilder &builder)