Changeset 92034 in vbox for trunk/src

Timestamp:

Oct 25, 2021 1:36:03 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: UINotificationMessage: Extend createMessage/destroyMessage stuff with possibility to have parent specified.

Location:

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

Files:

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

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

@@ -1155 +1155 @@
                                           const QString &strDetails,
                                           const QString &strInternalName /* = QString() */,
-                                          const QString &strHelpKeyword /* = QString() */)
+                                          const QString &strHelpKeyword /* = QString() */,
+                                          UINotificationCenter *pParent /* = 0 */)
 {
     /* Check if message suppressed: */
@@ -1165 +1166 @@
         return;
 
+    /* Choose effective parent: */
+    UINotificationCenter *pEffectiveParent = pParent ? pParent : gpNotificationCenter;
+
     /* Create message finally: */
-    const QUuid uId = gpNotificationCenter->append(new UINotificationMessage(strName,
-                                                                             strDetails,
-                                                                             strInternalName,
-                                                                             strHelpKeyword));
+    const QUuid uId = pEffectiveParent->append(new UINotificationMessage(strName,
+                                                                         strDetails,
+                                                                         strInternalName,
+                                                                         strHelpKeyword));
     if (!strInternalName.isEmpty())
         m_messages[strInternalName] = uId;
@@ -1175 +1179 @@
 
 /* static */
-void UINotificationMessage::destroyMessage(const QString &strInternalName)
+void UINotificationMessage::destroyMessage(const QString &strInternalName,
+                                           UINotificationCenter *pParent /* = 0 */)
 {
     /* Check if message really exists: */
@@ -1181 +1186 @@
         return;
 
+    /* Choose effective parent: */
+    UINotificationCenter *pEffectiveParent = pParent ? pParent : gpNotificationCenter;
+
     /* Destroy message finally: */
-    gpNotificationCenter->revoke(m_messages.value(strInternalName));
+    pEffectiveParent->revoke(m_messages.value(strInternalName));
     m_messages.remove(strInternalName);
 }

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

@@ -49 +49 @@
 
 /* Forward declarations: */
+class UINotificationCenter;
 class CAudioAdapter;
 class CEmulatedUSB;
@@ -491 +492 @@
       * @param  strDetails       Brings the message details.
       * @param  strInternalName  Brings the message internal name.
-      * @param  strHelpKeyword   Brings the message help keyword. */
+      * @param  strHelpKeyword   Brings the message help keyword.
+      * @param  pParent          Brings the local notification-center reference. */
     static void createMessage(const QString &strName,
                               const QString &strDetails,
                               const QString &strInternalName = QString(),
-                              const QString &strHelpKeyword = QString());
+                              const QString &strHelpKeyword = QString(),
+                              UINotificationCenter *pParent = 0);
     /** Destroys message.
-      * @param  strInternalName  Brings the message internal name. */
-    static void destroyMessage(const QString &strInternalName);
+      * @param  strInternalName  Brings the message internal name.
+      * @param  pParent          Brings the local notification-center reference. */
+    static void destroyMessage(const QString &strInternalName,
+                               UINotificationCenter *pParent = 0);
 
     /** Holds the IDs of messages registered. */