Utils etc: More use of Key and Store

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

2 files changed, 16 insertions, 11 deletions

diff --git a/src/plugins/fakevim/fakevimactions.cpp b/src/plugins/fakevim/fakevimactions.cpp
index 7770750094..dca99a23b5 100644
--- a/src/plugins/fakevim/fakevimactions.cpp
+++ b/src/plugins/fakevim/fakevimactions.cpp
@@ -265,7 +265,7 @@ QString FakeVimSettings::trySetValue(const QString &name, const QString &value)
 
 void FakeVimSettings::setup(FvBaseAspect *aspect,
                             const QVariant &value,
-                            const QString &settingsKey,
+                            const Key &settingsKey,
                             const QString &shortName,
                             const QString &labelText)
 {
@@ -282,7 +282,7 @@ void FakeVimSettings::setup(FvBaseAspect *aspect,
     Q_UNUSED(labelText)
 #endif
 
-    const QString longName = settingsKey.toLower();
+    const Key longName = settingsKey.toLower();
     if (!longName.isEmpty()) {
         m_nameToAspect[longName] = aspect;
         m_aspectToName[aspect] = longName;
diff --git a/src/plugins/fakevim/fakevimactions.h b/src/plugins/fakevim/fakevimactions.h
index 1d72080d9b..18baecafec 100644
--- a/src/plugins/fakevim/fakevimactions.h
+++ b/src/plugins/fakevim/fakevimactions.h
@@ -3,13 +3,15 @@
 
 #pragma once
 
-#ifndef FAKEVIM_STANDALONE
+#ifdef FAKEVIM_STANDALONE
 
-#include <coreplugin/dialogs/ioptionspage.h>
+#include <utils/store.h>
+
+namespace Utils { class FilePath {}; }
 
 #else
 
-namespace Utils { class FilePath {}; }
+#include <coreplugin/dialogs/ioptionspage.h>
 
 #endif
 
@@ -32,8 +34,11 @@ public:
     virtual void setDefaultVariantValue(const QVariant &) {}
     virtual QVariant variantValue() const { return {}; }
     virtual QVariant defaultVariantValue() const { return {}; }
-
+#ifdef QTC_USE_STORE
+    void setSettingsKey(const QString &group, const QByteArray &key);
+#else
     void setSettingsKey(const QString &group, const QString &key);
+#endif
     QString settingsKey() const;
     void setCheckable(bool) {}
     void setDisplayName(const QString &) {}
@@ -155,12 +160,12 @@ public:
 
 private:
     void setup(FvBaseAspect *aspect, const QVariant &value,
-                      const QString &settingsKey,
-                      const QString &shortName,
-                      const QString &label);
+               const Utils::Key &settingsKey,
+               const QString &shortName,
+               const QString &label);
 
-    QHash<QString, FvBaseAspect *> m_nameToAspect;
-    QHash<FvBaseAspect *, QString> m_aspectToName;
+    QHash<Utils::Key, FvBaseAspect *> m_nameToAspect;
+    QHash<FvBaseAspect *, Utils::Key> m_aspectToName;
 };
 
 FakeVimSettings &settings();