Changeset 103338 in vbox for trunk/src/VBox

Timestamp:

Feb 13, 2024 4:37:06 PM (12 months ago)

Author:

vboxsync

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

161647

Message:

FE/Qt: Medium related stuff: Moving getFormatsForDeviceType from UIMediumDefs to UIFDCreationDialog to avoid unwanted dependencies; This stuff is used just in one place after all.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• medium/UIFDCreationDialog.cpp (modified) (4 diffs)
• medium/UIFDCreationDialog.h (modified) (3 diffs)
• medium/UIMediumDefs.cpp (modified) (1 diff)
• medium/UIMediumDefs.h (modified) (2 diffs)
• settings/editors/UIStorageSettingsEditor.h (modified) (1 diff)

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

@@ -104 +104 @@
     /* Acquire medium path & formats: */
     const QString strMediumLocation = m_pFilePathSelector->path();
-    const QVector<CMediumFormat> mediumFormats = UIMediumDefs::getFormatsForDeviceType(KDeviceType_Floppy);
+    const QVector<CMediumFormat> mediumFormats = getFormatsForDeviceType(KDeviceType_Floppy);
     /* Make sure we have both path and formats selected: */
     if (strMediumLocation.isEmpty() || mediumFormats.isEmpty())
@@ -173 +173 @@
 }
 
+void UIFDCreationDialog::sltHandleMediumCreated(const CMedium &comMedium)
+{
+    /* Store the ID of the newly created medium: */
+    m_uMediumID = comMedium.GetId();
+
+    /* Close the dialog now: */
+    QDialog::accept();
+}
+
 void UIFDCreationDialog::sltPathChanged(const QString &strPath)
 {
@@ -180 +189 @@
     if (m_pButtonBox && m_pButtonBox->button(QDialogButtonBox::Ok))
         m_pButtonBox->button(QDialogButtonBox::Ok)->setEnabled(fIsFileUnique);
-}
-
-bool UIFDCreationDialog::checkFilePath(const QString &strPath) const
-{
-    return !QFileInfo(strPath).exists();
-}
-
-void UIFDCreationDialog::sltHandleMediumCreated(const CMedium &comMedium)
-{
-    /* Store the ID of the newly created medium: */
-    m_uMediumID = comMedium.GetId();
-
-    /* Close the dialog now: */
-    QDialog::accept();
 }
 
@@ -312 +307 @@
     return strDefaultFilePath;
 }
+
+bool UIFDCreationDialog::checkFilePath(const QString &strPath) const
+{
+    return !QFileInfo(strPath).exists();
+}
+
+/* static */
+QVector<CMediumFormat> UIFDCreationDialog::getFormatsForDeviceType(KDeviceType enmDeviceType)
+{
+    CSystemProperties comSystemProperties = uiCommon().virtualBox().GetSystemProperties();
+    QVector<CMediumFormat> mediumFormats = comSystemProperties.GetMediumFormats();
+    QVector<CMediumFormat> formatList;
+    for (int i = 0; i < mediumFormats.size(); ++i)
+    {
+        /* File extensions */
+        QVector<QString> fileExtensions;
+        QVector<KDeviceType> deviceTypes;
+
+        mediumFormats[i].DescribeFileExtensions(fileExtensions, deviceTypes);
+        if (deviceTypes.contains(enmDeviceType))
+            formatList.push_back(mediumFormats[i]);
+    }
+    return formatList;
+}

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

@@ -39 +39 @@
 #include "QIWithRetranslateUI.h"
 
+/* COM includes: */
+#include "COMEnums.h"
+#include "CMediumFormat.h"
+
 /* Forward declarations: */
 class QCheckBox;
@@ -70 +74 @@
       * returns the UUID of the newly created medium if successful, a null QUuid otherwise.*/
     static QUuid createFloppyDisk(QWidget *pParent, const QString &strDefaultFolder = QString(),
-                           const QString &strMachineName = QString());
-
+                                  const QString &strMachineName = QString());
 
 public slots:
 
     /** Creates the floppy disc image, asynchronously. */
-    virtual void accept() /* override final */;
+    virtual void accept() RT_OVERRIDE;
 
 protected:
 
     /** Handles translation event. */
-    virtual void retranslateUi() /* override final */;
+    virtual void retranslateUi() RT_OVERRIDE;
 
 private slots:
@@ -109 +112 @@
     bool checkFilePath(const QString &strPath) const;
 
+    /** Returns a list of formats for certain @a enmDeviceType. */
+    static QVector<CMediumFormat> getFormatsForDeviceType(KDeviceType enmDeviceType);
+
     /** Holds the default folder. */
     QString  m_strDefaultFolder;

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

@@ -135 +135 @@
     return QString();
 }
-
-QVector<CMediumFormat> UIMediumDefs::getFormatsForDeviceType(KDeviceType enmDeviceType)
-{
-    CSystemProperties comSystemProperties = uiCommon().virtualBox().GetSystemProperties();
-    QVector<CMediumFormat> mediumFormats = comSystemProperties.GetMediumFormats();
-    QVector<CMediumFormat> formatList;
-    for (int i = 0; i < mediumFormats.size(); ++i)
-    {
-        /* File extensions */
-        QVector <QString> fileExtensions;
-        QVector <KDeviceType> deviceTypes;
-
-        mediumFormats[i].DescribeFileExtensions(fileExtensions, deviceTypes);
-        if (deviceTypes.contains(enmDeviceType))
-            formatList.push_back(mediumFormats[i]);
-    }
-    return formatList;
-}

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

@@ -40 +40 @@
 /* COM includes: */
 #include "COMEnums.h"
-#include "CVirtualBox.h"
 
 /* Other VBox includes: */
@@ -89 +88 @@
     /** Returns the first file extension of the list of file extension support for the @a enmDeviceType. */
    QString getPreferredExtensionForMedium(KDeviceType enmDeviceType);
-   QVector<CMediumFormat>  getFormatsForDeviceType(KDeviceType enmDeviceType);
 }
 /* Using this namespace globally: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIStorageSettingsEditor.h

@@ -31 +31 @@
 # pragma once
 #endif
+
+/* Qt includes: */
+#include <QUuid>
 
 /* GUI includes: */