summaryrefslogtreecommitdiff
path: root/src/VBox/Main/src-client/xpcom/module.cpp
diff options
context:
space:
mode:
authorvboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>2019-01-01 20:13:07 +0000
committervboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>2019-01-01 20:13:07 +0000
commitfd40cef259ece463f0b9b8afa932627298001020 (patch)
tree3e815c25c5a02f78b388eff8d6c94aa053646537 /src/VBox/Main/src-client/xpcom/module.cpp
parentbab1ece54275c4194ac417ef07d88fdc51d70606 (diff)
downloadVirtualBox-svn-fd40cef259ece463f0b9b8afa932627298001020.tar.gz
Main: Don't use Logging.h.
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@76592 cfe28804-0f27-0410-a406-dd0f0b0b656f
Diffstat (limited to 'src/VBox/Main/src-client/xpcom/module.cpp')
-rw-r--r--src/VBox/Main/src-client/xpcom/module.cpp18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/VBox/Main/src-client/xpcom/module.cpp b/src/VBox/Main/src-client/xpcom/module.cpp
index 9e385cbf86d..e0bc2065c30 100644
--- a/src/VBox/Main/src-client/xpcom/module.cpp
+++ b/src/VBox/Main/src-client/xpcom/module.cpp
@@ -1,6 +1,5 @@
/* $Id$ */
/** @file
- *
* XPCOM module implementation functions
*/
@@ -16,6 +15,8 @@
* hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
*/
+#define LOG_GROUP LOG_GROUP_MAIN
+
/* Make sure all the stdint.h macros are included - must come first! */
#ifndef __STDC_LIMIT_MACROS
# define __STDC_LIMIT_MACROS
@@ -34,8 +35,6 @@
#include "RemoteUSBDeviceImpl.h"
#include "USBDeviceImpl.h"
-#include "Logging.h"
-
// XPCOM glue code unfolding
/*
@@ -69,28 +68,35 @@ public:
FinalRelease();
instance = 0;
}
+
static nsresult GetInstance(VirtualBoxClient **inst)
{
int rv = NS_OK;
if (instance == 0)
{
instance = new VirtualBoxClientClassFactory();
- if (instance) {
+ if (instance)
+ {
instance->AddRef(); // protect FinalConstruct()
rv = instance->FinalConstruct();
if (NS_FAILED(rv))
instance->Release();
else
instance->AddRef(); // self-reference
- } else {
+ }
+ else
+ {
rv = NS_ERROR_OUT_OF_MEMORY;
}
- } else {
+ }
+ else
+ {
instance->AddRef();
}
*inst = instance;
return rv;
}
+
static nsresult FactoryDestructor()
{
if (instance)