Use Utils::Storage instead of QVariantMap in a few places

Change-Id: I02833cf2bc3caaadc22ff93ae530e4aebe4c3868
Reviewed-by: Marcus Tillmanns <[email protected]>

4 files changed, 25 insertions, 27 deletions

diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp
index cbb0b300708..c02bba6a127 100644
--- a/src/libs/utils/aspects.cpp
+++ b/src/libs/utils/aspects.cpp
@@ -583,7 +583,7 @@ void BaseAspect::saveToMap(QVariantMap &data, const QVariant &value,
 /*!
     Retrieves the internal value of this BaseAspect from the QVariantMap \a map.
 */
-void BaseAspect::fromMap(const QVariantMap &map)
+void BaseAspect::fromMap(const Storage &map)
 {
     if (settingsKey().isEmpty())
         return;
@@ -594,7 +594,7 @@ void BaseAspect::fromMap(const QVariantMap &map)
 /*!
     Stores the internal value of this BaseAspect into the QVariantMap \a map.
 */
-void BaseAspect::toMap(QVariantMap &map) const
+void BaseAspect::toMap(Storage &map) const
 {
     if (settingsKey().isEmpty())
         return;
@@ -692,13 +692,13 @@ public:
 class CheckableAspectImplementation
 {
 public:
-    void fromMap(const QVariantMap &map)
+    void fromMap(const Storage &map)
     {
         if (m_checked)
             m_checked->fromMap(map);
     }
 
-    void toMap(QVariantMap &map)
+    void toMap(Storage &map)
     {
         if (m_checked)
             m_checked->toMap(map);
@@ -921,7 +921,7 @@ void StringAspect::setValueAcceptor(StringAspect::ValueAcceptor &&acceptor)
 /*!
     \reimp
 */
-void StringAspect::fromMap(const QVariantMap &map)
+void StringAspect::fromMap(const Storage &map)
 {
     if (!settingsKey().isEmpty())
         setValue(map.value(settingsKey(), defaultValue()).toString(), BeQuiet);
@@ -931,7 +931,7 @@ void StringAspect::fromMap(const QVariantMap &map)
 /*!
     \reimp
 */
-void StringAspect::toMap(QVariantMap &map) const
+void StringAspect::toMap(Storage &map) const
 {
     saveToMap(map, value(), defaultValue(), settingsKey());
     d->m_checkerImpl.toMap(map);
@@ -1440,7 +1440,7 @@ void FilePathAspect::addToLayout(Layouting::LayoutItem &parent)
 /*!
     \reimp
 */
-void FilePathAspect::fromMap(const QVariantMap &map)
+void FilePathAspect::fromMap(const Storage &map)
 {
     if (!settingsKey().isEmpty())
         setValue(map.value(settingsKey(), defaultValue()).toString(), BeQuiet);
@@ -1450,7 +1450,7 @@ void FilePathAspect::fromMap(const QVariantMap &map)
 /*!
     \reimp
 */
-void FilePathAspect::toMap(QVariantMap &map) const
+void FilePathAspect::toMap(Storage &map) const
 {
     saveToMap(map, value(), defaultValue(), settingsKey());
     d->m_checkerImpl.toMap(map);
@@ -2514,7 +2514,7 @@ const QList<BaseAspect *> &AspectContainer::aspects() const
     return d->m_items;
 }
 
-void AspectContainer::fromMap(const QVariantMap &map)
+void AspectContainer::fromMap(const Storage &map)
 {
     for (BaseAspect *aspect : std::as_const(d->m_items))
         aspect->fromMap(map);
@@ -2523,7 +2523,7 @@ void AspectContainer::fromMap(const QVariantMap &map)
 
 }
 
-void AspectContainer::toMap(QVariantMap &map) const
+void AspectContainer::toMap(Storage &map) const
 {
     for (BaseAspect *aspect : std::as_const(d->m_items))
         aspect->toMap(map);
diff --git a/src/libs/utils/aspects.h b/src/libs/utils/aspects.h
index 5779d45dd90..7e3b6942a88 100644
--- a/src/libs/utils/aspects.h
+++ b/src/libs/utils/aspects.h
@@ -8,6 +8,7 @@
 #include "infolabel.h"
 #include "macroexpander.h"
 #include "pathchooser.h"
+#include "storage.h"
 
 #include <functional>
 #include <memory>
@@ -100,9 +101,9 @@ public:
 
     AspectContainer *container() const;
 
-    virtual void fromMap(const QVariantMap &map);
-    virtual void toMap(QVariantMap &map) const;
-    virtual void toActiveMap(QVariantMap &map) const { toMap(map); }
+    virtual void fromMap(const Utils::Storage &map);
+    virtual void toMap(Utils::Storage &map) const;
+    virtual void toActiveMap(Utils::Storage &map) const { toMap(map); }
 
     virtual void addToLayout(Layouting::LayoutItem &parent);
 
@@ -557,8 +558,8 @@ public:
     };
     void setDisplayStyle(DisplayStyle style);
 
-    void fromMap(const QVariantMap &map) override;
-    void toMap(QVariantMap &map) const override;
+    void fromMap(const Utils::Storage &map) override;
+    void toMap(Utils::Storage &map) const override;
 
 signals:
     void validChanged(bool validState);
@@ -626,8 +627,8 @@ public:
 
     void addToLayout(Layouting::LayoutItem &parent) override;
 
-    void fromMap(const QVariantMap &map) override;
-    void toMap(QVariantMap &map) const override;
+    void fromMap(const Utils::Storage &map) override;
+    void toMap(Utils::Storage &map) const override;
 
 signals:
     void validChanged(bool validState);
@@ -831,8 +832,8 @@ public:
     void registerAspect(BaseAspect *aspect, bool takeOwnership = false);
     void registerAspects(const AspectContainer &aspects);
 
-    void fromMap(const QVariantMap &map) override;
-    void toMap(QVariantMap &map) const override;
+    void fromMap(const Utils::Storage &map) override;
+    void toMap(Utils::Storage &map) const override;
 
     void readSettings() override;
     void writeSettings() const override;
diff --git a/src/libs/utils/displayname.cpp b/src/libs/utils/displayname.cpp
index b8402c94021..9758b440c6e 100644
--- a/src/libs/utils/displayname.cpp
+++ b/src/libs/utils/displayname.cpp
@@ -35,13 +35,13 @@ bool DisplayName::usesDefaultValue() const
     return m_value.isEmpty();
 }
 
-void DisplayName::toMap(QVariantMap &map, const QString &key) const
+void DisplayName::toMap(Storage &map, const QString &key) const
 {
     if (m_forceSerialization || !usesDefaultValue())
         map.insert(key, m_value);
 }
 
-void DisplayName::fromMap(const QVariantMap &map, const QString &key)
+void DisplayName::fromMap(const Storage &map, const QString &key)
 {
     m_value = map.value(key).toString();
 }
diff --git a/src/libs/utils/displayname.h b/src/libs/utils/displayname.h
index b7a9b5f90d0..0998eafd6eb 100644
--- a/src/libs/utils/displayname.h
+++ b/src/libs/utils/displayname.h
@@ -3,10 +3,7 @@
 
 #pragma once
 
-#include "utils_global.h"
-
-#include <QString>
-#include <QVariantMap>
+#include "storage.h"
 
 namespace Utils {
 
@@ -24,8 +21,8 @@ public:
     bool usesDefaultValue() const;
     void forceSerialization() { m_forceSerialization = true; }
 
-    void toMap(QVariantMap &map, const QString &key) const;
-    void fromMap(const QVariantMap &map, const QString &key);
+    void toMap(Utils::Storage &map, const Key &key) const;
+    void fromMap(const Utils::Storage &map, const Key &key);
 
 private:
     QString m_value;