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

Timestamp:

Mar 28, 2014 4:16:41 PM (11 years ago)

Author:

vboxsync

Message:

6183 src-all/PCIDeviceAttachmentImpl.cpp

File:

• trunk/src/VBox/Main/include/PCIDeviceAttachmentImpl.h (modified) (2 diffs)

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

@@ -21 +21 @@
 #define ____H_PCIDEVICEATTACHMENTIMPL
 
-#include "VirtualBoxBase.h"
+#include "PCIDeviceAttachmentWrap.h"
 #include <VBox/settings.h>
 
 class ATL_NO_VTABLE PCIDeviceAttachment :
-    public VirtualBoxBase,
-    VBOX_SCRIPTABLE_IMPL(IPCIDeviceAttachment)
+    public PCIDeviceAttachmentWrap
 {
 public:
-    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(PCIDeviceAttachment, IPCIDeviceAttachment)
 
-    DECLARE_NOT_AGGREGATABLE(PCIDeviceAttachment)
-
-    DECLARE_PROTECT_FINAL_CONSTRUCT()
-
-    BEGIN_COM_MAP(PCIDeviceAttachment)
-        VBOX_DEFAULT_INTERFACE_ENTRIES(IPCIDeviceAttachment)
-    END_COM_MAP()
-
-    PCIDeviceAttachment() { }
-    ~PCIDeviceAttachment() { }
+    DECLARE_EMPTY_CTOR_DTOR(PCIDeviceAttachment)
 
     // public initializer/uninitializer for internal purposes only
@@ -52 +41 @@
 
     // settings
-    HRESULT loadSettings(IMachine * aParent,
-                         const settings::HostPCIDeviceAttachment& aHpda);
-    HRESULT saveSettings(settings::HostPCIDeviceAttachment &data);
+    HRESULT i_loadSettings(IMachine * aParent,
+                           const settings::HostPCIDeviceAttachment& aHpda);
+    HRESULT i_saveSettings(settings::HostPCIDeviceAttachment &data);
 
     HRESULT FinalConstruct();
     void FinalRelease();
 
-    // IPCIDeviceAttachment properties
-    STDMETHOD(COMGETTER(Name))(BSTR * aName);
-    STDMETHOD(COMGETTER(IsPhysicalDevice))(BOOL * aPhysical);
-    STDMETHOD(COMGETTER(HostAddress))(LONG  * hostAddress);
-    STDMETHOD(COMGETTER(GuestAddress))(LONG * guestAddress);
+private:
 
-private:
+    // wrapped IPCIDeviceAttachment properties
+    HRESULT getName(com::Utf8Str &aName);
+    HRESULT getIsPhysicalDevice(BOOL *aIsPhysicalDevice);
+    HRESULT getHostAddress(LONG *aHostAddress);
+    HRESULT getGuestAddress(LONG *aGuestAddress);
+
     struct Data;
     Data*  m;