Update upstream source from tag 'upstream/3.2.1+dfsg1'

Update to upstream version '3.2.1+dfsg1'
with Debian dir 5ea0333565de4dc898c062cc0ff4ba1153e2c1e4

1 files changed, 24 insertions, 20 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp
index 9fe88c2..123c4df 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp
@@ -99,7 +99,7 @@ void DbTreeModel::deleteGroup(QStandardItem *groupItem)
     if (!parentItem)
         parentItem = root();
 
-    foreach (QStandardItem* child, dynamic_cast<DbTreeItem*>(groupItem)->childs())
+    for (QStandardItem* child : dynamic_cast<DbTreeItem*>(groupItem)->childs())
         move(child, parentItem);
 
     parentItem->removeRow(groupItem->row());
@@ -163,12 +163,12 @@ void DbTreeModel::storeGroups()
 void DbTreeModel::readGroups(QList<Db*> dbList)
 {
     QList<Config::DbGroupPtr> groups = CFG->getGroups();
-    foreach (const Config::DbGroupPtr& group, groups)
+    for (const Config::DbGroupPtr& group : groups)
         restoreGroup(group, &dbList);
 
     // Add rest of databases, not mentioned in groups
     Config::DbGroupPtr group;
-    foreach (Db* db, dbList)
+    for (Db* db : dbList)
     {
         group = Config::DbGroupPtr::create();
         group->referencedDbName = db->getName();
@@ -243,7 +243,7 @@ void DbTreeModel::restoreGroup(const Config::DbGroupPtr& group, QList<Db*>* dbLi
 
     if (item->getType() == DbTreeItem::Type::DIR)
     {
-        foreach (const Config::DbGroupPtr& childGroup, group->childs)
+        for (const Config::DbGroupPtr& childGroup : group->childs)
             restoreGroup(childGroup, dbList, item);
     }
 
@@ -538,7 +538,7 @@ QList<QStandardItem *> DbTreeModel::refreshSchemaTables(const QStringList &table
         sortedTables.sort(Qt::CaseInsensitive);
 
     QList<QStandardItem *> items;
-    foreach (const QString& table, sortedTables)
+    for (const QString& table : sortedTables)
     {
         if (virtualTables.contains(table))
             items += DbTreeItemFactory::createVirtualTable(table, this);
@@ -605,7 +605,7 @@ QList<QStandardItem *> DbTreeModel::refreshSchemaViews(const QStringList &views,
         sortedViews.sort(Qt::CaseInsensitive);
 
     QList<QStandardItem *> items;
-    foreach (const QString& view, sortedViews)
+    for (const QString& view : sortedViews)
         items += DbTreeItemFactory::createView(view, this);
 
     return items;
@@ -638,7 +638,7 @@ void DbTreeModel::refreshSchemaBuild(QStandardItem *dbItem,
     DbTreeItem* columnsItem = nullptr;
     DbTreeItem* indexesItem = nullptr;
     DbTreeItem* triggersItem = nullptr;
-    foreach (QStandardItem* tableItem, tables)
+    for (QStandardItem* tableItem : tables)
     {
         tablesItem->appendRow(tableItem);
 
@@ -650,22 +650,22 @@ void DbTreeModel::refreshSchemaBuild(QStandardItem *dbItem,
         tableItem->appendRow(indexesItem);
         tableItem->appendRow(triggersItem);
 
-        foreach (QStandardItem* columnItem, allTableColumns[tableItem->text()])
+        for (QStandardItem* columnItem : allTableColumns[tableItem->text()])
             columnsItem->appendRow(columnItem);
 
-        foreach (QStandardItem* indexItem, indexes[tableItem->text()])
+        for (QStandardItem* indexItem : indexes[tableItem->text()])
             indexesItem->appendRow(indexItem);
 
-        foreach (QStandardItem* triggerItem, triggers[tableItem->text()])
+        for (QStandardItem* triggerItem : triggers[tableItem->text()])
             triggersItem->appendRow(triggerItem);
     }
-    foreach (QStandardItem* viewItem, views)
+    for (QStandardItem* viewItem : views)
     {
         viewsItem->appendRow(viewItem);
 
         triggersItem = DbTreeItemFactory::createTriggers(this);
         viewItem->appendRow(triggersItem);
-        foreach (QStandardItem* triggerItem, triggers[viewItem->text()])
+        for (QStandardItem* triggerItem : triggers[viewItem->text()])
             triggersItem->appendRow(triggerItem);
     }
 }
@@ -677,7 +677,7 @@ void DbTreeModel::restoreExpandedState(const QHash<QString, bool>& expandedState
     if (expandedState.contains(sig) && expandedState[sig])
         treeView->expand(parentItem->index());
 
-    foreach (QStandardItem* child, parentDbTreeItem->childs())
+    for (QStandardItem* child : parentDbTreeItem->childs())
         restoreExpandedState(expandedState, child);
 }
 
@@ -965,7 +965,7 @@ bool DbTreeModel::pasteData(const QMimeData* data, int row, int column, const QM
     }
 
     if (data->formats().contains(MIMETYPE))
-        return dropDbTreeItem(getDragItems(data), dstItem, defaultAction, *invokeStdAction);
+        return dropDbTreeItem(getDragItems(data), dstItem, defaultAction, invokeStdAction);
     else if (data->hasUrls())
         return dropUrls(data->urls());
     else
@@ -975,7 +975,7 @@ bool DbTreeModel::pasteData(const QMimeData* data, int row, int column, const QM
 void DbTreeModel::interruptableStarted(Interruptable* obj)
 {
     if (interruptables.size() == 0)
-        treeView->getDbTree()->showWidgetCover();
+        treeView->getDbTree()->showRefreshWidgetCover();
 
     interruptables << obj;
 }
@@ -984,7 +984,7 @@ void DbTreeModel::interruptableFinished(Interruptable* obj)
 {
     interruptables.removeOne(obj);
     if (interruptables.size() == 0)
-        treeView->getDbTree()->hideWidgetCover();
+        treeView->getDbTree()->hideRefreshWidgetCover();
 }
 
 QList<DbTreeItem*> DbTreeModel::getDragItems(const QMimeData* data)
@@ -1025,7 +1025,7 @@ void DbTreeModel::staticInit()
 {
 }
 
-bool DbTreeModel::dropDbTreeItem(const QList<DbTreeItem*>& srcItems, DbTreeItem* dstItem, Qt::DropAction defaultAction, bool& invokeStdDropAction)
+bool DbTreeModel::dropDbTreeItem(const QList<DbTreeItem*>& srcItems, DbTreeItem* dstItem, Qt::DropAction defaultAction, bool *invokeStdDropAction)
 {
     // The result means: do we want the old item to be removed from the tree?
     if (srcItems.size() == 0)
@@ -1040,9 +1040,9 @@ bool DbTreeModel::dropDbTreeItem(const QList<DbTreeItem*>& srcItems, DbTreeItem*
             if (!dstItem)
                 return false;
 
-            if (srcItem->getDb() == dstItem->getDb())
+            if (srcItem->getDb() == dstItem->getDb() && invokeStdDropAction)
             {
-                invokeStdDropAction = true;
+                *invokeStdDropAction = true;
                 return true;
             }
 
@@ -1050,8 +1050,12 @@ bool DbTreeModel::dropDbTreeItem(const QList<DbTreeItem*>& srcItems, DbTreeItem*
         }
         case DbTreeItem::Type::DB:
         case DbTreeItem::Type::DIR:
-            invokeStdDropAction = true;
+        {
+            if (invokeStdDropAction)
+                *invokeStdDropAction = true;
+
             break;
+        }
         case DbTreeItem::Type::COLUMN:
         case DbTreeItem::Type::TABLES:
         case DbTreeItem::Type::INDEXES: