Changeset 84400 in vbox for trunk/src

Timestamp:

May 20, 2020 1:44:57 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: ​bugref:9653: VirtualBox Manager: Chooser pane: Shortcut for groupType inside item as well; Adding a bit of assertion paranoia here and there across related stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser

Files:

• UIChooserAbstractModel.cpp (modified) (2 diffs)
• UIChooserDefs.h (modified) (1 diff)
• UIChooserItemGroup.cpp (modified) (6 diffs)
• UIChooserItemGroup.h (modified) (1 diff)
• UIChooserModel.cpp (modified) (2 diffs)
• UIChooserNodeGroup.cpp (modified) (1 diff)

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

@@ -650 +650 @@
         AssertMsg(!strFirstSuffix.isEmpty(), ("Invalid group name!"));
         /* Trying to get group node among our children: */
-        foreach (UIChooserNode *pGroupNode, pParentNode->nodes(UIChooserNodeType_Group))
+        foreach (UIChooserNode *pNode, pParentNode->nodes(UIChooserNodeType_Group))
         {
-            if (   pGroupNode->toGroupNode()->groupType() == UIChooserNodeGroupType_Local
-                && pGroupNode->name() == strSecondSubName)
+            AssertPtrReturn(pNode, 0);
+            UIChooserNodeGroup *pGroupNode = pNode->toGroupNode();
+            AssertPtrReturn(pGroupNode, 0);
+            if (   pGroupNode->groupType() == UIChooserNodeGroupType_Local
+                && pNode->name() == strSecondSubName)
             {
-                UIChooserNode *pFoundNode = getLocalGroupNode(strFirstSuffix, pGroupNode, fAllGroupsOpened);
+                UIChooserNode *pFoundNode = getLocalGroupNode(strFirstSuffix, pNode, fAllGroupsOpened);
                 if (UIChooserNodeGroup *pFoundGroupNode = pFoundNode->toGroupNode())
                     if (fAllGroupsOpened && pFoundGroupNode->isClosed())
@@ -692 +695 @@
         AssertMsg(!strFirstSuffix.isEmpty(), ("Invalid group name!"));
         /* Trying to get group node among our children: */
-        foreach (UIChooserNode *pGroupNode, pParentNode->nodes(UIChooserNodeType_Group))
+        foreach (UIChooserNode *pNode, pParentNode->nodes(UIChooserNodeType_Group))
         {
-            if (   pGroupNode->toGroupNode()->groupType() != UIChooserNodeGroupType_Local
-                && pGroupNode->name() == strSecondSubName)
+            AssertPtrReturn(pNode, 0);
+            UIChooserNodeGroup *pGroupNode = pNode->toGroupNode();
+            AssertPtrReturn(pGroupNode, 0);
+            if (   (   pGroupNode->groupType() == UIChooserNodeGroupType_Provider
+                    || pGroupNode->groupType() == UIChooserNodeGroupType_Profile)
+                && pNode->name() == strSecondSubName)
             {
-                UIChooserNode *pFoundNode = getCloudGroupNode(strFirstSuffix, pGroupNode, fAllGroupsOpened);
+                UIChooserNode *pFoundNode = getCloudGroupNode(strFirstSuffix, pNode, fAllGroupsOpened);
                 if (UIChooserNodeGroup *pFoundGroupNode = pFoundNode->toGroupNode())
                     if (fAllGroupsOpened && pFoundGroupNode->isClosed())

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserDefs.h

@@ -42 +42 @@
 enum UIChooserNodeGroupType
 {
+    UIChooserNodeGroupType_Invalid,
     UIChooserNodeGroupType_Local,
     UIChooserNodeGroupType_Provider,

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

@@ -93 +93 @@
 {
     return node() ? node()->toGroupNode() : 0;
+}
+
+UIChooserNodeGroupType UIChooserItemGroup::groupType() const
+{
+    return nodeToGroupType() ? nodeToGroupType()->groupType() : UIChooserNodeGroupType_Invalid;
 }
 
@@ -493 +498 @@
     /* Are we searching among group-items? */
     if (   (   iItemSearchFlags & UIChooserItemSearchFlag_LocalGroup
-            && nodeToGroupType()->groupType() == UIChooserNodeGroupType_Local)
+            && groupType() == UIChooserNodeGroupType_Local)
         || (   iItemSearchFlags & UIChooserItemSearchFlag_CloudProvider
-            && nodeToGroupType()->groupType() == UIChooserNodeGroupType_Provider)
+            && groupType() == UIChooserNodeGroupType_Provider)
         || (   iItemSearchFlags & UIChooserItemSearchFlag_CloudProfile
-            && nodeToGroupType()->groupType() == UIChooserNodeGroupType_Profile))
+            && groupType() == UIChooserNodeGroupType_Profile))
     {
         /* Are we searching by the exact ID? */
@@ -703 +708 @@
 
         /* For local items: */
-        if (   nodeToGroupType()->groupType() == UIChooserNodeGroupType_Local
-            && pGroupItem->nodeToGroupType()->groupType() == UIChooserNodeGroupType_Local)
+        if (   groupType() == UIChooserNodeGroupType_Local
+            && pGroupItem->groupType() == UIChooserNodeGroupType_Local)
         {
             /* Make sure passed machine isn't immutable within own group: */
@@ -727 +732 @@
         /* For cloud items: */
         else
-        if (   nodeToGroupType()->groupType() == UIChooserNodeGroupType_Provider
-            && pGroupItem->nodeToGroupType()->groupType() == UIChooserNodeGroupType_Profile)
+        if (   groupType() == UIChooserNodeGroupType_Provider
+            && pGroupItem->groupType() == UIChooserNodeGroupType_Profile)
         {
             /* Make sure passed item is ours: */
@@ -745 +750 @@
 
         /* For local items: */
-        if (   nodeToGroupType()->groupType() == UIChooserNodeGroupType_Local
+        if (   groupType() == UIChooserNodeGroupType_Local
             && pMachineItem->cacheType() == UIVirtualMachineItemType_Local)
         {
@@ -770 +775 @@
         /* For cloud items: */
         else
-        if (   nodeToGroupType()->groupType() == UIChooserNodeGroupType_Profile
+        if (   groupType() == UIChooserNodeGroupType_Profile
             && pMachineItem->cacheType() == UIVirtualMachineItemType_CloudReal)
         {

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.h

@@ -73 +73 @@
         /** Returns group node reference. */
         UIChooserNodeGroup *nodeToGroupType() const;
+
+        /** Returns group node type. */
+        UIChooserNodeGroupType groupType() const;
 
         /** Returns whether group is closed. */

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

@@ -362 +362 @@
 {
     return    isSingleGroupSelected()
-           && firstSelectedItem()->node()->toGroupNode()->groupType() == UIChooserNodeGroupType_Local;
+           && firstSelectedItem()->toGroupItem()->groupType() == UIChooserNodeGroupType_Local;
 }
 
@@ -368 +368 @@
 {
     return    isSingleGroupSelected()
-           && firstSelectedItem()->node()->toGroupNode()->groupType() == UIChooserNodeGroupType_Profile;
+           && firstSelectedItem()->toGroupItem()->groupType() == UIChooserNodeGroupType_Profile;
 }
 

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

@@ -120 +120 @@
             strNodePrefix = UIChooserAbstractModel::definitionOption(UIChooserAbstractModel::NodeDef_GroupPrefixProfile);
             break;
+        default:
+            AssertFailedReturn(QString());
     }
     const QString strNodeOptionOpened = UIChooserAbstractModel::definitionOption(UIChooserAbstractModel::NodeDef_GroupOptionOpened);