Changeset 21878 in vbox for trunk/src/VBox/Main/glue

Timestamp:

Jul 30, 2009 12:42:08 PM (15 years ago)

Author:

vboxsync

Message:

Main: coding style: have Main obey the standard VirtualBox coding style rules (no functional changes)

Location:

trunk/src/VBox/Main/glue

Files:

• ErrorInfo.cpp (modified) (13 diffs)
• EventQueue.cpp (modified) (3 diffs)
• SupportErrorInfo.cpp (modified) (13 diffs)
• VirtualBoxErrorInfo.cpp (modified) (12 diffs)
• com.cpp (modified) (5 diffs)
• initterm.cpp (modified) (9 diffs)

trunk/src/VBox/Main/glue/ErrorInfo.cpp

@@ -54 +54 @@
 #if !defined (VBOX_WITH_XPCOM)
 
-    ComPtr <IErrorInfo> err;
+    ComPtr<IErrorInfo> err;
     rc = ::GetErrorInfo (0, err.asOutParam());
     if (rc == S_OK && err)
@@ -61 +61 @@
             mErrorInfo = err;
 
-        ComPtr <IVirtualBoxErrorInfo> info;
-        rc = err.queryInterfaceTo (info.asOutParam());
-        if (SUCCEEDED (rc) && info)
+        ComPtr<IVirtualBoxErrorInfo> info;
+        rc = err.queryInterfaceTo(info.asOutParam());
+        if (SUCCEEDED(rc) && info)
             init (info);
 
@@ -71 +71 @@
 
             rc = err->GetGUID (mInterfaceID.asOutParam());
-            gotSomething |= SUCCEEDED (rc);
-            if (SUCCEEDED (rc))
+            gotSomething |= SUCCEEDED(rc);
+            if (SUCCEEDED(rc))
                 GetInterfaceNameByIID (mInterfaceID, mInterfaceName.asOutParam());
 
             rc = err->GetSource (mComponent.asOutParam());
-            gotSomething |= SUCCEEDED (rc);
+            gotSomething |= SUCCEEDED(rc);
 
             rc = err->GetDescription (mText.asOutParam());
-            gotSomething |= SUCCEEDED (rc);
+            gotSomething |= SUCCEEDED(rc);
 
             if (gotSomething)
@@ -92 +92 @@
     nsCOMPtr <nsIExceptionService> es;
     es = do_GetService (NS_EXCEPTIONSERVICE_CONTRACTID, &rc);
