X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsettings.h;h=1a0fa6d7f9ee5bfd9198fc799c23326ed5a0b7b7;hp=36576058a3d84fff45495b08808ad8f5fad85fa7;hb=6eefdfc697067d184a589fc8a231b16316c09106;hpb=68878dc8366f2f4a0afe132847aad9a51a80cdbf

diff --git a/src/common/settings.h b/src/common/settings.h
index 36576058..1a0fa6d7 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -18,18 +18,20 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef SETTINGS_H
-#define SETTINGS_H
+#pragma once
+
+#include "common-export.h"
 
 #include <QCoreApplication>
 #include <QHash>
 #include <QSettings>
 #include <QString>
 #include <QVariant>
+#include <utility>
 
 #include "quassel.h"
 
-class SettingsChangeNotifier : public QObject
+class COMMON_EXPORT SettingsChangeNotifier : public QObject
 {
     Q_OBJECT
 
@@ -41,7 +43,7 @@ private:
 };
 
 
-class Settings
+class COMMON_EXPORT Settings
 {
 public:
     enum Mode { Default, Custom };
@@ -98,8 +100,8 @@ public:
     bool isWritable();
 
 protected:
-    inline Settings(QString group_, QString appName_) : group(group_), appName(appName_) {}
-    inline virtual ~Settings() {}
+    inline Settings(QString group_, QString appName_) : group(std::move(group_)), appName(std::move(appName_)) {}
+    inline virtual ~Settings() = default;
 
     inline void setGroup(const QString &group_) { group = group_; }
 
@@ -108,7 +110,7 @@ protected:
     virtual QStringList localChildGroups(const QString &rootkey = QString());
 
     virtual void setLocalValue(const QString &key, const QVariant &data);
-    virtual const QVariant &localValue(const QString &key, const QVariant &def = QVariant());
+    virtual QVariant localValue(const QString &key, const QVariant &def = QVariant());
 
     /**
      * Gets if a key exists in settings
@@ -141,7 +143,8 @@ private:
     }
 
 
-    static QHash<QString, QVariant> settingsCache;
+    static QHash<QString, QVariant> settingsCache;         ///< Cached settings values
+    static QHash<QString, bool> settingsKeyPersistedCache; ///< Cached settings key exists on disk
     static QHash<QString, SettingsChangeNotifier *> settingsChangeNotifier;
 
     inline QString normalizedKey(const QString &group, const QString &key)
@@ -152,6 +155,44 @@ private:
     }
 
 
+    /**
+     * Update the cache of whether or not a given settings key persists on disk
+     *
+     * @param normKey Normalized settings key ID
+     * @param exists  True if key exists, otherwise false
+     */
+    inline void setCacheKeyPersisted(const QString &normKey, bool exists)
+    {
+        settingsKeyPersistedCache[normKey] = exists;
+    }
+
+
+    /**
+     * Check if the given settings key ID persists on disk (rather than being a default value)
+     *
+     * @see Settings::localKeyExists()
+     *
+     * @param normKey Normalized settings key ID
+     * @return True if key exists and persistence has been cached, otherwise false
+     */
+    inline const bool &cacheKeyPersisted(const QString &normKey)
+    {
+        return settingsKeyPersistedCache[normKey];
+    }
+
+
+    /**
+     * Check if the persistence of the given settings key ID has been cached
+     *
+     * @param normKey Normalized settings key ID
+     * @return True if key persistence has been cached, otherwise false
+     */
+    inline bool isKeyPersistedCached(const QString &normKey)
+    {
+        return settingsKeyPersistedCache.contains(normKey);
+    }
+
+
     inline void setCacheValue(const QString &normKey, const QVariant &data)
     {
         settingsCache[normKey] = data;
@@ -183,6 +224,3 @@ private:
         return settingsChangeNotifier.contains(normKey);
     }
 };
-
-
-#endif