Changeset 91579 in vbox for trunk/src/VBox

Timestamp:

Oct 5, 2021 5:32:35 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996: UIApplianceEditorWidget: Unify appliance member access for both sub-classes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIApplianceEditorWidget.cpp (modified) (2 diffs)
• UIApplianceEditorWidget.h (modified) (3 diffs)
• UIApplianceExportEditorWidget.cpp (modified) (1 diff)
• UIApplianceExportEditorWidget.h (modified) (1 diff)
• UIApplianceImportEditorWidget.cpp (modified) (1 diff)
• UIApplianceImportEditorWidget.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp

@@ -1765 +1765 @@
 UIApplianceEditorWidget::UIApplianceEditorWidget(QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
-    , m_pAppliance(0)
     , m_pModel(0)
 {
@@ -1848 +1847 @@
     /* Translate finally: */
     retranslateUi();
+}
+
+void UIApplianceEditorWidget::setAppliance(const CAppliance &comAppliance)
+{
+    m_comAppliance = comAppliance;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.h

@@ -34 +34 @@
 /* COM includes: */
 #include "COMEnums.h"
+#include "CAppliance.h"
 #include "CVirtualSystemDescription.h"
 
@@ -294 +295 @@
     UIApplianceEditorWidget(QWidget *pParent = 0);
 
+    /** Defines @a comAppliance wrapper instance. */
+    virtual void setAppliance(const CAppliance &comAppliance);
+
     /** Defines the list of VSD @a hints. */
     void setVsdHints(const AbstractVSDParameterList &hints);
-
-    /** Returns whether the Appliance Editor has valid state. */
-    bool isValid() const { return m_pAppliance != 0; }
-    /** Returns the currently set appliance reference. */
-    CAppliance *appliance() const { return m_pAppliance; }
 
     /** Defines virtual system base folder @a strPath. */
@@ -324 +323 @@
     virtual void retranslateUi() /* override */;
 
+    /** Holds the currently set appliance reference. */
+    CAppliance  m_comAppliance;
+
     /** Holds the list of VSD hints. */
     AbstractVSDParameterList  m_listVsdHints;
 
-    /** Holds the currently set appliance reference. */
-    CAppliance         *m_pAppliance;
     /** Holds the Appliance model reference. */
     UIApplianceModel *m_pModel;

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp

@@ -63 +63 @@
 void UIApplianceExportEditorWidget::setAppliance(const CAppliance &comAppliance)
 {
-    /* Cache newly passed appliance: */
-    m_comAppliance = comAppliance;
+    /* Call to base-class: */
+    UIApplianceEditorWidget::setAppliance(comAppliance);
 
     /* Cleanup previous stuff: */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.h

@@ -39 +39 @@
 
     /** Assigns @a comAppliance and populates widget contents. */
-    void setAppliance(const CAppliance &comAppliance);
+    virtual void setAppliance(const CAppliance &comAppliance) /* override final */;
 
     /** Prepares export by pushing edited data back to appliance. */
     void prepareExport();
-
-private:
-
-    /** Holds the appliance wrapper instance. */
-    CAppliance  m_comAppliance;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp

@@ -50 +50 @@
 void UIApplianceImportEditorWidget::setAppliance(const CAppliance &comAppliance)
 {
-    /* Cache newly passed appliance: */
-    m_comAppliance = comAppliance;
+    /* Call to base-class: */
+    UIApplianceEditorWidget::setAppliance(comAppliance);
 
     /* Cleanup previous stuff: */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.h

@@ -39 +39 @@
 
     /** Assigns @a comAppliance and populates widget contents. */
-    void setAppliance(const CAppliance &comAppliance);
+    virtual void setAppliance(const CAppliance &comAppliance) /* override final */;
 
     /** Prepares import by pushing edited data back to appliance. */
     void prepareImport();
-
-private:
-
-    /** Holds the appliance wrapper instance. */
-    CAppliance  m_comAppliance;
 };