Changeset 54919 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 24, 2015 2:02:55 PM (10 years ago)

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp (modified) (9 diffs)

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

@@ -208 +208 @@
 void UISettingsDialogGlobal::loadData()
 {
-    /* Call for base-class: */
+    /* Call to base-class: */
     UISettingsDialog::loadData();
 
+    /* Get properties and settings: */
+    CSystemProperties properties = vboxGlobal().virtualBox().GetSystemProperties();
+    VBoxGlobalSettings settings = vboxGlobal().settings();
     /* Prepare global data: */
     qRegisterMetaType<UISettingsDataGlobal>();
-    UISettingsDataGlobal data(vboxGlobal().virtualBox().GetSystemProperties(), vboxGlobal().settings());
-    /* Create global settings loader,
-     * it will load global settings & delete itself in the appropriate time: */
+    UISettingsDataGlobal data(properties, settings);
+    /* Create global settings loader: */
     UISettingsSerializer *pGlobalSettingsLoader = new UISettingsSerializer(this,
                                                                            UISettingsSerializer::Load,
@@ -227 +229 @@
 void UISettingsDialogGlobal::saveData()
 {
-    /* Call for base-class: */
+    /* Call to base-class: */
     UISettingsDialog::saveData();
 
@@ -236 +238 @@
     qRegisterMetaType<UISettingsDataGlobal>();
     UISettingsDataGlobal data(properties, settings);
-    /* Create global settings saver,
-     * it will save global settings & delete itself in the appropriate time: */
+    /* Create global settings saver: */
     UISettingsSerializer *pGlobalSettingsSaver = new UISettingsSerializer(this,
                                                                           UISettingsSerializer::Save,
@@ -511 +512 @@
         return;
 
-    /* Call for base-class: */
+    /* Call to base-class: */
     UISettingsDialog::loadData();
 
@@ -518 +519 @@
 
     /* Prepare session: */
-    m_session = configurationAccessLevel() == ConfigurationAccessLevel_Null ? CSession() : vboxGlobal().openExistingSession(m_strMachineId);
+    m_session = configurationAccessLevel() == ConfigurationAccessLevel_Null ? CSession() :
+                configurationAccessLevel() == ConfigurationAccessLevel_Full ? vboxGlobal().openSession(m_strMachineId) :
+                                                                              vboxGlobal().openExistingSession(m_strMachineId);
     /* Check that session was created: */
     if (m_session.isNull())
         return;
 
-    /* Get machine from session: */
+    /* Get machine and console: */
     m_machine = m_session.GetMachine();
-    /* Get console from session: */
     m_console = configurationAccessLevel() == ConfigurationAccessLevel_Full ? CConsole() : m_session.GetConsole();
-
     /* Prepare machine data: */
     qRegisterMetaType<UISettingsDataMachine>();
     UISettingsDataMachine data(m_machine, m_console);
-    /* Create machine settings loader,
-     * it will load machine settings & delete itself in the appropriate time: */
+    /* Create machine settings loader: */
     UISettingsSerializer *pMachineSettingsLoader = new UISettingsSerializer(this,
                                                                             UISettingsSerializer::Load,
@@ -551 +551 @@
         return;
 
-    /* Call for base-class: */
+    /* Call to base-class: */
     UISettingsDialog::saveData();
 
@@ -558 +558 @@
 
     /* Prepare session: */
-    if (configurationAccessLevel() == ConfigurationAccessLevel_Null)
-        m_session = CSession();
-    else if (configurationAccessLevel() != ConfigurationAccessLevel_Full)
-        m_session = vboxGlobal().openExistingSession(m_strMachineId);
-    else
-        m_session = vboxGlobal().openSession(m_strMachineId);
+    m_session = configurationAccessLevel() == ConfigurationAccessLevel_Null ? CSession() :
+                configurationAccessLevel() == ConfigurationAccessLevel_Full ? vboxGlobal().openSession(m_strMachineId) :
+                                                                              vboxGlobal().openExistingSession(m_strMachineId);
     /* Check that session was created: */
     if (m_session.isNull())
         return;
 
-    /* Get machine from session: */
+    /* Get machine and console: */
     m_machine = m_session.GetMachine();
-    /* Get console from session: */
     m_console = configurationAccessLevel() == ConfigurationAccessLevel_Full ? CConsole() : m_session.GetConsole();
-
     /* Prepare machine data: */
     qRegisterMetaType<UISettingsDataMachine>();
     UISettingsDataMachine data(m_machine, m_console);
-    /* Create machine settings saver,
-     * it will save machine settings & delete itself in the appropriate time: */
+    /* Create machine settings saver: */
     UISettingsSerializer *pMachineSettingsSaver = new UISettingsSerializer(this,
                                                                            UISettingsSerializer::Save,
@@ -587 +581 @@
     /* Get updated machine: */
     m_machine = pMachineSettingsSaver->data().value<UISettingsDataMachine>().m_machine;
-    /* If machine is ok => perform final operations: */
+    /* If machine is OK => perform final operations: */
     if (m_machine.isOk())
     {
@@ -622 +616 @@
     }
 
-    /* If machine is NOT ok => show the error message: */
+    /* If machine is NOT OK => show the error message: */
     if (!m_machine.isOk())
         msgCenter().cannotSaveMachineSettings(m_machine, this);