Changeset 31220 in vbox

Timestamp:

Jul 29, 2010 3:25:57 PM (15 years ago)

Author:

vboxsync

Message:

Main: rename IConsole::forgetSavedState() to discardSavedState()

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageMisc.cpp (modified) (1 diff)
• Frontends/VBoxSDL/VBoxSDL.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp (modified) (1 diff)
• Main/ConsoleImpl.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (3 diffs)
• Main/include/ConsoleImpl.h (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp

@@ -442 +442 @@
                 ComPtr<IConsole> console;
                 CHECK_ERROR_BREAK(a->session, COMGETTER(Console)(console.asOutParam()));
-                CHECK_ERROR_BREAK(console, ForgetSavedState());
+                CHECK_ERROR_BREAK(console, DiscardSavedState());
             } while (0);
             CHECK_ERROR_BREAK(a->session, UnlockMachine());

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -1652 +1652 @@
         if (machineState == MachineState_Saved)
         {
-            CHECK_ERROR(gConsole, ForgetSavedState());
+            CHECK_ERROR(gConsole, DiscardSavedState());
         }
         /*

trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp

@@ -805 +805 @@
 
     CConsole console = session.GetConsole();
-    console.ForgetSavedState();
+    console.DiscardSavedState();
     if (!console.isOk())
         vboxProblem().cannotDiscardSavedState (console);

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -2387 +2387 @@
 }
 
-STDMETHODIMP Console::ForgetSavedState()
+STDMETHODIMP Console::DiscardSavedState()
 {
     AutoCaller autoCaller(this);

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -5933 +5933 @@
   <interface
      name="IConsole" extends="$unknown"
-     uuid="3a7bb20e-bbee-47f2-a5ee-b158555f2c79"
+     uuid="03cb7897-ea17-4e6c-81ae-4bd90be2fde2"
      wsmap="managed"
      >
@@ -6299 +6299 @@
     </method>
 
-    <method name="forgetSavedState">
-      <desc>
-        Forgets the saved state of the virtual machine if it is currently
-        in the "Saved" state (previously created by <link to="#saveState"/>)
+    <method name="discardSavedState">
+      <desc>
+        Forcibly resets the machine to "Powered Off" state if it is
+        currently in the "Saved" state (previously created by <link to="#saveState"/>)
         and deletes the file into which the machine state was saved.
         Next time the machine is powered up, a clean boot will occur.
         <note>
           This operation is equivalent to resetting or powering off
-          the machine without doing a proper shutdown in the guest OS.
+          the machine without doing a proper shutdown of the guest
+          operating system; as with resetting a running phyiscal
+          computer, it can can lead to data loss.
         </note>
         <result name="VBOX_E_INVALID_VM_STATE">
@@ -6591 +6593 @@
           If the machine state is <link to="MachineState_Saved">Saved</link>
           prior to this operation, the saved state file will be implicitly
-          deleted (as if <link to="IConsole::forgetSavedState"/> were
+          deleted (as if <link to="IConsole::discardSavedState"/> were
           called).
         </note>

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

@@ -138 +138 @@
     STDMETHOD(SaveState)(IProgress **aProgress);
     STDMETHOD(AdoptSavedState)(IN_BSTR aSavedStateFile);
-    STDMETHOD(ForgetSavedState)();
+    STDMETHOD(DiscardSavedState)();
     STDMETHOD(GetDeviceActivity)(DeviceType_T aDeviceType,
                                 DeviceActivity_T *aDeviceActivity);