Changeset 84574 in vbox

Timestamp:

May 27, 2020 4:50:49 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

138304

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Cleanup for group disband functionality; There can't be a collision between local and cloud provider groups; Adding a bit of comments to clarify the situation.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -597 +597 @@
         return;
 
-    /* Check if we have collisions with our potential siblings: */
+    /* Check if we have collisions between disbandable group children and their potential siblings: */
     UIChooserItem *pCurrentItem = currentItem();
     UIChooserNode *pCurrentNode = pCurrentItem->node();
@@ -605 +605 @@
     foreach (UIChooserNode *pChildNode, pCurrentNode->nodes())
     {
+        /* Acquire disbandable group child name to check for collision with group siblings: */
         const QString strChildName = pChildNode->name();
         UIChooserNode *pCollisionSibling = 0;
+        /* And then compare this child name with all the sibling names: */
         foreach (UIChooserNode *pSiblingNode, pParentNode->nodes())
+        {
+            /* There can't be a collision between local child and cloud provider sibling: */
+            if (   pSiblingNode->type() == UIChooserNodeType_Group
+                && pSiblingNode->toGroupNode()->groupType() == UIChooserNodeGroupType_Provider)
+                continue;
+            /* If sibling isn't disbandable group itself and has name similar to one of group children: */
             if (pSiblingNode != pCurrentNode && pSiblingNode->name() == strChildName)
             {
+                /* We have a collision sibling: */
                 pCollisionSibling = pSiblingNode;
                 break;
             }
+        }
+        /* If there is a collision sibling: */
         if (pCollisionSibling)
         {
             switch (pChildNode->type())
             {
+                /* We can't resolve collision automatically for VMs: */
                 case UIChooserNodeType_Machine:
                 {
@@ -622 +634 @@
                     return;
                 }
+                /* But we can do it for VM groups: */
                 case UIChooserNodeType_Group:
                 {