Changeset 25151 in vbox

Timestamp:

Dec 2, 2009 3:23:18 PM (15 years ago)

Author:

vboxsync

Message:

Main: cleanup: std::list< ComOBjPtr<Medium> > typedefs

Location:

trunk/src/VBox/Main

Files:

• HostImpl.cpp (modified) (2 diffs)
• MachineImpl.cpp (modified) (2 diffs)
• SnapshotImpl.cpp (modified) (2 diffs)
• VirtualBoxImpl.cpp (modified) (10 diffs)
• include/MediumImpl.h (modified) (1 diff)

trunk/src/VBox/Main/HostImpl.cpp

@@ -390 +390 @@
     AutoWriteLock alock(this);
 
-    std::list< ComObjPtr<Medium> > list;
+    MediaList list;
     HRESULT rc = S_OK;
     try
@@ -514 +514 @@
     AutoWriteLock alock(this);
 
-    std::list<ComObjPtr<Medium> > list;
+    MediaList list;
     HRESULT rc = S_OK;
 

trunk/src/VBox/Main/MachineImpl.cpp

@@ -7285 +7285 @@
     HRESULT rc = S_OK;
 
-    typedef std::list< ComObjPtr<Medium> > LockedMedia;
-    LockedMedia lockedMedia;
+    MediaList lockedMedia;
 
     try
@@ -7417 +7416 @@
         ErrorInfoKeeper eik;
 
-        for (LockedMedia::const_iterator it = lockedMedia.begin();
+        for (MediaList::const_iterator it = lockedMedia.begin();
              it != lockedMedia.end();
              ++it)

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -1812 +1812 @@
         // images to delete _after_ saveSettings()
 
-        std::list< ComObjPtr<Medium> > llDiffsToDelete;
+        MediaList llDiffsToDelete;
 
         for (std::list< ComObjPtr<MediumAttachment> >::iterator it = llDiffAttachmentsToDelete.begin();
@@ -1847 +1847 @@
         // from here on we cannot roll back on failure any more
 
-        for (std::list< ComObjPtr<Medium> >::iterator it = llDiffsToDelete.begin();
+        for (MediaList::iterator it = llDiffsToDelete.begin();
              it != llDiffsToDelete.end();
              ++it)

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -91 +91 @@
 typedef std::map<Guid, ComPtr<IProgress> > ProgressMap;
 
-typedef std::list <ComObjPtr<Medium> > HardDiskList;
-typedef std::list <ComObjPtr<Medium> > DVDImageList;
-typedef std::list <ComObjPtr<Medium> > FloppyImageList;
 typedef std::list <ComObjPtr<SharedFolder> > SharedFolderList;
 typedef std::list <ComObjPtr<DHCPServer> > DHCPServerList;
@@ -206 +203 @@
     ProgressMap                         mapProgressOperations;
 
-    HardDiskList                        llHardDisks;
-    DVDImageList                        llDVDImages;
-    FloppyImageList                     llFloppyImages;
+    MediaList                           llHardDisks,
+                                        llDVDImages,
+                                        llFloppyImages;
     SharedFolderList                    llSharedFolders;
     DHCPServerList                      llDHCPServers;
@@ -2009 +2006 @@
 void VirtualBox::dumpAllBackRefs()
 {
-    for (HardDiskList::const_iterator mt = m->llHardDisks.begin();
+    for (MediaList::const_iterator mt = m->llHardDisks.begin();
          mt != m->llHardDisks.end();
          ++mt)
@@ -2016 +2013 @@
         pMedium->dumpBackRefs();
     }
-    for (DVDImageList::const_iterator mt = m->llDVDImages.begin();
+    for (MediaList::const_iterator mt = m->llDVDImages.begin();
          mt != m->llDVDImages.end();
          ++mt)
@@ -2894 +2891 @@
     bool found = false;
 
-    for (DVDImageList::const_iterator it = m->llDVDImages.begin();
+    for (MediaList::const_iterator it = m->llDVDImages.begin();
          it != m->llDVDImages.end();
          ++ it)
@@ -2970 +2967 @@
     bool found = false;
 
-    for (FloppyImageList::const_iterator it = m->llFloppyImages.begin();
+    for (MediaList::const_iterator it = m->llFloppyImages.begin();
          it != m->llFloppyImages.end();
          ++ it)
@@ -3260 +3257 @@
         // hard disks
         m->pMainConfigFile->llHardDisks.clear();
-        for (HardDiskList::const_iterator it = m->llHardDisks.begin();
+        for (MediaList::const_iterator it = m->llHardDisks.begin();
              it != m->llHardDisks.end();
              ++it)
@@ -3272 +3269 @@
         /* CD/DVD images */
         m->pMainConfigFile->llDvdImages.clear();
-        for (DVDImageList::const_iterator it = m->llDVDImages.begin();
+        for (MediaList::const_iterator it = m->llDVDImages.begin();
              it != m->llDVDImages.end();
              ++it)
@@ -3284 +3281 @@
         /* floppy images */
         m->pMainConfigFile->llFloppyImages.clear();
-        for (FloppyImageList::const_iterator it = m->llFloppyImages.begin();
+        for (MediaList::const_iterator it = m->llFloppyImages.begin();
              it != m->llFloppyImages.end();
              ++it)
@@ -3770 +3767 @@
 
     /* check DVD paths */
-    for (DVDImageList::iterator it = m->llDVDImages.begin();
+    for (MediaList::iterator it = m->llDVDImages.begin();
          it != m->llDVDImages.end();
          ++ it)
     {
-        (*it)->updatePath (aOldPath, aNewPath);
+        (*it)->updatePath(aOldPath, aNewPath);
     }
 
     /* check Floppy paths */
-    for (FloppyImageList::iterator it = m->llFloppyImages.begin();
+    for (MediaList::iterator it = m->llFloppyImages.begin();
          it != m->llFloppyImages  .end();
          ++ it)
     {
-        (*it)->updatePath (aOldPath, aNewPath);
+        (*it)->updatePath(aOldPath, aNewPath);
     }
 
     /* check HardDisk paths */
-    for (HardDiskList::const_iterator it = m->llHardDisks.begin();
+    for (MediaList::const_iterator it = m->llHardDisks.begin();
          it != m->llHardDisks.end();
          ++ it)
     {
-        (*it)->updatePaths (aOldPath, aNewPath);
+        (*it)->updatePaths(aOldPath, aNewPath);
     }
 

trunk/src/VBox/Main/include/MediumImpl.h

@@ -38 +38 @@
 
 ////////////////////////////////////////////////////////////////////////////////
+
+class Medium;
+typedef std::list< ComObjPtr<Medium> > MediaList;
 
 /**