From 89214766d8e3e7b8dd749a1fa18a5b9727f5010d Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Sun, 14 Dec 2014 08:24:26 -0500 Subject: Imported Upstream version 3.0.0 --- SQLiteStudio3/coreSQLiteStudio/dbobjectorganizer.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'SQLiteStudio3/coreSQLiteStudio/dbobjectorganizer.h') diff --git a/SQLiteStudio3/coreSQLiteStudio/dbobjectorganizer.h b/SQLiteStudio3/coreSQLiteStudio/dbobjectorganizer.h index 70b748f..8a7e7a9 100644 --- a/SQLiteStudio3/coreSQLiteStudio/dbobjectorganizer.h +++ b/SQLiteStudio3/coreSQLiteStudio/dbobjectorganizer.h @@ -108,6 +108,7 @@ class API_EXPORT DbObjectOrganizer : public QObject, public QRunnable, public In bool commit(); bool rollback(); void emitFinished(bool success); + bool execConfirmFunctionInMainThread(const QStringList& tables); ReferencedTablesConfimFunction confirmFunction; NameConflictResolveFunction nameConflictResolveFunction; @@ -142,6 +143,7 @@ class API_EXPORT DbObjectOrganizer : public QObject, public QRunnable, public In private slots: void processPreparationFinished(); + bool confirmFunctionSlot(const QStringList& tables); signals: void finishedDbObjectsMove(bool success, Db* srcDb, Db* dstDb); -- cgit v1.2.3