Changeset 30764 in vbox for trunk/src/VBox/Main/SnapshotImpl.cpp

Timestamp:

Jul 9, 2010 2:12:12 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

63552

Message:

back out r63543, r63544 until windows build problems can be solved properly

File:

• trunk/src/VBox/Main/SnapshotImpl.cpp (modified) (8 diffs)

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -21 +21 @@
 #include "SnapshotImpl.h"
 
+#include "MachineImpl.h"
+#include "MediumImpl.h"
+#include "MediumFormatImpl.h"
 #include "Global.h"
-
-#include "AudioAdapterImpl.h"
-#include "BIOSSettingsImpl.h"
-#include "MachineImplPrivate.h"
-#include "MediumImpl.h"
-#include "MediumAttachmentImpl.h"
-#include "MediumFormatImpl.h"
-#include "NetworkAdapterImpl.h"
-#include "ParallelPortImpl.h"
 #include "ProgressImpl.h"
-#include "SerialPortImpl.h"
-#include "StorageControllerImpl.h"
-#include "VRDPServerImpl.h"
 
 // @todo these three includes are required for about one or two lines, try
@@ -44 +35 @@
 #include "AutoCaller.h"
 
-#include <iprt/file.h>
 #include <iprt/path.h>
 #include <iprt/cpp/utils.h>
@@ -50 +40 @@
 #include <VBox/param.h>
 #include <VBox/err.h>
-
-#include <VBox/com/array.h>
 
 #include <VBox/settings.h>
@@ -908 +896 @@
     /* associate hard disks with the snapshot
      * (Machine::uninitDataAndChildObjects() will deassociate at destruction) */
-    for (MediumAttachmentsList::const_iterator it = mMediaData->mAttachments.begin();
+    for (MediaData::AttachmentList::const_iterator it = mMediaData->mAttachments.begin();
          it != mMediaData->mAttachments.end();
          ++it)
@@ -1607 +1595 @@
     ULONG ulOpCount = 1;            // one for preparations
     ULONG ulTotalWeight = 1;        // one for preparations
-    for (MediumAttachmentsList::iterator it = pSnapMachine->mMediaData->mAttachments.begin();
+    for (MediaData::AttachmentList::iterator it = pSnapMachine->mMediaData->mAttachments.begin();
          it != pSnapMachine->mMediaData->mAttachments.end();
          ++it)
@@ -1837 +1825 @@
         std::list< ComObjPtr<MediumAttachment> > llDiffAttachmentsToDelete;
 
-        for (MediumAttachmentsList::const_iterator it = mMediaData.backedUpData()->mAttachments.begin();
+        for (MediaData::AttachmentList::const_iterator it = mMediaData.backedUpData()->mAttachments.begin();
              it != mMediaData.backedUpData()->mAttachments.end();
              ++it)
@@ -2065 +2053 @@
 
     // count normal hard disks and add their sizes to the weight
-    for (MediumAttachmentsList::iterator it = pSnapMachine->mMediaData->mAttachments.begin();
+    for (MediaData::AttachmentList::iterator it = pSnapMachine->mMediaData->mAttachments.begin();
          it != pSnapMachine->mMediaData->mAttachments.end();
          ++it)
@@ -2281 +2269 @@
         // merge it with its one and only child (the diff image holding the
         // changes written after the snapshot was taken).
-        for (MediumAttachmentsList::iterator it = pSnapMachine->mMediaData->mAttachments.begin();
+        for (MediaData::AttachmentList::iterator it = pSnapMachine->mMediaData->mAttachments.begin();
              it != pSnapMachine->mMediaData->mAttachments.end();
              ++it)