Changeset 52442 in vbox for trunk/src/VBox/Main/include/VirtualBoxClientImpl.h

Timestamp:

Aug 21, 2014 4:03:15 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

95649

Message:

Main: convert VirtualBoxClient and VRDEServerInfo to use wrappers

File:

• trunk/src/VBox/Main/include/VirtualBoxClientImpl.h (modified) (5 diffs)

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20 +20 @@
 #define ____H_VIRTUALBOXCLIENTIMPL
 
-#include "VirtualBoxBase.h"
+#include "VirtualBoxClientWrap.h"
 #include "EventImpl.h"
 
@@ -28 +28 @@
 
 class ATL_NO_VTABLE VirtualBoxClient :
-    public VirtualBoxBase,
-    VBOX_SCRIPTABLE_IMPL(IVirtualBoxClient)
+    public VirtualBoxClientWrap
 #ifdef RT_OS_WINDOWS
     , public CComCoClass<VirtualBoxClient, &CLSID_VirtualBoxClient>
@@ -35 +34 @@
 {
 public:
-
-    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(VirtualBoxClient, IVirtualBoxClient)
-
     DECLARE_CLASSFACTORY()
 
     DECLARE_REGISTRY_RESOURCEID(IDR_VIRTUALBOX)
+
     DECLARE_NOT_AGGREGATABLE(VirtualBoxClient)
-
-    DECLARE_PROTECT_FINAL_CONSTRUCT()
-
-    BEGIN_COM_MAP(VirtualBoxClient)
-        VBOX_DEFAULT_INTERFACE_ENTRIES(IVirtualBoxClient)
-    END_COM_MAP()
 
     HRESULT FinalConstruct();
@@ -56 +47 @@
     void uninit();
 
-    // IUSBDevice properties
-    STDMETHOD(COMGETTER(VirtualBox))(IVirtualBox **aVirtualBox);
-    STDMETHOD(COMGETTER(Session))(ISession **aSession);
-    STDMETHOD(COMGETTER(EventSource))(IEventSource **aEventSource);
-    STDMETHOD(CheckMachineError)(IMachine *aMachine);
+private:
+    // wrapped IVirtualBoxClient properties
+    virtual HRESULT getVirtualBox(ComPtr<IVirtualBox> &aVirtualBox);
+    virtual HRESULT getSession(ComPtr<ISession> &aSession);
+    virtual HRESULT getEventSource(ComPtr<IEventSource> &aEventSource);
 
-private:
+    // wrapped IVirtualBoxClient methods
+    virtual HRESULT checkMachineError(const ComPtr<IMachine> &aMachine);
+
     /** Instance counter for simulating something similar to a singleton.
      * Only the first instance will be a usable object, all additional