Changeset 83672 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 10, 2020 4:27:16 PM (5 years ago)

Author:

vboxsync

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

137158

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Rename UIChooserItemType to UIChooserNodeType.

Location:

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

Files:

• UIChooserAbstractModel.cpp (modified) (16 diffs)
• UIChooserAbstractModel.h (modified) (1 diff)
• UIChooserDefs.h (modified) (2 diffs)
• UIChooserHandlerKeyboard.cpp (modified) (5 diffs)
• UIChooserHandlerMouse.cpp (modified) (1 diff)
• UIChooserItem.cpp (modified) (4 diffs)
• UIChooserItem.h (modified) (1 diff)
• UIChooserItemGlobal.cpp (modified) (1 diff)
• UIChooserItemGlobal.h (modified) (2 diffs)
• UIChooserItemGroup.cpp (modified) (17 diffs)
• UIChooserItemGroup.h (modified) (2 diffs)
• UIChooserItemMachine.cpp (modified) (3 diffs)
• UIChooserItemMachine.h (modified) (2 diffs)
• UIChooserModel.cpp (modified) (22 diffs)
• UIChooserNode.h (modified) (2 diffs)
• UIChooserNodeGlobal.cpp (modified) (2 diffs)
• UIChooserNodeGlobal.h (modified) (2 diffs)
• UIChooserNodeGroup.cpp (modified) (6 diffs)
• UIChooserNodeGroup.h (modified) (2 diffs)
• UIChooserNodeMachine.cpp (modified) (2 diffs)
• UIChooserNodeMachine.h (modified) (2 diffs)

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

@@ -99 +99 @@
     /* Enumerate all the group names: */
     QStringList groupNames;
-    foreach (UIChooserNode *pNode, pRoot->nodes(UIChooserItemType_Group))
+    foreach (UIChooserNode *pNode, pRoot->nodes(UIChooserNodeType_Group))
         groupNames << pNode->name();
 
@@ -453 +453 @@
                                                    false /* favorite */,
                                                    getDesiredNodePosition(m_pInvisibleRootNode,
-                                                                          UIChooserItemType_Group,
+                                                                          UIChooserNodeType_Group,
                                                                           strProviderName),
                                                    strProviderName,
@@ -484 +484 @@
                                                                false /* favorite */,
                                                                getDesiredNodePosition(pProviderNode,
-                                                                                      UIChooserItemType_Group,
+                                                                                      UIChooserNodeType_Group,
                                                                                       strProfileName),
                                                                strProfileName,
@@ -576 +576 @@
         AssertMsg(!strFirstSuffix.isEmpty(), ("Invalid group name!"));
         /* Trying to get group node among our children: */
