Changeset 98352 in vbox for trunk/src/VBox/Main/src-server/SnapshotImpl.cpp

Timestamp:

Jan 30, 2023 7:44:51 PM (23 months ago)

Author:

vboxsync

Message:

Main: Fix identifiers containing an incorrect plural of "medium".

File:

• trunk/src/VBox/Main/src-server/SnapshotImpl.cpp (modified) (12 diffs)

trunk/src/VBox/Main/src-server/SnapshotImpl.cpp

@@ -1763 +1763 @@
     BOOL fSuspendedBySave     = FALSE;
 
-    std::set<ComObjPtr<Medium> > pMediumsForNotify;
+    std::set<ComObjPtr<Medium> > pMediaForNotify;
     std::map<Guid, DeviceType_T> uIdsForNotify;
 
@@ -1949 +1949 @@
                 if (!fFound)
                 {
-                    pMediumsForNotify.insert(pMedium->i_getParent());
+                    pMediaForNotify.insert(pMedium->i_getParent());
                     uIdsForNotify[pMedium->i_getId()] = pMedium->i_getDeviceType();
                 }
@@ -2065 +2065 @@
         }
 
-        for (std::set<ComObjPtr<Medium> >::const_iterator it = pMediumsForNotify.begin();
-             it != pMediumsForNotify.end();
+        for (std::set<ComObjPtr<Medium> >::const_iterator it = pMediaForNotify.begin();
+             it != pMediaForNotify.end();
              ++it)
         {
@@ -2329 +2329 @@
     HRESULT hrc = S_OK;
     Guid snapshotId;
-    std::set<ComObjPtr<Medium> > pMediumsForNotify;
+    std::set<ComObjPtr<Medium> > pMediaForNotify;
     std::map<Guid, std::pair<DeviceType_T, BOOL> > uIdsForNotify;
 
@@ -2461 +2461 @@
                 if (!fFound)
                 {
-                    pMediumsForNotify.insert(pMedium->i_getParent());
+                    pMediaForNotify.insert(pMedium->i_getParent());
                     uIdsForNotify[pMedium->i_getId()] = std::pair<DeviceType_T, BOOL>(pMedium->i_getDeviceType(), TRUE);
                 }
@@ -2571 +2571 @@
             if (SUCCEEDED(hrc2))
             {
-                pMediumsForNotify.insert(pParent);
+                pMediaForNotify.insert(pParent);
                 uIdsForNotify[id] = std::pair<DeviceType_T, BOOL>(pMedium->i_getDeviceType(), FALSE);
                 pMedium->uninit();
@@ -2609 +2609 @@
             mParent->i_onMediumRegistered(it->first, it->second.first, it->second.second);
         }
-        for (std::set<ComObjPtr<Medium> >::const_iterator it = pMediumsForNotify.begin();
-             it != pMediumsForNotify.end();
+        for (std::set<ComObjPtr<Medium> >::const_iterator it = pMediaForNotify.begin();
+             it != pMediaForNotify.end();
              ++it)
         {
@@ -2972 +2972 @@
     MediumDeleteRecList toDelete;
     Guid snapshotId;
-    std::set<ComObjPtr<Medium> > pMediumsForNotify;
+    std::set<ComObjPtr<Medium> > pMediaForNotify;
     std::map<Guid,DeviceType_T> uIdsForNotify;
 
@@ -3345 +3345 @@
                         throw hrc;
 
-                    pMediumsForNotify.insert(pParent);
+                    pMediaForNotify.insert(pParent);
                     uIdsForNotify[uMedium] = uMediumType;
 
@@ -3356 +3356 @@
                 {
                     //store ids before merging for notify
-                    pMediumsForNotify.insert(it->mpTarget);
+                    pMediaForNotify.insert(it->mpTarget);
                     if (it->mfMergeForward)
-                        pMediumsForNotify.insert(it->mpSource->i_getParent());
+                        pMediaForNotify.insert(it->mpSource->i_getParent());
                     else
                     {
@@ -3366 +3366 @@
                              ++iit)
                         {
-                            pMediumsForNotify.insert(*iit);
+                            pMediaForNotify.insert(*iit);
                         }
                     }
@@ -3605 +3605 @@
             mParent->i_onMediumRegistered(it->first, it->second, FALSE);
         }
-        for (std::set<ComObjPtr<Medium> >::const_iterator it = pMediumsForNotify.begin();
-             it != pMediumsForNotify.end();
+        for (std::set<ComObjPtr<Medium> >::const_iterator it = pMediaForNotify.begin();
+             it != pMediaForNotify.end();
              ++it)
         {