diff options
Diffstat (limited to 'src/VBox/Main/src-client/xpcom/module.cpp')
| -rw-r--r-- | src/VBox/Main/src-client/xpcom/module.cpp | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/VBox/Main/src-client/xpcom/module.cpp b/src/VBox/Main/src-client/xpcom/module.cpp index e646a3bd..f66603d6 100644 --- a/src/VBox/Main/src-client/xpcom/module.cpp +++ b/src/VBox/Main/src-client/xpcom/module.cpp @@ -48,7 +48,6 @@ #include "MouseImpl.h" #include "NATEngineImpl.h" #include "NetworkAdapterImpl.h" -#include "ProgressCombinedImpl.h" #include "ProgressImpl.h" #include "RemoteUSBDeviceImpl.h" #include "SessionImpl.h" @@ -60,9 +59,15 @@ // XPCOM glue code unfolding +NS_DECL_CLASSINFO(VirtualBoxClient) +NS_IMPL_THREADSAFE_ISUPPORTS1_CI(VirtualBoxClient, IVirtualBoxClient) +NS_DECL_CLASSINFO(Session) +NS_IMPL_THREADSAFE_ISUPPORTS2_CI(Session, ISession, IInternalSessionControl) + +#ifndef VBOX_COM_INPROC_API_CLIENT NS_DECL_CLASSINFO(Guest) NS_IMPL_THREADSAFE_ISUPPORTS1_CI(Guest, IGuest) -#ifdef VBOX_WITH_GUEST_CONTROL + #ifdef VBOX_WITH_GUEST_CONTROL NS_DECL_CLASSINFO(GuestDirectory) NS_IMPL_THREADSAFE_ISUPPORTS2_CI(GuestDirectory, IGuestDirectory, IDirectory) NS_DECL_CLASSINFO(GuestFile) @@ -73,7 +78,7 @@ NS_DECL_CLASSINFO(GuestProcess) NS_IMPL_THREADSAFE_ISUPPORTS2_CI(GuestProcess, IGuestProcess, IProcess) NS_DECL_CLASSINFO(GuestSession) NS_IMPL_THREADSAFE_ISUPPORTS1_CI(GuestSession, IGuestSession) -#endif + #endif NS_DECL_CLASSINFO(Keyboard) NS_IMPL_THREADSAFE_ISUPPORTS1_CI(Keyboard, IKeyboard) NS_DECL_CLASSINFO(Mouse) @@ -84,8 +89,6 @@ NS_DECL_CLASSINFO(MachineDebugger) NS_IMPL_THREADSAFE_ISUPPORTS1_CI(MachineDebugger, IMachineDebugger) NS_DECL_CLASSINFO(Progress) NS_IMPL_THREADSAFE_ISUPPORTS1_CI(Progress, IProgress) -NS_DECL_CLASSINFO(CombinedProgress) -NS_IMPL_THREADSAFE_ISUPPORTS1_CI(CombinedProgress, IProgress) NS_DECL_CLASSINFO(OUSBDevice) NS_IMPL_THREADSAFE_ISUPPORTS1_CI(OUSBDevice, IUSBDevice) NS_DECL_CLASSINFO(RemoteUSBDevice) @@ -94,24 +97,22 @@ NS_DECL_CLASSINFO(SharedFolder) NS_IMPL_THREADSAFE_ISUPPORTS1_CI(SharedFolder, ISharedFolder) NS_DECL_CLASSINFO(VRDEServerInfo) NS_IMPL_THREADSAFE_ISUPPORTS1_CI(VRDEServerInfo, IVRDEServerInfo) -#ifdef VBOX_WITH_EXTPACK -NS_DECL_CLASSINFO(ExtPackFile) -NS_IMPL_THREADSAFE_ISUPPORTS2_CI(ExtPackFile, IExtPackFile, IExtPackBase) + #ifdef VBOX_WITH_EXTPACK +// deliberately omit ExtPackFile as it's unusable in the client context +// NS_DECL_CLASSINFO(ExtPackFile) +// NS_IMPL_THREADSAFE_ISUPPORTS2_CI(ExtPackFile, IExtPackFile, IExtPackBase) NS_DECL_CLASSINFO(ExtPack) NS_IMPL_THREADSAFE_ISUPPORTS2_CI(ExtPack, IExtPack, IExtPackBase) NS_DECL_CLASSINFO(ExtPackManager) NS_IMPL_THREADSAFE_ISUPPORTS1_CI(ExtPackManager, IExtPackManager) -#endif + #endif NS_DECL_CLASSINFO(AdditionsFacility) NS_IMPL_THREADSAFE_ISUPPORTS1_CI(AdditionsFacility, IAdditionsFacility) -NS_DECL_CLASSINFO(Session) -NS_IMPL_THREADSAFE_ISUPPORTS2_CI(Session, ISession, IInternalSessionControl) NS_DECL_CLASSINFO(Console) NS_IMPL_THREADSAFE_ISUPPORTS1_CI(Console, IConsole) -NS_DECL_CLASSINFO(VirtualBoxClient) -NS_IMPL_THREADSAFE_ISUPPORTS1_CI(VirtualBoxClient, IVirtualBoxClient) +#endif /* VBOX_COM_INPROC_API_CLIENT */ /** * Singleton class factory that holds a reference to the created instance |