Changeset 100902 in vbox

Timestamp:

Aug 17, 2023 6:40:28 PM (16 months ago)

Author:

vboxsync

Message:

FE/Qt: UISettingsDialog: A bit of cleanup related to serialization.

Location:

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

Files:

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

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

@@ -175 +175 @@
 }
 
-void UISettingsDialog::sltMarkLoaded()
-{
-    /* Delete serializer if exists: */
-    if (serializeProcess())
-    {
-        delete m_pSerializeProcess;
-        m_pSerializeProcess = 0;
-    }
-
-    /* Mark serialization finished: */
-    m_fSerializationIsInProgress = false;
-}
-
-void UISettingsDialog::sltMarkSaved()
+void UISettingsDialog::sltHandleSerializationFinished()
 {
     /* Delete serializer if exists: */
@@ -384 +371 @@
         connect(m_pSerializeProcess, &UISettingsSerializer::sigNotifyAboutProcessStarted, this, &UISettingsDialog::sltHandleProcessStarted);
         connect(m_pSerializeProcess, &UISettingsSerializer::sigNotifyAboutProcessProgressChanged, this, &UISettingsDialog::sltHandleProcessProgressChange);
-        connect(m_pSerializeProcess, &UISettingsSerializer::sigNotifyAboutProcessFinished, this, &UISettingsDialog::sltMarkLoaded);
+        connect(m_pSerializeProcess, &UISettingsSerializer::sigNotifyAboutProcessFinished, this, &UISettingsDialog::sltHandleSerializationFinished);
 
         /* Raise current page priority: */

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

@@ -98 +98 @@
     virtual void sltCategoryChanged(int cId);
 
-    /** Marks dialog loaded. */
-    virtual void sltMarkLoaded();
-    /** Marks dialog saved. */
-    virtual void sltMarkSaved();
+    /** Handle serializartion finished. */
+    virtual void sltHandleSerializationFinished();
 
     /** Handles process start. */

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

@@ -169 +169 @@
         msgCenter().cannotSetSystemProperties(comNewProperties, this);
 
-    /* Mark as saved: */
-    sltMarkSaved();
+    /* Handle serializartion finished: */
+    sltHandleSerializationFinished();
 }
 
@@ -484 +484 @@
         msgCenter().cannotSaveMachineSettings(m_machine, this);
 
-    /* Mark as saved: */
-    sltMarkSaved();
+    /* Handle serializartion finished: */
+    sltHandleSerializationFinished();
 }
 
@@ -556 +556 @@
 }
 
-void UISettingsDialogMachine::sltMarkLoaded()
-{
-    /* Call for base-class: */
-    UISettingsDialog::sltMarkLoaded();
-
-    /* Unlock the session if exists: */
-    if (!m_session.isNull())
-    {
-        m_session.UnlockMachine();
-        m_session = CSession();
-        m_machine = CMachine();
-        m_console = CConsole();
-    }
-}
-
-void UISettingsDialogMachine::sltMarkSaved()
-{
-    /* Call for base-class: */
-    UISettingsDialog::sltMarkSaved();
+void UISettingsDialogMachine::sltHandleSerializationFinished()
+{
+    /* Call to base-class: */
+    UISettingsDialog::sltHandleSerializationFinished();
 
     /* Unlock the session if exists: */

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

@@ -138 +138 @@
     virtual void sltCategoryChanged(int cId) RT_OVERRIDE;
 
-    /** Marks dialog loaded. */
-    virtual void sltMarkLoaded() RT_OVERRIDE;
-    /** Marks dialog saved. */
-    virtual void sltMarkSaved() RT_OVERRIDE;
+    /** Handle serializartion finished. */
+    virtual void sltHandleSerializationFinished() RT_OVERRIDE;
 
 private slots: