From ee7ac389a43e1064ead5e7beaa908419af9904b4 Mon Sep 17 00:00:00 2001
From: Aleksandar Dimov <dimov.aleks@gmail.com>
Date: Wed, 27 Mar 2024 23:41:28 +0100
Subject: [PATCH] add minor improvements

---
 client/secure_qsettings.cpp | 8 +++++++-
 client/secure_qsettings.h   | 6 +-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/client/secure_qsettings.cpp b/client/secure_qsettings.cpp
index 1df101684..a7a3abdf9 100644
--- a/client/secure_qsettings.cpp
+++ b/client/secure_qsettings.cpp
@@ -16,6 +16,12 @@
 
 using namespace QKeychain;
 
+namespace {
+constexpr auto settingsKeyTag{"settingsKeyTag"};
+constexpr auto settingsIvTag{"settingsIvTag"};
+constexpr auto keyChainName{"AmneziaVPN-Keychain"};
+}
+
 SecureQSettings::SecureQSettings(const QString &organization, const QString &application, QObject *parent)
     : QObject { parent }, m_settings(organization, application, parent), encryptedKeys({ "Servers/serversList" })
 {
@@ -50,7 +56,7 @@ QVariant SecureQSettings::value(const QString &key, const QVariant &defaultValue
     // check if value is not encrypted, v. < 2.0.x
     retVal = m_settings.value(key);
     if (retVal.isValid()) {
-        if (retVal.userType() == QVariant::ByteArray && retVal.toByteArray().mid(0, magicString.size()) == magicString) {
+        if (retVal.userType() == QMetaType::QByteArray && retVal.toByteArray().mid(0, magicString.size()) == magicString) {
 
             if (getEncKey().isEmpty() || getEncIv().isEmpty()) {
                 qCritical() << "SecureQSettings::setValue Decryption requested, but key is empty";
diff --git a/client/secure_qsettings.h b/client/secure_qsettings.h
index 89147fc11..f71fd9ba5 100644
--- a/client/secure_qsettings.h
+++ b/client/secure_qsettings.h
@@ -8,10 +8,6 @@
 
 #include "keychain.h"
 
-constexpr const char *settingsKeyTag = "settingsKeyTag";
-constexpr const char *settingsIvTag = "settingsIvTag";
-constexpr const char *keyChainName = "AmneziaVPN-Keychain";
-
 class SecureQSettings : public QObject
 {
     Q_OBJECT
@@ -44,7 +40,7 @@ public:
 private:
     QSettings m_settings;
 
-    mutable QMap<QString, QVariant> m_cache;
+    mutable QHash<QString, QVariant> m_cache;
 
     QStringList encryptedKeys; // encode only key listed here