Changeset 80890 in vbox for trunk

Timestamp:

Sep 18, 2019 1:46:52 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8472: A bit of cleanup for machine media enumeration code.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.h (modified) (1 diff)
• runtime/UIMachine.cpp (modified) (1 diff)
• runtime/UISession.cpp (modified) (1 diff)
• runtime/UISession.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.h

@@ -483 +483 @@
      * @{ */
         /** Starts medium-enumeration. */
-        void startMediumEnumeration(const CMediumVector &mediaList = CMediumVector());
+        void startMediumEnumeration(const CMediumVector &comMedia = CMediumVector());
         /** Enumerates additional medium. */
         void enumerateAdditionalMedium(const CMedium &comMedium);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp

@@ -210 +210 @@
     {
         AssertReturn(m_pSession, false);
-        uiCommon().startMediumEnumeration(m_pSession->getMachineMedia());
-    }
+        uiCommon().startMediumEnumeration(m_pSession->machineMedia());
+    }
+
     /* Prepare machine-logic: */
     prepareMachineLogic();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -2173 +2173 @@
 }
 
-CMediumVector UISession::getMachineMedia() const
-{
-    CMediumVector media;
+CMediumVector UISession::machineMedia() const
+{
+    CMediumVector comMedia;
+    /* Enumerate all the controllers: */
     foreach (const CStorageController &comController, m_machine.GetStorageControllers())
     {
-        QString strAttData;
         /* Enumerate all the attachments: */
         foreach (const CMediumAttachment &comAttachment, m_machine.GetMediumAttachmentsOfController(comController.GetName()))
         {
-            /* Skip unrelated attachments: */
-            if (comAttachment.GetType() != KDeviceType_HardDisk &&
-                comAttachment.GetType() != KDeviceType_Floppy &&
-                comAttachment.GetType() != KDeviceType_DVD)
+            /* Skip unrelated device types: */
+            const KDeviceType enmDeviceType = comAttachment.GetType();
+            if (   enmDeviceType != KDeviceType_HardDisk
+                && enmDeviceType != KDeviceType_Floppy
+                && enmDeviceType != KDeviceType_DVD)
                 continue;
-            if (comAttachment.GetIsEjected() || comAttachment.GetMedium().isNull())
+            if (   comAttachment.GetIsEjected()
+                || comAttachment.GetMedium().isNull())
                 continue;
-            media.append(comAttachment.GetMedium());
-        }
-    }
-    return media;
+            comMedia.append(comAttachment.GetMedium());
+        }
+    }
+    return comMedia;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -298 +298 @@
 
     /** Returns a vector of media attached to the machine. */
-    CMediumVector getMachineMedia() const;
+    CMediumVector machineMedia() const;
 
 signals: