Changeset 91254 in vbox

Timestamp:

Sep 15, 2021 1:46:39 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. Refactoring UIDiskFormatsGroupBox. part 2.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors

Files:

• UIWizardDiskEditors.cpp (modified) (1 diff)
• UIWizardDiskEditors.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardDiskEditors.cpp

@@ -173 +173 @@
 UIDiskFormatsGroupBox::UIDiskFormatsGroupBox(bool fExpertMode, KDeviceType enmDeviceType, QWidget *pParent /* = 0 */)
     : UIDiskEditorGroupBox(fExpertMode, pParent)
-    , m_enmDeviceType(enmDeviceType)
+    , UIDiskFormatBase(enmDeviceType)
     , m_pFormatButtonGroup(0)
     , m_pMainLayout(0)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardDiskEditors.h

@@ -74 +74 @@
 };
 
-class SHARED_LIBRARY_STUFF UIDiskFormatsGroupBox : public UIDiskEditorGroupBox
-{
-    Q_OBJECT;
-
-signals:
-
-    void sigMediumFormatChanged();
-
-public:
-
-    UIDiskFormatsGroupBox(bool fExpertMode, KDeviceType enmDeviceType, QWidget *pParent = 0);
-    CMediumFormat mediumFormat() const;
-    void setMediumFormat(const CMediumFormat &mediumFormat);
-    const CMediumFormat &VDIMediumFormat() const;
-    const QStringList formatExtensions() const;
-
-private:
+class UIDiskFormatBase
+{
+
+public:
+
+    UIDiskFormatBase(KDeviceType enmDeviceType)
+        : m_enmDeviceType(enmDeviceType)
+    {}
+
+protected:
+
     struct Format
     {
@@ -106 +100 @@
     };
 
+    QVector<Format> m_formatList;
+    CMediumFormat m_comVDIMediumFormat;
+    KDeviceType m_enmDeviceType;
+
+};
+
+class SHARED_LIBRARY_STUFF UIDiskFormatsGroupBox : public UIDiskEditorGroupBox, public UIDiskFormatBase
+{
+    Q_OBJECT;
+
+signals:
+
+    void sigMediumFormatChanged();
+
+public:
+
+    UIDiskFormatsGroupBox(bool fExpertMode, KDeviceType enmDeviceType, QWidget *pParent = 0);
+    CMediumFormat mediumFormat() const;
+    void setMediumFormat(const CMediumFormat &mediumFormat);
+    const CMediumFormat &VDIMediumFormat() const;
+    const QStringList formatExtensions() const;
+
+private:
+
     void prepare();
     void populateFormats();
@@ -112 +130 @@
     virtual void retranslateUi() /* override final */;
 
-    QVector<Format> m_formatList;
-
-    CMediumFormat m_comVDIMediumFormat;
-    KDeviceType m_enmDeviceType;
 
     QButtonGroup *m_pFormatButtonGroup;