From d3fcf2e0c472810abaf7eee3bd903e913e4ade14 Mon Sep 17 00:00:00 2001
From: Felix Geyer <debfx@fobos.de>
Date: Thu, 31 May 2012 14:51:44 +0200
Subject: Move singleton instance code to static member functions.

---
 src/core/Config.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/core/Config.h')

diff --git a/src/core/Config.h b/src/core/Config.h
index 625a22a85..341e030a5 100644
--- a/src/core/Config.h
+++ b/src/core/Config.h
@@ -30,17 +30,21 @@ public:
     QVariant get(const QString& key, const QVariant& defaultValue);
     void set(const QString& key, const QVariant& value);
 
+    static Config* instance();
+
 private:
     Config();
 
+    static Config* m_instance;
+
     QScopedPointer<QSettings> m_settings;
     QHash<QString, QVariant> m_defaults;
 
     Q_DISABLE_COPY(Config)
-
-    friend Config* config();
 };
 
-Config* config();
+inline Config* config() {
+    return Config::instance();
+}
 
 #endif // KEEPASSX_CONFIG_H
-- 
cgit v1.2.3