-    if (NS_SUCCEEDED (rc))
+    if (NS_SUCCEEDED(rc))
     {
         nsCOMPtr <nsIExceptionManager> em;
         rc = es->GetCurrentExceptionManager (getter_AddRefs (em));
-        if (NS_SUCCEEDED (rc))
+        if (NS_SUCCEEDED(rc))
         {
-            ComPtr <nsIException> ex;
+            ComPtr<nsIException> ex;
             rc = em->GetCurrentException (ex.asOutParam());
-            if (NS_SUCCEEDED (rc) && ex)
+            if (NS_SUCCEEDED(rc) && ex)
             {
                 if (aKeepObj)
                     mErrorInfo = ex;
 
-                ComPtr <IVirtualBoxErrorInfo> info;
-                rc = ex.queryInterfaceTo (info.asOutParam());
-                if (NS_SUCCEEDED (rc) && info)
+                ComPtr<IVirtualBoxErrorInfo> info;
+                rc = ex.queryInterfaceTo(info.asOutParam());
+                if (NS_SUCCEEDED(rc) && info)
                     init (info);
 
@@ -115 +115 @@
 
                     rc = ex->GetResult (&mResultCode);
-                    gotSomething |= NS_SUCCEEDED (rc);
+                    gotSomething |= NS_SUCCEEDED(rc);
 
                     Utf8Str message;
                     rc = ex->GetMessage(message.asOutParam());
                     message.jolt();
-                    gotSomething |= NS_SUCCEEDED (rc);
-                    if (NS_SUCCEEDED (rc))
+                    gotSomething |= NS_SUCCEEDED(rc);
+                    if (NS_SUCCEEDED(rc))
                         mText = message;
 
@@ -151 +151 @@
 #if !defined (VBOX_WITH_XPCOM)
 
-    ComPtr <IUnknown> iface = aI;
-    ComPtr <ISupportErrorInfo> serr;
-    HRESULT rc = iface.queryInterfaceTo (serr.asOutParam());
-    if (SUCCEEDED (rc))
+    ComPtr<IUnknown> iface = aI;
+    ComPtr<ISupportErrorInfo> serr;
+    HRESULT rc = iface.queryInterfaceTo(serr.asOutParam());
+    if (SUCCEEDED(rc))
     {
         rc = serr->InterfaceSupportsErrorInfo (aIID);
-        if (SUCCEEDED (rc))
+        if (SUCCEEDED(rc))
             init (aKeepObj);
     }
@@ -184 +184 @@
 
     rc = info->COMGETTER(ResultCode) (&lrc); mResultCode = lrc;
-    gotSomething |= SUCCEEDED (rc);
-    gotAll &= SUCCEEDED (rc);
+    gotSomething |= SUCCEEDED(rc);
+    gotAll &= SUCCEEDED(rc);
 
     Bstr iid;
     rc = info->COMGETTER(InterfaceID) (iid.asOutParam());
-    gotSomething |= SUCCEEDED (rc);
-    gotAll &= SUCCEEDED (rc);
-    if (SUCCEEDED (rc))
+    gotSomething |= SUCCEEDED(rc);
+    gotAll &= SUCCEEDED(rc);
+    if (SUCCEEDED(rc))
     {
         mInterfaceID = iid;
@@ -198 +198 @@
 
     rc = info->COMGETTER(Component) (mComponent.asOutParam());
-    gotSomething |= SUCCEEDED (rc);
-    gotAll &= SUCCEEDED (rc);
+    gotSomething |= SUCCEEDED(rc);
+    gotAll &= SUCCEEDED(rc);
 
     rc = info->COMGETTER(Text) (mText.asOutParam());
-    gotSomething |= SUCCEEDED (rc);
-    gotAll &= SUCCEEDED (rc);
-
-    ComPtr <IVirtualBoxErrorInfo> next;
+    gotSomething |= SUCCEEDED(rc);
+    gotAll &= SUCCEEDED(rc);
+
+    ComPtr<IVirtualBoxErrorInfo> next;
     rc = info->COMGETTER(Next) (next.asOutParam());
-    if (SUCCEEDED (rc) && !next.isNull())
+    if (SUCCEEDED(rc) && !next.isNull())
     {
         mNext.reset (new ErrorInfo (next));
@@ -216 +216 @@
     else
         mNext.reset();
-    gotSomething |= SUCCEEDED (rc);
-    gotAll &= SUCCEEDED (rc);
+    gotSomething |= SUCCEEDED(rc);
+    gotAll &= SUCCEEDED(rc);
 
     mIsBasicAvailable = gotSomething;
@@ -239 +239 @@
         return;
 
-    ComPtr <IVirtualBoxErrorInfo> info;
+    ComPtr<IVirtualBoxErrorInfo> info;
     HRESULT rc = progress->COMGETTER(ErrorInfo) (info.asOutParam());
-    if (SUCCEEDED (rc) && info)
+    if (SUCCEEDED(rc) && info)
         init (info);
 }
@@ -257 +257 @@
 #if !defined (VBOX_WITH_XPCOM)
 
-    ComPtr <IErrorInfo> err;
+    ComPtr<IErrorInfo> err;
     if (!mErrorInfo.isNull())
     {
-        rc = mErrorInfo.queryInterfaceTo (err.asOutParam());
+        rc = mErrorInfo.queryInterfaceTo(err.asOutParam());
         AssertComRC (rc);
     }
@@ -269 +269 @@
     nsCOMPtr <nsIExceptionService> es;
     es = do_GetService (NS_EXCEPTIONSERVICE_CONTRACTID, &rc);
-    if (NS_SUCCEEDED (rc))
+    if (NS_SUCCEEDED(rc))
     {
         nsCOMPtr <nsIExceptionManager> em;
         rc = es->GetCurrentExceptionManager (getter_AddRefs (em));
-        if (NS_SUCCEEDED (rc))
+        if (NS_SUCCEEDED(rc))
         {
-            ComPtr <nsIException> ex;
+            ComPtr<nsIException> ex;
             if (!mErrorInfo.isNull())
             {
-                rc = mErrorInfo.queryInterfaceTo (ex.asOutParam());
+                rc = mErrorInfo.queryInterfaceTo(ex.asOutParam());
                 AssertComRC (rc);
             }
@@ -287 +287 @@
 #endif // !defined (VBOX_WITH_XPCOM)
 
-    if (SUCCEEDED (rc))
+    if (SUCCEEDED(rc))
     {
         mErrorInfo.setNull();

trunk/src/VBox/Main/glue/EventQueue.cpp

@@ -92 +92 @@
     nsresult rc = NS_GetEventQueueService (getter_AddRefs (mEventQService));
 
-    if (NS_SUCCEEDED (rc))
+    if (NS_SUCCEEDED(rc))
     {
         rc = mEventQService->GetThreadEventQueue (NS_CURRENT_THREAD,
@@ -99 +99 @@
         {
             rc = mEventQService->CreateMonitoredThreadEventQueue();
-            if (NS_SUCCEEDED (rc))
+            if (NS_SUCCEEDED(rc))
             {
                 mEQCreated = TRUE;
@@ -151 +151 @@
     mEventQ->InitEvent (ev, this, plEventHandler, plEventDestructor);
     HRESULT rc = mEventQ->PostEvent (ev);
-    return NS_SUCCEEDED (rc);
+    return NS_SUCCEEDED(rc);
 
 #endif

trunk/src/VBox/Main/glue/SupportErrorInfo.cpp

@@ -114 +114 @@
     {
         /* these are mandatory, others -- not */
-        AssertReturn ((!aWarning && FAILED (aResultCode)) ||
+        AssertReturn((!aWarning && FAILED (aResultCode)) ||
                       (aWarning && aResultCode != S_OK),
                       E_FAIL);
-        AssertReturn (aText != NULL, E_FAIL);
-        AssertReturn (*aText != '\0', E_FAIL);
+        AssertReturn(aText != NULL, E_FAIL);
+        AssertReturn(*aText != '\0', E_FAIL);
 
         /* reset the error severity bit if it's a warning */
@@ -129 +129 @@
     do
     {
-        ComPtr <IVirtualBoxErrorInfo> info;
+        ComPtr<IVirtualBoxErrorInfo> info;
 
 #if !defined (VBOX_WITH_XPCOM)
 
-        ComPtr <IVirtualBoxErrorInfo> curInfo;
+        ComPtr<IVirtualBoxErrorInfo> curInfo;
         if (preserve)
         {
             /* get the current error info if any */
-            ComPtr <IErrorInfo> err;
+            ComPtr<IErrorInfo> err;
             rc = ::GetErrorInfo (0, err.asOutParam());
             CheckComRCBreakRC (rc);
-            rc = err.queryInterfaceTo (curInfo.asOutParam());
+            rc = err.queryInterfaceTo(curInfo.asOutParam());
             if (FAILED (rc))
             {
                 /* create a IVirtualBoxErrorInfo wrapper for the native
                  * IErrorInfo object */
-                ComObjPtr <VirtualBoxErrorInfo> wrapper;
+                ComObjPtr<VirtualBoxErrorInfo> wrapper;
                 rc = wrapper.createObject();
-                if (SUCCEEDED (rc))
+                if (SUCCEEDED(rc))
                 {
                     rc = wrapper->init (err);
-                    if (SUCCEEDED (rc))
+                    if (SUCCEEDED(rc))
                         curInfo = wrapper;
                 }
@@ -156 +156 @@
         }
         /* On failure, curInfo will stay null */
-        Assert (SUCCEEDED (rc) || curInfo.isNull());
+        Assert (SUCCEEDED(rc) || curInfo.isNull());
 
         /* set the current error info and preserve the previous one if any */
@@ -167 +167 @@
             else
             {
-                ComObjPtr <VirtualBoxErrorInfoGlue> infoObj;
+                ComObjPtr<VirtualBoxErrorInfoGlue> infoObj;
                 rc = infoObj.createObject();
                 CheckComRCBreakRC (rc);
@@ -183 +183 @@
         else
         {
-            ComObjPtr <VirtualBoxErrorInfo> infoObj;
+            ComObjPtr<VirtualBoxErrorInfo> infoObj;
             rc = infoObj.createObject();
             CheckComRCBreakRC (rc);
@@ -193 +193 @@
         }
 
-        ComPtr <IErrorInfo> err;
-        rc = info.queryInterfaceTo (err.asOutParam());
-        if (SUCCEEDED (rc))
+        ComPtr<IErrorInfo> err;
+        rc = info.queryInterfaceTo(err.asOutParam());
+        if (SUCCEEDED(rc))
             rc = ::SetErrorInfo (0, err);
 
@@ -202 +202 @@
         nsCOMPtr <nsIExceptionService> es;
         es = do_GetService (NS_EXCEPTIONSERVICE_CONTRACTID, &rc);
-        if (NS_SUCCEEDED (rc))
+        if (NS_SUCCEEDED(rc))
         {
             nsCOMPtr <nsIExceptionManager> em;
@@ -208 +208 @@
             CheckComRCBreakRC (rc);
 
-            ComPtr <IVirtualBoxErrorInfo> curInfo;
+            ComPtr<IVirtualBoxErrorInfo> curInfo;
             if (preserve)
             {
                 /* get the current error info if any */
-                ComPtr <nsIException> ex;
+                ComPtr<nsIException> ex;
                 rc = em->GetCurrentException (ex.asOutParam());
                 CheckComRCBreakRC (rc);
-                rc = ex.queryInterfaceTo (curInfo.asOutParam());
+                rc = ex.queryInterfaceTo(curInfo.asOutParam());
                 if (FAILED (rc))
                 {
                     /* create a IVirtualBoxErrorInfo wrapper for the native
                      * nsIException object */
-                    ComObjPtr <VirtualBoxErrorInfo> wrapper;
+                    ComObjPtr<VirtualBoxErrorInfo> wrapper;
                     rc = wrapper.createObject();
-                    if (SUCCEEDED (rc))
+                    if (SUCCEEDED(rc))
                     {
                         rc = wrapper->init (ex);
-                        if (SUCCEEDED (rc))
+                        if (SUCCEEDED(rc))
                             curInfo = wrapper;
                     }
@@ -231 +231 @@
             }
             /* On failure, curInfo will stay null */
-            Assert (SUCCEEDED (rc) || curInfo.isNull());
+            Assert (SUCCEEDED(rc) || curInfo.isNull());
 
             /* set the current error info and preserve the previous one if any */
@@ -242 +242 @@
                 else
                 {
-                    ComObjPtr <VirtualBoxErrorInfoGlue> infoObj;
+                    ComObjPtr<VirtualBoxErrorInfoGlue> infoObj;
                     rc = infoObj.createObject();
                     CheckComRCBreakRC (rc);
@@ -259 +259 @@
             else
             {
-                ComObjPtr <VirtualBoxErrorInfo> infoObj;
+                ComObjPtr<VirtualBoxErrorInfo> infoObj;
                 rc = infoObj.createObject();
                 CheckComRCBreakRC (rc);
@@ -269 +269 @@
             }
 
-            ComPtr <nsIException> ex;
-            rc = info.queryInterfaceTo (ex.asOutParam());
-            if (SUCCEEDED (rc))
+            ComPtr<nsIException> ex;
+            rc = info.queryInterfaceTo(ex.asOutParam());
+            if (SUCCEEDED(rc))
                 rc = em->SetCurrentException (ex);
         }
@@ -298 +298 @@
     AssertComRC (rc);
 
-    return SUCCEEDED (rc) ? aResultCode : rc;
+    return SUCCEEDED(rc) ? aResultCode : rc;
 }
 

trunk/src/VBox/Main/glue/VirtualBoxErrorInfo.cpp

@@ -74 +74 @@
         return E_POINTER;
 
-    mIID.toUtf16().cloneTo (aIID);
+    mIID.toUtf16().cloneTo(aIID);
     return S_OK;
 }
@@ -83 +83 @@
         return E_POINTER;
 
-    mComponent.cloneTo (aComponent);
+    mComponent.cloneTo(aComponent);
     return S_OK;
 }
@@ -92 +92 @@
         return E_POINTER;
 
-    mText.cloneTo (aText);
+    mText.cloneTo(aText);
     return S_OK;
 }
@@ -102 +102 @@
 
     /* this will set aNext to NULL if mNext is null */
-    return mNext.queryInterfaceTo (aNext);
+    return mNext.queryInterfaceTo(aNext);
 }
 
@@ -113 +113 @@
 HRESULT VirtualBoxErrorInfo::init (IErrorInfo *aInfo)
 {
-    AssertReturn (aInfo, E_FAIL);
+    AssertReturn(aInfo, E_FAIL);
 
     HRESULT rc = S_OK;
@@ -172 +172 @@
 HRESULT VirtualBoxErrorInfo::init (nsIException *aInfo)
 {
-    AssertReturn (aInfo, E_FAIL);
+    AssertReturn(aInfo, E_FAIL);
 
     HRESULT rc = S_OK;
@@ -200 +200 @@
         return NS_ERROR_INVALID_POINTER;
 
-    Utf8Str (mText).cloneTo (aMessage);
+    Utf8Str (mText).cloneTo(aMessage);
     return S_OK;
 }
@@ -250 +250 @@
 NS_IMETHODIMP VirtualBoxErrorInfo::GetInner (nsIException **aInner)
 {
-    ComPtr <IVirtualBoxErrorInfo> info;
+    ComPtr<IVirtualBoxErrorInfo> info;
     nsresult rv = COMGETTER(Next) (info.asOutParam());
-    CheckComRCReturnRC (rv);
-    return info.queryInterfaceTo (aInner);
+    CheckComRCReturnRC(rv);
+    return info.queryInterfaceTo(aInner);
 }
 
@@ -289 +289 @@
                                        IVirtualBoxErrorInfo *aTail)
 {
-    AssertReturn (aHead != NULL, E_INVALIDARG);
-    AssertReturn (aTail != NULL, E_INVALIDARG);
+    AssertReturn(aHead != NULL, E_INVALIDARG);
+    AssertReturn(aTail != NULL, E_INVALIDARG);
 
     HRESULT rc = S_OK;
 
-    typedef std::list <ComPtr <IVirtualBoxErrorInfo> > List;
+    typedef std::list <ComPtr<IVirtualBoxErrorInfo> > List;
     List list;
 
-    ComPtr <IVirtualBoxErrorInfo> cur = aHead;
+    ComPtr<IVirtualBoxErrorInfo> cur = aHead;
 
     do
     {
-        ComPtr <IVirtualBoxErrorInfo> next;
+        ComPtr<IVirtualBoxErrorInfo> next;
         rc = cur->COMGETTER(Next) (next.asOutParam());
-        CheckComRCReturnRC (rc);
+        CheckComRCReturnRC(rc);
 
         if (next.isNull())
@@ -323 +323 @@
     for (List::iterator it = list.end(), prev = it; it != list.begin(); -- it)
     {
-        ComObjPtr <VirtualBoxErrorInfoGlue> wrapper;
+        ComObjPtr<VirtualBoxErrorInfoGlue> wrapper;
         rc = wrapper.createObject();
         CheckComRCBreakRC (rc);
@@ -354 +354 @@
                                                 IVirtualBoxErrorInfo *aNext)
 {
-    AssertReturn (aReal != NULL, E_INVALIDARG);
+    AssertReturn(aReal != NULL, E_INVALIDARG);
 
     mReal = aReal;
@@ -371 +371 @@
 
     /* this will set aNext to NULL if mNext is null */
-    return mNext.queryInterfaceTo (aNext);
+    return mNext.queryInterfaceTo(aNext);
 }
 

trunk/src/VBox/Main/glue/com.cpp

@@ -113 +113 @@
     nsCOMPtr <nsIInterfaceInfoManager> iim =
         do_GetService (NS_INTERFACEINFOMANAGER_SERVICE_CONTRACTID, &rv);
-    if (NS_SUCCEEDED (rv))
+    if (NS_SUCCEEDED(rv))
     {
         nsCOMPtr <nsIInterfaceInfo> iinfo;
         rv = iim->GetInfoForIID (&aIID, getter_AddRefs (iinfo));
-        if (NS_SUCCEEDED (rv))
+        if (NS_SUCCEEDED(rv))
         {
             const char *iname = NULL;
             iinfo->GetNameShared (&iname);
             char *utf8IName = NULL;
-            if (RT_SUCCESS (RTStrCurrentCPToUtf8 (&utf8IName, iname)))
+            if (RT_SUCCESS(RTStrCurrentCPToUtf8 (&utf8IName, iname)))
             {
                 PRTUTF16 utf16IName = NULL;
-                if (RT_SUCCESS (RTStrToUtf16 (utf8IName, &utf16IName)))
+                if (RT_SUCCESS(RTStrToUtf16 (utf8IName, &utf16IName)))
                 {
                     *aName = SysAllocString ((OLECHAR *) utf16IName);
@@ -140 +140 @@
 int GetVBoxUserHomeDirectory (char *aDir, size_t aDirLen)
 {
-    AssertReturn (aDir, VERR_INVALID_POINTER);
-    AssertReturn (aDirLen > 0, VERR_BUFFER_OVERFLOW);
+    AssertReturn(aDir, VERR_INVALID_POINTER);
+    AssertReturn(aDirLen > 0, VERR_BUFFER_OVERFLOW);
 
     /* start with null */
@@ -156 +156 @@
         char *VBoxUserHomeUtf8 = NULL;
         vrc = RTStrCurrentCPToUtf8 (&VBoxUserHomeUtf8, VBoxUserHome);
-        if (RT_SUCCESS (vrc))
+        if (RT_SUCCESS(vrc))
         {
             vrc = RTPathAbs (VBoxUserHomeUtf8, path, sizeof (path));
-            if (RT_SUCCESS (vrc))
+            if (RT_SUCCESS(vrc))
             {
                 if (aDirLen < strlen (path) + 1)
@@ -173 +173 @@
         /* compose the config directory (full path) */
         vrc = RTPathUserHome (path, sizeof (path));
-        if (RT_SUCCESS (vrc))
+        if (RT_SUCCESS(vrc))
         {
             size_t len =
@@ -184 +184 @@
 
     /* ensure the home directory exists */
-    if (RT_SUCCESS (vrc))
+    if (RT_SUCCESS(vrc))
         if (!RTDirExists (aDir))
             vrc = RTDirCreateFullPath (aDir, 0777);

trunk/src/VBox/Main/glue/initterm.cpp

@@ -133 +133 @@
                                 const char *aCurrProcDirLocation)
 {
-    AssertReturn (aCompRegLocation, NS_ERROR_INVALID_ARG);
-    AssertReturn (aXPTIDatLocation, NS_ERROR_INVALID_ARG);
+    AssertReturn(aCompRegLocation, NS_ERROR_INVALID_ARG);
+    AssertReturn(aXPTIDatLocation, NS_ERROR_INVALID_ARG);
 
     int vrc = RTStrUtf8ToCurrentCP (&mCompRegLocation, aCompRegLocation);
-    if (RT_SUCCESS (vrc))
+    if (RT_SUCCESS(vrc))
         vrc = RTStrUtf8ToCurrentCP (&mXPTIDatLocation, aXPTIDatLocation);
-    if (RT_SUCCESS (vrc) && aComponentDirLocation)
+    if (RT_SUCCESS(vrc) && aComponentDirLocation)
         vrc = RTStrUtf8ToCurrentCP (&mComponentDirLocation, aComponentDirLocation);
-    if (RT_SUCCESS (vrc) && aCurrProcDirLocation)
+    if (RT_SUCCESS(vrc) && aCurrProcDirLocation)
         vrc = RTStrUtf8ToCurrentCP (&mCurrProcDirLocation, aCurrProcDirLocation);
 
-    return RT_SUCCESS (vrc) ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+    return RT_SUCCESS(vrc) ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
 }
 
@@ -326 +326 @@
         rc = NS_GetMainEventQ (getter_AddRefs (eventQ));
 
-        if (NS_SUCCEEDED (rc))
+        if (NS_SUCCEEDED(rc))
         {
             PRBool isOnMainThread = PR_FALSE;
             rc = eventQ->IsOnCurrentThread (&isOnMainThread);
-            if (NS_SUCCEEDED (rc) && isOnMainThread)
+            if (NS_SUCCEEDED(rc) && isOnMainThread)
                 ++ gXPCOMInitCount;
         }
@@ -395 +395 @@
             vrc = RTPathAppPrivateArch (appHomeDir, sizeof (appHomeDir));
             AssertRC (vrc);
-            if (RT_FAILURE (vrc))
+            if (RT_FAILURE(vrc))
             {
                 rc = NS_ERROR_FAILURE;
@@ -431 +431 @@
             char *appDirCP = NULL;
             vrc = RTStrUtf8ToCurrentCP (&appDirCP, appHomeDir);
-            if (RT_SUCCESS (vrc))
+            if (RT_SUCCESS(vrc))
             {
                 nsCOMPtr <nsILocalFile> file;
                 rc = NS_NewNativeLocalFile (nsEmbedCString (appDirCP),
                                             PR_FALSE, getter_AddRefs (file));
-                if (NS_SUCCEEDED (rc))
+                if (NS_SUCCEEDED(rc))
                     appDir = do_QueryInterface (file, &rc);
 
@@ -452 +452 @@
             char *pathCP = NULL;
             vrc = RTStrUtf8ToCurrentCP (&pathCP, appHomeDir);
-            if (RT_SUCCESS (vrc))
+            if (RT_SUCCESS(vrc))
             {
                 vrc = RTEnvSet ("VBOX_XPCOM_HOME", pathCP);
@@ -466 +466 @@
                                 appDir, dsProv);
 
-            if (NS_SUCCEEDED (rc))
+            if (NS_SUCCEEDED(rc))
             {
                 nsCOMPtr <nsIComponentRegistrar> registrar =
                     do_QueryInterface (serviceManager, &rc);
-                if (NS_SUCCEEDED (rc))
+                if (NS_SUCCEEDED(rc))
                 {
                     rc = registrar->AutoRegister (nsnull);
-                    if (NS_SUCCEEDED (rc))
+                    if (NS_SUCCEEDED(rc))
                     {
                         /* We succeeded, stop probing paths */
@@ -513 +513 @@
     rc = NS_GetMainEventQ (getter_AddRefs (eventQ));
 
-    if (NS_SUCCEEDED (rc) || rc == NS_ERROR_NOT_AVAILABLE)
+    if (NS_SUCCEEDED(rc) || rc == NS_ERROR_NOT_AVAILABLE)
     {
         /* NS_ERROR_NOT_AVAILABLE seems to mean that
@@ -523 +523 @@
 
         PRBool isOnMainThread = PR_FALSE;
-        if (NS_SUCCEEDED (rc))
+        if (NS_SUCCEEDED(rc))
         {
             rc = eventQ->IsOnCurrentThread (&isOnMainThread);
@@ -534 +534 @@
         }
 
-        if (NS_SUCCEEDED (rc) && isOnMainThread)
+        if (NS_SUCCEEDED(rc) && isOnMainThread)
         {
             /* only the main thread needs to uninitialize XPCOM and only if