Changeset 98724 in vbox

Timestamp:

Feb 24, 2023 2:10:32 PM (21 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Runtime UI: Reworking CMachine wrapper usage step-by-step; Data related stuff, settings save procedure.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachine.cpp (modified) (1 diff)
• UIMachine.h (modified) (1 diff)
• UIMachineLogic.cpp (modified) (6 diffs)
• UISession.cpp (modified) (2 diffs)
• UISession.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp

@@ -354 +354 @@
 {
     return uisession()->setPause(fPause);
+}
+
+bool UIMachine::saveSettings()
+{
+    return uisession()->saveSettings();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h

@@ -246 +246 @@
         /** Performes VM pausing/resuming depending on @a fPause state. */
         bool setPause(bool fPause);
+    /** @} */
+
+    /** @name Machine-data stuff.
+     ** @{ */
+        /** Saves machine data. */
+        bool saveSettings();
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -1980 +1980 @@
     }
 
-    /* Save machine-settings: */
-    machine().SaveSettings();
-    if (!machine().isOk())
-    {
-        /* Make sure action is updated: */
-        uimachine()->updateStateRecordingAction();
-        /* Notify about the error: */
-        return UINotificationMessage::cannotSaveMachineSettings(machine());
-    }
+    /* Save machine-settings, make sure action is updated in case of failure: */
+    if (!uimachine()->saveSettings())
+        return uimachine()->updateStateRecordingAction();
 }
 
@@ -2016 +2010 @@
     }
 
-    /* Save machine-settings: */
-    machine().SaveSettings();
-    if (!machine().isOk())
-    {
-        /* Make sure action is updated: */
-        uimachine()->updateStateVRDEServerAction();
-        /* Notify about the error: */
-        return UINotificationMessage::cannotSaveMachineSettings(machine());
-    }
+    /* Save machine-settings, make sure action is updated in case of failure: */
+    if (!uimachine()->saveSettings())
+        return uimachine()->updateStateVRDEServerAction();
 }
 
@@ -2217 +2205 @@
     }
 
-    /* Save machine-settings: */
-    machine().SaveSettings();
-    if (!machine().isOk())
-    {
-        /* Make sure action is updated: */
-        uimachine()->updateStateAudioActions();
-        /* Notify about the error: */
-        return UINotificationMessage::cannotSaveMachineSettings(machine());
-    }
+    /* Save machine-settings, make sure action is updated in case of failure: */
+    if (!uimachine()->saveSettings())
+        return uimachine()->updateStateAudioActions();
 }
 
@@ -2254 +2236 @@
     }
 
-    /* Save machine-settings: */
-    machine().SaveSettings();
-    if (!machine().isOk())
-    {
-        /* Make sure action is updated: */
-        uimachine()->updateStateAudioActions();
-        /* Notify about the error: */
-        return UINotificationMessage::cannotSaveMachineSettings(machine());
-    }
+    /* Save machine-settings, make sure action is updated in case of failure: */
+    if (!uimachine()->saveSettings())
+        return uimachine()->updateStateAudioActions();
 }
 
@@ -2350 +2326 @@
 
     /* Save machine-settings: */
-    machine().SaveSettings();
-    if (!machine().isOk())
-        return UINotificationMessage::cannotSaveMachineSettings(machine());
+    uimachine()->saveSettings();
 }
 
@@ -3187 +3161 @@
         msgCenter().cannotRemountMedium(comMachine, guiMedium, true /* mount? */, false /* retry? */, pParent);
     else
-    {
-        /* Save machine settings: */
-        comMachine.SaveSettings();
-        fSuccess = comMachine.isOk();
-
-        /* Show error message if necessary: */
-        if (!fSuccess)
-            UINotificationMessage::cannotSaveMachineSettings(machine());
-    }
+        fSuccess = uimachine()->saveSettings();
     return fSuccess;
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -296 +296 @@
             UINotificationMessage::cannotResumeMachine(comConsole);
     }
+    return fSuccess;
+}
+
+bool UISession::saveSettings()
+{
+    CMachine comMachine = machine();
+    comMachine.SaveSettings();
+    const bool fSuccess = comMachine.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotSaveMachineSettings(comMachine);
     return fSuccess;
 }
@@ -1830 +1840 @@
 
     /* Save machine settings: */
-    machine().SaveSettings();
-
-    /* Show error message if necessary: */
-    if (!machine().isOk())
-    {
-        UINotificationMessage::cannotSaveMachineSettings(machine());
-        return false;
-    }
+    if (!saveSettings())
+        return false;
 
     /* True by default: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -243 +243 @@
         /** Performes VM pausing/resuming depending on @a fPause state. */
         bool setPause(bool fPause);
+    /** @} */
+
+    /** @name Machine-data stuff.
+     ** @{ */
+        /** Saves machine data. */
+        bool saveSettings();
     /** @} */