Changeset 6975 in vbox for trunk/src/VBox/Frontends/VirtualBox/include

Timestamp:

Feb 15, 2008 5:32:46 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt: Added support for warning result codes (#2673).

Location:

trunk/src/VBox/Frontends/VirtualBox/include

Files:

• COMDefs.h (modified) (4 diffs)
• COMWrappers.xsl (modified) (1 diff)
• VBoxProblemReporter.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/COMDefs.h

@@ -195 +195 @@
      *  Returns error info set by the last unsuccessfully invoked interface
      *  method. Returned error info is useful only if CInterface::lastRC()
-     *  represents a failure (i.e. CInterface::isOk() is false).
+     *  represents a failure or a warning (i.e. CInterface::isReallyOk() is
+     *  false).
      */
     virtual COMErrorInfo errorInfo() const { return COMErrorInfo(); }
@@ -473 +474 @@
      *  Returns error info set by the last unsuccessfully invoked interface
      *  method. Returned error info is useful only if CInterface::lastRC()
-     *  represents a failure (i.e. CInterface::isOk() is false).
+     *  represents a failure or a warning (i.e. CInterface::isReallyOk() is
+     *  false).
      */
     COMErrorInfo errorInfo() const { return mErrInfo; }
@@ -517 +519 @@
 
     bool isNull() const { return mErrInfo.isNull(); }
-    bool isOk() const { return mErrInfo.isNull() && SUCCEEDED (mRC); }
+
+    /**
+     * Returns @c true if the result code repesents success (with or without
+     * warnings).
+     */
+    bool isOk() const { return SUCCEEDED (mRC); }
+
+    /**
+     * Returns @c true if the result code represends success with one or more
+     * warnings.
+     */
+    bool isWarning() const { return SUCCEEDED_WARNING (mRC); }
+
+    /**
+     * Returns @c true if the result code represends success with no warnings.
+     */
+    bool isReallyOk() const { return mRC == S_OK; }
 
     COMErrorInfo errorInfo() const { return mErrInfo; }
@@ -624 +642 @@
     bool isNull() const { return mIface == NULL; }
 
+    /**
+     * Returns @c true if the result code repesents success (with or without
+     * warnings).
+     */
     bool isOk() const { return !isNull() && SUCCEEDED (B::mRC); }
+
+    /**
+     * Returns @c true if the result code represends success with one or more
+     * warnings.
+     */
+    bool isWarning() const { return !isNull() && SUCCEEDED_WARNING (B::mRC); }
+
+    /**
+     * Returns @c true if the result code represends success with no warnings.
+     */
+    bool isReallyOk() const { return !isNull() && B::mRC == S_OK; }
 
     /* utility operators */

trunk/src/VBox/Frontends/VirtualBox/include/COMWrappers.xsl

@@ -906 +906 @@
         <xsl:otherwise>
             <xsl:if test="$supports='strict' or $supports='yes'">
-                <xsl:text>    if (FAILED (mRC))&#x0A;    {&#x0A;</xsl:text>
+                <xsl:text>    if (mRC != S_OK)&#x0A;    {&#x0A;</xsl:text>
                 <xsl:text>        fetchErrorInfo (mIface, &amp;COM_IIDOF (Base::Iface));&#x0A;</xsl:text>
                 <xsl:if test="$supports='strict'">

trunk/src/VBox/Frontends/VirtualBox/include/VBoxProblemReporter.h

@@ -289 +289 @@
     static QString formatErrorInfo (const COMBase &aWrapper)
     {
-        Assert (FAILED (aWrapper.lastRC()));
+        Assert (aWrapper.lastRC() != S_OK);
         return formatErrorInfo (aWrapper.errorInfo(), aWrapper.lastRC());
     }
@@ -295 +295 @@
     static QString formatErrorInfo (const COMResult &aRC)
     {
-        Assert (FAILED (aRC.rc()));
+        Assert (aRC.rc() != S_OK);
         return formatErrorInfo (aRC.errorInfo(), aRC.rc());
     }