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

Timestamp:

Jun 13, 2019 12:38:40 PM (6 years ago)

Author:

vboxsync

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

131291

Message:

FE/Qt: bugref:7127: A bit of refactoring: More flexible input/output arguments for UIMediumEnumerator parse routines.

Location:

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

Files:

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

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

@@ -392 +392 @@
 
     /* Parse attachment: */
-    parseAttachment(comAttachment);
+    QList<QUuid> result;
+    parseAttachment(comAttachment, result);
 }
 
@@ -401 +402 @@
 
     /* Parse attachment: */
-    parseAttachment(comAttachment);
+    QList<QUuid> result;
+    parseAttachment(comAttachment, result);
 }
 
@@ -410 +412 @@
 
     /* Parse medium: */
-    parseMedium(comMedium);
+    QList<QUuid> result;
+    parseMedium(comMedium, result);
 }
 
@@ -757 +760 @@
 #else /* VBOX_GUI_WITH_NEW_MEDIA_EVENTS */
 
-QList<QUuid> UIMediumEnumerator::parseAttachment(CMediumAttachment &comAttachment)
-{
-    /* Prepare result: */
-    QList<QUuid> result;
-
+void UIMediumEnumerator::parseAttachment(CMediumAttachment comAttachment, QList<QUuid> &result)
+{
     /* Make sure attachment is valid: */
     if (comAttachment.isNull())
@@ -781 +781 @@
         {
             /* Parse medium: */
-            result << parseMedium(comMedium);
+            parseMedium(comMedium, result);
 
             // WORKAROUND:
@@ -825 +825 @@
         }
     }
-
-    /* Return result: */
-    return result;
-}
-
-QList<QUuid> UIMediumEnumerator::parseMedium(CMedium &comMedium)
-{
-    /* Prepare result: */
-    QList<QUuid> result;
-
+}
+
+void UIMediumEnumerator::parseMedium(CMedium comMedium, QList<QUuid> &result)
+{
     /* Make sure medium is valid: */
     if (comMedium.isNull())
@@ -874 +868 @@
         }
     }
-
-    /* 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.
-      * @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);
+    /** Parses incoming @a comAttachment, enumerating the media it has attached.
+      * @param  result  Brings the list of previously enumerated media
+      *                 IDs to be appended with newly enumerated. */
+    void parseAttachment(CMediumAttachment comAttachment, QList<QUuid> &result);
+    /** Parses incoming @a comMedium, enumerating the media it represents.
+      * @param  result  Brings the list of previously enumerated media
+      *                 IDs to be appended with newly enumerated. */
+    void parseMedium(CMedium comMedium, QList<QUuid> &result);
 #endif /* VBOX_GUI_WITH_NEW_MEDIA_EVENTS */