Changeset 28205 in vbox for trunk/src/VBox/Main/include

Timestamp:

Apr 12, 2010 1:39:18 PM (15 years ago)

Author:

vboxsync

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

59945

Message:

Main/VirtualBoxCallback: rename OnSnapshotDiscard to OnSnapshotDeleted for consistency, clean up wording and other minor issues

Location:

trunk/src/VBox/Main/include

Files:

• AutoCaller.h (modified) (1 diff)
• Global.h (modified) (2 diffs)
• Performance.h (modified) (1 diff)
• VirtualBoxCallbackImpl.h (modified) (4 diffs)

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

@@ -141 +141 @@
             if (mObj && SUCCEEDED(mRC))
                 release();
+            else if (!mObj)
+            {
+                /* Fix up the success state when nothing is attached. Otherwise
+                 * there are a couple of assertion which would trigger. */
+                mRC = E_FAIL;
+            }
             mObj = aObj;
             add();

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2008 Sun Microsystems, Inc.
+ * Copyright (C) 2008-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -113 +113 @@
      * Returns @c true if the given machine state is a transient state. This is
      * a recommended way to detect if the VM is performing some potentially
-     * lengthy operation (such as starting, stopping, saving, discarding
+     * lengthy operation (such as starting, stopping, saving, deleting
      * snapshot, etc.). Note some (but not all) transitional states are also
      * online states (see #IsOnline()).

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

@@ -356 +356 @@
         SubMetric *mUsed;
         SubMetric *mAvailable;
-        SubMetric *mAllocVMM; 
-        SubMetric *mFreeVMM; 
+        SubMetric *mAllocVMM;
+        SubMetric *mFreeVMM;
         SubMetric *mBalloonVMM;
     };

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2009 Sun Microsystems, Inc.
+ * Copyright (C) 2009-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -56 +56 @@
     // public initializers/uninitializers only for internal purposes
     HRESULT init();
-    void uninit (bool aFinalRelease);
+    void uninit(bool aFinalRelease);
 
     // ILocalOwner methods
@@ -67 +67 @@
                                     BSTR *error, BOOL *changeAllowed);
     STDMETHOD(OnExtraDataChange)(IN_BSTR machineId, IN_BSTR key, IN_BSTR value);
-    STDMETHOD(OnMediumRegistered) (IN_BSTR mediaId, DeviceType_T mediaType,
-                                   BOOL registered);
+    STDMETHOD(OnMediumRegistered)(IN_BSTR mediaId, DeviceType_T mediaType,
+                                  BOOL registered);
     STDMETHOD(OnMachineRegistered)(IN_BSTR machineId, BOOL registered);
     STDMETHOD(OnSessionStateChange)(IN_BSTR machineId, SessionState_T state);
-    STDMETHOD(OnSnapshotTaken) (IN_BSTR aMachineId, IN_BSTR aSnapshotId);
-    STDMETHOD(OnSnapshotDiscarded) (IN_BSTR aMachineId, IN_BSTR aSnapshotId);
-    STDMETHOD(OnSnapshotChange) (IN_BSTR aMachineId, IN_BSTR aSnapshotId);
+    STDMETHOD(OnSnapshotTaken)(IN_BSTR aMachineId, IN_BSTR aSnapshotId);
+    STDMETHOD(OnSnapshotDeleted)(IN_BSTR aMachineId, IN_BSTR aSnapshotId);
+    STDMETHOD(OnSnapshotChange)(IN_BSTR aMachineId, IN_BSTR aSnapshotId);
     STDMETHOD(OnGuestPropertyChange)(IN_BSTR machineId, IN_BSTR key, IN_BSTR value, IN_BSTR flags);
 
@@ -83 +83 @@
     STDMETHOD(OnStateChange)(MachineState_T machineState);
     STDMETHOD(OnAdditionsStateChange)();
-    STDMETHOD(OnNetworkAdapterChange) (INetworkAdapter *aNetworkAdapter);
-    STDMETHOD(OnSerialPortChange) (ISerialPort *aSerialPort);
-    STDMETHOD(OnParallelPortChange) (IParallelPort *aParallelPort);
+    STDMETHOD(OnNetworkAdapterChange)(INetworkAdapter *aNetworkAdapter);
+    STDMETHOD(OnSerialPortChange)(ISerialPort *aSerialPort);
+    STDMETHOD(OnParallelPortChange)(IParallelPort *aParallelPort);
     STDMETHOD(OnVRDPServerChange)();
     STDMETHOD(OnRemoteDisplayInfoChange)();
     STDMETHOD(OnUSBControllerChange)();
-    STDMETHOD(OnUSBDeviceStateChange) (IUSBDevice *aDevice, BOOL aAttached,
+    STDMETHOD(OnUSBDeviceStateChange)(IUSBDevice *aDevice, BOOL aAttached,
                                        IVirtualBoxErrorInfo *aError);
-    STDMETHOD(OnSharedFolderChange) (Scope_T aScope);
-    STDMETHOD(OnStorageControllerChange) ();
+    STDMETHOD(OnSharedFolderChange)(Scope_T aScope);
+    STDMETHOD(OnStorageControllerChange)();
     STDMETHOD(OnMediumChange)(IMediumAttachment *iMediumAttachment);
     STDMETHOD(OnCPUChange)(ULONG aCPU, BOOL aRemove);
     STDMETHOD(OnRuntimeError)(BOOL fFatal, IN_BSTR id, IN_BSTR message);
     STDMETHOD(OnCanShowWindow)(BOOL *canShow);
-    STDMETHOD(OnShowWindow) (ULONG64 *winId);
+    STDMETHOD(OnShowWindow)(ULONG64 *winId);
 
     // for VirtualBoxSupportErrorInfoImpl