Merge tag 'upstream/3.0.0'

Upstream version 3.0.0

# gpg: Signature made Sun 14 Dec 2014 08:24:31 AM EST using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"

1 files changed, 2 insertions, 0 deletions

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);