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, 7 insertions, 6 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/plugins/scriptingqtdbproxy.h b/SQLiteStudio3/coreSQLiteStudio/plugins/scriptingqtdbproxy.h
index add9540..9a86f6b 100644
--- a/SQLiteStudio3/coreSQLiteStudio/plugins/scriptingqtdbproxy.h
+++ b/SQLiteStudio3/coreSQLiteStudio/plugins/scriptingqtdbproxy.h
@@ -2,18 +2,18 @@
 #define SCRIPTINGQTDBPROXY_H
 
 #include <QObject>
-#include <QScriptable>
 #include <QHash>
 #include <QList>
 #include <QVariant>
+#include <QJSValue>
 
 class Db;
 
-class ScriptingQtDbProxy : public QObject, protected QScriptable
+class ScriptingQtDbProxy : public QObject
 {
         Q_OBJECT
     public:
-        explicit ScriptingQtDbProxy(QObject *parent = 0);
+        explicit ScriptingQtDbProxy(QJSEngine* engine, QObject *parent = 0);
 
         Db* getDb() const;
         void setDb(Db* value);
@@ -23,20 +23,21 @@ class ScriptingQtDbProxy : public QObject, protected QScriptable
 
     private:
         QVariant evalInternal(const QString& sql, const QList<QVariant>& listArgs, const QMap<QString, QVariant>& mapArgs, bool singleCell,
-                              const QScriptValue* funcPtr = nullptr);
+                              const QJSValue* funcPtr = nullptr);
         QVariant evalInternalErrorResult(bool singleCell);
 
         static QHash<QString, QVariant> mapToHash(const QMap<QString, QVariant>& map);
 
         Db* db = nullptr;
         bool useDbLocking = false;
+        QJSEngine* engine = nullptr;
 
     public slots:
         QVariant eval(const QString& sql);
         QVariant eval(const QString& sql, const QList<QVariant>& args);
         QVariant eval(const QString& sql, const QMap<QString, QVariant>& args);
-        QVariant eval(const QString& sql, const QList<QVariant>& args, const QScriptValue& func);
-        QVariant eval(const QString& sql, const QMap<QString, QVariant>& args, const QScriptValue& func);
+        QVariant eval(const QString& sql, const QList<QVariant>& args, const QJSValue& func);
+        QVariant eval(const QString& sql, const QMap<QString, QVariant>& args, const QJSValue& func);
         QVariant onecolumn(const QString& sql, const QList<QVariant>& args);
         QVariant onecolumn(const QString& sql, const QMap<QString, QVariant>& args);
 };