Changeset 72822 in vbox

Timestamp:

Jul 3, 2018 1:43:06 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: Move/rework MediumBackends functionality out of VBoxGlobal to UIMediumDefs.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (7 diffs)
• globals/VBoxGlobal.h (modified) (1 diff)
• medium/UIMediumDefs.cpp (modified) (2 diffs)
• medium/UIMediumDefs.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -90 +90 @@
 # include "CExtPackManager.h"
 # include "CMachine.h"
-# include "CSystemProperties.h"
 # include "CUSBDevice.h"
 # include "CUSBDeviceFilters.h"
@@ -104 +103 @@
 # include "CHostUSBDevice.h"
 # include "CHostVideoInputDevice.h"
-# include "CMediumFormat.h"
 # include "CSharedFolder.h"
 # include "CConsole.h"
@@ -179 +177 @@
 /* Namespaces: */
 using namespace UIExtraDataDefs;
+using namespace UIMediumDefs;
 
 
@@ -2415 +2414 @@
 }
 
-QList<QPair<QString, QString> > VBoxGlobal::MediumBackends(KDeviceType enmType) const
-{
-    /* Prepare a list of pairs with the form <tt>{"Backend Name", "*.suffix1 .suffix2 ..."}</tt>. */
-    CSystemProperties comSystemProperties = virtualBox().GetSystemProperties();
-    QVector<CMediumFormat> mediumFormats = comSystemProperties.GetMediumFormats();
-    QList< QPair<QString, QString> > backendPropList;
-    for (int i = 0; i < mediumFormats.size(); ++i)
-    {
-        /* File extensions */
-        QVector <QString> fileExtensions;
-        QVector <KDeviceType> deviceTypes;
-
-        mediumFormats[i].DescribeFileExtensions(fileExtensions, deviceTypes);
-
-        QStringList f;
-        for (int a = 0; a < fileExtensions.size(); ++a)
-            if (deviceTypes[a] == enmType)
-                f << QString("*.%1").arg(fileExtensions[a]);
-        /* Create a pair out of the backend description and all suffix's. */
-        if (!f.isEmpty())
-            backendPropList << QPair<QString, QString>(mediumFormats[i].GetName(), f.join(" "));
-    }
-    return backendPropList;
-}
-
-/* static */
-QList<QPair<QString, QString> > VBoxGlobal::HDDBackends() const
-{
-    return MediumBackends(KDeviceType_HardDisk);
-}
-
-/* static */
-QList<QPair<QString, QString> > VBoxGlobal::DVDBackends() const
-{
-    return MediumBackends(KDeviceType_DVD);
-}
-
-/* static */
-QList<QPair<QString, QString> > VBoxGlobal::FloppyBackends() const
-{
-    return MediumBackends(KDeviceType_Floppy);
-}
-
 void VBoxGlobal::startMediumEnumeration()
 {
@@ -2626 +2582 @@
         case UIMediumType_HardDisk:
         {
-            filters = HDDBackends();
+            filters = HDDBackends(virtualBox());
             strTitle = tr("Please choose a virtual hard disk file");
             allType = tr("All virtual hard disk files (%1)");
@@ -2638 +2594 @@
         case UIMediumType_DVD:
         {
-            filters = DVDBackends();
+            filters = DVDBackends(virtualBox());
             strTitle = tr("Please choose a virtual optical disk file");
             allType = tr("All virtual optical disk files (%1)");
@@ -2650 +2606 @@
         case UIMediumType_Floppy:
         {
-            filters = FloppyBackends();
+            filters = FloppyBackends(virtualBox());
             strTitle = tr("Please choose a virtual floppy disk file");
             allType = tr("All virtual floppy disk files (%1)");

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

@@ -475 +475 @@
     /** @name COM: Virtual Media stuff.
      * @{ */
-        /** Returns medium formats which are currently supported by VirtualBox for the given @a enmDeviceType. */
-        QList<QPair<QString, QString> > MediumBackends(KDeviceType enmDeviceType) const;
-        /** Returns which hard disk formats are currently supported by VirtualBox. */
-        QList<QPair<QString, QString> > HDDBackends() const;
-        /** Returns which optical disk formats are currently supported by VirtualBox. */
-        QList<QPair<QString, QString> > DVDBackends() const;
-        /** Returns which floppy disk formats are currently supported by VirtualBox. */
-        QList<QPair<QString, QString> > FloppyBackends() const;
-
         /** Starts medium enumeration. */
         void startMediumEnumeration();

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

@@ -22 +22 @@
 /* GUI includes: */
 # include "UIMediumDefs.h"
+
+/* COM includes: */
+# include "CMediumFormat.h"
+# include "CSystemProperties.h"
+# include "CVirtualBox.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -60 +65 @@
 }
 
+QList<QPair<QString, QString> > UIMediumDefs::MediumBackends(const CVirtualBox &comVBox, KDeviceType enmType)
+{
+    /* Prepare a list of pairs with the form <tt>{"Backend Name", "*.suffix1 .suffix2 ..."}</tt>. */
+    const CSystemProperties comSystemProperties = comVBox.GetSystemProperties();
+    QVector<CMediumFormat> mediumFormats = comSystemProperties.GetMediumFormats();
+    QList<QPair<QString, QString> > backendPropList;
+    for (int i = 0; i < mediumFormats.size(); ++i)
+    {
+        /* Acquire file extensions & device types: */
+        QVector<QString> fileExtensions;
+        QVector<KDeviceType> deviceTypes;
+        mediumFormats[i].DescribeFileExtensions(fileExtensions, deviceTypes);
+
+        /* Compose filters list: */
+        QStringList filters;
+        for (int iExtensionIndex = 0; iExtensionIndex < fileExtensions.size(); ++iExtensionIndex)
+            if (deviceTypes[iExtensionIndex] == enmType)
+                filters << QString("*.%1").arg(fileExtensions[iExtensionIndex]);
+        /* Create a pair out of the backend description and all suffix's. */
+        if (!filters.isEmpty())
+            backendPropList << QPair<QString, QString>(mediumFormats[i].GetName(), filters.join(" "));
+    }
+    return backendPropList;
+}
+
+QList<QPair<QString, QString> > UIMediumDefs::HDDBackends(const CVirtualBox &comVBox)
+{
+    return MediumBackends(comVBox, KDeviceType_HardDisk);
+}
+
+QList<QPair<QString, QString> > UIMediumDefs::DVDBackends(const CVirtualBox &comVBox)
+{
+    return MediumBackends(comVBox, KDeviceType_DVD);
+}
+
+QList<QPair<QString, QString> > UIMediumDefs::FloppyBackends(const CVirtualBox &comVBox)
+{
+    return MediumBackends(comVBox, KDeviceType_Floppy);
+}

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

@@ -27 +27 @@
 /* COM includes: */
 #include "COMEnums.h"
+#include "CVirtualBox.h"
 
 /* Other VBox includes: */
 #include <VBox/com/defs.h>
+
+/* Forward declarations: */
+class CVirtualBox;
 
 
@@ -58 +62 @@
     /** Converts global medium type (KDeviceType) to local (UIMediumType). */
     SHARED_LIBRARY_STUFF UIMediumType mediumTypeToLocal(KDeviceType globalType);
-
     /** Convert local medium type (UIMediumType) to global (KDeviceType). */
     SHARED_LIBRARY_STUFF KDeviceType mediumTypeToGlobal(UIMediumType localType);
+
+    /** Returns medium formats which are currently supported by @a comVBox for the given @a enmDeviceType. */
+    QList<QPair<QString, QString> > MediumBackends(const CVirtualBox &comVBox, KDeviceType enmDeviceType);
+    /** Returns which hard disk formats are currently supported by @a comVBox. */
+    QList<QPair<QString, QString> > HDDBackends(const CVirtualBox &comVBox);
+    /** Returns which optical disk formats are currently supported by @a comVBox. */
+    QList<QPair<QString, QString> > DVDBackends(const CVirtualBox &comVBox);
+    /** Returns which floppy disk formats are currently supported by @a comVBox. */
+    QList<QPair<QString, QString> > FloppyBackends(const CVirtualBox &comVBox);
 }
 /* Using this namespace globally: */