Changeset 102322 in vbox

Timestamp:

Nov 27, 2023 1:54:40 PM (16 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

160456

Message:

FE/Qt: bugref:10450: Handle final commit data call for UIVirtualBoxManagerWidget as well; Mostly the same connection cleanup as for parent UIVirtualBoxManager.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager

Files:

• UIVirtualBoxManager.cpp (modified) (1 diff)
• UIVirtualBoxManagerWidget.cpp (modified) (3 diffs)
• UIVirtualBoxManagerWidget.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -767 +767 @@
 
     // WORKAROUND:
-    // This will be fixed proper way during session management cleanaup for Qt6.
+    // This will be fixed proper way during session management cleanup for Qt6.
     // But for now we will just cleanup connections which is Ok anyway.
     cleanupConnections();

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

@@ -344 +344 @@
 }
 
+void UIVirtualBoxManagerWidget::sltHandleCommitData()
+{
+    // WORKAROUND:
+    // This will be fixed proper way during session management cleanup for Qt6.
+    // But for now we will just cleanup connections which is Ok anyway.
+    cleanupConnections();
+}
+
 void UIVirtualBoxManagerWidget::sltHandleStateChange(const QUuid &uId)
 {
@@ -788 +796 @@
 void UIVirtualBoxManagerWidget::prepareConnections()
 {
+    /* UICommon connections: */
+    connect(&uiCommon(), &UICommon::sigAskToCommitData,
+            this, &UIVirtualBoxManagerWidget::sltHandleCommitData);
+
     /* Global VBox event handlers: */
     connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineStateChange,
@@ -1102 +1114 @@
 void UIVirtualBoxManagerWidget::cleanup()
 {
+    /* Ask sub-dialogs to commit data: */
+    sltHandleCommitData();
+
     /* Cleanup everything: */
-    cleanupConnections();
     cleanupWidgets();
 }

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.h

@@ -265 +265 @@
 private slots:
 
+    /** @name General stuff.
+      * @{ */
+        /** Handles request to commit data. */
+        void sltHandleCommitData();
+    /** @} */
+
     /** @name CVirtualBox event handling stuff.
       * @{ */