Changeset 31307 in vbox

Timestamp:

Aug 2, 2010 2:22:15 PM (15 years ago)

Author:

vboxsync

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

64334

Message:

Main: remove unused arg

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (3 diffs)
• SnapshotImpl.cpp (modified) (2 diffs)
• include/MachineImpl.h (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -8157 +8157 @@
  * machine and a new set of attachments to refer to created disks.
  *
- * Used when taking a snapshot or when deleting the current state.
+ * Used when taking a snapshot or when deleting the current state. Gets called
+ * from SessionMachine::BeginTakingSnapshot() and SessionMachine::restoreSnapshotHandler().
  *
  * This method assumes that mMediaData contains the original hard disk attachments
@@ -8173 +8174 @@
  * writing if this method succeeds.
  *
- * @param aFolder           Folder where to create diff hard disks.
  * @param aProgress         Progress object to run (must contain at least as
  *                          many operations left as the number of hard disks
@@ -8186 +8186 @@
  * @note Locks this object for writing.
  */
-HRESULT Machine::createImplicitDiffs(const Bstr &aFolder,
-                                     IProgress *aProgress,
+HRESULT Machine::createImplicitDiffs(IProgress *aProgress,
                                      ULONG aWeight,
                                      bool aOnline,
                                      bool *pfNeedsSaveSettings)
 {
-    AssertReturn(!aFolder.isEmpty(), E_FAIL);
-
-    LogFlowThisFunc(("aFolder='%ls', aOnline=%d\n", aFolder.raw(), aOnline));
+    LogFlowThisFunc(("aOnline=%d\n", aOnline));
 
     AutoCaller autoCaller(this);

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -1432 +1432 @@
 
         /* create new differencing hard disks and attach them to this machine */
-        rc = createImplicitDiffs(mUserData->mSnapshotFolderFull,
-                                 aConsoleProgress,
+        rc = createImplicitDiffs(aConsoleProgress,
                                  1,            // operation weight; must be the same as in Console::TakeSnapshot()
                                  !!fTakingSnapshotOnline,
@@ -1831 +1830 @@
             alock.leave();
 
-            rc = createImplicitDiffs(mUserData->mSnapshotFolderFull,
-                                     aTask.pProgress,
+            rc = createImplicitDiffs(aTask.pProgress,
                                      1,
                                      false /* aOnline */,

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

@@ -760 +760 @@
     HRESULT saveStateSettings(int aFlags);
 
-    HRESULT createImplicitDiffs(const Bstr &aFolder,
-                                IProgress *aProgress,
+    HRESULT createImplicitDiffs(IProgress *aProgress,
                                 ULONG aWeight,
                                 bool aOnline,