CompilerExplorer: More Key and Store

Change-Id: I49a79e672915503359380e776b994e53b210eda9
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>

src/plugins/compilerexplorer/compilerexploreraspects.h

@@ -84,14 +84,14 @@ public:
         : Utils::BaseAspect(container)
     {}
 
-    void fromMap(const QVariantMap &map) override
+    void fromMap(const Utils::Store &map) override
     {
         QTC_ASSERT(!settingsKey().isEmpty(), return);
 
         QVariantList list = map[settingsKey()].toList();
-        for (const auto &entry : list) {
+        for (const QVariant &entry : list) {
             T item = m_createItem();
-            m_toBaseAspect(item)->fromMap(entry.toMap());
+            m_toBaseAspect(item)->fromMap(Utils::storeFromVariant(entry));
             m_volatileItems.append(item);
         }
         m_items = m_volatileItems;
@@ -103,13 +103,13 @@ public:
         const auto &items = v ? m_volatileItems : m_items;
 
         for (const auto &item : items) {
-            QVariantMap childMap;
+            Utils::Store childMap;
             if (v)
                 m_toBaseAspect(item)->volatileToMap(childMap);
             else
                 m_toBaseAspect(item)->toMap(childMap);
 
-            list.append(childMap);
+            list.append(Utils::variantFromStore(childMap));
         }
 
         return list;
@@ -118,14 +118,14 @@ public:
     void toMap(Utils::Store &map) const override
     {
         QTC_ASSERT(!settingsKey().isEmpty(), return);
-        const QString key = settingsKey();
+        const Utils::Key key = settingsKey();
         map[key] = toList(false);
     }
 
     void volatileToMap(Utils::Store &map) const override
     {
         QTC_ASSERT(!settingsKey().isEmpty(), return);
-        const QString key = settingsKey();
+        const Utils::Key key = settingsKey();
         map[key] = toList(true);
     }
 
@@ -191,7 +191,7 @@ public:
         return false;
     }
 
-    QVariant volatileVariantValue() const override { return {}; };
+    QVariant volatileVariantValue() const override { return {}; }
 
 private:
     QList<T> m_items;

src/plugins/compilerexplorer/compilerexplorereditor.cpp

@@ -44,6 +44,7 @@
 using namespace std::chrono_literals;
 using namespace Aggregation;
 using namespace TextEditor;
+using namespace Utils;
 
 namespace CompilerExplorer {
 
@@ -51,7 +52,8 @@ class CodeEditorWidget : public TextEditorWidget
 {
 public:
     CodeEditorWidget(const std::shared_ptr<SourceSettings> &settings)
-        : m_settings(settings){};
+        : m_settings(settings)
+    {}
 
     void updateHighlighter()
     {
@@ -94,8 +96,8 @@ JsonSettingsDocument::JsonSettingsDocument()
 JsonSettingsDocument::~JsonSettingsDocument() {}
 
 Core::IDocument::OpenResult JsonSettingsDocument::open(QString *errorString,
-                                                       const Utils::FilePath &filePath,
+                                                       const FilePath &filePath,
-                                                       const Utils::FilePath &realFilePath)
+                                                       const FilePath &realFilePath)
 {
     if (!filePath.isReadableFile())
         return OpenResult::ReadError;
@@ -121,16 +123,16 @@ Core::IDocument::OpenResult JsonSettingsDocument::open(QString *errorString,
         return OpenResult::CannotHandle;
     }
 
-    m_ceSettings.fromMap(doc.toVariant().toMap());
+    m_ceSettings.fromMap(storeFromVariant(doc.toVariant().toMap()));
     emit settingsChanged();
     return OpenResult::Success;
 }
 
 bool JsonSettingsDocument::saveImpl(QString *errorString,
-                                    const Utils::FilePath &newFilePath,
+                                    const FilePath &newFilePath,
                                     bool autoSave)
 {
-    QVariantMap map;
+    Store map;
 
     if (autoSave) {
         if (m_windowStateCallback)
@@ -145,7 +147,7 @@ bool JsonSettingsDocument::saveImpl(QString *errorString,
         m_ceSettings.toMap(map);
     }
 
-    QJsonDocument doc = QJsonDocument::fromVariant(map);
+    QJsonDocument doc = QJsonDocument::fromVariant(variantFromStore(map));
 
     Utils::FilePath path = newFilePath.isEmpty() ? filePath() : newFilePath;
 
@@ -174,7 +176,7 @@ bool JsonSettingsDocument::setContents(const QByteArray &contents)
 
     QTC_ASSERT(doc.isObject(), return false);
 
-    m_ceSettings.fromMap(doc.toVariant().toMap());
+    m_ceSettings.fromMap(storeFromVariant(doc.toVariant()));
 
     emit settingsChanged();
     return true;
@@ -241,7 +243,7 @@ CompilerWidget::CompilerWidget(const std::shared_ptr<SourceSettings> &sourceSett
     , m_compilerSettings(compilerSettings)
 {
     using namespace Layouting;
-    QVariantMap map;
+    Store map;
 
     m_delayTimer = new QTimer(this);
     m_delayTimer->setSingleShot(true);