Changeset 79043 in vbox for trunk

Timestamp:

Jun 7, 2019 4:25:23 PM (6 years ago)

Author:

vboxsync

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

131201

Message:

FE/Qt: bugref:7127: Rework parseAttachment/parseMedium to be more informative.

Location:

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

Files:

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

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

@@ -757 +757 @@
 #else /* VBOX_GUI_WITH_NEW_MEDIA_EVENTS */
 
-void UIMediumEnumerator::parseAttachment(CMediumAttachment &comAttachment)
-{
+QList<QUuid> UIMediumEnumerator::parseAttachment(CMediumAttachment &comAttachment)
+{
+    /* Prepare result: */
+    QList<QUuid> result;
+
     /* Make sure attachment is valid: */
     if (comAttachment.isNull())
@@ -778 +781 @@
         {
             /* Parse medium: */
-            parseMedium(comMedium);
-        }
-    }
-}
-
-void UIMediumEnumerator::parseMedium(CMedium &comMedium)
-{
+            result << parseMedium(comMedium);
+        }
+    }
+
+    /* Return result: */
+    return result;
+}
+
+QList<QUuid> UIMediumEnumerator::parseMedium(CMedium &comMedium)
+{
+    /* Prepare result: */
+    QList<QUuid> result;
+
     /* Make sure medium is valid: */
     if (comMedium.isNull())
@@ -820 +829 @@
                          uMediumId.toString().toUtf8().constData()));
                 createMediumEnumerationTask(m_media.value(uMediumId));
+                result << uMediumId;
             }
         }
     }
+
+    /* Return result: */
+    return 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 comAttachment. */
-    void parseAttachment(CMediumAttachment &comAttachment);
-    /** Parses incoming @a comMedium. */
-    void parseMedium(CMedium &comMedium);
+    /** Parses incoming @a comAttachment.
+      * @returns a list of newly enumerated media IDs. */
+    QList<QUuid> parseAttachment(CMediumAttachment &comAttachment);
+    /** Parses incoming @a comMedium.
+      * @returns a list of newly enumerated media IDs. */
+    QList<QUuid> parseMedium(CMedium &comMedium);
 #endif /* VBOX_GUI_WITH_NEW_MEDIA_EVENTS */