Changeset 107352 in vbox for trunk/src/VBox/Frontends

Timestamp:

Dec 18, 2024 1:02:30 PM (4 weeks ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10814: VBox Manager: Rework the cleanup procedures for Global and Machine tool managers; No need to cleanup connections twice as they are certainly cleaned up by the UICommon's cleanup signal.

Location:

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

Files:

• UIGlobalToolsManagerWidget.cpp (modified) (3 diffs)
• UIGlobalToolsManagerWidget.h (modified) (2 diffs)
• UIMachineManagerWidget.cpp (modified) (3 diffs)
• UIMachineManagerWidget.h (modified) (2 diffs)

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

@@ -54 +54 @@
 }
 
-UIGlobalToolsManagerWidget::~UIGlobalToolsManagerWidget()
-{
-    cleanup();
-}
-
 UIToolPaneGlobal *UIGlobalToolsManagerWidget::toolPane() const
 {
@@ -169 +164 @@
 void UIGlobalToolsManagerWidget::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();
 }
@@ -288 +280 @@
     disconnect(toolPaneMachine(), &UIToolPaneMachine::sigSwitchToActivityOverviewPane,
                this, &UIGlobalToolsManagerWidget::sltSwitchToActivitiesTool);
-}
-
-void UIGlobalToolsManagerWidget::cleanup()
-{
-    /* Ask sub-dialogs to commit data: */
-    sltHandleCommitData();
 }
 

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

@@ -65 +65 @@
       * @param  pActionPool  Brings the action-pool reference.  */
     UIGlobalToolsManagerWidget(UIVirtualBoxManagerAdvancedWidget *pParent, UIActionPool *pActionPool);
-    /** Destructs Global Tools Manager widget. */
-    virtual ~UIGlobalToolsManagerWidget() RT_OVERRIDE;
 
     /** @name Common stuff.
@@ -148 +146 @@
         /** Cleanups connections. */
         void cleanupConnections();
-        /** Cleanups all. */
-        void cleanup();
     /** @} */
 

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

@@ -61 +61 @@
 }
 
-UIMachineManagerWidget::~UIMachineManagerWidget()
-{
-    cleanup();
-}
-
 UIChooser *UIMachineManagerWidget::chooser() const
 {
@@ -215 +210 @@
 void UIMachineManagerWidget::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();
 }
@@ -548 +540 @@
     disconnect(toolMenu(), &UITools::sigSelectionChanged,
                this, &UIMachineManagerWidget::sltHandleToolsMenuIndexChange);
-}
-
-void UIMachineManagerWidget::cleanup()
-{
-    /* Ask sub-dialogs to commit data: */
-    sltHandleCommitData();
 }
 

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

@@ -94 +94 @@
       * @param  pActionPool  Brings the action-pool reference. */
     UIMachineManagerWidget(UIToolPaneGlobal *pParent, UIActionPool *pActionPool);
-    /** Destructs Machine Manager widget. */
-    virtual ~UIMachineManagerWidget() RT_OVERRIDE;
 
     /** @name Common stuff.
@@ -233 +231 @@
         /** Cleanups connections. */
         void cleanupConnections();
-        /** Cleanups all. */
-        void cleanup();
     /** @} */