Changeset 77845 in vbox for trunk

Timestamp:

Mar 22, 2019 12:35:31 PM (6 years ago)

Author:

vboxsync

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

129528

Message:

FE/Qt: bugref:9241: VirtualBox Manager: A bit of extra-data getters cleanup related to machine visibility stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (2 diffs)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• manager/UIVirtualMachineItem.cpp (modified) (1 diff)
• manager/chooser/UIChooserModel.cpp (modified) (3 diffs)
• medium/UIMedium.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -3059 +3059 @@
 }
 
-bool UIExtraDataManager::showMachineInSelectorChooser(const QUuid &uID)
+bool UIExtraDataManager::showMachineInVirtualBoxManagerChooser(const QUuid &uID)
 {
     /* 'True' unless 'restriction' feature allowed: */
@@ -3065 +3065 @@
 }
 
-bool UIExtraDataManager::showMachineInSelectorDetails(const QUuid &uID)
+bool UIExtraDataManager::showMachineInVirtualBoxManagerDetails(const QUuid &uID)
 {
     /* 'True' unless 'restriction' feature allowed: */

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -412 +412 @@
     /** @name Virtual Machine
       * @{ */
-        /** Returns whether machine should be shown in selector-window chooser-pane. */
-        bool showMachineInSelectorChooser(const QUuid &uID);
-        /** Returns whether machine should be shown in selector-window details-pane. */
-        bool showMachineInSelectorDetails(const QUuid &uID);
+        /** Returns whether machine should be shown in VirtualBox Manager Chooser-pane. */
+        bool showMachineInVirtualBoxManagerChooser(const QUuid &uID);
+        /** Returns whether machine should be shown in VirtualBox Manager Details-pane. */
+        bool showMachineInVirtualBoxManagerDetails(const QUuid &uID);
 
         /** Returns whether machine reconfiguration enabled. */

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItem.cpp

@@ -156 +156 @@
 
         /* Should we show details for this item? */
-        m_fHasDetails = gEDataManager->showMachineInSelectorDetails(m_uId);
+        m_fHasDetails = gEDataManager->showMachineInVirtualBoxManagerDetails(m_uId);
     }
     else

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

@@ -741 +741 @@
         /* Show machine if we should: */
         CMachine comMachine = vboxGlobal().virtualBox().FindMachine(uId.toString());
-        if (gEDataManager->showMachineInSelectorChooser(uId))
+        if (gEDataManager->showMachineInVirtualBoxManagerChooser(uId))
         {
             /* Add new machine-item: */
@@ -1041 +1041 @@
     /* Show machine if we should: */
     CMachine comMachine = vboxGlobal().virtualBox().FindMachine(uId.toString());
-    if (gEDataManager->showMachineInSelectorChooser(uId))
+    if (gEDataManager->showMachineInVirtualBoxManagerChooser(uId))
     {
         /* Add new machine-item: */
@@ -1690 +1690 @@
         {
             const QUuid uMachineID = comMachine.GetId();
-            /// @todo rename showMachineInSelectorChooser to showMachineInVirtualBoxManager
-            if (!uMachineID.isNull() && gEDataManager->showMachineInSelectorChooser(uMachineID))
+            if (!uMachineID.isNull() && gEDataManager->showMachineInVirtualBoxManagerChooser(uMachineID))
                 addMachineIntoTheTree(comMachine);
         }

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMedium.cpp

@@ -340 +340 @@
 
                 /* Finally we can precisely check if current machine is 'hidden': */
-                if (gEDataManager->showMachineInSelectorChooser(uMachineID))
+                if (gEDataManager->showMachineInVirtualBoxManagerChooser(uMachineID))
                     m_fUsedByHiddenMachinesOnly = false;