diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2017-02-09 04:37:26 -0500 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2017-02-09 04:37:26 -0500 |
| commit | c9d6debf9015b7853c3e061bbc64a555d85e2fcd (patch) | |
| tree | 53341bc57ae9fbad2beb5b6c08d97a68bee0ec8e /SQLiteStudio3/coreSQLiteStudio/services/config.h | |
| parent | d5caba2b1f36dc3b92fa705a06097d0597fa2ddd (diff) | |
| parent | d9aa870e5d509cc7309ab82dd102a937ab58613a (diff) | |
Merge tag 'upstream/3.1.1+dfsg1'
Upstream version 3.1.1+dfsg1
# gpg: Signature made Thu 09 Feb 2017 04:37:24 AM EST
# gpg: using RSA key 5001E1B09AA3744B
# gpg: issuer "unit193@ubuntu.com"
# gpg: Good signature from "Unit 193 <unit193@ubuntu.com>" [unknown]
# gpg: aka "Unit 193 <unit193@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8DB3 E586 865D 2B4A 2B18 5A5C 5001 E1B0 9AA3 744B
Diffstat (limited to 'SQLiteStudio3/coreSQLiteStudio/services/config.h')
| -rw-r--r-- | SQLiteStudio3/coreSQLiteStudio/services/config.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/SQLiteStudio3/coreSQLiteStudio/services/config.h b/SQLiteStudio3/coreSQLiteStudio/services/config.h index c7bebf3..1e4c410 100644 --- a/SQLiteStudio3/coreSQLiteStudio/services/config.h +++ b/SQLiteStudio3/coreSQLiteStudio/services/config.h @@ -14,7 +14,7 @@ #include <QSharedPointer> #include <QDateTime> -const int SQLITESTUDIO_CONFIG_VERSION = 1; +const int SQLITESTUDIO_CONFIG_VERSION = 2; CFG_CATEGORIES(Core, CFG_CATEGORY(General, @@ -104,6 +104,9 @@ class API_EXPORT Config : public QObject typedef QSharedPointer<ReportHistoryEntry> ReportHistoryEntryPtr; + static void setMasterConfigFile(const QString& path); + static QString getMasterConfigFile(); + virtual void init() = 0; virtual void cleanUp() = 0; virtual const QString& getConfigDir() const = 0; @@ -166,7 +169,7 @@ class API_EXPORT Config : public QObject signals: void massSaveBegins(); - void massSaveCommited(); + void massSaveCommitted(); void sqlHistoryRefreshNeeded(); void ddlHistoryRefreshNeeded(); void reportsHistoryRefreshNeeded(); |