VirtualBox

Changeset 41184 in vbox for trunk/src/VBox/Main/src-all


Ignore:
Timestamp:
May 7, 2012 1:28:04 PM (13 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
77810
Message:

Main+Frontends: removed unused and confusing VirtualBoxErrorInfo implementation, and cleaned up lots of misleading comments and other leftovers about the earlier ErrorInfo mess

Location:
trunk/src/VBox/Main/src-all
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Main/src-all/ProgressImpl.cpp

    r40257 r41184  
    12351235 * Marks the operation as complete and attaches full error info.
    12361236 *
    1237  * See com::SupportErrorInfoImpl::setError(HRESULT, const GUID &, const wchar_t
     1237 * See VirtualBoxBase::setError(HRESULT, const GUID &, const wchar_t
    12381238 * *, const char *, ...) for more info.
    12391239 *

  • trunk/src/VBox/Main/src-all/VirtualBoxBase.cpp

    r41104 r41184  
    739739
    740740/**
    741  * Places the managed VirtualBoxBase object to  Ready/Limited state if the
     741 * Places the managed VirtualBoxBase object to Ready/Limited state if the
    742742 * initialization succeeded or partly succeeded, or places it to InitFailed
    743743 * state and calls the object's uninit() method.

  • trunk/src/VBox/Main/src-all/VirtualBoxErrorInfoImpl.cpp

    r38533 r41184  
    11/** @file
    22 *
    3  * VirtualBoxErrorInfo COM classe implementation
     3 * VirtualBoxErrorInfo COM class implementation
    44 */
    55
    66/*
    7  * Copyright (C) 2006-2010 Oracle Corporation
     7 * Copyright (C) 2006-2012 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    6666////////////////////////////////////////////////////////////////////////////////
    6767
    68 STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(ResultCode) (LONG *aResultCode)
     68STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(ResultCode)(LONG *aResultCode)
    6969{
    7070    CheckComArgOutPointerValid(aResultCode);
    … …  
    7474}
    7575
    76 STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(InterfaceID) (BSTR *aIID)
     76STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(InterfaceID)(BSTR *aIID)
    7777{
    7878    CheckComArgOutPointerValid(aIID);
    … …  
    8282}
    8383
    84 STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(Component) (BSTR *aComponent)
     84STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(Component)(BSTR *aComponent)
    8585{
    8686    CheckComArgOutPointerValid(aComponent);
    … …  
    9090}
    9191
    92 STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(Text) (BSTR *aText)
     92STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(Text)(BSTR *aText)
    9393{
    9494    CheckComArgOutPointerValid(aText);
    … …  
    9898}
    9999
    100 STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(Next) (IVirtualBoxErrorInfo **aNext)
     100STDMETHODIMP VirtualBoxErrorInfo::COMGETTER(Next)(IVirtualBoxErrorInfo **aNext)
    101101{
    102102    CheckComArgOutPointerValid(aNext);
    … …  
    112112 *  object.
    113113 */
    114 HRESULT VirtualBoxErrorInfo::init (IErrorInfo *aInfo)
     114HRESULT VirtualBoxErrorInfo::init(IErrorInfo *aInfo)
    115115{
    116116    AssertReturn(aInfo, E_FAIL);
    … …  
    124124    m_resultCode = S_OK;
    125125    rc = aInfo->GetGUID(m_IID.asOutParam());
    126     AssertComRC (rc);
     126    AssertComRC(rc);
    127127    Bstr bstrComponent;
    128128    rc = aInfo->GetSource(bstrComponent.asOutParam());
    129     AssertComRC (rc);
     129    AssertComRC(rc);
    130130    m_strComponent = bstrComponent;
    131131    Bstr bstrText;
    132132    rc = aInfo->GetDescription(bstrText.asOutParam());
    133     AssertComRC (rc);
     133    AssertComRC(rc);
    134134    m_strText = bstrText;
    135135
    … …  
    140140////////////////////////////////////////////////////////////////////////////////
    141141
    142 STDMETHODIMP VirtualBoxErrorInfo::GetDescription (BSTR *description)
    143 {
    144     return COMGETTER(Text) (description);
    145 }
    146 
    147 STDMETHODIMP VirtualBoxErrorInfo::GetGUID (GUID *guid)
     142STDMETHODIMP VirtualBoxErrorInfo::GetDescription(BSTR *description)
     143{
     144    return COMGETTER(Text)(description);
     145}
     146
     147STDMETHODIMP VirtualBoxErrorInfo::GetGUID(GUID *guid)
    148148{
    149149    Bstr iid;
    150     HRESULT rc = COMGETTER(InterfaceID) (iid.asOutParam());
     150    HRESULT rc = COMGETTER(InterfaceID)(iid.asOutParam());
    151151    if (SUCCEEDED(rc))
    152152        *guid = Guid(iid).ref();
    … …  
    154154}
    155155
    156 STDMETHODIMP VirtualBoxErrorInfo::GetHelpContext (DWORD *pdwHelpContext)
     156STDMETHODIMP VirtualBoxErrorInfo::GetHelpContext(DWORD *pdwHelpContext)
    157157{
    158158    return E_NOTIMPL;
    159159}
    160160
    161 STDMETHODIMP VirtualBoxErrorInfo::GetHelpFile (BSTR *pbstrHelpFile)
     161STDMETHODIMP VirtualBoxErrorInfo::GetHelpFile(BSTR *pbstrHelpFile)
    162162{
    163163    return E_NOTIMPL;
    164164}
    165165
    166 STDMETHODIMP VirtualBoxErrorInfo::GetSource (BSTR *source)
    167 {
    168     return COMGETTER(Component) (source);
     166STDMETHODIMP VirtualBoxErrorInfo::GetSource(BSTR *source)
     167{
     168    return COMGETTER(Component)(source);
    169169}
    170170
    … …  
    206206
    207207/* readonly attribute string message; */
    208 NS_IMETHODIMP VirtualBoxErrorInfo::GetMessage (char **aMessage)
     208NS_IMETHODIMP VirtualBoxErrorInfo::GetMessage(char **aMessage)
    209209{
    210210    CheckComArgOutPointerValid(aMessage);
    … …  
    215215
    216216/* readonly attribute nsresult result; */
    217 NS_IMETHODIMP VirtualBoxErrorInfo::GetResult (nsresult *aResult)
     217NS_IMETHODIMP VirtualBoxErrorInfo::GetResult(nsresult *aResult)
    218218{
    219219    if (!aResult)
    … …  
    221221
    222222    PRInt32 lrc;
    223     nsresult rc = COMGETTER(ResultCode) (&lrc);
     223    nsresult rc = COMGETTER(ResultCode)(&lrc);
    224224    if (SUCCEEDED(rc))
    225225      *aResult = lrc;
    … …  
    228228
    229229/* readonly attribute string name; */
    230 NS_IMETHODIMP VirtualBoxErrorInfo::GetName (char ** /* aName */)
     230NS_IMETHODIMP VirtualBoxErrorInfo::GetName(char ** /* aName */)
    231231{
    232232    return NS_ERROR_NOT_IMPLEMENTED;
    … …  
    234234
    235235/* readonly attribute string filename; */
    236 NS_IMETHODIMP VirtualBoxErrorInfo::GetFilename (char ** /* aFilename */)
     236NS_IMETHODIMP VirtualBoxErrorInfo::GetFilename(char ** /* aFilename */)
    237237{
    238238    return NS_ERROR_NOT_IMPLEMENTED;
    … …  
    240240
    241241/* readonly attribute PRUint32 lineNumber; */
    242 NS_IMETHODIMP VirtualBoxErrorInfo::GetLineNumber (PRUint32 * /* aLineNumber */)
     242NS_IMETHODIMP VirtualBoxErrorInfo::GetLineNumber(PRUint32 * /* aLineNumber */)
    243243{
    244244    return NS_ERROR_NOT_IMPLEMENTED;
    … …  
    246246
    247247/* readonly attribute PRUint32 columnNumber; */
    248 NS_IMETHODIMP VirtualBoxErrorInfo::GetColumnNumber (PRUint32 * /*aColumnNumber */)
     248NS_IMETHODIMP VirtualBoxErrorInfo::GetColumnNumber(PRUint32 * /*aColumnNumber */)
    249249{
    250250    return NS_ERROR_NOT_IMPLEMENTED;
    … …  
    252252
    253253/* readonly attribute nsIStackFrame location; */
    254 NS_IMETHODIMP VirtualBoxErrorInfo::GetLocation (nsIStackFrame ** /* aLocation */)
     254NS_IMETHODIMP VirtualBoxErrorInfo::GetLocation(nsIStackFrame ** /* aLocation */)
    255255{
    256256    return NS_ERROR_NOT_IMPLEMENTED;
    … …  
    258258
    259259/* readonly attribute nsIException inner; */
    260 NS_IMETHODIMP VirtualBoxErrorInfo::GetInner (nsIException **aInner)
     260NS_IMETHODIMP VirtualBoxErrorInfo::GetInner(nsIException **aInner)
    261261{
    262262    ComPtr<IVirtualBoxErrorInfo> info;
    263     nsresult rv = COMGETTER(Next) (info.asOutParam());
     263    nsresult rv = COMGETTER(Next)(info.asOutParam());
    264264    if (FAILED(rv)) return rv;
    265265    return info.queryInterfaceTo(aInner);
    … …  
    267267
    268268/* readonly attribute nsISupports data; */
    269 NS_IMETHODIMP VirtualBoxErrorInfo::GetData (nsISupports ** /* aData */)
    270 {
    271     return NS_ERROR_NOT_IMPLEMENTED;
    272 }
    273 
    274 /* string toString (); */
    275 NS_IMETHODIMP VirtualBoxErrorInfo::ToString (char ** /* retval */)
    276 {
    277     return NS_ERROR_NOT_IMPLEMENTED;
    278 }
    279 
    280 NS_IMPL_THREADSAFE_ISUPPORTS2 (VirtualBoxErrorInfo,
    281                                nsIException, IVirtualBoxErrorInfo)
     269NS_IMETHODIMP VirtualBoxErrorInfo::GetData(nsISupports ** /* aData */)
     270{
     271    return NS_ERROR_NOT_IMPLEMENTED;
     272}
     273
     274/* string toString(); */
     275NS_IMETHODIMP VirtualBoxErrorInfo::ToString(char ** /* retval */)
     276{
     277    return NS_ERROR_NOT_IMPLEMENTED;
     278}
     279
     280NS_IMPL_THREADSAFE_ISUPPORTS2(VirtualBoxErrorInfo,
     281                              nsIException, IVirtualBoxErrorInfo)
    282282
    283283#endif // defined(VBOX_WITH_XPCOM)
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette