Changeset 2845 in vbox for trunk/src/VBox/Main/include

Timestamp:

May 24, 2007 4:16:41 PM (18 years ago)

Author:

vboxsync

Message:

Main: Switched USBController to the new locking model.

File:

• trunk/src/VBox/Main/include/USBControllerImpl.h (modified) (7 diffs)

trunk/src/VBox/Main/include/USBControllerImpl.h

@@ -33 +33 @@
 class HostUSBDevice;
 
+/**
+ *  @note we cannot use VirtualBoxBaseWithTypedChildren <USBDeviceFilter> as a
+ *  base class, because we want a quick (map-based) way of validating
+ *  IUSBDeviceFilter pointers passed from outside as method parameters that
+ *  VirtualBoxBaseWithChildren::getDependentChild() gives us.
+ */
+
 class ATL_NO_VTABLE USBController :
-    public VirtualBoxBaseWithChildren,
-    public VirtualBoxSupportErrorInfoImpl<USBController, IUSBController>,
-    public VirtualBoxSupportTranslation<USBController>,
+    public VirtualBoxBaseWithChildrenNEXT,
+    public VirtualBoxSupportErrorInfoImpl <USBController, IUSBController>,
+    public VirtualBoxSupportTranslation <USBController>,
     public IUSBController
 {
@@ -44 +51 @@
     {
         /* Constructor. */
-        Data() : m_fEnabled(FALSE) { }
+        Data() : mEnabled (FALSE) { }
 
         bool operator== (const Data &that) const
         {
-            return this == &that || m_fEnabled == that.m_fEnabled;
+            return this == &that || mEnabled == that.mEnabled;
         }
 
         /** Enabled indicator. */
-        BOOL                            m_fEnabled;
+        BOOL mEnabled;
     };
 
 public:
 
-    DECLARE_NOT_AGGREGATABLE(USBController)
+    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT (USBController)
+
+    DECLARE_NOT_AGGREGATABLE (USBController)
 
     DECLARE_PROTECT_FINAL_CONSTRUCT()
 
     BEGIN_COM_MAP(USBController)
-        COM_INTERFACE_ENTRY(ISupportErrorInfo)
-        COM_INTERFACE_ENTRY(IUSBController)
+        COM_INTERFACE_ENTRY (ISupportErrorInfo)
+        COM_INTERFACE_ENTRY (IUSBController)
     END_COM_MAP()
 
     NS_DECL_ISUPPORTS
+
+    DECLARE_EMPTY_CTOR_DTOR (USBController)
 
     HRESULT FinalConstruct();
@@ -72 +83 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init (Machine *parent);
-    HRESULT init (Machine *parent, USBController *that);
-    HRESULT initCopy (Machine *parent, USBController *that);
+    HRESULT init (Machine *aParent);
+    HRESULT init (Machine *aParent, USBController *aThat);
+    HRESULT initCopy (Machine *aParent, USBController *aThat);
     void uninit();
 
     // IUSBController properties
-    STDMETHOD(COMGETTER(Enabled))(BOOL *a_pfEnabled);
-    STDMETHOD(COMSETTER(Enabled))(BOOL a_fEnabled);
-    STDMETHOD(COMGETTER(USBStandard))(USHORT *a_pusUSBStandard);
-    STDMETHOD(COMGETTER(DeviceFilters))(IUSBDeviceFilterCollection **aDevicesFilters);
+    STDMETHOD(COMGETTER(Enabled)) (BOOL *aEnabled);
+    STDMETHOD(COMSETTER(Enabled)) (BOOL aEnabled);
+    STDMETHOD(COMGETTER(USBStandard)) (USHORT *aUSBStandard);
+    STDMETHOD(COMGETTER(DeviceFilters)) (IUSBDeviceFilterCollection **aDevicesFilters);
 
     // IUSBController methods
@@ -90 +101 @@
     // public methods only for internal purposes
 
-    ComObjPtr <Machine, ComWeakRef> &parent() { return m_Parent; };
+    const ComObjPtr <Machine, ComWeakRef> &parent() { return mParent; };
 
     HRESULT loadSettings (CFGNODE aMachine);
@@ -101 +112 @@
     void copyFrom (USBController *aThat);
 
-    const Backupable<Data> &data() { return m_Data; }
+    const Backupable<Data> &data() { return mData; }
 
     HRESULT onMachineRegistered (BOOL aRegistered);
@@ -130 +141 @@
 
     /** Parent object. */
-    ComObjPtr<Machine, ComWeakRef>  m_Parent;
+    const ComObjPtr<Machine, ComWeakRef> mParent;
     /** Peer object. */
-    ComObjPtr<USBController>        m_Peer;
+    const ComObjPtr <USBController> mPeer;
     /** Data. */
-    Backupable<Data>                m_Data;
+    Backupable <Data> mData;
 
     // the following fields need special backup/rollback/commit handling,
@@ -140 +151 @@
 
     typedef std::list <ComObjPtr <USBDeviceFilter> > DeviceFilterList;
-    Backupable <DeviceFilterList> m_DeviceFilters;
+    Backupable <DeviceFilterList> mDeviceFilters;
 };