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

Timestamp:

Apr 30, 2015 11:14:40 AM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 7127: Medium-enumeration improvements: On machine-data change GUI should update all excluded and currently used (by that machine) mediums, not only excluded and included.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.cpp

@@ -197 +197 @@
             currentCMediumIDs.isEmpty() ? "<empty>" : currentCMediumIDs.join(", ").toAscii().constData()));
 
-    /* Determine excluded/included mediums: */
-    QSet<QString> oldSet = previousUIMediumIDs.toSet();
-    QSet<QString> newSet = currentCMediumIDs.toSet();
-    QSet<QString> excludedSet = oldSet - newSet;
-    QSet<QString> includedSet = newSet - oldSet;
-    QStringList excludedList = excludedSet.toList();
-    QStringList includedList = includedSet.toList();
-    if (!excludedList.isEmpty())
-        LogRel(("UIMediumEnumerator:  Items excluded from usage: %s\n", excludedList.join(", ").toAscii().constData()));
-    if (!includedList.isEmpty())
-        LogRel(("UIMediumEnumerator:  Items included into usage: %s\n", includedList.join(", ").toAscii().constData()));
+    /* Determine excluded mediums: */
+    const QSet<QString> previousSet = previousUIMediumIDs.toSet();
+    const QSet<QString> currentSet = currentCMediumIDs.toSet();
+    const QSet<QString> excludedSet = previousSet - currentSet;
+    const QStringList excludedUIMediumIDs = excludedSet.toList();
+    if (!excludedUIMediumIDs.isEmpty())
+        LogRel(("UIMediumEnumerator:  Items excluded from usage: %s\n", excludedUIMediumIDs.join(", ").toAscii().constData()));
+    if (!currentCMediumIDs.isEmpty())
+        LogRel(("UIMediumEnumerator:  Items currently in usage: %s\n", currentCMediumIDs.join(", ").toAscii().constData()));
 
     /* Update cache for excluded UIMediums: */
-    recacheFromCachedUsage(excludedList);
-
-    /* Update cache for included CMediums: */
-    recacheFromActualUsage(currentCMediums, includedList);
+    recacheFromCachedUsage(excludedUIMediumIDs);
+
+    /* Update cache for current CMediums: */
+    recacheFromActualUsage(currentCMediums, currentCMediumIDs);
 
     LogRel(("UIMediumEnumerator: Machine (or snapshot) event processed, ID = %s\n",