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

Timestamp:

Jun 14, 2019 1:12:21 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:7127: A bit of fefactoring for UIMediumEnumerator: Rework r131292 and r131293 to be more clear.

Location:

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

Files:

• UIMediumEnumerator.cpp (modified) (7 diffs)
• UIMediumEnumerator.h (modified) (2 diffs)

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

@@ -387 +387 @@
              uMachineId.toString().toUtf8().constData()));
 
-    /* Parse machine ID: */
+    /* Enumerate all the media of machine with this ID: */
     QList<QUuid> result;
-    parseMachineId(uMachineId, result);
+    enumerateAllMediaOfMachineWithId(uMachineId, result);
 }
 
@@ -414 +414 @@
 void UIMediumEnumerator::sltHandleMediumChange(CMediumAttachment comAttachment)
 {
-    //printf("OnMediumChanged\n");
-    LogRel2(("GUI: UIMediumEnumerator: OnMediumChanged event received\n"));
+    //printf("MediumChanged\n");
+    LogRel2(("GUI: UIMediumEnumerator: MediumChanged event received\n"));
 
     /* Parse attachment: */
@@ -424 +424 @@
 void UIMediumEnumerator::sltHandleMediumConfigChange(CMedium comMedium)
 {
-    //printf("OnMediumConfigChanged\n");
-    LogRel2(("GUI: UIMediumEnumerator: OnMediumConfigChanged event received\n"));
+    //printf("MediumConfigChanged\n");
+    LogRel2(("GUI: UIMediumEnumerator: MediumConfigChanged event received\n"));
 
     /* Parse medium: */
@@ -434 +434 @@
 void UIMediumEnumerator::sltHandleMediumRegistered(const QUuid &uMediumId, KDeviceType enmMediumType, bool fRegistered)
 {
-    //printf("OnMediumRegistered: medium-id=%s, medium-type=%d, registered=%d\n",
+    //printf("MediumRegistered: medium-id=%s, medium-type=%d, registered=%d\n",
     //       uMediumId.toString().toUtf8().constData(), enmMediumType, fRegistered);
     //printf(" Medium to recache: %s\n",
     //       uMediumId.toString().toUtf8().constData());
-    LogRel2(("GUI: UIMediumEnumerator: OnMediumRegistered event received, Medium ID = {%s}, Medium type = {%d}, Registered = {%d}\n",
+    LogRel2(("GUI: UIMediumEnumerator: MediumRegistered event received, Medium ID = {%s}, Medium type = {%d}, Registered = {%d}\n",
              uMediumId.toString().toUtf8().constData(), enmMediumType, fRegistered));
 
@@ -775 +775 @@
 
 #else /* VBOX_GUI_WITH_NEW_MEDIA_EVENTS */
-
-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;
-        }
-    }
-}
 
 void UIMediumEnumerator::parseAttachment(CMediumAttachment comAttachment, QList<QUuid> &result)
@@ -844 +822 @@
                 else
                 {
-                    /* Parse machine ID: */
-                    parseMachineId(uMachineId, result);
+                    /* Enumerate all the media of machine with this ID: */
+                    enumerateAllMediaOfMachineWithId(uMachineId, result);
                 }
             }
@@ -895 +873 @@
 }
 
+void UIMediumEnumerator::enumerateAllMediaOfMachineWithId(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: */
+            printf(" Medium to recache: %s\n",
+                   uMediumId.toString().toUtf8().constData());
+            LogRel2(("GUI: UIMediumEnumerator:  Medium {%s} of machine {%s} will be enumerated..\n",
+                     uMediumId.toString().toUtf8().constData(),
+                     uMachineId.toString().toUtf8().constData()));
+            createMediumEnumerationTask(guiMedium);
+            result << uMediumId;
+        }
+    }
+}
+
 #endif /* VBOX_GUI_WITH_NEW_MEDIA_EVENTS */
 

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

@@ -186 +186 @@
                                 const QList<QUuid> &currentCMediumIDs);
 #else /* VBOX_GUI_WITH_NEW_MEDIA_EVENTS */
-    /** 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 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
@@ -198 +194 @@
       *                 IDs to be appended with newly enumerated. */
     void parseMedium(CMedium comMedium, QList<QUuid> &result);
+
+    /** Enumerates all the known media attached to machine with certain @a uMachineId.
+      * @param  result  Brings the list of previously enumerated media
+      *                 IDs to be appended with newly enumerated. */
+    void enumerateAllMediaOfMachineWithId(const QUuid &uMachineId, QList<QUuid> &result);
 #endif /* VBOX_GUI_WITH_NEW_MEDIA_EVENTS */