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

Timestamp:

Nov 2, 2020 6:40:54 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: A bit of cleanup for prepare/cleanup cascade.

Location:

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

Files:

• UIChooserAbstractModel.cpp (modified) (4 diffs)
• UIChooserAbstractModel.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserAbstractModel.cpp

@@ -353 +353 @@
 *********************************************************************************************************************************/
 
-UIChooserAbstractModel:: UIChooserAbstractModel(UIChooser *pParent)
+UIChooserAbstractModel::UIChooserAbstractModel(UIChooser *pParent)
     : QObject(pParent)
     , m_pParent(pParent)
@@ -359 +359 @@
 {
     prepare();
+}
+
+UIChooserAbstractModel::~UIChooserAbstractModel()
+{
+    cleanup();
 }
 
@@ -948 +953 @@
             this, &UIChooserAbstractModel::sltCloudMachineRegistered);
 
-    /* Setup global connections: */
+    /* Global connections: */
     connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineStateChange,
             this, &UIChooserAbstractModel::sltLocalMachineStateChanged);
@@ -974 +979 @@
             this, &UIChooserAbstractModel::sltHandleCloudProviderUninstall);
 
-    /* Setup group saving connections: */
+    /* Group saving connections: */
     connect(this, &UIChooserAbstractModel::sigStartGroupSaving,
             this, &UIChooserAbstractModel::sltStartGroupSaving,
             Qt::QueuedConnection);
 
-    /* Setup extra-data connections: */
+    /* Extra-data connections: */
     connect(gEDataManager, &UIExtraDataManager::sigCloudProfileManagerRestrictionChange,
             this, &UIChooserAbstractModel::sltHandleCloudProfileManagerCumulativeChange);
+}
+
+void UIChooserAbstractModel::cleanupConnections()
+{
+    /* Cloud thread-pool connections: */
+    disconnect(uiCommon().threadPoolCloud(), &UIThreadPool::sigTaskComplete,
+               this, &UIChooserAbstractModel::sltHandleCloudListMachinesTaskComplete);
+
+    /* Cloud VM registration connections: */
+    disconnect(&uiCommon(), &UICommon::sigCloudMachineUnregistered,
+               this, &UIChooserAbstractModel::sltCloudMachineUnregistered);
+    disconnect(&uiCommon(), &UICommon::sigCloudMachineRegistered,
+               this, &UIChooserAbstractModel::sltCloudMachineRegistered);
+
+    /* Global connections: */
+    disconnect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineStateChange,
+               this, &UIChooserAbstractModel::sltLocalMachineStateChanged);
+    disconnect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineDataChange,
+               this, &UIChooserAbstractModel::sltLocalMachineDataChanged);
+    disconnect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineRegistered,
+               this, &UIChooserAbstractModel::sltLocalMachineRegistrationChanged);
+    disconnect(gVBoxEvents, &UIVirtualBoxEventHandler::sigSessionStateChange,
+               this, &UIChooserAbstractModel::sltSessionStateChanged);
+    disconnect(gVBoxEvents, &UIVirtualBoxEventHandler::sigSnapshotTake,
+               this, &UIChooserAbstractModel::sltSnapshotChanged);
+    disconnect(gVBoxEvents, &UIVirtualBoxEventHandler::sigSnapshotDelete,
+               this, &UIChooserAbstractModel::sltSnapshotChanged);
+    disconnect(gVBoxEvents, &UIVirtualBoxEventHandler::sigSnapshotChange,
+               this, &UIChooserAbstractModel::sltSnapshotChanged);
+    disconnect(gVBoxEvents, &UIVirtualBoxEventHandler::sigSnapshotRestore,
+               this, &UIChooserAbstractModel::sltSnapshotChanged);
+    disconnect(gVBoxEvents, &UIVirtualBoxEventHandler::sigCloudProviderListChanged,
+               this, &UIChooserAbstractModel::sltHandleCloudProfileManagerCumulativeChange);
+    disconnect(gVBoxEvents, &UIVirtualBoxEventHandler::sigCloudProfileRegistered,
+               this, &UIChooserAbstractModel::sltHandleCloudProfileManagerCumulativeChange);
+    disconnect(gVBoxEvents, &UIVirtualBoxEventHandler::sigCloudProfileChanged,
+               this, &UIChooserAbstractModel::sltHandleCloudProfileManagerCumulativeChange);
+    disconnect(gVBoxEvents, &UIVirtualBoxEventHandler::sigCloudProviderUninstall,
+               this, &UIChooserAbstractModel::sltHandleCloudProviderUninstall);
+
+    /* Group saving connections: */
+    disconnect(this, &UIChooserAbstractModel::sigStartGroupSaving,
+               this, &UIChooserAbstractModel::sltStartGroupSaving);
+
+    /* Extra-data connections: */
+    disconnect(gEDataManager, &UIExtraDataManager::sigCloudProfileManagerRestrictionChange,
+               this, &UIChooserAbstractModel::sltHandleCloudProfileManagerCumulativeChange);
+}
+
+void UIChooserAbstractModel::cleanup()
+{
+    cleanupConnections();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserAbstractModel.h

@@ -74 +74 @@
     /** Constructs abstract Chooser-model passing @a pParent to the base-class. */
     UIChooserAbstractModel(UIChooser *pParent);
+    /** Destructs abstract Chooser-model. */
+    virtual ~UIChooserAbstractModel() /* override */;
 
     /** @name General stuff.
@@ -247 +249 @@
         /** Prepares connections. */
         void prepareConnections();
+
+        /** Cleanups connections. */
+        void cleanupConnections();
+        /** Cleanups all. */
+        void cleanup();
     /** @} */