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

Timestamp:

May 16, 2007 2:15:41 PM (18 years ago)

Author:

vboxsync

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

21222

Message:

FE/Qt: Added support for displaying more than one COM error if several errors are returned after a method invocation.

Location:

trunk/src/VBox/Frontends/VirtualBox/include

Files:

• COMDefs.h (modified) (3 diffs)
• VBoxProblemReporter.h (modified) (2 diffs)

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

@@ -32 +32 @@
 #include <quuid.h>
 
+#include <iprt/memory> // for auto_copy_ptr
+
 /*
  * common COM / XPCOM includes and defines
@@ -171 +173 @@
     QString text() const { return mText; }
 
+    const COMErrorInfo *next() const { return mNext.get(); }
+
     QString interfaceName() const { return mInterfaceName; }
     QUuid calleeIID() const { return mCalleeIID; }
@@ -190 +194 @@
     QString mComponent;
     QString mText;
+
+    cppx::auto_copy_ptr <COMErrorInfo> mNext;
 
     QString mInterfaceName;

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

@@ -216 +216 @@
                            const QString &errorMsg);
 
-    static QString formatErrorInfo (const COMErrorInfo &info,
-                                    HRESULT wrapperRC = S_OK);
-    static QString formatErrorInfo (const CVirtualBoxErrorInfo &info) {
-        return formatErrorInfo (COMErrorInfo (info));
-    }
-    static QString formatErrorInfo (const COMBase &wrapper) {
-        Assert (FAILED (wrapper.lastRC()));
-        return formatErrorInfo (wrapper.errorInfo(), wrapper.lastRC());
-    }
-    static QString formatErrorInfo (const COMResult &rc) {
-        Assert (FAILED (rc.rc()));
-        return formatErrorInfo (rc.errorInfo(), rc.rc());
+    static QString formatErrorInfo (const COMErrorInfo &aInfo,
+                                    HRESULT aWrapperRC = S_OK);
+
+    static QString formatErrorInfo (const CVirtualBoxErrorInfo &aInfo)
+    {
+        return formatErrorInfo (COMErrorInfo (aInfo));
+    }
+
+    static QString formatErrorInfo (const COMBase &aWrapper)
+    {
+        Assert (FAILED (aWrapper.lastRC()));
+        return formatErrorInfo (aWrapper.errorInfo(), aWrapper.lastRC());
+    }
+
+    static QString formatErrorInfo (const COMResult &aRC)
+    {
+        Assert (FAILED (aRC.rc()));
+        return formatErrorInfo (aRC.errorInfo(), aRC.rc());
     }
 
@@ -239 +245 @@
 
     friend VBoxProblemReporter &vboxProblem();
+
+    static QString doFormatErrorInfo (const COMErrorInfo &aInfo,
+                                      HRESULT aWrapperRC = S_OK);
 };