From 1fdc150116cad39aae5c5da407c3312b47a59e3a Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@unit193.net>
Date: Fri, 17 Dec 2021 07:06:30 -0500
Subject: New upstream version 3.3.3+dfsg1.

---
 SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.h')

diff --git a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.h b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.h
index f72ebda..62ef0df 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.h
+++ b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.h
@@ -60,7 +60,6 @@ class GUI_API_EXPORT DbTree : public QDockWidget, public ExtActionContainer
             DISCONNECT_FROM_DB,
             IMPORT_INTO_DB,
             EXPORT_DB,
-            CONVERT_DB,
             VACUUM_DB,
             INTEGRITY_CHECK,
             ADD_TABLE,
@@ -133,10 +132,10 @@ class GUI_API_EXPORT DbTree : public QDockWidget, public ExtActionContainer
         void setActionEnabled(int action, bool enabled);
         TableWindow* openTable(DbTreeItem* item);
         TableWindow* openTable(Db* db, const QString& database, const QString& table);
-        TableWindow* newTable(DbTreeItem* item);
+        TableWindow* newTable(Db* db);
         ViewWindow* openView(DbTreeItem* item);
         ViewWindow* openView(Db* db, const QString& database, const QString& view);
-        ViewWindow* newView(DbTreeItem* item);
+        ViewWindow* newView(Db* db);
         void editIndex(DbTreeItem* item);
         void editTrigger(DbTreeItem* item);
         void delSelectedObject();
@@ -156,6 +155,7 @@ class GUI_API_EXPORT DbTree : public QDockWidget, public ExtActionContainer
         bool execQueryFromFile(Db* db, const QString& sql);
         void handleFileQueryExecution(Db* db, int executed, int attemptedExecutions, bool ok, bool ignoreErrors, int millis);
         QList<QPair<QString, QString>> executeFileQueries(Db* db, QTextStream& stream, int& executed, int& attemptedExecutions, bool& ok, bool ignoreErrors, qint64 fileSize);
+        bool shouldSkipQueryFromFileExecution(const QString& sql);
 
         static bool areDbTreeItemsValidForItem(QList<DbTreeItem*> srcItems, const DbTreeItem* dstItem, bool forPasting = false);
         static bool areUrlsValidForItem(const QList<QUrl>& srcUrls, const DbTreeItem* dstItem);
@@ -210,7 +210,6 @@ class GUI_API_EXPORT DbTree : public QDockWidget, public ExtActionContainer
         void addColumn();
         void editColumn();
         void delColumn();
-        void convertDb();
         void vacuumDb();
         void integrityCheck();
         void createSimilarTable();
@@ -241,6 +240,7 @@ class GUI_API_EXPORT DbTree : public QDockWidget, public ExtActionContainer
         void updateFileExecProgress(int value);
         void fileExecCoverToBeClosed();
         void fileExecErrors(const QList<QPair<QString, QString>>& errors, bool rolledBack);
+        void schemaNeedsRefreshing(Db* db);
 };
 
 int qHash(DbTree::Action action);
-- 
cgit v1.2.3