Changeset 57893 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Sep 25, 2015 12:59:15 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: Window menu Manager cleanup/rework (step 4): Hash window related actions by corresponding window pointer, not by title.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIWindowMenuManager.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIWindowMenuManager.cpp

@@ -78 +78 @@
         QAction *pAction = 0;
         if (   pWindow
-            && !m_windows.contains(pWindow->windowTitle()))
+            && !m_windows.contains(pWindow))
         {
             if (m_windows.size() < 2)
@@ -96 +96 @@
                     this, SLOT(sltRaiseSender()));
             m_pWindowMenu->addAction(pAction);
-            m_windows[pWindow->windowTitle()] = pAction;
+            m_windows[pWindow] = pAction;
         }
         return pAction;
@@ -104 +104 @@
     void removeWindow(QWidget *pWindow)
     {
-        if (m_windows.contains(pWindow->windowTitle()))
-        {
-            delete m_windows.value(pWindow->windowTitle());
-            m_windows.remove(pWindow->windowTitle());
+        if (m_windows.contains(pWindow))
+        {
+            delete m_windows.value(pWindow);
+            m_windows.remove(pWindow);
         }
     }
@@ -131 +131 @@
         {
             /* Toggle corresponding action on: */
-            if (m_windows.contains(pActiveWindow->windowTitle()))
-                m_windows.value(pActiveWindow->windowTitle())->setChecked(true);
+            if (m_windows.contains(pActiveWindow))
+                m_windows.value(pActiveWindow)->setChecked(true);
         }
         /* If there is no active-window: */
@@ -176 +176 @@
     QAction *m_pMinimizeAction;
     /** Holds the hash of the registered menu-helper instances. */
-    QHash<QString, QAction*> m_windows;
+    QHash<QWidget*, QAction*> m_windows;
 };