Changeset 98263 in vbox

Timestamp:

Jan 24, 2023 1:52:49 AM (2 years ago)

Author:

vboxsync

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

155463

Message:

Main: rc() -> hrc()/vrc().

Location:

trunk/src/VBox/Main

Files:

• include/AutoCaller.h (modified) (6 diffs)
• include/AutoStateDep.h (modified) (3 diffs)
• src-client/ConsoleImpl.cpp (modified) (2 diffs)
• src-server/MediumImpl.cpp (modified) (1 diff)

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

@@ -54 +54 @@
  * destroyed).
  *
- * If #rc() returns a failure after the instance creation, it means that
+ * If #hrc() returns a failure after the instance creation, it means that
  * the managed VirtualBoxBase object is not Ready, or in any other invalid
  * state, so that the caller must not use the object and can return this
@@ -97 +97 @@
      * @param aObj      Object to add a normal caller to. If NULL, this
      *                  instance is effectively turned to no-op (where
-     *                  rc() will return S_OK).
+     *                  hrc() will return S_OK).
      */
     AutoCaller(VirtualBoxBase *aObj)
@@ -124 +124 @@
 
     /**
-     * Returns the stored result code returned by ObjectState::addCaller()
-     * after instance creation or after the last #add() call. A successful
-     * result code means the number of callers was successfully increased.
-     * @deprecated use hrc()
-     */
-    HRESULT rc() const { return mRC; }
-
-    /**
-     * Returns |true| if |SUCCEEDED(rc())| is |true|, for convenience.
-     * |true| means the number of callers was successfully increased.
+     * Returns |true| if |SUCCEEDED(hrc())| is |true|, for convenience. |true| means
+     * the number of callers was successfully increased.
      */
     bool isOk() const { return SUCCEEDED(mRC); }
 
     /**
-     * Returns |true| if |FAILED(rc())| is |true|, for convenience.
-     * |true| means the number of callers was _not_ successfully increased.
+     * Returns |true| if |FAILED(hrc())| is |true|, for convenience. |true| means
+     * the number of callers was _not_ successfully increased.
      */
     bool isNotOk() const { return FAILED(mRC); }
@@ -145 +137 @@
     /**
      * Temporarily decreases the number of callers of the managed object.
-     * May only be called if #isOk() returns |true|. Note that #rc() will
-     * return E_FAIL after this method succeeds.
+     * May only be called if #isOk() returns |true|. Note that #hrc() will return
+     * E_FAIL after this method succeeds.
      */
     void release()
@@ -204 +196 @@
      *
      * @param aObj      Object to add a caller to. If NULL, this
-     *                  instance is effectively turned to no-op (where
-     *                  rc() will return S_OK).
+     *                  instance is effectively turned to no-op (where hrc() will
+     *                  return S_OK).
      * @param aLimited  If |false|, then it's a regular caller, otherwise a
      *                  limited caller.
@@ -268 +260 @@
      *
      * @param aObj      Object to add a limited caller to. If NULL, this
-     *                  instance is effectively turned to no-op (where
-     *                  rc() will return S_OK).
+     *                  instance is effectively turned to no-op (where hrc() will
+     *                  return S_OK).
      */
     AutoLimitedCaller(VirtualBoxBase *aObj)

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

@@ -84 +84 @@
 
         /** Decreases the number of dependencies before the instance is
-         *  destroyed. Note that will reset #rc() to E_FAIL. */
+         *  destroyed. Note that will reset #hrc() to E_FAIL. */
         void release()
         {
@@ -92 +92 @@
         }
 
-        /** Restores the number of callers after by #release(). #rc() will be
+        /** Restores the number of callers after by #release(). #hrc() will be
          *  reset to the result of calling addStateDependency() and must be
          *  rechecked to ensure the operation succeeded. */
@@ -104 +104 @@
         /** Returns the result of Machine::addStateDependency(). */
         HRESULT hrc() const { return mRC; }
-        /** Returns the result of Machine::addStateDependency().
-         * @deprecated Use #hrc() instead.  */
-        HRESULT rc() const { return mRC; }
 
         /** Shortcut to SUCCEEDED(hrc()). */

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -212 +212 @@
 
     HRESULT hrc() const { return mRC; }
-    HRESULT rc() const { return mRC; }
     bool isOk() const { return SUCCEEDED(hrc()); }
 
@@ -6255 +6254 @@
         /* The VM may be no more operational when this message arrives
          * (e.g. it may be Saving or Stopping or just PoweredOff). Use
-         * AutoVMCaller to detect it -- AutoVMCaller::rc() will return a
+         * AutoVMCaller to detect it -- AutoVMCaller::hrc() will return a
          * failure in this case. */
 

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -348 +348 @@
 
     HRESULT hrc() const { return mRC; }
-    HRESULT rc() const { return mRC; }
     bool isOk() const { return SUCCEEDED(hrc()); }
     bool NotifyAboutChanges() const { return mNotifyAboutChanges; }