diff options
| author | Tannin <devnull@localhost> | 2015-01-04 10:13:12 +0100 |
|---|---|---|
| committer | Tannin <devnull@localhost> | 2015-01-04 10:13:12 +0100 |
| commit | bd8267993d1ed0292200f3052e3c30d4fc9c84f7 (patch) | |
| tree | 6314f0ba928e81349417a8de495746b1b18cee11 /src/settings.h | |
| parent | f5c56efeb3f362378459fdc1ddbf1fc71a2351f8 (diff) | |
- fixes after merge
Diffstat (limited to 'src/settings.h')
| -rw-r--r-- | src/settings.h | 3 |
1 files changed, 2 insertions, 1 deletions
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: |
