Changeset 30714 in vbox for trunk/src/VBox/Main/VirtualBoxErrorInfoImpl.cpp

Timestamp:

Jul 7, 2010 4:20:03 PM (15 years ago)

Author:

vboxsync

Message:

Main: remove SupportErrorInfo template magic

File:

• trunk/src/VBox/Main/VirtualBoxErrorInfoImpl.cpp (modified) (9 diffs)

trunk/src/VBox/Main/VirtualBoxErrorInfoImpl.cpp

@@ -22 +22 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-HRESULT VirtualBoxErrorInfo::init (HRESULT aResultCode, const GUID &aIID,
-                                   CBSTR aComponent, CBSTR aText,
-                                   IVirtualBoxErrorInfo *aNext)
-{
-    mResultCode = aResultCode;
-    mIID = aIID;
-    mComponent = aComponent;
-    mText = aText;
+HRESULT VirtualBoxErrorInfo::init(HRESULT aResultCode,
+                                  const GUID &aIID,
+                                  const char *pcszComponent,
+                                  const Utf8Str &strText,
+                                  IVirtualBoxErrorInfo *aNext)
+{
+    m_resultCode = aResultCode;
+    m_IID = aIID;
+    m_strComponent = pcszComponent;
+    m_strText = strText;
     mNext = aNext;
 
@@ -42 +44 @@
     CheckComArgOutPointerValid(aResultCode);
 
-    *aResultCode = mResultCode;
+    *aResultCode = m_resultCode;
     return S_OK;
 }
@@ -50 +52 @@
     CheckComArgOutPointerValid(aIID);
 
-    mIID.toUtf16().cloneTo(aIID);
+    m_IID.toUtf16().cloneTo(aIID);
     return S_OK;
 }
@@ -58 +60 @@
     CheckComArgOutPointerValid(aComponent);
 
-    mComponent.cloneTo(aComponent);
+    m_strComponent.cloneTo(aComponent);
     return S_OK;
 }
@@ -66 +68 @@
     CheckComArgOutPointerValid(aText);
 
-    mText.cloneTo(aText);
+    m_strText.cloneTo(aText);
     return S_OK;
 }
@@ -94 +96 @@
      * corresponding fields will simply remain null in this case). */
 
-    mResultCode = S_OK;
-    rc = aInfo->GetGUID (mIID.asOutParam());
+    m_resultCode = S_OK;
+    rc = aInfo->GetGUID(m_IID.asOutParam());
     AssertComRC (rc);
-    rc = aInfo->GetSource (mComponent.asOutParam());
+    Bstr bstrComponent;
+    rc = aInfo->GetSource(bstrComponent.asOutParam());
     AssertComRC (rc);
-    rc = aInfo->GetDescription (mText.asOutParam());
+    m_strComponent = bstrComponent;
+    Bstr bstrText;
+    rc = aInfo->GetDescription(bstrText.asOutParam());
     AssertComRC (rc);
+    m_strText = bstrText;
 
     return S_OK;
@@ -153 +159 @@
      * corresponding fields will simply remain null in this case). */
 
-    rc = aInfo->GetResult(&mResultCode);
+    rc = aInfo->GetResult(&m_resultCode);
     AssertComRC(rc);
 
@@ -161 +167 @@
     if (NS_SUCCEEDED(rc))
     {
-        mText = Bstr(pszMsg);
+        m_strText = pszMsg;
         nsMemory::Free(pszMsg);
     }
     else
-        mText.setNull();
+        m_strText.setNull();
 
     return S_OK;
@@ -178 +184 @@
     CheckComArgOutPointerValid(aMessage);
 
-    Utf8Str (mText).cloneTo(aMessage);
+    m_strText.cloneTo(aMessage);
     return S_OK;
 }