From bd8267993d1ed0292200f3052e3c30d4fc9c84f7 Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Sun, 4 Jan 2015 10:13:12 +0100
Subject: - fixes after merge

---
 src/settings.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/settings.h')

diff --git a/src/settings.h b/src/settings.h
index 5d398f49..cea4729a 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -43,7 +43,7 @@ public:
   /**
    * @brief constructor
    **/
-  Settings();
+  Settings(const QSettings &settingsSource);
 
   virtual ~Settings();
 
@@ -281,6 +281,7 @@ private:
   void addStyles(QComboBox *styleBox);
   void readPluginBlacklist();
   void writePluginBlacklist();
+  QString getConfigurablePath(const QString &key, const QString &def) const;
 
 private slots:
 
-- 
cgit v1.3.1