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

Timestamp:

Jun 13, 2019 1:17:48 PM (6 years ago)

Author:

vboxsync

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

131293

Message:

FE/Qt: bugref:7127: More refactoring: Rework r131292 to use machine ID instead of machine itself.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium

Files:

• UIMediumEnumerator.cpp (modified) (2 diffs)
• UIMediumEnumerator.h (modified) (1 diff)

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

@@ -760 +760 @@
 #else /* VBOX_GUI_WITH_NEW_MEDIA_EVENTS */
 
-void UIMediumEnumerator::parseMachine(CMachine comMachine, QList<QUuid> &result)
-{
-    /* Acquire machine ID: */
-    const QUuid uMachineId = comMachine.GetId();
-    if (!comMachine.isOk())
-    {
-        LogRel2(("GUI: UIMediumEnumerator:  Unable to acquire machine ID!\n"));
-        msgCenter().cannotAcquireMachineParameter(comMachine);
-    }
-    else
-    {
-        /* For each the cached UIMedium we have: */
-        foreach (const QUuid &uMediumId, mediumIDs())
-        {
-            /* Check if medium isn't NULL, used by our
-             * machine and wasn't already enumerated. */
-            const UIMedium guiMedium = medium(uMediumId);
-            if (   !guiMedium.isNull()
-                && guiMedium.machineIds().contains(uMachineId)
-                && !result.contains(uMediumId))
-            {
-                /* Enumerate corresponding UIMedium: */
-                LogRel2(("GUI: UIMediumEnumerator:  Medium {%s} of machine {%s} will be enumerated..\n",
-                         uMediumId.toString().toUtf8().constData(),
-                         uMachineId.toString().toUtf8().constData()));
-                createMediumEnumerationTask(guiMedium);
-                result << uMediumId;
-            }
+void UIMediumEnumerator::parseMachineId(const QUuid &uMachineId, QList<QUuid> &result)
+{
+    /* For each the cached UIMedium we have: */
+    foreach (const QUuid &uMediumId, mediumIDs())
+    {
+        /* Check if medium isn't NULL, used by our
+         * machine and wasn't already enumerated. */
+        const UIMedium guiMedium = medium(uMediumId);
+        if (   !guiMedium.isNull()
+            && guiMedium.machineIds().contains(uMachineId)
+            && !result.contains(uMediumId))
+        {
+            /* Enumerate corresponding UIMedium: */
+            LogRel2(("GUI: UIMediumEnumerator:  Medium {%s} of machine {%s} will be enumerated..\n",
+                     uMediumId.toString().toUtf8().constData(),
+                     uMachineId.toString().toUtf8().constData()));
+            createMediumEnumerationTask(guiMedium);
+            result << uMediumId;
         }
     }
@@ -829 +819 @@
             else
             {
-                /* Parse machine: */
-                parseMachine(comMachine, result);
+                /* Acquire machine ID: */
+                const QUuid uMachineId = comMachine.GetId();
+                if (!comMachine.isOk())
+                {
+                    LogRel2(("GUI: UIMediumEnumerator:  Unable to acquire machine ID!\n"));
+                    msgCenter().cannotAcquireMachineParameter(comMachine);
+                }
+                else
+                {
+                    /* Parse machine ID: */
+                    parseMachineId(uMachineId, result);
+                }
             }
         }

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.h

@@ -183 +183 @@
                                 const QList<QUuid> &currentCMediumIDs);
 #else /* VBOX_GUI_WITH_NEW_MEDIA_EVENTS */
-    /** Parses incoming @a comMachine, enumerating ONLY KNOWN media it has.
+    /** Parses machine with incoming @a uMachineId, enumerating ONLY KNOWN media it has.
       * @param  result  Brings the list of previously enumerated media
       *                 IDs to be appended with newly enumerated. */
-    void parseMachine(CMachine comMachine, QList<QUuid> &result);
+    void parseMachineId(const QUuid &uMachineId, QList<QUuid> &result);
     /** Parses incoming @a comAttachment, enumerating the media it has attached.
       * @param  result  Brings the list of previously enumerated media