VirtualBox

Changeset 108158 in vbox


Ignore:
Timestamp:
Feb 11, 2025 1:45:15 PM (3 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
167471
Message:

FE/Qt: bugref:10814: VBox Manager / Chooser pane: Cleanup all the stuff related to global node itself.

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
2 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r108157 r108158  
    601601        src/manager/chooser/UIChooserNode.h \
    602602        src/manager/chooser/UIChooserNodeGroup.h \
    603         src/manager/chooser/UIChooserNodeGlobal.h \
    604603        src/manager/chooser/UIChooserNodeMachine.h \
    605604        src/manager/chooser/UIChooserSearchWidget.h \
    … …  
    11251124        src/manager/chooser/UIChooserNode.cpp \
    11261125        src/manager/chooser/UIChooserNodeGroup.cpp \
    1127         src/manager/chooser/UIChooserNodeGlobal.cpp \
    11281126        src/manager/chooser/UIChooserNodeMachine.cpp \
    11291127        src/manager/chooser/UIChooserSearchWidget.cpp \

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

    r108151 r108158  
    3737#include "UIChooserNode.h"
    3838#include "UIChooserNodeGroup.h"
    39 #include "UIChooserNodeGlobal.h"
    4039#include "UIChooserNodeMachine.h"
    4140#include "UICloudNetworkingStuff.h"
    … …  
    405404        invisibleRoot()->setModel(this);
    406405
    407 #ifdef VBOX_GUI_WITH_LEGACY_WIDGETS
    408         /* Create global node: */
    409         new UIChooserNodeGlobal(invisibleRoot() /* parent */,
    410                                 0 /* position */,
    411                                 shouldGlobalNodeBeFavorite(invisibleRoot()),
    412                                 QString() /* tip */);
    413 #endif
    414 
    415406        /* Reload local tree: */
    416407        reloadLocalTree();
    … …  
    570561    switch (enmType)
    571562    {
    572         /* Global nodes: */
    573         case UIChooserNodeDataPrefixType_Global:   return "n";
    574563        /* Machine nodes: */
    575564        case UIChooserNodeDataPrefixType_Machine:  return "m";
    … …  
    14971486        switch (enmDataType)
    14981487        {
    1499             case UIChooserNodeDataPrefixType_Global:   enmType = UIChooserNodeType_Global; break;
    15001488            case UIChooserNodeDataPrefixType_Machine:  enmType = UIChooserNodeType_Machine; break;
    15011489            case UIChooserNodeDataPrefixType_Local:
    … …  
    15101498            AssertPtrReturn(pNode, iNewNodeDesiredPosition);
    15111499            /* Which position should be current node placed by definitions? */
    1512             UIChooserNodeDataPrefixType enmNodeDataType = UIChooserNodeDataPrefixType_Global;
     1500            UIChooserNodeDataPrefixType enmNodeDataType = UIChooserNodeDataPrefixType_Invalid;
    15131501            QString strDefinitionName;
    15141502            switch (pNode->type())
    … …  
    17821770    /* Prepare extra-data key for current group: */
    17831771    const QString strExtraDataKey = pParentGroup->fullName();
    1784     /* Iterate over all the global-nodes: */
    1785     foreach (UIChooserNode *pNode, pParentGroup->nodes(UIChooserNodeType_Global))
    1786     {
    1787         /* Append node definition: */
    1788         AssertPtrReturnVoid(pNode);
    1789         definitions[strExtraDataKey] << pNode->definition(true /* full */);
    1790     }
    17911772    /* Iterate over all the group-nodes: */
    17921773    foreach (UIChooserNode *pNode, pParentGroup->nodes(UIChooserNodeType_Group))

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

    r108155 r108158  
    4444    UIChooserNodeType_Any     = QGraphicsItem::UserType,
    4545    UIChooserNodeType_Group,
    46     UIChooserNodeType_Global,
    4746    UIChooserNodeType_Machine
    4847};
    … …  
    6261enum UIChooserNodeDataPrefixType
    6362{
    64     UIChooserNodeDataPrefixType_Global,
     63    UIChooserNodeDataPrefixType_Invalid,
    6564    UIChooserNodeDataPrefixType_Machine,
    6665    UIChooserNodeDataPrefixType_Local,

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

    r108157 r108158  
    4545#include "UIChooserNode.h"
    4646#include "UIChooserNodeGroup.h"
    47 #include "UIChooserNodeGlobal.h"
    4847#include "UIChooserNodeMachine.h"
    4948#include "UIChooserView.h"

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserNode.cpp

    r108147 r108158  
    2929#include "UIChooserNode.h"
    3030#include "UIChooserNodeGroup.h"
    31 #include "UIChooserNodeGlobal.h"
    3231#include "UIChooserNodeMachine.h"
    3332
    … …  
    5352{
    5453    return static_cast<UIChooserNodeGroup*>(this);
    55 }
    56 
    57 UIChooserNodeGlobal *UIChooserNode::toGlobalNode()
    58 {
    59     return static_cast<UIChooserNodeGlobal*>(this);
    6054}
    6155

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

    r108147 r108158  
    4444class UIChooserAbstractModel;
    4545class UIChooserNodeGroup;
    46 class UIChooserNodeGlobal;
    4746class UIChooserNodeMachine;
    4847
    … …  
    6766    /** Casts node to group one. */
    6867    UIChooserNodeGroup *toGroupNode();
    69     /** Casts node to global one. */
    70     UIChooserNodeGlobal *toGlobalNode();
    7168    /** Casts node to machine one. */
    7269    UIChooserNodeMachine *toMachineNode();

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

    r108147 r108158  
    2929#include "UIChooserAbstractModel.h"
    3030#include "UIChooserNodeGroup.h"
    31 #include "UIChooserNodeGlobal.h"
    3231#include "UIChooserNodeMachine.h"
    3332#include "UITranslationEventListener.h"
    … …  
    8786    while (!m_nodesGroup.isEmpty())
    8887        delete m_nodesGroup.last();
    89     while (!m_nodesGlobal.isEmpty())
    90         delete m_nodesGlobal.last();
    9188    while (!m_nodesMachine.isEmpty())
    9289        delete m_nodesMachine.last();
    … …  
    151148    {
    152149        case UIChooserNodeType_Any:
    153             return hasNodes(UIChooserNodeType_Group) || hasNodes(UIChooserNodeType_Global) || hasNodes(UIChooserNodeType_Machine);
     150            return hasNodes(UIChooserNodeType_Group) || hasNodes(UIChooserNodeType_Machine);
    154151        case UIChooserNodeType_Group:
    155152            return !m_nodesGroup.isEmpty();
    156         case UIChooserNodeType_Global:
    157             return !m_nodesGlobal.isEmpty();
    158153        case UIChooserNodeType_Machine:
    159154            return !m_nodesMachine.isEmpty();
    … …  
    166161    switch (enmType)
    167162    {
    168         case UIChooserNodeType_Any:     return m_nodesGlobal + m_nodesGroup + m_nodesMachine;
     163        case UIChooserNodeType_Any:     return m_nodesGroup + m_nodesMachine;
    169164        case UIChooserNodeType_Group:   return m_nodesGroup;
    170         case UIChooserNodeType_Global:  return m_nodesGlobal;
    171165        case UIChooserNodeType_Machine: return m_nodesMachine;
    172166    }
    … …  
    179173    {
    180174        case UIChooserNodeType_Group:   m_nodesGroup.insert(iPosition < 0 || iPosition > m_nodesGroup.size() ? m_nodesGroup.size() : iPosition, pNode); return;
    181         case UIChooserNodeType_Global:  m_nodesGlobal.insert(iPosition < 0 || iPosition > m_nodesGlobal.size() ? m_nodesGlobal.size() : iPosition, pNode); return;
    182175        case UIChooserNodeType_Machine: m_nodesMachine.insert(iPosition < 0 || iPosition > m_nodesMachine.size() ? m_nodesMachine.size() : iPosition, pNode); return;
    183176        default: break;
    … …  
    191184    {
    192185        case UIChooserNodeType_Group:   m_nodesGroup.removeAll(pNode); return;
    193         case UIChooserNodeType_Global:  m_nodesGlobal.removeAll(pNode); return;
    194186        case UIChooserNodeType_Machine: m_nodesMachine.removeAll(pNode); return;
    195187        default: break;
    … …  
    221213    {
    222214        case UIChooserNodeType_Group:   return m_nodesGroup.indexOf(pNode->toGroupNode());
    223         case UIChooserNodeType_Global:  return m_nodesGlobal.indexOf(pNode->toGlobalNode());
    224215        case UIChooserNodeType_Machine: return m_nodesMachine.indexOf(pNode->toMachineNode());
    225216        default: break;
    … …  
    287278    foreach (UIChooserNode *pNode, m_nodesGroup)
    288279        pNode->searchForNodes(strSearchTerm, iSearchFlags, matchedItems);
    289     foreach (UIChooserNode *pNode, m_nodesGlobal)
    290         pNode->searchForNodes(strSearchTerm, iSearchFlags, matchedItems);
    291280    foreach (UIChooserNode *pNode, m_nodesMachine)
    292281        pNode->searchForNodes(strSearchTerm, iSearchFlags, matchedItems);
    … …  
    300289    m_nodesGroup = mapGroup.values();
    301290
    302     QMap<QString, UIChooserNode*> mapGlobal;
    303     foreach (UIChooserNode *pNode, m_nodesGlobal)
    304         mapGlobal[pNode->name()] = pNode;
    305     m_nodesGlobal = mapGlobal.values();
    306 
    307291    QMap<QString, UIChooserNode*> mapMachine;
    308292    foreach (UIChooserNode *pNode, m_nodesMachine)
    … …  
    327311    foreach (UIChooserNode *pNode, pCopyFrom->nodes(UIChooserNodeType_Group))
    328312        new UIChooserNodeGroup(this, m_nodesGroup.size(), pNode->toGroupNode());
    329 #ifdef VBOX_GUI_WITH_LEGACY_WIDGETS
    330     foreach (UIChooserNode *pNode, pCopyFrom->nodes(UIChooserNodeType_Global))
    331         new UIChooserNodeGlobal(this, m_nodesGlobal.size(), pNode->toGlobalNode());
    332 #endif
    333313    foreach (UIChooserNode *pNode, pCopyFrom->nodes(UIChooserNodeType_Machine))
    334314        new UIChooserNodeMachine(this, m_nodesMachine.size(), pNode->toMachineNode());

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

    r106061 r108158  
    144144    /** Holds group children. */
    145145    QList<UIChooserNode*>  m_nodesGroup;
    146     /** Holds global children. */
    147     QList<UIChooserNode*>  m_nodesGlobal;
    148146    /** Holds machine children. */
    149147    QList<UIChooserNode*>  m_nodesMachine;
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette