Changeset 57894 in vbox

Timestamp:

Sep 25, 2015 1:04:05 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: Window menu Manager cleanup/rework (step 5): Simplify hash enumeration routines.

File:

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

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

@@ -253 +253 @@
     m_windows.append(pWindow);
     /* Add window to all menus we have: */
-    QHash<QWidget*, UIMenuHelper*>::const_iterator i = m_helpers.constBegin();
-    while (i != m_helpers.constEnd())
-    {
-        i.value()->addWindow(pWindow);
-        ++i;
-    }
+    foreach (UIMenuHelper *pHelper, m_helpers.values())
+        pHelper->addWindow(pWindow);
 }
 
@@ -264 +260 @@
 {
     /* Remove window from all menus we have: */
-    QHash<QWidget*, UIMenuHelper*>::const_iterator i = m_helpers.constBegin();
-    while (i != m_helpers.constEnd())
-    {
-        i.value()->removeWindow(pWindow);
-        ++i;
-    }
+    foreach (UIMenuHelper *pHelper, m_helpers.values())
+        pHelper->removeWindow(pWindow);
     /* Unregister window: */
     m_windows.removeAll(pWindow);
@@ -277 +269 @@
 {
     /* Translate all the helpers: */
-    QHash<QWidget*, UIMenuHelper*>::const_iterator i = m_helpers.constBegin();
-    while (i != m_helpers.constEnd())
-    {
-        i.value()->retranslateUi();
-        ++i;
-    }
+    foreach (UIMenuHelper *pHelper, m_helpers.values())
+        pHelper->retranslateUi();
 }
 
@@ -321 +309 @@
     {
         QWidget *pActiveWindow = qApp->activeWindow();
-        QHash<QWidget*, UIMenuHelper*>::const_iterator i = m_helpers.constBegin();
-        while (i != m_helpers.constEnd())
-        {
-            i.value()->updateStatus(pActiveWindow);
-            ++i;
-        }
+        foreach (UIMenuHelper *pHelper, m_helpers.values())
+            pHelper->updateStatus(pActiveWindow);
     }