Update upstream source from tag 'upstream/3.4.4+dfsg'

Update to upstream version '3.4.4+dfsg'
with Debian dir 482614bd23f0ef52dabc9803477204ad88e917ed

1 files changed, 8 insertions, 3 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/services/config.h b/SQLiteStudio3/coreSQLiteStudio/services/config.h
index 9d1e567..bd001c2 100644
--- a/SQLiteStudio3/coreSQLiteStudio/services/config.h
+++ b/SQLiteStudio3/coreSQLiteStudio/services/config.h
@@ -3,8 +3,6 @@
 
 #include "coreSQLiteStudio_global.h"
 #include "config_builder.h"
-#include "services/functionmanager.h"
-#include "collationmanager.h"
 #include "sqlitestudio.h"
 #include "common/utils.h"
 #include <QObject>
@@ -34,11 +32,16 @@ CFG_CATEGORIES(Core,
         CFG_ENTRY(QVariantList, Functions,               QVariantList())
         CFG_ENTRY(QVariantList, Collations,              QVariantList())
         CFG_ENTRY(QVariantList, Extensions,              QVariantList())
+        CFG_ENTRY(QVariantList, CodeSnippets,            QVariantList())
         CFG_ENTRY(QString,      BugReportUser,           QString())
         CFG_ENTRY(QString,      BugReportPassword,       QString())
         CFG_ENTRY(QString,      BugReportRecentTitle,    QString())
         CFG_ENTRY(QString,      BugReportRecentContents, QString())
         CFG_ENTRY(bool,         BugReportRecentError,    false)
+        CFG_ENTRY(bool,         DefaultSnippetsCreated,  false)
+    )
+    CFG_CATEGORY(CodeAssistant,
+        CFG_ENTRY(bool,         AutoTrigger,             true)
     )
 )
 
@@ -46,6 +49,7 @@ CFG_CATEGORIES(Core,
 
 class QAbstractItemModel;
 class DdlHistoryModel;
+class QSettings;
 
 class API_EXPORT Config : public QObject
 {
@@ -113,9 +117,10 @@ class API_EXPORT Config : public QObject
         static void setMasterConfigFile(const QString& path);
         static QString getMasterConfigFile();
         static void setAskUserForConfigDirFunc(const AskUserForConfigDirFunc& value);
+        static QString getPortableConfigPath();
+        static QSettings* getSettings();
 
         virtual void init() = 0;
-        virtual void cleanUp() = 0;
         virtual const QString& getConfigDir() const = 0;
         virtual QString getConfigFilePath() const = 0;
         virtual bool isInMemory() const = 0;