← Back to branch summary

~ubuntu-branches/ubuntu/raring/virtualbox-ose/raring

« back to all changes in this revision

Viewing changes to src/VBox/Main/include/VirtualBoxErrorInfoImpl.h

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-12-18 16:44:29 UTC
  • mfrom: (0.3.3 upstream) (0.4.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091218164429-jd34ccexpv5na11a
Tags: 3.1.2-dfsg-1ubuntu1
https://launchpad.net/bugs/498219
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/474625
https://launchpad.net/bugs/495935
https://launchpad.net/bugs/473334
* Merge from Debian unstable (LP: #498219), remaining changes:
  - Disable update action
    - debian/patches/u01-disable-update-action.dpatch
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
* Fixes the following bugs:
  - Kernel module fails to build with Linux >= 2.6.32 (LP: #474625)
  - X.Org drivers need to be rebuilt against X-Server 1.7 (LP: #495935)
  - The *-source packages try to build the kernel modules even though the
    kernel headers aren't available (LP: #473334)
* Replace *-source packages with transitional packages for *-dkms.
* Adapt u01-disable-update-action.dpatch and u02-lp-integration.dpatch for
  new upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Main/include/VirtualBoxErrorInfoImpl.h
27
27
using namespace com;
28
28
 
29
29
class ATL_NO_VTABLE VirtualBoxErrorInfo
30
 
#if defined (RT_OS_WINDOWS)
31
30
    : public CComObjectRootEx <CComMultiThreadModel>
32
 
#else
33
 
    : public CComObjectRootEx
34
 
#endif
35
31
    , public IVirtualBoxErrorInfo
36
32
{
37
33
public:
45
41
        COM_INTERFACE_ENTRY(IVirtualBoxErrorInfo)
46
42
    END_COM_MAP()
47
43
 
48
 
    NS_DECL_ISUPPORTS
49
 
 
50
44
#if defined (RT_OS_WINDOWS)
51
45
 
52
46
    HRESULT init (IErrorInfo *aInfo);
74
68
 
75
69
    // IVirtualBoxErrorInfo properties
76
70
    STDMETHOD(COMGETTER(ResultCode)) (LONG *aResultCode);
77
 
    STDMETHOD(COMGETTER(InterfaceID)) (OUT_GUID aIID);
 
71
    STDMETHOD(COMGETTER(InterfaceID)) (BSTR *aIID);
78
72
    STDMETHOD(COMGETTER(Component)) (BSTR *aComponent);
79
73
    STDMETHOD(COMGETTER(Text)) (BSTR *aText);
80
74
    STDMETHOD(COMGETTER(Next)) (IVirtualBoxErrorInfo **aNext);
92
86
    Bstr mText;
93
87
    Guid mIID;
94
88
    Bstr mComponent;
95
 
    ComPtr <IVirtualBoxErrorInfo> mNext;
 
89
    ComPtr<IVirtualBoxErrorInfo> mNext;
96
90
};
97
91
 
98
92
#endif // ____H_VIRTUALBOXERRORINFOIMPL