Changeset 73931 in vbox

Timestamp:

Aug 28, 2018 6:59:00 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8472. Some refactoring in UIMediumEnumerator

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

@@ -145 +145 @@
     UIMediumMap media;
     addNullMediumToMap(media);
-    addHardDisksToMap(vboxGlobal().virtualBox().GetHardDisks(), media);
-    addMediaToMap(vboxGlobal().host().GetDVDDrives(), media, UIMediumType_DVD);
-    addMediaToMap(vboxGlobal().virtualBox().GetDVDImages(), media, UIMediumType_DVD);
-    addMediaToMap(vboxGlobal().host().GetFloppyDrives(), media, UIMediumType_Floppy);
-    addMediaToMap(vboxGlobal().virtualBox().GetFloppyImages(), media, UIMediumType_Floppy);
+    addMediaToMap(vboxGlobal().virtualBox().GetHardDisks(), media);
+    addMediaToMap(vboxGlobal().host().GetDVDDrives(), media);
+    addMediaToMap(vboxGlobal().virtualBox().GetDVDImages(), media);
+    addMediaToMap(vboxGlobal().host().GetFloppyDrives(), media);
+    addMediaToMap(vboxGlobal().virtualBox().GetFloppyImages(), media);
     if (VBoxGlobal::isCleaningUp())
         return; /* VBoxGlobal is cleaning up, abort immediately. */
@@ -378 +378 @@
 }
 
-void UIMediumEnumerator::addMediaToMap(const CMediumVector &inputMedia, UIMediumMap &outputMedia, UIMediumType mediumType)
+void UIMediumEnumerator::addMediaToMap(const CMediumVector &inputMedia, UIMediumMap &outputMedia)
 {
     /* Insert hard-disks to the passed uimedium map.
@@ -391 +391 @@
         QString strMediumID = medium.GetId();
         UIMedium uimedium = m_media.contains(strMediumID) ? m_media[strMediumID] :
-                                                              UIMedium(medium, mediumType);
+            UIMedium(medium, UIMediumDefs::mediumTypeToLocal(medium.GetDeviceType()));
 
         /* Insert uimedium into map: */
         outputMedia.insert(uimedium.id(), uimedium);
-    }
-}
-
-void UIMediumEnumerator::addHardDisksToMap(const CMediumVector &inputMedia, UIMediumMap &outputMedia)
-{
-    /* Insert hard-disks to the passed uimedium map.
-     * Get existing one from the previous map if any. */
-    foreach (CMedium medium, inputMedia)
-    {
-        /* If VBoxGlobal is cleaning up, abort immediately: */
-        if (VBoxGlobal::isCleaningUp())
-            break;
-
-        /* Prepare uimedium on the basis of current medium: */
-        QString strMediumID = medium.GetId();
-        UIMedium uimedium = m_media.contains(strMediumID) ? m_media[strMediumID] :
-                                                              UIMedium(medium, UIMediumType_HardDisk);
-
-        /* Insert uimedium into map: */
-        outputMedia.insert(uimedium.id(), uimedium);
 
         /* Insert medium children into map too: */
-        addHardDisksToMap(medium.GetChildren(), outputMedia);
+        addMediaToMap(medium.GetChildren(), outputMedia);
     }
 }

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

@@ -88 +88 @@
     void createMediumEnumerationTask(const UIMedium &medium);
     void addNullMediumToMap(UIMediumMap &media);
-    void addMediaToMap(const CMediumVector &inputMedia, UIMediumMap &outputMedia, UIMediumType mediumType);
-    void addHardDisksToMap(const CMediumVector &inputMedia, UIMediumMap &outputMedia);
+    void addMediaToMap(const CMediumVector &inputMedia, UIMediumMap &outputMedia);
 
     /* Helpers: Medium re-caching stuff: */