-        foreach (UIChooserNode *pGroupNode, pParentNode->nodes(UIChooserItemType_Group))
+        foreach (UIChooserNode *pGroupNode, pParentNode->nodes(UIChooserNodeType_Group))
         {
             if (pGroupNode->name() == strSecondSubName)
@@ -593 +593 @@
         new UIChooserNodeGroup(pParentNode,
                                false /* favorite */,
-                               getDesiredNodePosition(pParentNode, UIChooserItemType_Group, strSecondSubName),
+                               getDesiredNodePosition(pParentNode, UIChooserNodeType_Group, strSecondSubName),
                                strSecondSubName,
                                fAllGroupsOpened || shouldGroupNodeBeOpened(pParentNode, strSecondSubName));
@@ -630 +630 @@
 {
     /* Cleanup all the group-items recursively first: */
-    foreach (UIChooserNode *pNode, pParent->nodes(UIChooserItemType_Group))
+    foreach (UIChooserNode *pNode, pParent->nodes(UIChooserNodeType_Group))
         wipeOutEmptyGroupsStartingFrom(pNode);
     /* If parent has no nodes: */
@@ -672 +672 @@
 }
 
-int UIChooserAbstractModel::getDesiredNodePosition(UIChooserNode *pParentNode, UIChooserItemType enmType, const QString &strName)
+int UIChooserAbstractModel::getDesiredNodePosition(UIChooserNode *pParentNode, UIChooserNodeType enmType, const QString &strName)
 {
     /* End of list (by default)? */
@@ -691 +691 @@
             UIChooserNode *pNode = nodes[i];
             /* Which position should be current node placed by definitions? */
-            QString strDefinitionName = pNode->type() == UIChooserItemType_Group ? pNode->name() :
-                                        pNode->type() == UIChooserItemType_Machine ? toOldStyleUuid(pNode->toMachineNode()->cache()->id()) :
+            QString strDefinitionName = pNode->type() == UIChooserNodeType_Group ? pNode->name() :
+                                        pNode->type() == UIChooserNodeType_Machine ? toOldStyleUuid(pNode->toMachineNode()->cache()->id()) :
                                         QString();
             AssertMsg(!strDefinitionName.isEmpty(), ("Wrong definition name!"));
@@ -713 +713 @@
 }
 
-int UIChooserAbstractModel::getDefinedNodePosition(UIChooserNode *pParentNode, UIChooserItemType enmType, const QString &strName)
+int UIChooserAbstractModel::getDefinedNodePosition(UIChooserNode *pParentNode, UIChooserNodeType enmType, const QString &strName)
 {
     /* Read group definitions: */
@@ -726 +726 @@
     switch (enmType)
     {
-        case UIChooserItemType_Group:
+        case UIChooserNodeType_Group:
             strDefinitionTemplateShort = QString("^g(\\S)*=");
             strDefinitionTemplateFull = QString("^g(\\S)*=%1$").arg(strName);
             break;
-        case UIChooserItemType_Machine:
+        case UIChooserNodeType_Machine:
             strDefinitionTemplateShort = QString("^m=");
             strDefinitionTemplateFull = QString("^m=%1$").arg(strName);
@@ -762 +762 @@
     new UIChooserNodeMachine(pParentNode,
                              false /* favorite */,
-                             getDesiredNodePosition(pParentNode, UIChooserItemType_Machine, toOldStyleUuid(comMachine.GetId())),
+                             getDesiredNodePosition(pParentNode, UIChooserNodeType_Machine, toOldStyleUuid(comMachine.GetId())),
                              comMachine);
 }
@@ -807 +807 @@
 {
     /* Iterate over all the machine-nodes: */
-    foreach (UIChooserNode *pNode, pParentGroup->nodes(UIChooserItemType_Machine))
+    foreach (UIChooserNode *pNode, pParentGroup->nodes(UIChooserNodeType_Machine))
         if (UIChooserNodeMachine *pMachineNode = pNode->toMachineNode())
             if (   pMachineNode->cache()->itemType() == UIVirtualMachineItem::ItemType_Local
@@ -813 +813 @@
                 definitions[toOldStyleUuid(pMachineNode->cache()->id())] << pParentGroup->fullName();
     /* Iterate over all the group-nodes: */
-    foreach (UIChooserNode *pNode, pParentGroup->nodes(UIChooserItemType_Group))
+    foreach (UIChooserNode *pNode, pParentGroup->nodes(UIChooserNodeType_Group))
         gatherGroupDefinitions(definitions, pNode);
 }
@@ -823 +823 @@
     const QString strExtraDataKey = pParentGroup->fullName();
     /* Iterate over all the global-nodes: */
-    foreach (UIChooserNode *pNode, pParentGroup->nodes(UIChooserItemType_Global))
+    foreach (UIChooserNode *pNode, pParentGroup->nodes(UIChooserNodeType_Global))
     {
         const QString strGlobalDescriptor(pNode->isFavorite() ? "nf" : "n");
@@ -829 +829 @@
     }
     /* Iterate over all the group-nodes: */
-    foreach (UIChooserNode *pNode, pParentGroup->nodes(UIChooserItemType_Group))
+    foreach (UIChooserNode *pNode, pParentGroup->nodes(UIChooserNodeType_Group))
     {
         const QString strGroupDescriptor(pNode->toGroupNode()->isOpened() ? "go" : "gc");
@@ -836 +836 @@
     }
     /* Iterate over all the machine-nodes: */
-    foreach (UIChooserNode *pNode, pParentGroup->nodes(UIChooserItemType_Machine))
+    foreach (UIChooserNode *pNode, pParentGroup->nodes(UIChooserNodeType_Machine))
         if (UIChooserNodeMachine *pMachineNode = pNode->toMachineNode())
             if (pMachineNode->cache()->itemType() == UIVirtualMachineItem::ItemType_Local)

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

@@ -193 +193 @@
 
         /** Acquires desired position for a child of @a pParentNode with specified @a enmType and @a strName. */
-        int getDesiredNodePosition(UIChooserNode *pParentNode, UIChooserItemType enmType, const QString &strName);
+        int getDesiredNodePosition(UIChooserNode *pParentNode, UIChooserNodeType enmType, const QString &strName);
         /** Acquires defined position for a child of @a pParentNode with specified @a enmType and @a strName. */
-        int getDefinedNodePosition(UIChooserNode *pParentNode, UIChooserItemType enmType, const QString &strName);
+        int getDefinedNodePosition(UIChooserNode *pParentNode, UIChooserNodeType enmType, const QString &strName);
 
         /** Creates machine node based on certain @a comMachine as a child of specified @a pParentNode. */

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

@@ -29 +29 @@
 
 
-/** UIChooserItem types. */
-enum UIChooserItemType
+/** UIChooserNode types. */
+enum UIChooserNodeType
 {
-    UIChooserItemType_Any     = QGraphicsItem::UserType,
-    UIChooserItemType_Group,
-    UIChooserItemType_Global,
-    UIChooserItemType_Machine
+    UIChooserNodeType_Any     = QGraphicsItem::UserType,
+    UIChooserNodeType_Group,
+    UIChooserNodeType_Global,
+    UIChooserNodeType_Machine
 };
 
@@ -58 +58 @@
 };
 
+
 /** UIChooserItemMachine enumeration flags. */
 enum UIChooserItemMachineEnumerationFlag

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

@@ -251 +251 @@
         {
             /* If this item is of group type: */
-            if (model()->currentItem()->type() == UIChooserItemType_Group)
+            if (model()->currentItem()->type() == UIChooserNodeType_Group)
             {
                 /* Start embedded editing of current-item: */
@@ -265 +265 @@
         {
             /* If this item is of group or machine type: */
-            if (   model()->currentItem()->type() == UIChooserItemType_Group
-                || model()->currentItem()->type() == UIChooserItemType_Machine)
+            if (   model()->currentItem()->type() == UIChooserNodeType_Group
+                || model()->currentItem()->type() == UIChooserNodeType_Machine)
             {
                 /* Activate item: */
@@ -282 +282 @@
             {
                 /* Of the group type: */
-                if (pCurrentItem->type() == UIChooserItemType_Group)
+                if (pCurrentItem->type() == UIChooserNodeType_Group)
                 {
                     /* Toggle that group: */
@@ -367 +367 @@
     switch (pCurrentNode->type())
     {
-        case UIChooserItemType_Group:
+        case UIChooserNodeType_Group:
         {
             UIChooserNodeGroup *pNewNode = new UIChooserNodeGroup(pParentNode, pCurrentNode->toGroupNode(), iNewCurrentNodePosition);
@@ -373 +373 @@
             break;
         }
-        case UIChooserItemType_Machine:
+        case UIChooserNodeType_Machine:
         {
             UIChooserNodeMachine *pNewNode = new UIChooserNodeMachine(pParentNode, pCurrentNode->toMachineNode(), iNewCurrentNodePosition);

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

@@ -212 +212 @@
                 }
                 /* Or a machine one? */
-                else if (pItemUnderMouse->type() == UIChooserItemType_Machine)
+                else if (pItemUnderMouse->type() == UIChooserNodeType_Machine)
                 {
                     /* Activate machine-item: */

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

@@ -101 +101 @@
 
         /* Return the number of group children: */
-        if (item()->type() == UIChooserItemType_Group)
+        if (item()->type() == UIChooserNodeType_Group)
             return item()->items().size();
 
@@ -168 +168 @@
 
         /* Return the role of group: */
-        if (item()->type() == UIChooserItemType_Group)
+        if (item()->type() == UIChooserNodeType_Group)
             return QAccessible::List;
 
@@ -195 +195 @@
 
         /* Compose the state of group: */
-        if (item()->type() == UIChooserItemType_Group)
+        if (item()->type() == UIChooserNodeType_Group)
         {
             state.expandable = true;
@@ -513 +513 @@
         /* Allow drag tokens only for the same item type as current: */
         bool fAllowDragToken = false;
-        if ((type() == UIChooserItemType_Group &&
+        if ((type() == UIChooserNodeType_Group &&
              pEvent->mimeData()->hasFormat(UIChooserItemGroup::className())) ||
-            (type() == UIChooserItemType_Machine &&
+            (type() == UIChooserNodeType_Machine &&
              pEvent->mimeData()->hasFormat(UIChooserItemMachine::className())))
             fAllowDragToken = true;

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

@@ -154 +154 @@
       * @{ */
         /** Returns children items of certain @a enmType. */
-        virtual QList<UIChooserItem*> items(UIChooserItemType enmType = UIChooserItemType_Any) const = 0;
+        virtual QList<UIChooserItem*> items(UIChooserNodeType enmType = UIChooserNodeType_Any) const = 0;
 
         /** Adds possible @a fFavorite child @a pItem to certain @a iPosition. */

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

@@ -190 +190 @@
 }
 
-QList<UIChooserItem*> UIChooserItemGlobal::items(UIChooserItemType) const
+QList<UIChooserItem*> UIChooserItemGlobal::items(UIChooserNodeType) const
 {
     AssertMsgFailedReturn(("Global graphics item do NOT support children!"), QList<UIChooserItem*>());

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

@@ -37 +37 @@
 
     /** RTTI required for qgraphicsitem_cast. */
-    enum { Type = UIChooserItemType_Global };
+    enum { Type = UIChooserNodeType_Global };
 
     /** Build item for certain @a pNode, passing @a pParent to the base-class. */
@@ -100 +100 @@
       * @{ */
         /** Returns children items of certain @a enmType. */
-        virtual QList<UIChooserItem*> items(UIChooserItemType enmType = UIChooserItemType_Any) const /* override */;
+        virtual QList<UIChooserItem*> items(UIChooserNodeType enmType = UIChooserNodeType_Any) const /* override */;
 
         /** Adds possible @a fFavorite child @a pItem to certain @a iPosition. */

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

@@ -115 +115 @@
 {
     /* Global items only for now, move items to corresponding layout: */
-    foreach (UIChooserItem *pItem, items(UIChooserItemType_Global))
+    foreach (UIChooserItem *pItem, items(UIChooserNodeType_Global))
         if (pItem->isFavorite())
         {
@@ -307 +307 @@
 
     /* Should we add group info? */
-    if (!items(UIChooserItemType_Group).isEmpty())
+    if (!items(UIChooserNodeType_Group).isEmpty())
     {
         /* Template: */
-        QString strGroupCount = tr("%n group(s)", "Group item tool-tip / Group info", items(UIChooserItemType_Group).size());
+        QString strGroupCount = tr("%n group(s)", "Group item tool-tip / Group info", items(UIChooserNodeType_Group).size());
 
         /* Append value: */
@@ -318 +318 @@
 
     /* Should we add machine info? */
-    if (!items(UIChooserItemType_Machine).isEmpty())
+    if (!items(UIChooserNodeType_Machine).isEmpty())
     {
         /* Check if 'this' group contains started VMs: */
         int iCountOfStartedMachineItems = 0;
-        foreach (UIChooserItem *pItem, items(UIChooserItemType_Machine))
+        foreach (UIChooserItem *pItem, items(UIChooserNodeType_Machine))
             if (pItem->node()->toMachineNode()->cache()->isItemStarted())
                 ++iCountOfStartedMachineItems;
         /* Template: */
-        QString strMachineCount = tr("%n machine(s)", "Group item tool-tip / Machine info", items(UIChooserItemType_Machine).size());
+        QString strMachineCount = tr("%n machine(s)", "Group item tool-tip / Machine info", items(UIChooserNodeType_Machine).size());
         QString strStartedMachineCount = tr("(%n running)", "Group item tool-tip / Running machine info", iCountOfStartedMachineItems);
 
@@ -346 +346 @@
 }
 
-QList<UIChooserItem*> UIChooserItemGroup::items(UIChooserItemType type /* = UIChooserItemType_Any */) const
+QList<UIChooserItem*> UIChooserItemGroup::items(UIChooserNodeType type /* = UIChooserNodeType_Any */) const
 {
     switch (type)
     {
-        case UIChooserItemType_Any: return items(UIChooserItemType_Global) + items(UIChooserItemType_Group) + items(UIChooserItemType_Machine);
-        case UIChooserItemType_Global: return m_globalItems;
-        case UIChooserItemType_Group: return m_groupItems;
-        case UIChooserItemType_Machine: return m_machineItems;
+        case UIChooserNodeType_Any: return items(UIChooserNodeType_Global) + items(UIChooserNodeType_Group) + items(UIChooserNodeType_Machine);
+        case UIChooserNodeType_Global: return m_globalItems;
+        case UIChooserNodeType_Group: return m_groupItems;
+        case UIChooserNodeType_Machine: return m_machineItems;
         default: break;
     }
@@ -364 +364 @@
     switch (pItem->type())
     {
-        case UIChooserItemType_Global:
+        case UIChooserNodeType_Global:
         {
             AssertMsg(!m_globalItems.contains(pItem), ("Global-item already added!"));
@@ -385 +385 @@
             break;
         }
-        case UIChooserItemType_Group:
+        case UIChooserNodeType_Group:
         {
             AssertMsg(!m_groupItems.contains(pItem), ("Group-item already added!"));
@@ -400 +400 @@
             break;
         }
-        case UIChooserItemType_Machine:
+        case UIChooserNodeType_Machine:
         {
             AssertMsg(!m_machineItems.contains(pItem), ("Machine-item already added!"));
@@ -434 +434 @@
     switch (pItem->type())
     {
-        case UIChooserItemType_Global:
+        case UIChooserNodeType_Global:
         {
             AssertMsg(m_globalItems.contains(pItem), ("Global-item was not found!"));
@@ -444 +444 @@
             break;
         }
-        case UIChooserItemType_Group:
+        case UIChooserNodeType_Group:
         {
             AssertMsg(m_groupItems.contains(pItem), ("Group-item was not found!"));
@@ -454 +454 @@
             break;
         }
-        case UIChooserItemType_Machine:
+        case UIChooserNodeType_Machine:
         {
             AssertMsg(m_machineItems.contains(pItem), ("Machine-item was not found!"));
@@ -506 +506 @@
 
     /* Search among all the children, but machines first: */
-    foreach (UIChooserItem *pItem, items(UIChooserItemType_Machine))
+    foreach (UIChooserItem *pItem, items(UIChooserNodeType_Machine))
         if (UIChooserItem *pFoundItem = pItem->searchForItem(strSearchTag, iItemSearchFlags))
             return pFoundItem;
-    foreach (UIChooserItem *pItem, items(UIChooserItemType_Global))
+    foreach (UIChooserItem *pItem, items(UIChooserNodeType_Global))
         if (UIChooserItem *pFoundItem = pItem->searchForItem(strSearchTag, iItemSearchFlags))
             return pFoundItem;
-    foreach (UIChooserItem *pItem, items(UIChooserItemType_Group))
+    foreach (UIChooserItem *pItem, items(UIChooserNodeType_Group))
         if (UIChooserItem *pFoundItem = pItem->searchForItem(strSearchTag, iItemSearchFlags))
             return pFoundItem;
@@ -523 +523 @@
 {
     /* If this group-item have at least one machine-item: */
-    if (node()->hasNodes(UIChooserItemType_Machine))
+    if (node()->hasNodes(UIChooserNodeType_Machine))
         /* Return the first machine-item: */
-        return items(UIChooserItemType_Machine).first()->firstMachineItem();
+        return items(UIChooserNodeType_Machine).first()->firstMachineItem();
     /* If this group-item have at least one group-item: */
-    else if (node()->hasNodes(UIChooserItemType_Group))
+    else if (node()->hasNodes(UIChooserNodeType_Group))
         /* Return the first machine-item of the first group-item: */
-        return items(UIChooserItemType_Group).first()->firstMachineItem();
+        return items(UIChooserNodeType_Group).first()->firstMachineItem();
     /* Found nothing? */
     return 0;
@@ -683 +683 @@
         /* Make sure passed group is mutable within this group: */
         if (pItem->toGroupItem()->isContainsLockedMachine() &&
-            !items(UIChooserItemType_Group).contains(pItem))
+            !items(UIChooserNodeType_Group).contains(pItem))
             return false;
         /* Make sure passed group is not 'this': */
@@ -706 +706 @@
         /* Make sure passed machine is mutable within this group: */
         if (pItem->toMachineItem()->isLockedMachine() &&
-            !items(UIChooserItemType_Machine).contains(pItem))
+            !items(UIChooserNodeType_Machine).contains(pItem))
             return false;
         switch (pEvent->proposedAction())
@@ -877 +877 @@
     /* Enumerate all the group names: */
     QStringList groupNames;
-    foreach (UIChooserItem *pItem, parentItem()->items(UIChooserItemType_Group))
+    foreach (UIChooserItem *pItem, parentItem()->items(UIChooserNodeType_Group))
         groupNames << pItem->name();
     /* If proposed name is empty or not unique, reject it: */
@@ -1197 +1197 @@
 void UIChooserItemGroup::copyContents(UIChooserNodeGroup *pCopyFrom)
 {
-    foreach (UIChooserNode *pNode, pCopyFrom->nodes(UIChooserItemType_Group))
+    foreach (UIChooserNode *pNode, pCopyFrom->nodes(UIChooserNodeType_Group))
         new UIChooserItemGroup(this, pNode->toGroupNode());
-    foreach (UIChooserNode *pNode, pCopyFrom->nodes(UIChooserItemType_Global))
+    foreach (UIChooserNode *pNode, pCopyFrom->nodes(UIChooserNodeType_Global))
         new UIChooserItemGlobal(this, pNode->toGlobalNode());
-    foreach (UIChooserNode *pNode, pCopyFrom->nodes(UIChooserItemType_Machine))
+    foreach (UIChooserNode *pNode, pCopyFrom->nodes(UIChooserNodeType_Machine))
         new UIChooserItemMachine(this, pNode->toMachineNode());
 }
@@ -1218 +1218 @@
 {
     /* Check each machine-item: */
-    foreach (UIChooserItem *pItem, items(UIChooserItemType_Machine))
+    foreach (UIChooserItem *pItem, items(UIChooserNodeType_Machine))
         if (pItem->toMachineItem()->isLockedMachine())
             return true;
     /* Check each group-item: */
-    foreach (UIChooserItem *pItem, items(UIChooserItemType_Group))
+    foreach (UIChooserItem *pItem, items(UIChooserNodeType_Group))
         if (pItem->toGroupItem()->isContainsLockedMachine())
             return true;

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

@@ -60 +60 @@
 
     /** RTTI required for qgraphicsitem_cast. */
-    enum { Type = UIChooserItemType_Group };
+    enum { Type = UIChooserNodeType_Group };
 
     /** Build item for certain @a pNode, adding it directly to the @a pScene. */
@@ -147 +147 @@
       * @{ */
         /** Returns children items of certain @a enmType. */
-        virtual QList<UIChooserItem*> items(UIChooserItemType enmType = UIChooserItemType_Any) const /* override */;
+        virtual QList<UIChooserItem*> items(UIChooserNodeType enmType = UIChooserNodeType_Any) const /* override */;
 
         /** Adds possible @a fFavorite child @a pItem to certain @a iPosition. */

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

@@ -115 +115 @@
     {
         /* If that is machine-item: */
-        if (pItem->type() == UIChooserItemType_Machine)
+        if (pItem->type() == UIChooserNodeType_Machine)
         {
             /* Get the iterated machine-item: */
@@ -134 +134 @@
         }
         /* If that is group-item: */
-        else if (pItem->type() == UIChooserItemType_Group)
+        else if (pItem->type() == UIChooserNodeType_Group)
         {
             /* Enumerate all the machine-items recursively: */
-            enumerateMachineItems(pItem->items(UIChooserItemType_Machine), ol, iEnumerationFlags);
+            enumerateMachineItems(pItem->items(UIChooserNodeType_Machine), ol, iEnumerationFlags);
             /* Enumerate all the group-items recursively: */
-            enumerateMachineItems(pItem->items(UIChooserItemType_Group), ol, iEnumerationFlags);
+            enumerateMachineItems(pItem->items(UIChooserNodeType_Group), ol, iEnumerationFlags);
         }
     }
@@ -223 +223 @@
 }
 
-QList<UIChooserItem*> UIChooserItemMachine::items(UIChooserItemType) const
+QList<UIChooserItem*> UIChooserItemMachine::items(UIChooserNodeType) const
 {
     AssertMsgFailed(("Machine graphics item do NOT support children!"));

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

@@ -37 +37 @@
 
     /** RTTI required for qgraphicsitem_cast. */
-    enum { Type = UIChooserItemType_Machine };
+    enum { Type = UIChooserNodeType_Machine };
 
     /** Build item for certain @a pNode, passing @a pParent to the base-class. */
@@ -108 +108 @@
       * @{ */
         /** Returns children items of certain @a enmType. */
-        virtual QList<UIChooserItem*> items(UIChooserItemType enmType = UIChooserItemType_Any) const /* override */;
+        virtual QList<UIChooserItem*> items(UIChooserNodeType enmType = UIChooserNodeType_Any) const /* override */;
 
         /** Adds possible @a fFavorite child @a pItem to certain @a iPosition. */

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

@@ -138 +138 @@
     switch (pItem->type())
     {
-        case UIChooserItemType_Global:
+        case UIChooserNodeType_Global:
             emit sigToolMenuRequested(UIToolClass_Global, pItem->mapToScene(QPointF(pItem->size().width(), 0)).toPoint());
             break;
-        case UIChooserItemType_Machine:
+        case UIChooserNodeType_Machine:
             emit sigToolMenuRequested(UIToolClass_Machine, pItem->mapToScene(QPointF(pItem->size().width(), 0)).toPoint());
             break;
@@ -153 +153 @@
     switch (pItem->type())
     {
-        case UIChooserItemType_Global:
+        case UIChooserNodeType_Global:
             pItem->setFavorite(!pItem->isFavorite());
             break;
@@ -317 +317 @@
 bool UIChooserModel::isGroupItemSelected() const
 {
-    return firstSelectedItem() && firstSelectedItem()->type() == UIChooserItemType_Group;
+    return firstSelectedItem() && firstSelectedItem()->type() == UIChooserNodeType_Group;
 }
 
 bool UIChooserModel::isGlobalItemSelected() const
 {
-    return firstSelectedItem() && firstSelectedItem()->type() == UIChooserItemType_Global;
+    return firstSelectedItem() && firstSelectedItem()->type() == UIChooserNodeType_Global;
 }
 
 bool UIChooserModel::isMachineItemSelected() const
 {
-    return firstSelectedItem() && firstSelectedItem()->type() == UIChooserItemType_Machine;
+    return firstSelectedItem() && firstSelectedItem()->type() == UIChooserNodeType_Machine;
 }
 
@@ -333 +333 @@
 {
     return    selectedItems().size() == 1
-           && firstSelectedItem()->type() == UIChooserItemType_Group;
+           && firstSelectedItem()->type() == UIChooserNodeType_Group;
 }
 
@@ -379 +379 @@
             {
                 pItem = navigationItems().at(idxBefore);
-                if (!selectedItems().contains(pItem) && pItem->type() == UIChooserItemType_Machine)
+                if (!selectedItems().contains(pItem) && pItem->type() == UIChooserNodeType_Machine)
                     return pItem;
                 --idxBefore;
@@ -386 +386 @@
             {
                 pItem = navigationItems().at(idxAfter);
-                if (!selectedItems().contains(pItem) && pItem->type() == UIChooserItemType_Machine)
+                if (!selectedItems().contains(pItem) && pItem->type() == UIChooserNodeType_Machine)
                     return pItem;
                 ++idxAfter;
@@ -580 +580 @@
     {
         /* And for each global item: */
-        if (pItem->type() == UIChooserItemType_Global)
+        if (pItem->type() == UIChooserNodeType_Global)
         {
             /* Apply the height hint we have: */
@@ -788 +788 @@
 
     /* Make sure current-item is of group type! */
-    AssertMsg(currentItem()->type() == UIChooserItemType_Group, ("This is not group-item!"));
+    AssertMsg(currentItem()->type() == UIChooserNodeType_Group, ("This is not group-item!"));
 
     /* Check if we have collisions with our siblings: */
@@ -807 +807 @@
         if (pCollisionSibling)
         {
-            if (pNode->type() == UIChooserItemType_Machine)
+            if (pNode->type() == UIChooserNodeType_Machine)
             {
-                if (pCollisionSibling->type() == UIChooserItemType_Machine)
+                if (pCollisionSibling->type() == UIChooserNodeType_Machine)
                     toBeRemoved << pNode;
-                else if (pCollisionSibling->type() == UIChooserItemType_Group)
+                else if (pCollisionSibling->type() == UIChooserNodeType_Group)
                 {
                     msgCenter().cannotResolveCollisionAutomatically(strItemName, pParentNode->name());
@@ -817 +817 @@
                 }
             }
-            else if (pNode->type() == UIChooserItemType_Group)
+            else if (pNode->type() == UIChooserNodeType_Group)
             {
                 if (msgCenter().confirmAutomaticCollisionResolve(strItemName, pParentNode->name()))
@@ -835 +835 @@
         switch (pNode->type())
         {
-            case UIChooserItemType_Group:
+            case UIChooserNodeType_Group:
             {
                 UIChooserNodeGroup *pGroupNode = new UIChooserNodeGroup(pParentNode,
@@ -846 +846 @@
                 break;
             }
-            case UIChooserItemType_Machine:
+            case UIChooserNodeType_Machine:
             {
                 UIChooserNodeMachine *pMachineNode = new UIChooserNodeMachine(pParentNode,
@@ -957 +957 @@
         switch (pItem->type())
         {
-            case UIChooserItemType_Group:
+            case UIChooserNodeType_Group:
             {
                 /* Avoid name collisions: */
@@ -972 +972 @@
                 break;
             }
-            case UIChooserItemType_Machine:
+            case UIChooserNodeType_Machine:
             {
                 /* Avoid name collisions: */
@@ -1428 +1428 @@
                 switch (pItem->type())
                 {
-                    case UIChooserItemType_Global:
+                    case UIChooserNodeType_Global:
                     {
                         /* Global context menu for global item cases: */
@@ -1434 +1434 @@
                         return true;
                     }
-                    case UIChooserItemType_Group:
+                    case UIChooserNodeType_Group:
                     {
                         /* Get group-item: */
@@ -1450 +1450 @@
                     }
                     RT_FALL_THRU();
-                    case UIChooserItemType_Machine:
+                    case UIChooserNodeType_Machine:
                     {
                         /* Machine context menu for other Group/Machine cases: */
@@ -1470 +1470 @@
                 switch (pItem->type())
                 {
-                    case UIChooserItemType_Global:
+                    case UIChooserNodeType_Global:
                     {
                         /* Global context menu for global item cases: */
@@ -1476 +1476 @@
                         return true;
                     }
-                    case UIChooserItemType_Group:
+                    case UIChooserNodeType_Group:
                     {
                         /* Is this group-item only the one selected? */
@@ -1487 +1487 @@
                     }
                     RT_FALL_THRU();
-                    case UIChooserItemType_Machine:
+                    case UIChooserNodeType_Machine:
                     {
                         /* Machine context menu for other Group/Machine cases: */
@@ -1544 +1544 @@
 
     /* Iterate over all the global-items: */
-    foreach (UIChooserItem *pGlobalItem, pItem->items(UIChooserItemType_Global))
+    foreach (UIChooserItem *pGlobalItem, pItem->items(UIChooserNodeType_Global))
         navigationItems << pGlobalItem;
     /* Iterate over all the group-items: */
-    foreach (UIChooserItem *pGroupItem, pItem->items(UIChooserItemType_Group))
+    foreach (UIChooserItem *pGroupItem, pItem->items(UIChooserNodeType_Group))
     {
         navigationItems << pGroupItem;
@@ -1554 +1554 @@
     }
     /* Iterate over all the machine-items: */
-    foreach (UIChooserItem *pMachineItem, pItem->items(UIChooserItemType_Machine))
+    foreach (UIChooserItem *pMachineItem, pItem->items(UIChooserNodeType_Machine))
         navigationItems << pMachineItem;
 

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

@@ -55 +55 @@
 
     /** Returns RTTI node type. */
-    virtual UIChooserItemType type() const = 0;
+    virtual UIChooserNodeType type() const = 0;
 
     /** Casts node to group one. */
@@ -91 +91 @@
 
     /** Returns whether there are children of certain @a enmType. */
-    virtual bool hasNodes(UIChooserItemType enmType = UIChooserItemType_Any) const = 0;
+    virtual bool hasNodes(UIChooserNodeType enmType = UIChooserNodeType_Any) const = 0;
     /** Returns a list of nodes of certain @a enmType. */
-    virtual QList<UIChooserNode*> nodes(UIChooserItemType enmType = UIChooserItemType_Any) const = 0;
+    virtual QList<UIChooserNode*> nodes(UIChooserNodeType enmType = UIChooserNodeType_Any) const = 0;
 
     /** Adds passed @a pNode to specified @a iPosition. */

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

@@ -80 +80 @@
 }
 
-bool UIChooserNodeGlobal::hasNodes(UIChooserItemType enmType /* = UIChooserItemType_Any */) const
+bool UIChooserNodeGlobal::hasNodes(UIChooserNodeType enmType /* = UIChooserNodeType_Any */) const
 {
     Q_UNUSED(enmType);
@@ -86 +86 @@
 }
 
-QList<UIChooserNode*> UIChooserNodeGlobal::nodes(UIChooserItemType enmType /* = UIChooserItemType_Any */) const
+QList<UIChooserNode*> UIChooserNodeGlobal::nodes(UIChooserNodeType enmType /* = UIChooserNodeType_Any */) const
 {
     Q_UNUSED(enmType);

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

@@ -51 +51 @@
 
     /** Returns RTTI node type. */
-    virtual UIChooserItemType type() const /* override */ { return UIChooserItemType_Global; }
+    virtual UIChooserNodeType type() const /* override */ { return UIChooserNodeType_Global; }
 
     /** Returns node name. */
@@ -63 +63 @@
 
     /** Returns whether there are children of certain @a enmType. */
-    virtual bool hasNodes(UIChooserItemType enmType = UIChooserItemType_Any) const /* override */;
+    virtual bool hasNodes(UIChooserNodeType enmType = UIChooserNodeType_Any) const /* override */;
     /** Returns a list of nodes of certain @a enmType. */
-    virtual QList<UIChooserNode*> nodes(UIChooserItemType enmType = UIChooserItemType_Any) const /* override */;
+    virtual QList<UIChooserNode*> nodes(UIChooserNodeType enmType = UIChooserNodeType_Any) const /* override */;
 
     /** Adds passed @a pNode to specified @a iPosition. */

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

@@ -107 +107 @@
 }
 
-bool UIChooserNodeGroup::hasNodes(UIChooserItemType enmType /* = UIChooserItemType_Any */) const
+bool UIChooserNodeGroup::hasNodes(UIChooserNodeType enmType /* = UIChooserNodeType_Any */) const
 {
     switch (enmType)
     {
-        case UIChooserItemType_Any:
-            return hasNodes(UIChooserItemType_Group) || hasNodes(UIChooserItemType_Global) || hasNodes(UIChooserItemType_Machine);
-        case UIChooserItemType_Group:
+        case UIChooserNodeType_Any:
+            return hasNodes(UIChooserNodeType_Group) || hasNodes(UIChooserNodeType_Global) || hasNodes(UIChooserNodeType_Machine);
+        case UIChooserNodeType_Group:
             return !m_nodesGroup.isEmpty();
-        case UIChooserItemType_Global:
+        case UIChooserNodeType_Global:
             return !m_nodesGlobal.isEmpty();
-        case UIChooserItemType_Machine:
+        case UIChooserNodeType_Machine:
             return !m_nodesMachine.isEmpty();
     }
@@ -123 +123 @@
 }
 
-QList<UIChooserNode*> UIChooserNodeGroup::nodes(UIChooserItemType enmType /* = UIChooserItemType_Any */) const
+QList<UIChooserNode*> UIChooserNodeGroup::nodes(UIChooserNodeType enmType /* = UIChooserNodeType_Any */) const
 {
     switch (enmType)
     {
-        case UIChooserItemType_Any:     return m_nodesGlobal + m_nodesGroup + m_nodesMachine;
-        case UIChooserItemType_Group:   return m_nodesGroup;
-        case UIChooserItemType_Global:  return m_nodesGlobal;
-        case UIChooserItemType_Machine: return m_nodesMachine;
+        case UIChooserNodeType_Any:     return m_nodesGlobal + m_nodesGroup + m_nodesMachine;
+        case UIChooserNodeType_Group:   return m_nodesGroup;
+        case UIChooserNodeType_Global:  return m_nodesGlobal;
+        case UIChooserNodeType_Machine: return m_nodesMachine;
     }
     AssertFailedReturn(QList<UIChooserNode*>());
@@ -139 +139 @@
     switch (pNode->type())
     {
-        case UIChooserItemType_Group:   m_nodesGroup.insert(iPosition == -1 ? m_nodesGroup.size() : iPosition, pNode); return;
-        case UIChooserItemType_Global:  m_nodesGlobal.insert(iPosition == -1 ? m_nodesGlobal.size() : iPosition, pNode); return;
-        case UIChooserItemType_Machine: m_nodesMachine.insert(iPosition == -1 ? m_nodesMachine.size() : iPosition, pNode); return;
+        case UIChooserNodeType_Group:   m_nodesGroup.insert(iPosition == -1 ? m_nodesGroup.size() : iPosition, pNode); return;
+        case UIChooserNodeType_Global:  m_nodesGlobal.insert(iPosition == -1 ? m_nodesGlobal.size() : iPosition, pNode); return;
+        case UIChooserNodeType_Machine: m_nodesMachine.insert(iPosition == -1 ? m_nodesMachine.size() : iPosition, pNode); return;
         default: break;
     }
@@ -151 +151 @@
     switch (pNode->type())
     {
-        case UIChooserItemType_Group:   m_nodesGroup.removeAll(pNode); return;
-        case UIChooserItemType_Global:  m_nodesGlobal.removeAll(pNode); return;
-        case UIChooserItemType_Machine: m_nodesMachine.removeAll(pNode); return;
+        case UIChooserNodeType_Group:   m_nodesGroup.removeAll(pNode); return;
+        case UIChooserNodeType_Global:  m_nodesGlobal.removeAll(pNode); return;
+        case UIChooserNodeType_Machine: m_nodesMachine.removeAll(pNode); return;
         default: break;
     }
@@ -194 +194 @@
     switch (pNode->type())
     {
-        case UIChooserItemType_Group:   return m_nodesGroup.indexOf(pNode->toGroupNode());
-        case UIChooserItemType_Global:  return m_nodesGlobal.indexOf(pNode->toGlobalNode());
-        case UIChooserItemType_Machine: return m_nodesMachine.indexOf(pNode->toMachineNode());
+        case UIChooserNodeType_Group:   return m_nodesGroup.indexOf(pNode->toGroupNode());
+        case UIChooserNodeType_Global:  return m_nodesGlobal.indexOf(pNode->toGlobalNode());
+        case UIChooserNodeType_Machine: return m_nodesMachine.indexOf(pNode->toMachineNode());
         default: break;
     }
@@ -280 +280 @@
 void UIChooserNodeGroup::copyContents(UIChooserNodeGroup *pCopyFrom)
 {
-    foreach (UIChooserNode *pNode, pCopyFrom->nodes(UIChooserItemType_Group))
+    foreach (UIChooserNode *pNode, pCopyFrom->nodes(UIChooserNodeType_Group))
         new UIChooserNodeGroup(this, pNode->toGroupNode(), m_nodesGroup.size());
-    foreach (UIChooserNode *pNode, pCopyFrom->nodes(UIChooserItemType_Global))
+    foreach (UIChooserNode *pNode, pCopyFrom->nodes(UIChooserNodeType_Global))
         new UIChooserNodeGlobal(this, pNode->toGlobalNode(), m_nodesGlobal.size());
-    foreach (UIChooserNode *pNode, pCopyFrom->nodes(UIChooserItemType_Machine))
+    foreach (UIChooserNode *pNode, pCopyFrom->nodes(UIChooserNodeType_Machine))
         new UIChooserNodeMachine(this, pNode->toMachineNode(), m_nodesMachine.size());
 }

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

@@ -53 +53 @@
 
     /** Returns RTTI node type. */
-    virtual UIChooserItemType type() const /* override */ { return UIChooserItemType_Group; }
+    virtual UIChooserNodeType type() const /* override */ { return UIChooserNodeType_Group; }
 
     /** Returns item name. */
@@ -65 +65 @@
 
     /** Returns whether there are children of certain @a enmType. */
-    virtual bool hasNodes(UIChooserItemType enmType = UIChooserItemType_Any) const /* override */;
+    virtual bool hasNodes(UIChooserNodeType enmType = UIChooserNodeType_Any) const /* override */;
     /** Returns a list of nodes of certain @a enmType. */
-    virtual QList<UIChooserNode*> nodes(UIChooserItemType enmType = UIChooserItemType_Any) const /* override */;
+    virtual QList<UIChooserNode*> nodes(UIChooserNodeType enmType = UIChooserNodeType_Any) const /* override */;
 
     /** Adds passed @a pNode to specified @a iPosition. */

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

@@ -138 +138 @@
 }
 
-bool UIChooserNodeMachine::hasNodes(UIChooserItemType enmType /* = UIChooserItemType_Any */) const
+bool UIChooserNodeMachine::hasNodes(UIChooserNodeType enmType /* = UIChooserNodeType_Any */) const
 {
     Q_UNUSED(enmType);
@@ -144 +144 @@
 }
 
-QList<UIChooserNode*> UIChooserNodeMachine::nodes(UIChooserItemType enmType /* = UIChooserItemType_Any */) const
+QList<UIChooserNode*> UIChooserNodeMachine::nodes(UIChooserNodeType enmType /* = UIChooserNodeType_Any */) const
 {
     Q_UNUSED(enmType);

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

@@ -70 +70 @@
 
     /** Returns RTTI node type. */
-    virtual UIChooserItemType type() const /* override */ { return UIChooserItemType_Machine; }
+    virtual UIChooserNodeType type() const /* override */ { return UIChooserNodeType_Machine; }
 
     /** Returns item name. */
@@ -82 +82 @@
 
     /** Returns whether there are children of certain @a enmType. */
-    virtual bool hasNodes(UIChooserItemType enmType = UIChooserItemType_Any) const /* override */;
+    virtual bool hasNodes(UIChooserNodeType enmType = UIChooserNodeType_Any) const /* override */;
     /** Returns a list of nodes of certain @a enmType. */
-    virtual QList<UIChooserNode*> nodes(UIChooserItemType enmType = UIChooserItemType_Any) const /* override */;
+    virtual QList<UIChooserNode*> nodes(UIChooserNodeType enmType = UIChooserNodeType_Any) const /* override */;
 
     /** Adds passed @a pNode to specified @a iPosition. */