Changeset 54922 in vbox

Timestamp:

Mar 24, 2015 2:34:00 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Machine settings Serializer: Cleanup rework to prepare to the encryption settings integration (step 5).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

• UISettingsDialog.cpp (modified) (1 diff)
• UISettingsDialogSpecific.cpp (modified) (2 diffs)
• UISettingsDialogSpecific.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp

@@ -150 +150 @@
 UISettingsDialog::~UISettingsDialog()
 {
+    /* Delete serializer early if exists: */
+    if (UISettingsSerializer::instance())
+        delete UISettingsSerializer::instance();
+
     /* Recall popup-pane if any: */
     popupCenter().recall(m_pStack, "SettingsDialogWarning");
+
     /* Delete selector early! */
     delete m_pSelector;

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

@@ -199 +199 @@
 }
 
-UISettingsDialogGlobal::~UISettingsDialogGlobal()
-{
-    /* Delete serializer early if exists: */
-    if (UISettingsSerializer::instance())
-        delete UISettingsSerializer::instance();
-}
-
 void UISettingsDialogGlobal::loadOwnData()
 {
@@ -484 +477 @@
     else
         m_pSelector->selectById(MachineSettingsPageType_General);
-}
-
-UISettingsDialogMachine::~UISettingsDialogMachine()
-{
-    /* Delete serializer early if exists: */
-    if (UISettingsSerializer::instance())
-        delete UISettingsSerializer::instance();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h

@@ -37 +37 @@
                            const QString &strCategory = QString(),
                            const QString &strControl = QString());
-    ~UISettingsDialogGlobal();
 
 protected:
@@ -64 +63 @@
     UISettingsDialogMachine(QWidget *pParent, const QString &strMachineId,
                             const QString &strCategory, const QString &strControl);
-    ~UISettingsDialogMachine();
 
 protected: