Changeset 98928 in vbox

Timestamp:

Mar 13, 2023 10:37:02 AM (21 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Notification-center: Reworking r156239 the way that the model cleanup should clean the tree itself, no need for separate redundant handler.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter

Files:

• UINotificationCenter.cpp (modified) (4 diffs)
• UINotificationCenter.h (modified) (1 diff)
• UINotificationModel.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationCenter.cpp

@@ -396 +396 @@
 
     /* Cleanup items first: */
-    qDeleteAll(m_items);
-    m_items.clear();
+    cleanup();
 
     /* Populate model contents again: */
@@ -514 +513 @@
 }
 
-void UINotificationCenter::sltDetachCOM()
-{
-    cleanup();
-}
-
 void UINotificationCenter::prepare()
 {
@@ -527 +521 @@
     if (parent())
         parent()->installEventFilter(this);
-
-    /* Prepare alignment: */
-    m_enmAlignment = gEDataManager->notificationCenterAlignment();
-    connect(gEDataManager, &UIExtraDataManager::sigNotificationCenterAlignmentChange,
-            this, &UINotificationCenter::sltHandleAlignmentChange);
-    /* Prepare order: */
-    m_enmOrder = gEDataManager->notificationCenterOrder();
-    connect(gEDataManager, &UIExtraDataManager::sigNotificationCenterOrderChange,
-            this, &UINotificationCenter::sltHandleOrderChange);
 
     /* Prepare the rest of stuff: */
@@ -543 +528 @@
     prepareOpenTimer();
 
-    /* COM related connections: */
-    connect(&uiCommon(), &UICommon::sigAskToDetachCOM,
-            this, &UINotificationCenter::sltDetachCOM);
+    /* Prepare alignment: */
+    m_enmAlignment = gEDataManager->notificationCenterAlignment();
+    connect(gEDataManager, &UIExtraDataManager::sigNotificationCenterAlignmentChange,
+            this, &UINotificationCenter::sltHandleAlignmentChange);
+    sltHandleAlignmentChange();
+    /* Prepare order: */
+    m_enmOrder = gEDataManager->notificationCenterOrder();
+    connect(gEDataManager, &UIExtraDataManager::sigNotificationCenterOrderChange,
+            this, &UINotificationCenter::sltHandleOrderChange);
+    sltHandleOrderChange();
 
     /* Apply language settings: */

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationCenter.h

@@ -140 +140 @@
       * @note Breaks blocking handleNow() call. */
     void sltHandleProgressFinished();
-
-    /** Handles request to detach COM. */
-    void sltDetachCOM();
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationModel.cpp

@@ -145 +145 @@
     /* Wipe out all the objects: */
     foreach (const QUuid &uId, m_ids)
-        delete m_objects.value(uId);
+        revokeObject(uId);
     m_objects.clear();
     m_ids.clear();