Merge remote-tracking branch 'origin/qds-1.59'

Change-Id: I8891e7490a7fd51997a3b57561961f6134be3252
2020-06-11 12:34:54 +02:00
parent 8114a58847 ad4c5e0258
commit 3acdb7891b
33 changed files with 456 additions and 273 deletions
--- a/src/libs/sqlite/sqlitedatabasebackend.h
+++ b/src/libs/sqlite/sqlitedatabasebackend.h
@@ -41,9 +41,6 @@ class Database;
 class SQLITE_EXPORT DatabaseBackend
 {
 public:
-    using UpdateCallback
-        = std::function<void(ChangeType type, char const *, char const *, long long)>;
-
    DatabaseBackend(Database &database);
    ~DatabaseBackend();

@@ -88,7 +85,9 @@ public:

    void walCheckpointFull();

-    void setUpdateHook(UpdateCallback &callback);
+    void setUpdateHook(
+        void *object,
+        void (*callback)(void *object, int, char const *database, char const *, long long rowId));
    void resetUpdateHook();

 protected: