From 7194a3d7a80c9b84334a175724e42f728d84aca5 Mon Sep 17 00:00:00 2001
From: Felix Geyer <debfx@fobos.de>
Date: Sun, 27 May 2012 20:05:57 +0200
Subject: [PATCH] Store defaults in Config.

---
 src/core/Config.cpp | 8 ++++++++
 src/core/Config.h   | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/core/Config.cpp b/src/core/Config.cpp
index c8ccb44f..c0d33032 100644
--- a/src/core/Config.cpp
+++ b/src/core/Config.cpp
@@ -21,6 +21,11 @@
 #include <QtCore/QSettings>
 #include <QtGui/QDesktopServices>
 
+QVariant Config::get(const QString& key)
+{
+    return m_settings->value(key, m_defaults.value(key));
+}
+
 QVariant Config::get(const QString& key, const QVariant& defaultValue)
 {
     return m_settings->value(key, defaultValue);
@@ -61,6 +66,9 @@ Config::Config()
     userPath += "keepassx2.ini";
 
     m_settings.reset(new QSettings(userPath, QSettings::IniFormat));
+
+    m_defaults.insert("security/clearclipboard", true);
+    m_defaults.insert("security/clearclipboardtimeout", 10);
 }
 
 Config* config()
diff --git a/src/core/Config.h b/src/core/Config.h
index 1f9278f4..625a22a8 100644
--- a/src/core/Config.h
+++ b/src/core/Config.h
@@ -26,13 +26,15 @@ class QSettings;
 class Config
 {
 public:
-    QVariant get(const QString& key, const QVariant& defaultValue = QVariant());
+    QVariant get(const QString& key);
+    QVariant get(const QString& key, const QVariant& defaultValue);
     void set(const QString& key, const QVariant& value);
 
 private:
     Config();
 
     QScopedPointer<QSettings> m_settings;
+    QHash<QString, QVariant> m_defaults;
 
     Q_DISABLE_COPY(Config)