← Back to branch summary

~ubuntu-branches/ubuntu/trusty/virtualbox-ose/trusty

« back to all changes in this revision

Viewing changes to src/VBox/Main/include/KeyboardImpl.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/KeyboardImpl.h
47
47
class Console;
48
48
 
49
49
class ATL_NO_VTABLE Keyboard :
50
 
    public VirtualBoxBaseNEXT,
51
 
    public VirtualBoxSupportErrorInfoImpl <Keyboard, IKeyboard>,
52
 
    public VirtualBoxSupportTranslation <Keyboard>,
 
50
    public VirtualBoxBase,
 
51
    public VirtualBoxSupportErrorInfoImpl<Keyboard, IKeyboard>,
 
52
    public VirtualBoxSupportTranslation<Keyboard>,
53
53
    VBOX_SCRIPTABLE_IMPL(IKeyboard)
54
54
{
55
55
 
67
67
        COM_INTERFACE_ENTRY(IDispatch)
68
68
    END_COM_MAP()
69
69
 
70
 
    NS_DECL_ISUPPORTS
71
 
 
72
70
    DECLARE_EMPTY_CTOR_DTOR (Keyboard)
73
71
 
74
72
    HRESULT FinalConstruct();
96
94
private:
97
95
 
98
96
    static DECLCALLBACK(void *) drvQueryInterface(PPDMIBASE pInterface, PDMINTERFACE enmInterface);
99
 
    static DECLCALLBACK(int)    drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle);
 
97
    static DECLCALLBACK(int)    drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags);
100
98
    static DECLCALLBACK(void)   drvDestruct(PPDMDRVINS pDrvIns);
101
99
 
102
 
    const ComObjPtr <Console, ComWeakRef> mParent;
 
100
    const ComObjPtr<Console, ComWeakRef> mParent;
103
101
    /** Pointer to the associated keyboard driver. */
104
102
    struct DRVMAINKEYBOARD *mpDrv;
105
103
    /** Pointer to the device instance for the VMM Device. */