Changeset 26186 in vbox for trunk/src/VBox/Main

Timestamp:

Feb 3, 2010 1:07:12 PM (15 years ago)

Author:

vboxsync

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

57205

Message:

Main: coding style fixes

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl2.cpp (modified) (5 diffs)
• ConsoleVRDPServer.cpp (modified) (49 diffs)
• DHCPServerRunner.cpp (modified) (2 diffs)
• DisplayImpl.cpp (modified) (7 diffs)
• GuestImpl.cpp (modified) (1 diff)
• HostImpl.cpp (modified) (10 diffs)
• HostPower.cpp (modified) (7 diffs)
• KeyboardImpl.cpp (modified) (3 diffs)
• MachineImpl.cpp (modified) (57 diffs)
• Matching.cpp (modified) (2 diffs)
• MediumFormatImpl.cpp (modified) (3 diffs)
• MediumImpl.cpp (modified) (4 diffs)
• MouseImpl.cpp (modified) (2 diffs)
• NetworkAdapterImpl.cpp (modified) (10 diffs)
• ParallelPortImpl.cpp (modified) (3 diffs)
• PerformanceImpl.cpp (modified) (26 diffs)
• ProgressImpl.cpp (modified) (17 diffs)
• SerialPortImpl.cpp (modified) (2 diffs)
• SessionImpl.cpp (modified) (55 diffs)
• SharedFolderImpl.cpp (modified) (2 diffs)
• SnapshotImpl.cpp (modified) (22 diffs)
• StorageControllerImpl.cpp (modified) (12 diffs)
• SystemPropertiesImpl.cpp (modified) (2 diffs)
• USBControllerImpl.cpp (modified) (1 diff)
• VirtualBoxBase.cpp (modified) (16 diffs)
• VirtualBoxImpl.cpp (modified) (28 diffs)
• generic/NetIf-generic.cpp (modified) (1 diff)
• glue/ErrorInfo.cpp (modified) (3 diffs)
• glue/EventQueue.cpp (modified) (3 diffs)
• glue/SupportErrorInfo.cpp (modified) (19 diffs)
• glue/initterm.cpp (modified) (2 diffs)
• glue/string.cpp (modified) (4 diffs)
• hgcm/HGCMThread.cpp (modified) (4 diffs)
• include/AutoCaller.h (modified) (4 diffs)
• include/ConsoleImpl.h (modified) (6 diffs)
• include/ProgressCombinedImpl.h (modified) (1 diff)
• include/VirtualBoxBase.h (modified) (9 diffs)
• include/VirtualBoxErrorInfoImpl.h (modified) (1 diff)
• linux/HostHardwareLinux.cpp (modified) (20 diffs)
• testcase/tstVBoxAPILinux.cpp (modified) (1 diff)
• win/NetIf-win.cpp (modified) (2 diffs)
• win/svchlp.cpp (modified) (2 diffs)
• win/svcmain.cpp (modified) (1 diff)
• xpcom/server.cpp (modified) (1 diff)
• xpcom/server_module.cpp (modified) (4 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1035 +1035 @@
         {
             ComPtr<IMedium> medium;
-            hrc = atts [j]->COMGETTER(Medium)(medium.asOutParam());                             H();
+            hrc = atts[j]->COMGETTER(Medium)(medium.asOutParam());                              H();
             LONG lDev;
             hrc = atts[j]->COMGETTER(Device)(&lDev);                                            H();
@@ -2096 +2096 @@
     /* Register VM state change handler */
     int rc2 = VMR3AtStateRegister (pVM, Console::vmstateChangeCallback, pConsole);
-    AssertRC (rc2);
+    AssertRC(rc2);
     if (RT_SUCCESS(rc))
         rc = rc2;
@@ -2102 +2102 @@
     /* Register VM runtime error handler */
     rc2 = VMR3AtRuntimeErrorRegister (pVM, Console::setVMRuntimeErrorCallback, pConsole);
-    AssertRC (rc2);
+    AssertRC(rc2);
     if (RT_SUCCESS(rc))
         rc = rc2;
@@ -2306 +2306 @@
             }
 
-            Assert ((int)pThis->maTapFD[uInstance] >= 0);
+            Assert((int)pThis->maTapFD[uInstance] >= 0);
             if ((int)pThis->maTapFD[uInstance] >= 0)
             {
@@ -2514 +2514 @@
                 }
 
-                Assert ((int)pThis->maTapFD[uInstance] >= 0);
+                Assert((int)pThis->maTapFD[uInstance] >= 0);
                 if ((int)pThis->maTapFD[uInstance] >= 0)
                 {

trunk/src/VBox/Main/ConsoleVRDPServer.cpp

@@ -46 +46 @@
 {
 public:
-    VRDPConsoleCallback (ConsoleVRDPServer *server) :
-        m_server(server)
+    VRDPConsoleCallback(ConsoleVRDPServer *server)
+        : m_server(server)
     {
 #ifndef VBOX_WITH_XPCOM
@@ -60 +60 @@
 #ifndef VBOX_WITH_XPCOM
     STDMETHOD_(ULONG, AddRef)() {
-        return ::InterlockedIncrement (&refcnt);
+        return ::InterlockedIncrement(&refcnt);
     }
     STDMETHOD_(ULONG, Release)()
     {
-        long cnt = ::InterlockedDecrement (&refcnt);
+        long cnt = ::InterlockedDecrement(&refcnt);
         if (cnt == 0)
             delete this;
         return cnt;
     }
-    STDMETHOD(QueryInterface) (REFIID riid , void **ppObj)
+    STDMETHOD(QueryInterface)(REFIID riid , void **ppObj)
     {
         if (riid == IID_IUnknown) {
@@ -103 +103 @@
         if (m_server)
         {
-            m_server->NotifyKeyboardLedsChange (fNumLock, fCapsLock, fScrollLock);
+            m_server->NotifyKeyboardLedsChange(fNumLock, fCapsLock, fScrollLock);
         }
         return S_OK;
@@ -128 +128 @@
     }
 
-    STDMETHOD(OnNetworkAdapterChange) (INetworkAdapter *aNetworkAdapter)
+    STDMETHOD(OnNetworkAdapterChange)(INetworkAdapter *aNetworkAdapter)
     {
         return S_OK;
     }
 
-    STDMETHOD(OnSerialPortChange) (ISerialPort *aSerialPort)
+    STDMETHOD(OnSerialPortChange)(ISerialPort *aSerialPort)
     {
         return S_OK;
     }
 
-    STDMETHOD(OnParallelPortChange) (IParallelPort *aParallelPort)
+    STDMETHOD(OnParallelPortChange)(IParallelPort *aParallelPort)
     {
         return S_OK;
     }
 
-    STDMETHOD(OnStorageControllerChange) ()
+    STDMETHOD(OnStorageControllerChange)()
     {
         return S_OK;
@@ -169 +169 @@
     }
 
-    STDMETHOD(OnSharedFolderChange) (Scope_T aScope)
+    STDMETHOD(OnSharedFolderChange)(Scope_T aScope)
     {
         return S_OK;
@@ -188 +188 @@
     }
 
-    STDMETHOD(OnShowWindow) (ULONG64 *winId)
+    STDMETHOD(OnShowWindow)(ULONG64 *winId)
     {
         if (!winId)
@@ -212 +212 @@
 #ifdef DEBUG_sunlover
 #define LOGDUMPPTR Log
-void dumpPointer (const uint8_t *pu8Shape, uint32_t width, uint32_t height, bool fXorMaskRGB32)
+void dumpPointer(const uint8_t *pu8Shape, uint32_t width, uint32_t height, bool fXorMaskRGB32)
 {
     unsigned i;
@@ -237 +237 @@
     if (fXorMaskRGB32)
     {
-        uint32_t *pu32Xor = (uint32_t *)(pu8Shape + ((((width + 7) / 8) * height + 3) & ~3));
+        uint32_t *pu32Xor = (uint32_t*)(pu8Shape + ((((width + 7) / 8) * height + 3) & ~3));
 
         for (i = 0; i < height; i++)
@@ -253 +253 @@
     {
         /* RDP 24 bit RGB mask. */
-        uint8_t *pu8Xor = (uint8_t *)(pu8Shape + ((((width + 7) / 8) * height + 3) & ~3));
+        uint8_t *pu8Xor = (uint8_t*)(pu8Shape + ((((width + 7) / 8) * height + 3) & ~3));
         for (i = 0; i < height; i++)
         {
@@ -271 +271 @@
 #endif /* DEBUG_sunlover */
 
-static void findTopLeftBorder (const uint8_t *pu8AndMask, const uint8_t *pu8XorMask, uint32_t width, uint32_t height, uint32_t *pxSkip, uint32_t *pySkip)
+static void findTopLeftBorder(const uint8_t *pu8AndMask, const uint8_t *pu8XorMask, uint32_t width, uint32_t height, uint32_t *pxSkip, uint32_t *pySkip)
 {
     /*
@@ -391 +391 @@
     }
 
-    *pxSkip = RT_MIN (xSkipAnd, xSkipXor);
-    *pySkip = RT_MIN (ySkipAnd, ySkipXor);
+    *pxSkip = RT_MIN(xSkipAnd, xSkipXor);
+    *pySkip = RT_MIN(ySkipAnd, ySkipXor);
 }
 
@@ -401 +401 @@
  * necessary, which we try to avoid.
  */
-static void mousePointerGenerateANDMask (uint8_t *pu8DstAndMask, int cbDstAndMask, const uint8_t *pu8SrcAlpha, int w, int h)
-{
-    memset (pu8DstAndMask, 0xFF, cbDstAndMask);
+static void mousePointerGenerateANDMask(uint8_t *pu8DstAndMask, int cbDstAndMask, const uint8_t *pu8SrcAlpha, int w, int h)
+{
+    memset(pu8DstAndMask, 0xFF, cbDstAndMask);
 
     int y;
@@ -431 +431 @@
 }
 
-STDMETHODIMP VRDPConsoleCallback::OnMousePointerShapeChange (
-    BOOL visible,
-    BOOL alpha,
-    ULONG xHot,
-    ULONG yHot,
-    ULONG width,
-    ULONG height,
-    BYTE *shape)
+STDMETHODIMP VRDPConsoleCallback::OnMousePointerShapeChange(BOOL visible,
+                                                            BOOL alpha,
+                                                            ULONG xHot,
+                                                            ULONG yHot,
+                                                            ULONG width,
+                                                            ULONG height,
+                                                            BYTE *shape)
 {
     LogSunlover(("VRDPConsoleCallback::OnMousePointerShapeChange: %d, %d, %lux%lu, @%lu,%lu\n", visible, alpha, width, height, xHot, yHot));
@@ -448 +447 @@
             if (!visible)
             {
-                m_server->MousePointerHide ();
+                m_server->MousePointerHide();
             }
         }
@@ -470 +469 @@
              */
 
-            dumpPointer (shape, width, height, true);
+            dumpPointer(shape, width, height, true);
 
             int cbDstAndMask = (((width + 7) / 8) * height + 3) & ~3;
@@ -479 +478 @@
             if (alpha)
             {
-                pu8AndMask = (uint8_t *)alloca (cbDstAndMask);
-
-                mousePointerGenerateANDMask (pu8AndMask, cbDstAndMask, pu8XorMask, width, height);
+                pu8AndMask = (uint8_t*)alloca(cbDstAndMask);
+
+                mousePointerGenerateANDMask(pu8AndMask, cbDstAndMask, pu8XorMask, width, height);
             }
 
@@ -493 +492 @@
             uint32_t xSkip = 0; /* How many columns to skip at the left. */
 
-            findTopLeftBorder (pu8AndMask, pu8XorMask, width, height, &xSkip, &ySkip);
+            findTopLeftBorder(pu8AndMask, pu8XorMask, width, height, &xSkip, &ySkip);
 
             /* Must not skip the hot spot. */
-            xSkip = RT_MIN (xSkip, xHot);
-            ySkip = RT_MIN (ySkip, yHot);
+            xSkip = RT_MIN(xSkip, xHot);
+            ySkip = RT_MIN(ySkip, yHot);
 
             /*
@@ -515 +514 @@
             uint32_t rdpdatalen = dstheight * rdpdatawidth;
 
-            pointer = (VRDPCOLORPOINTER *)RTMemTmpAlloc (sizeof (VRDPCOLORPOINTER) + rdpmasklen + rdpdatalen);
+            pointer = (VRDPCOLORPOINTER *)RTMemTmpAlloc(sizeof(VRDPCOLORPOINTER) + rdpmasklen + rdpdatalen);
 
             if (pointer)
             {
-                uint8_t *maskarray = (uint8_t *)pointer + sizeof (VRDPCOLORPOINTER);
+                uint8_t *maskarray = (uint8_t*)pointer + sizeof(VRDPCOLORPOINTER);
                 uint8_t *dataarray = maskarray + rdpmasklen;
 
-                memset (maskarray, 0xFF, rdpmasklen);
-                memset (dataarray, 0x00, rdpdatalen);
+                memset(maskarray, 0xFF, rdpmasklen);
+                memset(dataarray, 0x00, rdpdatalen);
 
                 uint32_t srcmaskwidth = (width + 7) / 8;
@@ -532 +531 @@
                 uint8_t *dst = maskarray + (dstheight - 1) * rdpmaskwidth;
 
-                uint32_t minheight = RT_MIN (height - ySkip, dstheight);
-                uint32_t minwidth = RT_MIN (width - xSkip, dstwidth);
+                uint32_t minheight = RT_MIN(height - ySkip, dstheight);
+                uint32_t minwidth = RT_MIN(width - xSkip, dstwidth);
 
                 unsigned x, y;
@@ -567 +566 @@
                     for (x = 0; x < minwidth; x++)
                     {
-                        memcpy (dst + x * 3, &src[4 * (x + xSkip)], 3);
+                        memcpy(dst + x * 3, &src[4 * (x + xSkip)], 3);
                     }
 
@@ -583 +582 @@
                 pointer->u16DataLen = (uint16_t)rdpdatalen;
 
-                dumpPointer ((uint8_t *)pointer + sizeof (*pointer), dstwidth, dstheight, false);
-
-                m_server->MousePointerUpdate (pointer);
-
-                RTMemTmpFree (pointer);
+                dumpPointer((uint8_t*)pointer + sizeof(*pointer), dstwidth, dstheight, false);
+
+                m_server->MousePointerUpdate(pointer);
+
+                RTMemTmpFree(pointer);
             }
         }
@@ -608 +607 @@
 VRDPCALLBACKS_1 ConsoleVRDPServer::mCallbacks =
 {
-    { VRDP_INTERFACE_VERSION_1, sizeof (VRDPCALLBACKS_1) },
+    { VRDP_INTERFACE_VERSION_1, sizeof(VRDPCALLBACKS_1) },
     ConsoleVRDPServer::VRDPCallbackQueryProperty,
     ConsoleVRDPServer::VRDPCallbackClientLogon,
@@ -623 +622 @@
 };
 
-DECLCALLBACK(int)  ConsoleVRDPServer::VRDPCallbackQueryProperty (void *pvCallback, uint32_t index, void *pvBuffer, uint32_t cbBuffer, uint32_t *pcbOut)
-{
-    ConsoleVRDPServer *server = static_cast <ConsoleVRDPServer *> (pvCallback);
+DECLCALLBACK(int)  ConsoleVRDPServer::VRDPCallbackQueryProperty(void *pvCallback, uint32_t index, void *pvBuffer, uint32_t cbBuffer, uint32_t *pcbOut)
+{
+    ConsoleVRDPServer *server = static_cast<ConsoleVRDPServer*>(pvCallback);
 
     int rc = VERR_NOT_SUPPORTED;
@@ -636 +635 @@
             ULONG port = 0;
 
-            if (cbBuffer >= sizeof (uint32_t))
+            if (cbBuffer >= sizeof(uint32_t))
             {
                 *(uint32_t *)pvBuffer = (uint32_t)port;
@@ -646 +645 @@
             }
 
-            *pcbOut = sizeof (uint32_t);
+            *pcbOut = sizeof(uint32_t);
         } break;
 
@@ -652 +651 @@
         {
             com::Bstr bstr;
-            server->mConsole->getVRDPServer ()->COMGETTER(NetAddress) (bstr.asOutParam());
+            server->mConsole->getVRDPServer()->COMGETTER(NetAddress)(bstr.asOutParam());
 
             /* The server expects UTF8. */
             com::Utf8Str address = bstr;
 
-            size_t cbAddress = address.length () + 1;
+            size_t cbAddress = address.length() + 1;
 
             if (cbAddress >= 0x10000)
@@ -672 +671 @@
                     if (address.raw())
                     {
-                        memcpy (pvBuffer, address.raw(), cbAddress);
+                        memcpy(pvBuffer, address.raw(), cbAddress);
                     }
                     else
@@ -695 +694 @@
             ULONG cMonitors = 1;
 
-            server->mConsole->machine ()->COMGETTER(MonitorCount)(&cMonitors);
-
-            if (cbBuffer >= sizeof (uint32_t))
+            server->mConsole->machine()->COMGETTER(MonitorCount)(&cMonitors);
+
+            if (cbBuffer >= sizeof(uint32_t))
             {
                 *(uint32_t *)pvBuffer = (uint32_t)cMonitors;
@@ -707 +706 @@
             }
 
-            *pcbOut = sizeof (uint32_t);
+            *pcbOut = sizeof(uint32_t);
         } break;
 
@@ -713 +712 @@
         {
             com::Bstr bstr;
-            HRESULT hrc = server->mConsole->getVRDPServer ()->COMGETTER(Ports) (bstr.asOutParam());
+            HRESULT hrc = server->mConsole->getVRDPServer()->COMGETTER(Ports)(bstr.asOutParam());
 
             if (hrc != S_OK)
@@ -743 +742 @@
                     if (portRange.raw())
                     {
-                        memcpy (pvBuffer, portRange.raw(), cbPortRange);
+                        memcpy(pvBuffer, portRange.raw(), cbPortRange);
                     }
                     else
@@ -764 +763 @@
         case VRDP_SP_NETWORK_BIND_PORT:
         {
-            if (cbBuffer != sizeof (uint32_t))
+            if (cbBuffer != sizeof(uint32_t))
             {
                 rc = VERR_INVALID_PARAMETER;
@@ -778 +777 @@
             if (pcbOut)
             {
-                *pcbOut = sizeof (uint32_t);
-            }
-
-            server->mConsole->onRemoteDisplayInfoChange ();
+                *pcbOut = sizeof(uint32_t);
+            }
+
+            server->mConsole->onRemoteDisplayInfoChange();
         } break;
 
@@ -791 +790 @@
 }
 
-DECLCALLBACK(int) ConsoleVRDPServer::VRDPCallbackClientLogon (void *pvCallback, uint32_t u32ClientId, const char *pszUser, const char *pszPassword, const char *pszDomain)
-{
-    ConsoleVRDPServer *server = static_cast <ConsoleVRDPServer *> (pvCallback);
+DECLCALLBACK(int) ConsoleVRDPServer::VRDPCallbackClientLogon(void *pvCallback, uint32_t u32ClientId, const char *pszUser, const char *pszPassword, const char *pszDomain)
+{
+    ConsoleVRDPServer *server = static_cast<ConsoleVRDPServer*>(pvCallback);
 
     return server->mConsole->VRDPClientLogon (u32ClientId, pszUser, pszPassword, pszDomain);
@@ -800 +799 @@
 DECLCALLBACK(void) ConsoleVRDPServer::VRDPCallbackClientConnect (void *pvCallback, uint32_t u32ClientId)
 {
-    ConsoleVRDPServer *server = static_cast <ConsoleVRDPServer *> (pvCallback);
+    ConsoleVRDPServer *server = static_cast<ConsoleVRDPServer*>(pvCallback);
 
     server->mConsole->VRDPClientConnect (u32ClientId);
@@ -807 +806 @@
 DECLCALLBACK(void) ConsoleVRDPServer::VRDPCallbackClientDisconnect (void *pvCallback, uint32_t u32ClientId, uint32_t fu32Intercepted)
 {
-    ConsoleVRDPServer *server = static_cast <ConsoleVRDPServer *> (pvCallback);
+    ConsoleVRDPServer *server = static_cast<ConsoleVRDPServer*>(pvCallback);
 
     server->mConsole->VRDPClientDisconnect (u32ClientId, fu32Intercepted);
@@ -814 +813 @@
 DECLCALLBACK(int)  ConsoleVRDPServer::VRDPCallbackIntercept (void *pvCallback, uint32_t u32ClientId, uint32_t fu32Intercept, void **ppvIntercept)
 {
-    ConsoleVRDPServer *server = static_cast <ConsoleVRDPServer *> (pvCallback);
+    ConsoleVRDPServer *server = static_cast<ConsoleVRDPServer*>(pvCallback);
 
     LogFlowFunc(("%x\n", fu32Intercept));
@@ -871 +870 @@
 DECLCALLBACK(bool) ConsoleVRDPServer::VRDPCallbackFramebufferQuery (void *pvCallback, unsigned uScreenId, VRDPFRAMEBUFFERINFO *pInfo)
 {
-    ConsoleVRDPServer *server = static_cast <ConsoleVRDPServer *> (pvCallback);
+    ConsoleVRDPServer *server = static_cast<ConsoleVRDPServer*>(pvCallback);
 
     bool fAvailable = false;
@@ -926 +925 @@
 DECLCALLBACK(void) ConsoleVRDPServer::VRDPCallbackFramebufferLock (void *pvCallback, unsigned uScreenId)
 {
-    ConsoleVRDPServer *server = static_cast <ConsoleVRDPServer *> (pvCallback);
+    ConsoleVRDPServer *server = static_cast<ConsoleVRDPServer*>(pvCallback);
 
     if (server->maFramebuffers[uScreenId])
@@ -936 +935 @@
 DECLCALLBACK(void) ConsoleVRDPServer::VRDPCallbackFramebufferUnlock (void *pvCallback, unsigned uScreenId)
 {
-    ConsoleVRDPServer *server = static_cast <ConsoleVRDPServer *> (pvCallback);
+    ConsoleVRDPServer *server = static_cast<ConsoleVRDPServer*>(pvCallback);
 
     if (server->maFramebuffers[uScreenId])
@@ -964 +963 @@
 DECLCALLBACK(void) ConsoleVRDPServer::VRDPCallbackInput (void *pvCallback, int type, const void *pvInput, unsigned cbInput)
 {
-    ConsoleVRDPServer *server = static_cast <ConsoleVRDPServer *> (pvCallback);
+    ConsoleVRDPServer *server = static_cast<ConsoleVRDPServer*>(pvCallback);
     Console *pConsole = server->mConsole;
 
@@ -1093 +1092 @@
 DECLCALLBACK(void) ConsoleVRDPServer::VRDPCallbackVideoModeHint (void *pvCallback, unsigned cWidth, unsigned cHeight, unsigned cBitsPerPixel, unsigned uScreenId)
 {
-    ConsoleVRDPServer *server = static_cast <ConsoleVRDPServer *> (pvCallback);
-
-    server->mConsole->getDisplay ()->SetVideoModeHint(cWidth, cHeight, cBitsPerPixel, uScreenId);
+    ConsoleVRDPServer *server = static_cast<ConsoleVRDPServer*>(pvCallback);
+
+    server->mConsole->getDisplay()->SetVideoModeHint(cWidth, cHeight, cBitsPerPixel, uScreenId);
 }
 #endif /* VBOX_WITH_VRDP */
@@ -1103 +1102 @@
     mConsole = console;
 
-    int rc = RTCritSectInit (&mCritSect);
-    AssertRC (rc);
+    int rc = RTCritSectInit(&mCritSect);
+    AssertRC(rc);
 
     mcClipboardRefs = 0;
@@ -1338 +1337 @@
     mUSBBackends.fThreadRunning = true;
     int rc = RTThreadUserSignal (thread);
-    AssertRC (rc);
+    AssertRC(rc);
 }
 
@@ -1378 +1377 @@
         /* Wait until the thread is ready. */
         rc = RTThreadUserWait (mUSBBackends.thread, 60000);
-        AssertRC (rc);
+        AssertRC(rc);
         Assert (mUSBBackends.fThreadRunning || RT_FAILURE(rc));
     }
@@ -1394 +1393 @@
 
         int rc = RTThreadWait (mUSBBackends.thread, 60000, NULL);
-        AssertRC (rc);
+        AssertRC(rc);
 
         mUSBBackends.thread = NIL_RTTHREAD;
@@ -1486 +1485 @@
         if (RT_FAILURE(rc))
         {
-            mConsole->reportAuthLibraryError (filename.raw(), rc);
+            mConsole->reportAuthLibraryError(filename.raw(), rc);
 
             mpfnAuthEntry = NULL;
@@ -1546 +1545 @@
 {
     int rc = RTCritSectEnter (&mCritSect);
-    AssertRC (rc);
+    AssertRC(rc);
     return rc;
 }
@@ -1941 +1940 @@
 #ifdef VBOX_WITH_USB
     int rc = lockConsoleVRDPServer ();
-    AssertRC (rc);
+    AssertRC(rc);
 
     /* Exclude the found instance from the list. */

trunk/src/VBox/Main/DHCPServerRunner.cpp

@@ -86 +86 @@
 
     /* get the path to the executable */
-    char exePathBuf [RTPATH_MAX];
-    const char *exePath = RTProcGetExecutableName (exePathBuf, RTPATH_MAX);
+    char exePathBuf[RTPATH_MAX];
+    const char *exePath = RTProcGetExecutableName(exePathBuf, RTPATH_MAX);
     char *substrSl = strrchr(exePathBuf, '/');
     char *substrBs = strrchr(exePathBuf, '\\');
@@ -121 +121 @@
     args[index++] = NULL;
 
-    int rc = RTProcCreate (exePath, args, RTENV_DEFAULT, 0, &mProcess);
+    int rc = RTProcCreate(exePath, args, RTENV_DEFAULT, 0, &mProcess);
     if (RT_FAILURE(rc))
         mProcess = NIL_RTPROCESS;

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -105 +105 @@
 
 #ifdef VBOX_WITH_OLD_VBVA_LOCK
-    int rc = RTCritSectInit (&mVBVALock);
-    AssertRC (rc);
+    int rc = RTCritSectInit(&mVBVALock);
+    AssertRC(rc);
     mfu32PendingVideoAccelDisable = false;
 #endif /* VBOX_WITH_OLD_VBVA_LOCK */
@@ -2247 +2247 @@
 
     if (vrc == VERR_NOT_IMPLEMENTED)
-        rc = setError (E_NOTIMPL,
-                       tr ("This feature is not implemented"));
+        rc = setError(E_NOTIMPL,
+                      tr("This feature is not implemented"));
     else if (RT_FAILURE(vrc))
-        rc = setError (VBOX_E_IPRT_ERROR,
-                       tr ("Could not take a screenshot (%Rrc)"), vrc);
+        rc = setError(VBOX_E_IPRT_ERROR,
+                      tr("Could not take a screenshot (%Rrc)"), vrc);
 
     LogFlowFunc (("rc=%08X\n", rc));
@@ -2323 +2323 @@
     }
     else if (vrc == VERR_NOT_IMPLEMENTED)
-        rc = setError (E_NOTIMPL,
-                       tr ("This feature is not implemented"));
+        rc = setError(E_NOTIMPL,
+                      tr("This feature is not implemented"));
     else
-        rc = setError (VBOX_E_IPRT_ERROR,
-                       tr ("Could not take a screenshot (%Rrc)"), vrc);
+        rc = setError(VBOX_E_IPRT_ERROR,
+                      tr("Could not take a screenshot (%Rrc)"), vrc);
 
     LogFlowFunc (("rc=%08X\n", rc));
@@ -2395 +2395 @@
     }
     else if (RT_FAILURE(rcVBox))
-        rc = setError (VBOX_E_IPRT_ERROR,
-            tr ("Could not draw to the screen (%Rrc)"), rcVBox);
+        rc = setError(VBOX_E_IPRT_ERROR,
+                      tr("Could not draw to the screen (%Rrc)"), rcVBox);
 //@todo
 //    else
@@ -2456 +2456 @@
 
     if (RT_FAILURE(rcVBox))
-        rc = setError (VBOX_E_IPRT_ERROR,
-            tr ("Could not invalidate and update the screen (%Rrc)"), rcVBox);
+        rc = setError(VBOX_E_IPRT_ERROR,
+                      tr("Could not invalidate and update the screen (%Rrc)"), rcVBox);
 
     LogFlowFunc (("rc=%08X\n", rc));
@@ -2487 +2487 @@
     /* this is only valid for external framebuffers */
     if (maFramebuffers[aScreenId].pFramebuffer == NULL)
-        return setError (VBOX_E_NOT_SUPPORTED,
-            tr ("Resize completed notification is valid only "
-                "for external framebuffers"));
+        return setError(VBOX_E_NOT_SUPPORTED,
+                        tr("Resize completed notification is valid only for external framebuffers"));
 
     /* Set the flag indicating that the resize has completed and display
@@ -2523 +2522 @@
     /* this is only valid for external framebuffers */
     if (maFramebuffers[VBOX_VIDEO_PRIMARY_SCREEN].pFramebuffer == NULL)
-        return setError (VBOX_E_NOT_SUPPORTED,
-            tr ("Resize completed notification is valid only "
-                "for external framebuffers"));
+        return setError(VBOX_E_NOT_SUPPORTED,
+                        tr("Resize completed notification is valid only for external framebuffers"));
 
     return S_OK;

trunk/src/VBox/Main/GuestImpl.cpp

@@ -283 +283 @@
     }
 
-    return setError (VBOX_E_VM_ERROR,
-        tr ("VMM device is not available (is the VM running?)"));
+    return setError(VBOX_E_VM_ERROR,
+                    tr("VMM device is not available (is the VM running?)"));
 }
 

trunk/src/VBox/Main/HostImpl.cpp

@@ -225 +225 @@
      */
 # if defined (RT_OS_DARWIN)
-    m->pUSBProxyService = new USBProxyServiceDarwin (this);
+    m->pUSBProxyService = new USBProxyServiceDarwin(this);
 # elif defined (RT_OS_LINUX)
-    m->pUSBProxyService = new USBProxyServiceLinux (this);
+    m->pUSBProxyService = new USBProxyServiceLinux(this);
 # elif defined (RT_OS_OS2)
     m->pUSBProxyService = new USBProxyServiceOs2 (this);
 # elif defined (RT_OS_SOLARIS)
-    m->pUSBProxyService = new USBProxyServiceSolaris (this);
+    m->pUSBProxyService = new USBProxyServiceSolaris(this);
 # elif defined (RT_OS_WINDOWS)
-    m->pUSBProxyService = new USBProxyServiceWindows (this);
+    m->pUSBProxyService = new USBProxyServiceWindows(this);
 # elif defined (RT_OS_FREEBSD)
-    m->pUSBProxyService = new USBProxyServiceFreeBSD (this);
+    m->pUSBProxyService = new USBProxyServiceFreeBSD(this);
 # else
-    m->pUSBProxyService = new USBProxyService (this);
+    m->pUSBProxyService = new USBProxyService(this);
 # endif
     HRESULT hrc = m->pUSBProxyService->init();
@@ -248 +248 @@
 
 #if defined (RT_OS_WINDOWS)
-    m->pHostPowerService = new HostPowerServiceWin (m->pParent);
+    m->pHostPowerService = new HostPowerServiceWin(m->pParent);
 #elif defined (RT_OS_DARWIN)
-    m->pHostPowerService = new HostPowerServiceDarwin (m->pParent);
+    m->pHostPowerService = new HostPowerServiceDarwin(m->pParent);
 #else
-    m->pHostPowerService = new HostPowerService (m->pParent);
+    m->pHostPowerService = new HostPowerService(m->pParent);
 #endif
 
@@ -1157 +1157 @@
     ComObjPtr<HostUSBDeviceFilter> filter;
     filter.createObject();
-    HRESULT rc = filter->init (this, aName);
+    HRESULT rc = filter->init(this, aName);
     ComAssertComRCRet (rc, rc);
     rc = filter.queryInterfaceTo(aFilter);
@@ -1203 +1203 @@
 
     if (pFilter->mInList)
-        return setError (E_INVALIDARG,
-            tr ("The given USB device filter is already in the list"));
+        return setError(E_INVALIDARG,
+                        tr("The given USB device filter is already in the list"));
 
     /* iterate to the position... */
@@ -1248 +1248 @@
 
     if (!m->llUSBDeviceFilters.size())
-        return setError (E_INVALIDARG,
-            tr ("The USB device filter list is empty"));
+        return setError(E_INVALIDARG,
+                        tr("The USB device filter list is empty"));
 
     if (aPosition >= m->llUSBDeviceFilters.size())
-        return setError (E_INVALIDARG,
-            tr ("Invalid position: %lu (must be in range [0, %lu])"),
-            aPosition, m->llUSBDeviceFilters.size() - 1);
+        return setError(E_INVALIDARG,
+                        tr("Invalid position: %lu (must be in range [0, %lu])"),
+                        aPosition, m->llUSBDeviceFilters.size() - 1);
 
     ComObjPtr<HostUSBDeviceFilter> filter;
@@ -1369 +1369 @@
 
     if (!found)
-        return setError (E_INVALIDARG, HostNetworkInterface::tr (
-                             "The host network interface with the given name could not be found"));
+        return setError(E_INVALIDARG,
+                        HostNetworkInterface::tr("The host network interface with the given name could not be found"));
 
     found->setVirtualBox(m->pParent);
@@ -1407 +1407 @@
 
     if (!found)
-        return setError (E_INVALIDARG, HostNetworkInterface::tr (
-                             "The host network interface with the given GUID could not be found"));
+        return setError(E_INVALIDARG,
+                        HostNetworkInterface::tr("The host network interface with the given GUID could not be found"));
 
     found->setVirtualBox(m->pParent);
@@ -1448 +1448 @@
 
 STDMETHODIMP Host::FindUSBDeviceByAddress(IN_BSTR aAddress,
-                                         IHostUSBDevice **aDevice)
+                                          IHostUSBDevice **aDevice)
 {
 #ifdef VBOX_WITH_USB
@@ -2402 +2402 @@
 
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
-void Host::registerMetrics (PerformanceCollector *aCollector)
+void Host::registerMetrics(PerformanceCollector *aCollector)
 {
     pm::CollectorHAL *hal = aCollector->getHAL();
     /* Create sub metrics */
-    pm::SubMetric *cpuLoadUser   = new pm::SubMetric ("CPU/Load/User",
+    pm::SubMetric *cpuLoadUser   = new pm::SubMetric("CPU/Load/User",
         "Percentage of processor time spent in user mode.");
-    pm::SubMetric *cpuLoadKernel = new pm::SubMetric ("CPU/Load/Kernel",
+    pm::SubMetric *cpuLoadKernel = new pm::SubMetric("CPU/Load/Kernel",
         "Percentage of processor time spent in kernel mode.");
-    pm::SubMetric *cpuLoadIdle   = new pm::SubMetric ("CPU/Load/Idle",
+    pm::SubMetric *cpuLoadIdle   = new pm::SubMetric("CPU/Load/Idle",
         "Percentage of processor time spent idling.");
-    pm::SubMetric *cpuMhzSM      = new pm::SubMetric ("CPU/MHz",
+    pm::SubMetric *cpuMhzSM      = new pm::SubMetric("CPU/MHz",
         "Average of current frequency of all processors.");
-    pm::SubMetric *ramUsageTotal = new pm::SubMetric ("RAM/Usage/Total",
+    pm::SubMetric *ramUsageTotal = new pm::SubMetric("RAM/Usage/Total",
         "Total physical memory installed.");
-    pm::SubMetric *ramUsageUsed  = new pm::SubMetric ("RAM/Usage/Used",
+    pm::SubMetric *ramUsageUsed  = new pm::SubMetric("RAM/Usage/Used",
         "Physical memory currently occupied.");
-    pm::SubMetric *ramUsageFree  = new pm::SubMetric ("RAM/Usage/Free",
+    pm::SubMetric *ramUsageFree  = new pm::SubMetric("RAM/Usage/Free",
         "Physical memory currently available to applications.");
     /* Create and register base metrics */
@@ -2424 +2424 @@
     ComObjPtr<Host> tmp = this;
     tmp.queryInterfaceTo(&objptr);
-    pm::BaseMetric *cpuLoad = new pm::HostCpuLoadRaw (hal, objptr, cpuLoadUser, cpuLoadKernel,
+    pm::BaseMetric *cpuLoad = new pm::HostCpuLoadRaw(hal, objptr, cpuLoadUser, cpuLoadKernel,
                                           cpuLoadIdle);
     aCollector->registerBaseMetric (cpuLoad);
-    pm::BaseMetric *cpuMhz = new pm::HostCpuMhz (hal, objptr, cpuMhzSM);
+    pm::BaseMetric *cpuMhz = new pm::HostCpuMhz(hal, objptr, cpuMhzSM);
     aCollector->registerBaseMetric (cpuMhz);
-    pm::BaseMetric *ramUsage = new pm::HostRamUsage (hal, objptr, ramUsageTotal, ramUsageUsed,
+    pm::BaseMetric *ramUsage = new pm::HostRamUsage(hal, objptr, ramUsageTotal, ramUsageUsed,
                                            ramUsageFree);
     aCollector->registerBaseMetric (ramUsage);
 
-    aCollector->registerMetric (new pm::Metric(cpuLoad, cpuLoadUser, 0));
-    aCollector->registerMetric (new pm::Metric(cpuLoad, cpuLoadUser,
-                                               new pm::AggregateAvg()));
-    aCollector->registerMetric (new pm::Metric(cpuLoad, cpuLoadUser,
-                                               new pm::AggregateMin()));
-    aCollector->registerMetric (new pm::Metric(cpuLoad, cpuLoadUser,
-                                               new pm::AggregateMax()));
-
-    aCollector->registerMetric (new pm::Metric(cpuLoad, cpuLoadKernel, 0));
-    aCollector->registerMetric (new pm::Metric(cpuLoad, cpuLoadKernel,
-                                               new pm::AggregateAvg()));
-    aCollector->registerMetric (new pm::Metric(cpuLoad, cpuLoadKernel,
-                                               new pm::AggregateMin()));
-    aCollector->registerMetric (new pm::Metric(cpuLoad, cpuLoadKernel,
-                                               new pm::AggregateMax()));
-
-    aCollector->registerMetric (new pm::Metric(cpuLoad, cpuLoadIdle, 0));
-    aCollector->registerMetric (new pm::Metric(cpuLoad, cpuLoadIdle,
-                                               new pm::AggregateAvg()));
-    aCollector->registerMetric (new pm::Metric(cpuLoad, cpuLoadIdle,
-                                               new pm::AggregateMin()));
-    aCollector->registerMetric (new pm::Metric(cpuLoad, cpuLoadIdle,
-                                               new pm::AggregateMax()));
-
-    aCollector->registerMetric (new pm::Metric(cpuMhz, cpuMhzSM, 0));
-    aCollector->registerMetric (new pm::Metric(cpuMhz, cpuMhzSM,
-                                               new pm::AggregateAvg()));
-    aCollector->registerMetric (new pm::Metric(cpuMhz, cpuMhzSM,
-                                               new pm::AggregateMin()));
-    aCollector->registerMetric (new pm::Metric(cpuMhz, cpuMhzSM,
-                                               new pm::AggregateMax()));
-
-    aCollector->registerMetric (new pm::Metric(ramUsage, ramUsageTotal, 0));
-    aCollector->registerMetric (new pm::Metric(ramUsage, ramUsageTotal,
-                                               new pm::AggregateAvg()));
-    aCollector->registerMetric (new pm::Metric(ramUsage, ramUsageTotal,
-                                               new pm::AggregateMin()));
-    aCollector->registerMetric (new pm::Metric(ramUsage, ramUsageTotal,
-                                               new pm::AggregateMax()));
-
-    aCollector->registerMetric (new pm::Metric(ramUsage, ramUsageUsed, 0));
-    aCollector->registerMetric (new pm::Metric(ramUsage, ramUsageUsed,
-                                               new pm::AggregateAvg()));
-    aCollector->registerMetric (new pm::Metric(ramUsage, ramUsageUsed,
-                                               new pm::AggregateMin()));
-    aCollector->registerMetric (new pm::Metric(ramUsage, ramUsageUsed,
-                                               new pm::AggregateMax()));
-
-    aCollector->registerMetric (new pm::Metric(ramUsage, ramUsageFree, 0));
-    aCollector->registerMetric (new pm::Metric(ramUsage, ramUsageFree,
-                                               new pm::AggregateAvg()));
-    aCollector->registerMetric (new pm::Metric(ramUsage, ramUsageFree,
-                                               new pm::AggregateMin()));
-    aCollector->registerMetric (new pm::Metric(ramUsage, ramUsageFree,
-                                               new pm::AggregateMax()));
+    aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadUser, 0));
+    aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadUser,
+                                              new pm::AggregateAvg()));
+    aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadUser,
+                                              new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadUser,
+                                              new pm::AggregateMax()));
+
+    aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadKernel, 0));
+    aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadKernel,
+                                              new pm::AggregateAvg()));
+    aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadKernel,
+                                              new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadKernel,
+                                              new pm::AggregateMax()));
+
+    aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadIdle, 0));
+    aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadIdle,
+                                              new pm::AggregateAvg()));
+    aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadIdle,
+                                              new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadIdle,
+                                              new pm::AggregateMax()));
+
+    aCollector->registerMetric(new pm::Metric(cpuMhz, cpuMhzSM, 0));
+    aCollector->registerMetric(new pm::Metric(cpuMhz, cpuMhzSM,
+                                              new pm::AggregateAvg()));
+    aCollector->registerMetric(new pm::Metric(cpuMhz, cpuMhzSM,
+                                              new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(cpuMhz, cpuMhzSM,
+                                              new pm::AggregateMax()));
+
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageTotal, 0));
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageTotal,
+                                              new pm::AggregateAvg()));
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageTotal,
+                                              new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageTotal,
+                                              new pm::AggregateMax()));
+
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageUsed, 0));
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageUsed,
+                                              new pm::AggregateAvg()));
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageUsed,
+                                              new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageUsed,
+                                              new pm::AggregateMax()));
+
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageFree, 0));
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageFree,
+                                              new pm::AggregateAvg()));
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageFree,
+                                              new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageFree,
+                                              new pm::AggregateMax()));
 };
 
 void Host::unregisterMetrics (PerformanceCollector *aCollector)
 {
-    aCollector->unregisterMetricsFor (this);
-    aCollector->unregisterBaseMetricsFor (this);
+    aCollector->unregisterMetricsFor(this);
+    aCollector->unregisterBaseMetricsFor(this);
 };
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */

trunk/src/VBox/Main/HostPower.cpp

@@ -36 +36 @@
 HostPowerService::HostPowerService (VirtualBox *aVirtualBox)
 {
-    Assert (aVirtualBox != NULL);
+    Assert(aVirtualBox != NULL);
     mVirtualBox = aVirtualBox;
 }
@@ -75 +75 @@
                 /* get the remote console */
                 ComPtr<IConsole> console;
-                rc = pControl->GetRemoteConsole (console.asOutParam());
+                rc = pControl->GetRemoteConsole(console.asOutParam());
                 /* the VM could have been powered down and closed or whatever */
-                if (FAILED (rc))
+                if (FAILED(rc))
                     continue;
 
@@ -83 +83 @@
                  * in an inappropriate state */
                 rc = console->Pause();
-                if (FAILED (rc))
+                if (FAILED(rc))
                     continue;
 
@@ -102 +102 @@
 
             /* go through VMs we paused on Suspend */
-            for (size_t i = 0; i < mConsoles.size(); ++ i)
+            for (size_t i = 0; i < mConsoles.size(); ++i)
             {
                 /* note that Resume() will simply return a failure if the VM is
@@ -108 +108 @@
                  * been somehow closed by this time already so that the
                  * console reference we have is dead) */
-                rc = mConsoles [i]->Resume();
-                if (FAILED (rc))
+                rc = mConsoles[i]->Resume();
+                if (FAILED(rc))
                     continue;
 
@@ -148 +148 @@
                 rc = pControl->GetRemoteConsole (console.asOutParam());
                 /* the VM could have been powered down and closed or whatever */
-                if (FAILED (rc))
+                if (FAILED(rc))
                     continue;
 
@@ -156 +156 @@
                  * is in an inappropriate state */
                 rc = console->SaveState (progress.asOutParam());
-                if (FAILED (rc))
+                if (FAILED(rc))
                     continue;
 

trunk/src/VBox/Main/KeyboardImpl.cpp

@@ -138 +138 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    CHECK_CONSOLE_DRV (mpDrv);
-
-    int vrc = mpDrv->pUpPort->pfnPutEvent (mpDrv->pUpPort, (uint8_t)scancode);
+    CHECK_CONSOLE_DRV(mpDrv);
+
+    int vrc = mpDrv->pUpPort->pfnPutEvent(mpDrv->pUpPort, (uint8_t)scancode);
 
     if (RT_FAILURE(vrc))
-        rc = setError (VBOX_E_IPRT_ERROR,
-            tr ("Could not send scan code 0x%08X to the virtual keyboard (%Rrc)"),
-                scancode, vrc);
+        rc = setError(VBOX_E_IPRT_ERROR,
+                      tr("Could not send scan code 0x%08X to the virtual keyboard (%Rrc)"),
+                      scancode, vrc);
 
     return rc;
@@ -179 +179 @@
 
     for (uint32_t i = 0; (i < keys.size()) && RT_SUCCESS(vrc); i++)
-        vrc = mpDrv->pUpPort->pfnPutEvent (mpDrv->pUpPort, (uint8_t)keys [i]);
+        vrc = mpDrv->pUpPort->pfnPutEvent(mpDrv->pUpPort, (uint8_t)keys[i]);
 
     if (RT_FAILURE(vrc))
-        return setError (VBOX_E_IPRT_ERROR,
-            tr ("Could not send all scan codes to the virtual keyboard (%Rrc)"),
-                vrc);
+        return setError(VBOX_E_IPRT_ERROR,
+                        tr("Could not send all scan codes to the virtual keyboard (%Rrc)"),
+                        vrc);
 
     /// @todo is it actually possible that not all scancodes can be transmitted?
@@ -202 +202 @@
 STDMETHODIMP Keyboard::PutCAD()
 {
-    static com::SafeArray<LONG> cadSequence (6);
-
-    cadSequence [0] = 0x1d; // Ctrl down
-    cadSequence [1] = 0x38; // Alt down
-    cadSequence [2] = 0x53; // Del down
-    cadSequence [3] = 0xd3; // Del up
-    cadSequence [4] = 0xb8; // Alt up
-    cadSequence [5] = 0x9d; // Ctrl up
-
-    return PutScancodes (ComSafeArrayAsInParam (cadSequence), NULL);
+    static com::SafeArray<LONG> cadSequence(6);
+
+    cadSequence[0] = 0x1d; // Ctrl down
+    cadSequence[1] = 0x38; // Alt down
+    cadSequence[2] = 0x53; // Del down
+    cadSequence[3] = 0xd3; // Del up
+    cadSequence[4] = 0xb8; // Alt up
+    cadSequence[5] = 0x9d; // Ctrl up
+
+    return PutScancodes(ComSafeArrayAsInParam(cadSequence), NULL);
 }
 

trunk/src/VBox/Main/MachineImpl.cpp

@@ -179 +179 @@
 
     /* default boot order: floppy - DVD - HDD */
-    mBootOrder [0] = DeviceType_Floppy;
-    mBootOrder [1] = DeviceType_DVD;
-    mBootOrder [2] = DeviceType_HardDisk;
-    for (size_t i = 3; i < RT_ELEMENTS (mBootOrder); ++i)
-        mBootOrder [i] = DeviceType_Null;
+    mBootOrder[0] = DeviceType_Floppy;
+    mBootOrder[1] = DeviceType_DVD;
+    mBootOrder[2] = DeviceType_HardDisk;
+    for (size_t i = 3; i < RT_ELEMENTS(mBootOrder); ++i)
+        mBootOrder[i] = DeviceType_Null;
 
     mClipboardMode = ClipboardMode_Bidirectional;
@@ -509 +509 @@
     LogFlowThisFuncEnter();
 
-    Assert (!isWriteLockOnCurrentThread());
+    Assert(!isWriteLockOnCurrentThread());
 
     /* Enclose the state transition Ready->InUninit->NotReady */
@@ -1730 +1730 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    Assert (!!mVRDPServer);
+    Assert(!!mVRDPServer);
     mVRDPServer.queryInterfaceTo(vrdpServer);
 
@@ -2278 +2278 @@
     setModified(IsModified_MachineData);
     mHWData.backup();
-    mHWData->mBootOrder [aPosition - 1] = aDevice;
+    mHWData->mBootOrder[aPosition - 1] = aDevice;
 
     return S_OK;
@@ -2295 +2295 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    *aDevice = mHWData->mBootOrder [aPosition - 1];
+    *aDevice = mHWData->mBootOrder[aPosition - 1];
 
     return S_OK;
@@ -3035 +3035 @@
 }
 
-STDMETHODIMP Machine::GetSerialPort (ULONG slot, ISerialPort **port)
+STDMETHODIMP Machine::GetSerialPort(ULONG slot, ISerialPort **port)
 {
     CheckComArgOutPointerValid(port);
-    CheckComArgExpr (slot, slot < RT_ELEMENTS (mSerialPorts));
+    CheckComArgExpr(slot, slot < RT_ELEMENTS(mSerialPorts));
 
     AutoCaller autoCaller(this);
@@ -3045 +3045 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    mSerialPorts [slot].queryInterfaceTo(port);
-
-    return S_OK;
-}
-
-STDMETHODIMP Machine::GetParallelPort (ULONG slot, IParallelPort **port)
+    mSerialPorts[slot].queryInterfaceTo(port);
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::GetParallelPort(ULONG slot, IParallelPort **port)
 {
     CheckComArgOutPointerValid(port);
-    CheckComArgExpr (slot, slot < RT_ELEMENTS (mParallelPorts));
+    CheckComArgExpr(slot, slot < RT_ELEMENTS(mParallelPorts));
 
     AutoCaller autoCaller(this);
@@ -3060 +3060 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    mParallelPorts [slot].queryInterfaceTo(port);
-
-    return S_OK;
-}
-
-STDMETHODIMP Machine::GetNetworkAdapter (ULONG slot, INetworkAdapter **adapter)
+    mParallelPorts[slot].queryInterfaceTo(port);
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::GetNetworkAdapter(ULONG slot, INetworkAdapter **adapter)
 {
     CheckComArgOutPointerValid(adapter);
-    CheckComArgExpr (slot, slot < RT_ELEMENTS (mNetworkAdapters));
+    CheckComArgExpr(slot, slot < RT_ELEMENTS(mNetworkAdapters));
 
     AutoCaller autoCaller(this);
@@ -3251 +3251 @@
      *  been actually changed
      */
-    rollback (true /* aNotify */);
+    rollback(true /* aNotify */);
 
     return S_OK;
@@ -3381 +3381 @@
     //  mData->mCurrentStateModified to FALSE
 
-    return setError (E_NOTIMPL, "Not implemented");
+    return setError(E_NOTIMPL, "Not implemented");
 }
 
@@ -3867 +3867 @@
     if (   (aConnectionType <= StorageBus_Null)
         || (aConnectionType >  StorageBus_SAS))
-        return setError (E_INVALIDARG,
-            tr ("Invalid connection type: %d"),
-                aConnectionType);
+        return setError(E_INVALIDARG,
+                        tr("Invalid connection type: %d"),
+                        aConnectionType);
 
     AutoCaller autoCaller(this);
@@ -3884 +3884 @@
     rc = getStorageControllerByName (aName, ctrl, false /* aSetError */);
     if (SUCCEEDED(rc))
-        return setError (VBOX_E_OBJECT_IN_USE,
-            tr ("Storage controller named '%ls' already exists"), aName);
+        return setError(VBOX_E_OBJECT_IN_USE,
+                        tr("Storage controller named '%ls' already exists"),
+                        aName);
 
     ctrl.createObject();
@@ -4146 +4147 @@
 
     if (RT_FAILURE(vrc))
-        return setError (VBOX_E_IPRT_ERROR,
-                         tr("Saved screenshot data is not available (%Rrc)"), vrc);
+        return setError(VBOX_E_IPRT_ERROR,
+                        tr("Saved screenshot data is not available (%Rrc)"),
+                        vrc);
 
     *aSize = cbData;
@@ -4179 +4181 @@
 
     if (RT_FAILURE(vrc))
-        return setError (VBOX_E_IPRT_ERROR,
-                         tr("Saved screenshot data is not available (%Rrc)"), vrc);
+        return setError(VBOX_E_IPRT_ERROR,
+                        tr("Saved screenshot data is not available (%Rrc)"),
+                        vrc);
 
     *aWidth = u32Width;
@@ -4237 +4240 @@
 
     if (RT_FAILURE(vrc))
-        return setError (VBOX_E_IPRT_ERROR,
-                         tr("Saved screenshot data is not available (%Rrc)"), vrc);
+        return setError(VBOX_E_IPRT_ERROR,
+                        tr("Saved screenshot data is not available (%Rrc)"),
+                        vrc);
 
     *aSize = cbData;
@@ -4270 +4274 @@
 
     if (RT_FAILURE(vrc))
-        return setError (VBOX_E_IPRT_ERROR,
-                         tr("Saved screenshot data is not available (%Rrc)"), vrc);
+        return setError(VBOX_E_IPRT_ERROR,
+                        tr("Saved screenshot data is not available (%Rrc)"),
+                        vrc);
 
     *aWidth = u32Width;
@@ -4508 +4513 @@
     {
         /* Log folder is <Machines>/<VM_SnapshotFolder>/Logs */
-        Assert (!mUserData->mSnapshotFolderFull.isEmpty());
+        Assert(!mUserData->mSnapshotFolderFull.isEmpty());
         aLogFolder = Utf8StrFmt ("%ls%cLogs", mUserData->mSnapshotFolderFull.raw(),
                                  RTPATH_DELIMITER);
@@ -4687 +4692 @@
              * with the relevant part in openSession()). */
 
-            Assert (mData->mSession.mRemoteControls.size() == 1);
+            Assert(mData->mSession.mRemoteControls.size() == 1);
             if (mData->mSession.mRemoteControls.size() == 1)
             {
@@ -4850 +4855 @@
         const char VirtualBox_exe[] = "VirtualBox" HOSTSUFF_EXE;
 # endif
-        Assert (sz >= sizeof (VirtualBox_exe));
+        Assert(sz >= sizeof (VirtualBox_exe));
         strcpy (cmd, VirtualBox_exe);
 
@@ -4873 +4878 @@
     {
         const char VBoxSDL_exe[] = "VBoxSDL" HOSTSUFF_EXE;
-        Assert (sz >= sizeof (VBoxSDL_exe));
+        Assert(sz >= sizeof (VBoxSDL_exe));
         strcpy (cmd, VBoxSDL_exe);
 
@@ -4901 +4906 @@
     {
         const char VBoxHeadless_exe[] = "VBoxHeadless" HOSTSUFF_EXE;
-        Assert (sz >= sizeof (VBoxHeadless_exe));
+        Assert(sz >= sizeof (VBoxHeadless_exe));
         strcpy (cmd, VBoxHeadless_exe);
 
@@ -4972 +4977 @@
 
     /* attach launch data to the machine */
-    Assert (mData->mSession.mPid == NIL_RTPROCESS);
+    Assert(mData->mSession.mPid == NIL_RTPROCESS);
     mData->mSession.mRemoteControls.push_back (aControl);
     mData->mSession.mProgress = aProgress;
@@ -4999 +5004 @@
 
     if (!mData->mRegistered)
-        return setError (E_UNEXPECTED,
-            tr ("The machine '%ls' is not registered"), mUserData->mName.raw());
+        return setError(E_UNEXPECTED,
+                        tr("The machine '%ls' is not registered"),
+                        mUserData->mName.raw());
 
     LogFlowThisFunc(("mSession.state=%s\n", Global::stringifySessionState(mData->mSession.mState)));
 
     if (mData->mSession.mState != SessionState_Open)
-        return setError (VBOX_E_INVALID_SESSION_STATE,
-            tr ("The machine '%ls' does not have an open session"),
-            mUserData->mName.raw());
+        return setError(VBOX_E_INVALID_SESSION_STATE,
+                        tr("The machine '%ls' does not have an open session"),
+                        mUserData->mName.raw());
 
     ComAssertRet (!mData->mSession.mDirectControl.isNull(), E_FAIL);
@@ -5018 +5024 @@
     HRESULT rc = mData->mSession.mDirectControl->
                      GetRemoteConsole (console.asOutParam());
-    if (FAILED (rc))
+    if (FAILED(rc))
     {
         /* The failure may occur w/o any error info (from RPC), so provide one */
-        return setError (VBOX_E_VM_ERROR,
-            tr ("Failed to get a console object from the direct session (%Rrc)"), rc);
+        return setError(VBOX_E_VM_ERROR,
+                        tr("Failed to get a console object from the direct session (%Rrc)"),
+                        rc);
     }
 
@@ -5427 +5434 @@
 
         ++mData->mMachineStateDeps;
-        Assert (mData->mMachineStateDeps != 0 /* overflow */);
+        Assert(mData->mMachineStateDeps != 0 /* overflow */);
     }
 
@@ -5459 +5466 @@
         if (mData->mMachineStateChangePending != 0)
         {
-            Assert (mData->mMachineStateDepsSem != NIL_RTSEMEVENTMULTI);
+            Assert(mData->mMachineStateDepsSem != NIL_RTSEMEVENTMULTI);
             RTSemEventMultiSignal (mData->mMachineStateDepsSem);
         }
@@ -5574 +5581 @@
     /* create associated BIOS settings object */
     unconst(mBIOSSettings).createObject();
-    mBIOSSettings->init (this);
+    mBIOSSettings->init(this);
 
 #ifdef VBOX_WITH_VRDP
     /* create an associated VRDPServer object (default is disabled) */
     unconst(mVRDPServer).createObject();
-    mVRDPServer->init (this);
+    mVRDPServer->init(this);
 #endif
 
     /* create associated serial port objects */
-    for (ULONG slot = 0; slot < RT_ELEMENTS (mSerialPorts); slot ++)
-    {
-        unconst(mSerialPorts [slot]).createObject();
-        mSerialPorts [slot]->init (this, slot);
+    for (ULONG slot = 0; slot < RT_ELEMENTS(mSerialPorts); slot++)
+    {
+        unconst(mSerialPorts[slot]).createObject();
+        mSerialPorts[slot]->init(this, slot);
     }
 
     /* create associated parallel port objects */
-    for (ULONG slot = 0; slot < RT_ELEMENTS (mParallelPorts); slot ++)
-    {
-        unconst(mParallelPorts [slot]).createObject();
-        mParallelPorts [slot]->init (this, slot);
+    for (ULONG slot = 0; slot < RT_ELEMENTS(mParallelPorts); slot++)
+    {
+        unconst(mParallelPorts[slot]).createObject();
+        mParallelPorts[slot]->init(this, slot);
     }
 
     /* create the audio adapter object (always present, default is disabled) */
     unconst(mAudioAdapter).createObject();
-    mAudioAdapter->init (this);
+    mAudioAdapter->init(this);
 
     /* create the USB controller object (always present, default is disabled) */
     unconst(mUSBController).createObject();
-    mUSBController->init (this);
+    mUSBController->init(this);
 
     /* create associated network adapter objects */
-    for (ULONG slot = 0; slot < RT_ELEMENTS (mNetworkAdapters); slot ++)
-    {
-        unconst(mNetworkAdapters [slot]).createObject();
-        mNetworkAdapters [slot]->init (this, slot);
+    for (ULONG slot = 0; slot < RT_ELEMENTS(mNetworkAdapters); slot ++)
+    {
+        unconst(mNetworkAdapters[slot]).createObject();
+        mNetworkAdapters[slot]->init(this, slot);
     }
 
@@ -6770 +6777 @@
                 /* new dir and old dir cannot be equal here because of 'if'
                  * above and because name != newName */
-                Assert (configDir != newConfigDir);
+                Assert(configDir != newConfigDir);
                 if (!aNew)
                 {
@@ -8021 +8028 @@
                 rc = pMedium->UnlockWrite(&state);
                 /* the disk may be alredy relocked for reading above */
-                Assert (SUCCEEDED(rc) || state == MediumState_LockedRead);
+                Assert(SUCCEEDED(rc) || state == MediumState_LockedRead);
             }
         }
@@ -8300 +8307 @@
     mUSBController->commit();
 
-    for (ULONG slot = 0; slot < RT_ELEMENTS (mNetworkAdapters); slot ++)
-        mNetworkAdapters [slot]->commit();
-    for (ULONG slot = 0; slot < RT_ELEMENTS (mSerialPorts); slot ++)
-        mSerialPorts [slot]->commit();
-    for (ULONG slot = 0; slot < RT_ELEMENTS (mParallelPorts); slot ++)
-        mParallelPorts [slot]->commit();
+    for (ULONG slot = 0; slot < RT_ELEMENTS(mNetworkAdapters); slot++)
+        mNetworkAdapters[slot]->commit();
+    for (ULONG slot = 0; slot < RT_ELEMENTS(mSerialPorts); slot++)
+        mSerialPorts[slot]->commit();
+    for (ULONG slot = 0; slot < RT_ELEMENTS(mParallelPorts); slot++)
+        mParallelPorts[slot]->commit();
 
     bool commitStorageControllers = false;
@@ -8332 +8339 @@
                      * create a peer owning data this device share it with */
                     peer.createObject();
-                    peer->init (mPeer, *it, true /* aReshare */);
+                    peer->init(mPeer, *it, true /* aReshare */);
                 }
                 else
                 {
                     /* remove peer from the old list */
-                    mPeer->mStorageControllers->remove (peer);
+                    mPeer->mStorageControllers->remove(peer);
                 }
                 /* and add it to the new list */
@@ -8354 +8361 @@
 
             /* attach new list of controllers to our peer */
-            mPeer->mStorageControllers.attach (newList);
+            mPeer->mStorageControllers.attach(newList);
         }
         else
@@ -8383 +8390 @@
     {
         /* attach new data to the primary machine and reshare it */
-        mPeer->mUserData.attach (mUserData);
-        mPeer->mHWData.attach (mHWData);
+        mPeer->mUserData.attach(mUserData);
+        mPeer->mHWData.attach(mHWData);
         /* mMediaData is reshared by fixupMedia */
         // mPeer->mMediaData.attach(mMediaData);
@@ -8408 +8415 @@
     AssertReturnVoid(aThat->getClassID() == clsidSnapshotMachine);
 
-    AssertReturnVoid(!Global::IsOnline (mData->mMachineState));
+    AssertReturnVoid(!Global::IsOnline(mData->mMachineState));
 
     mHWData.assignCopy(aThat->mHWData);
@@ -8421 +8428 @@
         folder.createObject();
         HRESULT rc = folder->initCopy(getMachine(), *it);
-        AssertComRC (rc);
+        AssertComRC(rc);
         *it = folder;
     }
@@ -8441 +8448 @@
         ComObjPtr<StorageController> ctrl;
         ctrl.createObject();
-        ctrl->initCopy (this, *it);
+        ctrl->initCopy(this, *it);
         mStorageControllers->push_back(ctrl);
     }
 
-    for (ULONG slot = 0; slot < RT_ELEMENTS (mNetworkAdapters); slot ++)
-        mNetworkAdapters[slot]->copyFrom (aThat->mNetworkAdapters [slot]);
-    for (ULONG slot = 0; slot < RT_ELEMENTS (mSerialPorts); slot ++)
-        mSerialPorts[slot]->copyFrom (aThat->mSerialPorts [slot]);
-    for (ULONG slot = 0; slot < RT_ELEMENTS (mParallelPorts); slot ++)
-        mParallelPorts[slot]->copyFrom (aThat->mParallelPorts [slot]);
+    for (ULONG slot = 0; slot < RT_ELEMENTS(mNetworkAdapters); slot++)
+        mNetworkAdapters[slot]->copyFrom(aThat->mNetworkAdapters[slot]);
+    for (ULONG slot = 0; slot < RT_ELEMENTS(mSerialPorts); slot++)
+        mSerialPorts[slot]->copyFrom(aThat->mSerialPorts[slot]);
+    for (ULONG slot = 0; slot < RT_ELEMENTS(mParallelPorts); slot++)
+        mParallelPorts[slot]->copyFrom(aThat->mParallelPorts[slot]);
 }
 
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
-void Machine::registerMetrics (PerformanceCollector *aCollector, Machine *aMachine, RTPROCESS pid)
+void Machine::registerMetrics(PerformanceCollector *aCollector, Machine *aMachine, RTPROCESS pid)
 {
     pm::CollectorHAL *hal = aCollector->getHAL();
     /* Create sub metrics */
-    pm::SubMetric *cpuLoadUser = new pm::SubMetric ("CPU/Load/User",
+    pm::SubMetric *cpuLoadUser = new pm::SubMetric("CPU/Load/User",
         "Percentage of processor time spent in user mode by VM process.");
-    pm::SubMetric *cpuLoadKernel = new pm::SubMetric ("CPU/Load/Kernel",
+    pm::SubMetric *cpuLoadKernel = new pm::SubMetric("CPU/Load/Kernel",
         "Percentage of processor time spent in kernel mode by VM process.");
-    pm::SubMetric *ramUsageUsed  = new pm::SubMetric ("RAM/Usage/Used",
+    pm::SubMetric *ramUsageUsed  = new pm::SubMetric("RAM/Usage/Used",
         "Size of resident portion of VM process in memory.");
     /* Create and register base metrics */
-    pm::BaseMetric *cpuLoad = new pm::MachineCpuLoadRaw (hal, aMachine, pid,
-                                                         cpuLoadUser, cpuLoadKernel);
-    aCollector->registerBaseMetric (cpuLoad);
-    pm::BaseMetric *ramUsage = new pm::MachineRamUsage (hal, aMachine, pid,
-                                                        ramUsageUsed);
-    aCollector->registerBaseMetric (ramUsage);
-
-    aCollector->registerMetric (new pm::Metric (cpuLoad, cpuLoadUser, 0));
-    aCollector->registerMetric (new pm::Metric (cpuLoad, cpuLoadUser,
+    pm::BaseMetric *cpuLoad = new pm::MachineCpuLoadRaw(hal, aMachine, pid,
+                                                        cpuLoadUser, cpuLoadKernel);
+    aCollector->registerBaseMetric(cpuLoad);
+    pm::BaseMetric *ramUsage = new pm::MachineRamUsage(hal, aMachine, pid,
+                                                       ramUsageUsed);
+    aCollector->registerBaseMetric(ramUsage);
+
+    aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadUser, 0));
+    aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadUser,
                                                 new pm::AggregateAvg()));
-    aCollector->registerMetric (new pm::Metric (cpuLoad, cpuLoadUser,
-                                                new pm::AggregateMin()));
-    aCollector->registerMetric (new pm::Metric (cpuLoad, cpuLoadUser,
-                                                new pm::AggregateMax()));
-    aCollector->registerMetric (new pm::Metric (cpuLoad, cpuLoadKernel, 0));
-    aCollector->registerMetric (new pm::Metric (cpuLoad, cpuLoadKernel,
-                                                new pm::AggregateAvg()));
-    aCollector->registerMetric (new pm::Metric (cpuLoad, cpuLoadKernel,
-                                                new pm::AggregateMin()));
-    aCollector->registerMetric (new pm::Metric (cpuLoad, cpuLoadKernel,
-                                                new pm::AggregateMax()));
-
-    aCollector->registerMetric (new pm::Metric (ramUsage, ramUsageUsed, 0));
-    aCollector->registerMetric (new pm::Metric (ramUsage, ramUsageUsed,
-                                                new pm::AggregateAvg()));
-    aCollector->registerMetric (new pm::Metric (ramUsage, ramUsageUsed,
-                                                new pm::AggregateMin()));
-    aCollector->registerMetric (new pm::Metric (ramUsage, ramUsageUsed,
-                                                new pm::AggregateMax()));
+    aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadUser,
+                                              new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadUser,
+                                              new pm::AggregateMax()));
+    aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadKernel, 0));
+    aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadKernel,
+                                              new pm::AggregateAvg()));
+    aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadKernel,
+                                              new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(cpuLoad, cpuLoadKernel,
+                                              new pm::AggregateMax()));
+
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageUsed, 0));
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageUsed,
+                                              new pm::AggregateAvg()));
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageUsed,
+                                              new pm::AggregateMin()));
+    aCollector->registerMetric(new pm::Metric(ramUsage, ramUsageUsed,
+                                              new pm::AggregateMax()));
 };
 
-void Machine::unregisterMetrics (PerformanceCollector *aCollector, Machine *aMachine)
-{
-    aCollector->unregisterMetricsFor (aMachine);
-    aCollector->unregisterBaseMetricsFor (aMachine);
+void Machine::unregisterMetrics(PerformanceCollector *aCollector, Machine *aMachine)
+{
+    aCollector->unregisterMetricsFor(aMachine);
+    aCollector->unregisterBaseMetricsFor(aMachine);
 };
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
@@ -8529 +8536 @@
     LogFlowThisFunc(("\n"));
 
-    uninit (Uninit::Unexpected);
+    uninit(Uninit::Unexpected);
 }
 
@@ -8535 +8542 @@
  *  @note Must be called only by Machine::openSession() from its own write lock.
  */
-HRESULT SessionMachine::init (Machine *aMachine)
+HRESULT SessionMachine::init(Machine *aMachine)
 {
     LogFlowThisFuncEnter();
@@ -8554 +8561 @@
         if (mIPCSemName[i] == '\\')
             mIPCSemName[i] = '/';
-    mIPCSem = ::CreateMutex (NULL, FALSE, mIPCSemName);
-    ComAssertMsgRet (mIPCSem,
-                     ("Cannot create IPC mutex '%ls', err=%d",
-                      mIPCSemName.raw(), ::GetLastError()),
-                     E_FAIL);
+    mIPCSem = ::CreateMutex(NULL, FALSE, mIPCSemName);
+    ComAssertMsgRet(mIPCSem,
+                    ("Cannot create IPC mutex '%ls', err=%d",
+                     mIPCSemName.raw(), ::GetLastError()),
+                    E_FAIL);
 #elif defined(RT_OS_OS2)
-    Utf8Str ipcSem = Utf8StrFmt ("\\SEM32\\VBOX\\VM\\{%RTuuid}",
-                                 aMachine->mData->mUuid.raw());
+    Utf8Str ipcSem = Utf8StrFmt("\\SEM32\\VBOX\\VM\\{%RTuuid}",
+                                aMachine->mData->mUuid.raw());
     mIPCSemName = ipcSem;
-    APIRET arc = ::DosCreateMutexSem ((PSZ) ipcSem.raw(), &mIPCSem, 0, FALSE);
-    ComAssertMsgRet (arc == NO_ERROR,
-                     ("Cannot create IPC mutex '%s', arc=%ld",
-                      ipcSem.raw(), arc),
-                     E_FAIL);
+    APIRET arc = ::DosCreateMutexSem((PSZ)ipcSem.raw(), &mIPCSem, 0, FALSE);
+    ComAssertMsgRet(arc == NO_ERROR,
+                    ("Cannot create IPC mutex '%s', arc=%ld",
+                     ipcSem.raw(), arc),
+                    E_FAIL);
 #elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER)
 # ifdef VBOX_WITH_NEW_SYS_V_KEYGEN
@@ -8582 +8589 @@
     {
         key = ((uint32_t)'V' << 24) | i;
-        int sem = ::semget (key, 1, S_IRUSR | S_IWUSR | IPC_CREAT | IPC_EXCL);
+        int sem = ::semget(key, 1, S_IRUSR | S_IWUSR | IPC_CREAT | IPC_EXCL);
         if (sem >= 0 || (errno != EEXIST && errno != EACCES))
         {
             mIPCSem = sem;
             if (sem >= 0)
-                mIPCKey = BstrFmt ("%u", key);
+                mIPCKey = BstrFmt("%u", key);
             break;
         }
@@ -8594 +8601 @@
     Utf8Str semName = aMachine->mData->m_strConfigFileFull;
     char *pszSemName = NULL;
-    RTStrUtf8ToCurrentCP (&pszSemName, semName);
-    key_t key = ::ftok (pszSemName, 'V');
-    RTStrFree (pszSemName);
-
-    mIPCSem = ::semget (key, 1, S_IRWXU | S_IRWXG | S_IRWXO | IPC_CREAT);
+    RTStrUtf8ToCurrentCP(&pszSemName, semName);
+    key_t key = ::ftok(pszSemName, 'V');
+    RTStrFree(pszSemName);
+
+    mIPCSem = ::semget(key, 1, S_IRWXU | S_IRWXG | S_IRWXO | IPC_CREAT);
 # endif /* !VBOX_WITH_NEW_SYS_V_KEYGEN */
 
@@ -8629 +8636 @@
         return E_FAIL;
     }
-    ComAssertMsgRet (mIPCSem >= 0, ("Cannot create IPC semaphore, errno=%d", errnoSave),
-                     E_FAIL);
+    ComAssertMsgRet(mIPCSem >= 0, ("Cannot create IPC semaphore, errno=%d", errnoSave),
+                    E_FAIL);
     /* set the initial value to 1 */
-    int rv = ::semctl (mIPCSem, 0, SETVAL, 1);
-    ComAssertMsgRet (rv == 0, ("Cannot init IPC semaphore, errno=%d", errno),
-                     E_FAIL);
+    int rv = ::semctl(mIPCSem, 0, SETVAL, 1);
+    ComAssertMsgRet(rv == 0, ("Cannot init IPC semaphore, errno=%d", errno),
+                    E_FAIL);
 #else
 # error "Port me!"
@@ -8645 +8652 @@
 
     /* take the pointers to data to share */
-    mData.share (aMachine->mData);
-    mSSData.share (aMachine->mSSData);
-
-    mUserData.share (aMachine->mUserData);
-    mHWData.share (aMachine->mHWData);
+    mData.share(aMachine->mData);
+    mSSData.share(aMachine->mSSData);
+
+    mUserData.share(aMachine->mUserData);
+    mHWData.share(aMachine->mHWData);
     mMediaData.share(aMachine->mMediaData);
 
@@ -8660 +8667 @@
         ctl.createObject();
         ctl->init(this, *it);
-        mStorageControllers->push_back (ctl);
+        mStorageControllers->push_back(ctl);
     }
 
     unconst(mBIOSSettings).createObject();
-    mBIOSSettings->init (this, aMachine->mBIOSSettings);
+    mBIOSSettings->init(this, aMachine->mBIOSSettings);
 #ifdef VBOX_WITH_VRDP
     /* create another VRDPServer object that will be mutable */
     unconst(mVRDPServer).createObject();
-    mVRDPServer->init (this, aMachine->mVRDPServer);
+    mVRDPServer->init(this, aMachine->mVRDPServer);
 #endif
     /* create another audio adapter object that will be mutable */
     unconst(mAudioAdapter).createObject();
-    mAudioAdapter->init (this, aMachine->mAudioAdapter);
+    mAudioAdapter->init(this, aMachine->mAudioAdapter);
     /* create a list of serial ports that will be mutable */
-    for (ULONG slot = 0; slot < RT_ELEMENTS (mSerialPorts); slot ++)
-    {
-        unconst(mSerialPorts [slot]).createObject();
-        mSerialPorts [slot]->init (this, aMachine->mSerialPorts [slot]);
+    for (ULONG slot = 0; slot < RT_ELEMENTS(mSerialPorts); slot++)
+    {
+        unconst(mSerialPorts[slot]).createObject();
+        mSerialPorts[slot]->init(this, aMachine->mSerialPorts[slot]);
     }
     /* create a list of parallel ports that will be mutable */
-    for (ULONG slot = 0; slot < RT_ELEMENTS (mParallelPorts); slot ++)
-    {
-        unconst(mParallelPorts [slot]).createObject();
-        mParallelPorts [slot]->init (this, aMachine->mParallelPorts [slot]);
+    for (ULONG slot = 0; slot < RT_ELEMENTS(mParallelPorts); slot++)
+    {
+        unconst(mParallelPorts[slot]).createObject();
+        mParallelPorts[slot]->init(this, aMachine->mParallelPorts[slot]);
     }
     /* create another USB controller object that will be mutable */
@@ -8692 +8699 @@
     for (ULONG slot = 0; slot < RT_ELEMENTS(mNetworkAdapters); slot++)
     {
-        unconst(mNetworkAdapters [slot]).createObject();
-        mNetworkAdapters[slot]->init (this, aMachine->mNetworkAdapters [slot]);
+        unconst(mNetworkAdapters[slot]).createObject();
+        mNetworkAdapters[slot]->init(this, aMachine->mNetworkAdapters[slot]);
     }
 
@@ -8714 +8721 @@
  *  @note Locks mParent + this object for writing.
  */
-void SessionMachine::uninit (Uninit::Reason aReason)
+void SessionMachine::uninit(Uninit::Reason aReason)
 {
     LogFlowThisFuncEnter();
@@ -8746 +8753 @@
 #if defined(RT_OS_WINDOWS)
         if (mIPCSem)
-            ::CloseHandle (mIPCSem);
+            ::CloseHandle(mIPCSem);
         mIPCSem = NULL;
 #elif defined(RT_OS_OS2)
         if (mIPCSem != NULLHANDLE)
-            ::DosCloseMutexSem (mIPCSem);
+            ::DosCloseMutexSem(mIPCSem);
         mIPCSem = NULLHANDLE;
 #elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER)
         if (mIPCSem >= 0)
-            ::semctl (mIPCSem, 0, IPC_RMID);
+            ::semctl(mIPCSem, 0, IPC_RMID);
         mIPCSem = -1;
 # ifdef VBOX_WITH_NEW_SYS_V_KEYGEN
@@ -8785 +8792 @@
     {
         LogWarningThisFunc(("ABNORMAL client termination! (wasBusy=%d)\n",
-                             Global::IsOnlineOrTransient (lastState)));
+                             Global::IsOnlineOrTransient(lastState)));
 
         /* reset the state to Aborted */
@@ -8796 +8803 @@
     {
         LogWarningThisFunc(("Discarding unsaved settings changes!\n"));
-        rollback (false /* aNotify */);
+        rollback(false /* aNotify */);
     }
 
@@ -8821 +8828 @@
 #ifdef VBOX_WITH_USB
     /* release all captured USB devices */
-    if (aReason == Uninit::Abnormal && Global::IsOnline (lastState))
+    if (aReason == Uninit::Abnormal && Global::IsOnline(lastState))
     {
         /* Console::captureUSBDevices() is called in the VM process only after
@@ -8831 +8838 @@
          * This is identical to SessionMachine::DetachAllUSBDevices except
          * for the aAbnormal argument. */
-        HRESULT rc = mUSBController->notifyProxy (false /* aInsertFilters */);
+        HRESULT rc = mUSBController->notifyProxy(false /* aInsertFilters */);
         AssertComRC(rc);
-        NOREF (rc);
+        NOREF(rc);
 
         USBProxyService *service = mParent->host()->usbProxyService();
         if (service)
-            service->detachAllDevicesFromVM (this, true /* aDone */, true /* aAbnormal */);
+            service->detachAllDevicesFromVM(this, true /* aDone */, true /* aAbnormal */);
     }
 #endif /* VBOX_WITH_USB */
@@ -8847 +8854 @@
          * need to queue the PID to reap the process (and avoid zombies on
          * Linux). */
-        Assert (mData->mSession.mPid != NIL_RTPROCESS);
-        mParent->addProcessToReap (mData->mSession.mPid);
+        Assert(mData->mSession.mPid != NIL_RTPROCESS);
+        mParent->addProcessToReap(mData->mSession.mPid);
     }
 
@@ -8874 +8881 @@
             HRESULT rc = (*it)->Uninitialize();
             LogFlowThisFunc(("  remoteControl->Uninitialize() returned %08X\n", rc));
-            if (FAILED (rc))
+            if (FAILED(rc))
                 LogWarningThisFunc(("Forgot to close the remote session?\n"));
             ++it;
@@ -8903 +8910 @@
     {
         /* this must be null here (see #OnSessionEnd()) */
-        Assert (mData->mSession.mDirectControl.isNull());
-        Assert (mData->mSession.mState == SessionState_Closing);
-        Assert (!mData->mSession.mProgress.isNull());
+        Assert(mData->mSession.mDirectControl.isNull());
+        Assert(mData->mSession.mState == SessionState_Closing);
+        Assert(!mData->mSession.mProgress.isNull());
 
         mData->mSession.mProgress->notifyComplete (S_OK);
@@ -8912 +8919 @@
 
     /* remove the association between the peer machine and this session machine */
-    Assert (mData->mSession.mMachine == this ||
-            aReason == Uninit::Unexpected);
+    Assert(mData->mSession.mMachine == this ||
+           aReason == Uninit::Unexpected);
 
     /* reset the rest of session data */
@@ -9192 +9199 @@
         /* go to the closing state (essential for all open*Session() calls and
          * for #checkForDeath()) */
-        Assert (mData->mSession.mState == SessionState_Open);
+        Assert(mData->mSession.mState == SessionState_Open);
         mData->mSession.mState = SessionState_Closing;
 
@@ -10197 +10204 @@
          * Machine::fixupMedia(). The last can happen when e.g a DVD/Floppy
          * image was unmounted at runtime. */
-        Assert (SUCCEEDED(rc) || state == MediumState_LockedRead || state == MediumState_Created);
+        Assert(SUCCEEDED(rc) || state == MediumState_LockedRead || state == MediumState_Created);
     }
 

trunk/src/VBox/Main/Matching.cpp

@@ -55 +55 @@
     do
     {
-        end = strcspn (aFilter + start, ",-");
+        end = strcspn(aFilter + start, ",-");
         end += start;
 
-        char delim = aFilter [end];
+        char delim = aFilter[end];
 
         if (delim == '-')
@@ -73 +73 @@
         // skip spaces around numbers
         size_t s = start;
-        while (s < end && aFilter [s] == ' ') ++ s;
+        while (s < end && aFilter[s] == ' ') ++s;
         size_t e = end - 1;
-        while (e > s && aFilter [e] == ' ') -- e;
-        ++ e;
-
-        that->parseValue (aFilter, s, e, mode);
+        while (e > s && aFilter[e] == ' ') --e;
+        ++e;
+
+        that->parseValue(aFilter, s, e, mode);
         if (!that->mValid)
             return;

trunk/src/VBox/Main/MediumFormatImpl.cpp

@@ -198 +198 @@
 }
 
-STDMETHODIMP MediumFormat::
-COMGETTER(FileExtensions)(ComSafeArrayOut (BSTR, aFileExtensions))
-{
-    if (ComSafeArrayOutIsNull (aFileExtensions))
+STDMETHODIMP MediumFormat::COMGETTER(FileExtensions)(ComSafeArrayOut(BSTR, aFileExtensions))
+{
+    if (ComSafeArrayOutIsNull(aFileExtensions))
         return E_POINTER;
 
@@ -208 +207 @@
 
     /* this is const, no need to lock */
-    com::SafeArray <BSTR> fileExtentions (m.fileExtensions.size());
+    com::SafeArray<BSTR> fileExtentions(m.fileExtensions.size());
     int i = 0;
     for (BstrList::const_iterator it = m.fileExtensions.begin();
-        it != m.fileExtensions.end(); ++ it, ++ i)
-        (*it).cloneTo (&fileExtentions [i]);
-    fileExtentions.detachTo (ComSafeArrayOutArg (aFileExtensions));
+         it != m.fileExtensions.end();
+         ++it, ++i)
+        (*it).cloneTo(&fileExtentions[i]);
+    fileExtentions.detachTo(ComSafeArrayOutArg(aFileExtensions));
 
     return S_OK;
@@ -254 +254 @@
 
     /* this is const, no need to lock */
-    com::SafeArray <BSTR> propertyNames (m.properties.size());
-    com::SafeArray <BSTR> propertyDescriptions (m.properties.size());
-    com::SafeArray <DataType_T> propertyTypes (m.properties.size());
-    com::SafeArray <ULONG> propertyFlags (m.properties.size());
-    com::SafeArray <BSTR> propertyDefaults (m.properties.size());
+    com::SafeArray<BSTR>        propertyNames(m.properties.size());
+    com::SafeArray<BSTR>        propertyDescriptions (m.properties.size());
+    com::SafeArray<DataType_T>  propertyTypes(m.properties.size());
+    com::SafeArray<ULONG>       propertyFlags(m.properties.size());
+    com::SafeArray<BSTR>        propertyDefaults(m.properties.size());
 
     int i = 0;
     for (PropertyList::const_iterator it = m.properties.begin();
-         it != m.properties.end(); ++ it, ++ i)
+         it != m.properties.end();
+         ++it, ++i)
     {
         const Property &prop = (*it);
-        prop.name.cloneTo (&propertyNames [i]);
-        prop.description.cloneTo (&propertyDescriptions [i]);
-        propertyTypes [i] = prop.type;
-        propertyFlags [i] = prop.flags;
-        prop.defaultValue.cloneTo (&propertyDefaults [i]);
+        prop.name.cloneTo(&propertyNames[i]);
+        prop.description.cloneTo(&propertyDescriptions[i]);
+        propertyTypes[i] = prop.type;
+        propertyFlags[i] = prop.flags;
+        prop.defaultValue.cloneTo(&propertyDefaults[i]);
     }
 
-    propertyNames.detachTo (ComSafeArrayOutArg (aNames));
-    propertyDescriptions.detachTo (ComSafeArrayOutArg (aDescriptions));
-    propertyTypes.detachTo (ComSafeArrayOutArg (aTypes));
-    propertyFlags.detachTo (ComSafeArrayOutArg (aFlags));
-    propertyDefaults.detachTo (ComSafeArrayOutArg (aDefaults));
+    propertyNames.detachTo(ComSafeArrayOutArg(aNames));
+    propertyDescriptions.detachTo(ComSafeArrayOutArg(aDescriptions));
+    propertyTypes.detachTo(ComSafeArrayOutArg(aTypes));
+    propertyFlags.detachTo(ComSafeArrayOutArg(aFlags));
+    propertyDefaults.detachTo(ComSafeArrayOutArg(aDefaults));
 
     return S_OK;

trunk/src/VBox/Main/MediumImpl.cpp

@@ -1753 +1753 @@
              it != m->backRefs.end(); ++ it, ++ i)
         {
-             it->machineId.toUtf16().detachTo(&machineIds [i]);
+             it->machineId.toUtf16().detachTo(&machineIds[i]);
         }
     }
@@ -2170 +2170 @@
         it->first.cloneTo(&names[i]);
         if (it->second.isEmpty())
-            Bstr("").cloneTo(&values [i]);
+            Bstr("").cloneTo(&values[i]);
         else
-            it->second.cloneTo(&values [i]);
+            it->second.cloneTo(&values[i]);
         ++ i;
     }
@@ -2218 +2218 @@
             it->second = (const char *)NULL;
         else
-            it->second = values [i];
+            it->second = values[i];
     }
 
@@ -2608 +2608 @@
     }
 
-    if (FAILED (rc))
+    if (FAILED(rc))
     {
         HRESULT rc2 = UnlockWrite(NULL);

trunk/src/VBox/Main/MouseImpl.cpp

@@ -240 +240 @@
     int vrc = mpDrv->pUpPort->pfnPutEvent(mpDrv->pUpPort, dx, dy, dz, dw, fButtons);
     if (RT_FAILURE(vrc))
-        rc = setError (VBOX_E_IPRT_ERROR,
-            tr ("Could not send the mouse event to the virtual mouse (%Rrc)"),
-                vrc);
+        rc = setError(VBOX_E_IPRT_ERROR,
+                      tr("Could not send the mouse event to the virtual mouse (%Rrc)"),
+                      vrc);
 
     return rc;
@@ -342 +342 @@
         mLastAbsY = mouseYAbs;
         if (RT_FAILURE(vrc))
-            rc = setError (VBOX_E_IPRT_ERROR,
-                tr ("Could not send the mouse event to the virtual mouse (%Rrc)"),
-                    vrc);
+            rc = setError(VBOX_E_IPRT_ERROR,
+                          tr("Could not send the mouse event to the virtual mouse (%Rrc)"),
+                          vrc);
     }
 

trunk/src/VBox/Main/NetworkAdapterImpl.cpp

@@ -221 +221 @@
             break;
         default:
-            return setError (E_FAIL,
-                tr("Invalid network adapter type '%d'"),
-                aAdapterType);
+            return setError(E_FAIL,
+                            tr("Invalid network adapter type '%d'"),
+                            aAdapterType);
     }
 
@@ -239 +239 @@
         mlock.release();
 
-        mParent->onNetworkAdapterChange (this, FALSE);
+        mParent->onNetworkAdapterChange(this, FALSE);
     }
 
@@ -297 +297 @@
         mlock.release();
 
-        mParent->onNetworkAdapterChange (this, FALSE);
+        mParent->onNetworkAdapterChange(this, FALSE);
     }
 
@@ -408 +408 @@
 
     if (emitChangeEvent)
-        mParent->onNetworkAdapterChange (this, FALSE);
+        mParent->onNetworkAdapterChange(this, FALSE);
 
     return rc;
@@ -508 +508 @@
             && mData->mAttachmentType == NetworkAttachmentType_Internal)
         {
-            return setError (E_FAIL,
-                tr ("Empty or null internal network name is not valid"));
+            return setError(E_FAIL,
+                            tr("Empty or null internal network name is not valid"));
         }
 
@@ -784 +784 @@
         mlock.release();
 
-        HRESULT rc = mParent->onNetworkAdapterChange (this, TRUE);
-        if (FAILED (rc))
+        HRESULT rc = mParent->onNetworkAdapterChange(this, TRUE);
+        if (FAILED(rc))
         {
             /* If changing the attachment failed then we can't assume
@@ -831 +831 @@
         mlock.release();
 
-        HRESULT rc = mParent->onNetworkAdapterChange (this, TRUE);
-        if (FAILED (rc))
+        HRESULT rc = mParent->onNetworkAdapterChange(this, TRUE);
+        if (FAILED(rc))
         {
             /* If changing the attachment failed then we can't assume
@@ -886 +886 @@
         mlock.release();
 
-        HRESULT rc = mParent->onNetworkAdapterChange (this, TRUE);
-        if (FAILED (rc))
+        HRESULT rc = mParent->onNetworkAdapterChange(this, TRUE);
+        if (FAILED(rc))
         {
             /* If changing the attachment failed then we can't assume
@@ -933 +933 @@
         mlock.release();
 
-        HRESULT rc = mParent->onNetworkAdapterChange (this, TRUE);
-        if (FAILED (rc))
+        HRESULT rc = mParent->onNetworkAdapterChange(this, TRUE);
+        if (FAILED(rc))
         {
             /* If changing the attachment failed then we can't assume
@@ -974 +974 @@
         mlock.release();
 
-        mParent->onNetworkAdapterChange (this, TRUE);
+        mParent->onNetworkAdapterChange(this, TRUE);
     }
 

trunk/src/VBox/Main/ParallelPortImpl.cpp

@@ -227 +227 @@
         if (aEnabled &&
             m->bd->strPath.isEmpty())
-            return setError (E_INVALIDARG,
-                        tr ("Cannot enable the parallel port %d "
-                            "because the port path is empty or null"),
-                        m->bd->ulSlot);
+            return setError(E_INVALIDARG,
+                            tr("Cannot enable the parallel port %d because the port path is empty or null"),
+                            m->bd->ulSlot);
 
         m->bd.backup();
@@ -282 +281 @@
      * (when changing this, make sure it corresponds to XML schema */
     if (aIRQ > 255)
-        return setError (E_INVALIDARG,
-            tr ("Invalid IRQ number of the parallel port %d: "
-                "%lu (must be in range [0, %lu])"),
-            m->bd->ulSlot, aIRQ, 255);
+        return setError(E_INVALIDARG,
+                        tr("Invalid IRQ number of the parallel port %d: %lu (must be in range [0, %lu])"),
+                        m->bd->ulSlot, aIRQ, 255);
 
     AutoCaller autoCaller(this);
@@ -334 +332 @@
      * (when changing this, make sure it corresponds to XML schema */
     if (aIOBase > 0xFFFF)
-        return setError (E_INVALIDARG,
-            tr ("Invalid I/O port base address of the parallel port %d: "
-                "%lu (must be in range [0, 0x%X])"),
-            m->bd->ulSlot, aIOBase, 0, 0xFFFF);
+        return setError(E_INVALIDARG,
+                        tr("Invalid I/O port base address of the parallel port %d: %lu (must be in range [0, 0x%X])"),
+                        m->bd->ulSlot, aIOBase, 0, 0xFFFF);
 
     AutoCaller autoCaller(this);

trunk/src/VBox/Main/PerformanceImpl.cpp

@@ -168 +168 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-STDMETHODIMP
-PerformanceCollector::COMGETTER(MetricNames) (ComSafeArrayOut(BSTR, theMetricNames))
+STDMETHODIMP PerformanceCollector::COMGETTER(MetricNames)(ComSafeArrayOut(BSTR, theMetricNames))
 {
     if (ComSafeArrayOutIsNull(theMetricNames))
@@ -216 +215 @@
 }
 
-STDMETHODIMP
-PerformanceCollector::GetMetrics (ComSafeArrayIn (IN_BSTR, metricNames),
-                                  ComSafeArrayIn (IUnknown *, objects),
-                                  ComSafeArrayOut(IPerformanceMetric *, outMetrics))
+STDMETHODIMP PerformanceCollector::GetMetrics(ComSafeArrayIn(IN_BSTR, metricNames),
+                                              ComSafeArrayIn(IUnknown *, objects),
+                                              ComSafeArrayOut(IPerformanceMetric *, outMetrics))
 {
     LogFlowThisFuncEnter();
@@ -251 +249 @@
         LogFlow (("PerformanceCollector::GetMetrics() store a metric at "
                   "retMetrics[%d]...\n", i));
-        metric.queryInterfaceTo(&retMetrics [i++]);
+        metric.queryInterfaceTo(&retMetrics[i++]);
     }
     retMetrics.detachTo(ComSafeArrayOutArg(outMetrics));
@@ -258 +256 @@
 }
 
-STDMETHODIMP
-PerformanceCollector::SetupMetrics (ComSafeArrayIn (IN_BSTR, metricNames),
-                                    ComSafeArrayIn (IUnknown *, objects),
-                                    ULONG aPeriod, ULONG aCount,
-                                    ComSafeArrayOut(IPerformanceMetric *,
-                                                     outMetrics))
+STDMETHODIMP PerformanceCollector::SetupMetrics(ComSafeArrayIn(IN_BSTR, metricNames),
+                                                ComSafeArrayIn(IUnknown *, objects),
+                                                ULONG aPeriod,
+                                                ULONG aCount,
+                                                ComSafeArrayOut(IPerformanceMetric *, outMetrics))
 {
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    pm::Filter filter (ComSafeArrayInArg (metricNames),
-                       ComSafeArrayInArg (objects));
+    pm::Filter filter(ComSafeArrayInArg (metricNames),
+                      ComSafeArrayInArg (objects));
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -297 +294 @@
         }
 
-    com::SafeIfaceArray<IPerformanceMetric> retMetrics (filteredMetrics.size());
+    com::SafeIfaceArray<IPerformanceMetric> retMetrics(filteredMetrics.size());
     int i = 0;
     for (it = filteredMetrics.begin();
          it != filteredMetrics.end() && SUCCEEDED(rc); ++it)
-        rc = toIPerformanceMetric(*it, &retMetrics [i++]);
+        rc = toIPerformanceMetric(*it, &retMetrics[i++]);
     retMetrics.detachTo(ComSafeArrayOutArg(outMetrics));
 
@@ -308 +305 @@
 }
 
-STDMETHODIMP
-PerformanceCollector::EnableMetrics (ComSafeArrayIn (IN_BSTR, metricNames),
-                                     ComSafeArrayIn (IUnknown *, objects),
-                                     ComSafeArrayOut(IPerformanceMetric *,
-                                                      outMetrics))
+STDMETHODIMP PerformanceCollector::EnableMetrics(ComSafeArrayIn(IN_BSTR, metricNames),
+                                                 ComSafeArrayIn(IUnknown *, objects),
+                                                 ComSafeArrayOut(IPerformanceMetric *, outMetrics))
 {
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    pm::Filter filter (ComSafeArrayInArg (metricNames),
-                       ComSafeArrayInArg (objects));
+    pm::Filter filter(ComSafeArrayInArg(metricNames),
+                      ComSafeArrayInArg(objects));
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); /* Write lock is not needed atm since we are */
@@ -334 +329 @@
         }
 
-    com::SafeIfaceArray<IPerformanceMetric> retMetrics (filteredMetrics.size());
+    com::SafeIfaceArray<IPerformanceMetric> retMetrics(filteredMetrics.size());
     int i = 0;
     for (it = filteredMetrics.begin();
          it != filteredMetrics.end() && SUCCEEDED(rc); ++it)
-        rc = toIPerformanceMetric(*it, &retMetrics [i++]);
+        rc = toIPerformanceMetric(*it, &retMetrics[i++]);
     retMetrics.detachTo(ComSafeArrayOutArg(outMetrics));
 
@@ -345 +340 @@
 }
 
-STDMETHODIMP
-PerformanceCollector::DisableMetrics (ComSafeArrayIn (IN_BSTR, metricNames),
-                                      ComSafeArrayIn (IUnknown *, objects),
-                                      ComSafeArrayOut(IPerformanceMetric *,
-                                                       outMetrics))
+STDMETHODIMP PerformanceCollector::DisableMetrics(ComSafeArrayIn(IN_BSTR, metricNames),
+                                                  ComSafeArrayIn(IUnknown *, objects),
+                                                  ComSafeArrayOut(IPerformanceMetric *, outMetrics))
 {
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    pm::Filter filter (ComSafeArrayInArg (metricNames),
-                       ComSafeArrayInArg (objects));
+    pm::Filter filter(ComSafeArrayInArg(metricNames),
+                      ComSafeArrayInArg(objects));
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); /* Write lock is not needed atm since we are */
@@ -371 +364 @@
         }
 
-    com::SafeIfaceArray<IPerformanceMetric> retMetrics (filteredMetrics.size());
+    com::SafeIfaceArray<IPerformanceMetric> retMetrics(filteredMetrics.size());
     int i = 0;
     for (it = filteredMetrics.begin();
          it != filteredMetrics.end() && SUCCEEDED(rc); ++it)
-        rc = toIPerformanceMetric(*it, &retMetrics [i++]);
+        rc = toIPerformanceMetric(*it, &retMetrics[i++]);
     retMetrics.detachTo(ComSafeArrayOutArg(outMetrics));
 
@@ -382 +375 @@
 }
 
-STDMETHODIMP
-PerformanceCollector::QueryMetricsData (ComSafeArrayIn (IN_BSTR, metricNames),
-                                        ComSafeArrayIn (IUnknown *, objects),
-                                        ComSafeArrayOut(BSTR, outMetricNames),
-                                        ComSafeArrayOut(IUnknown *, outObjects),
-                                        ComSafeArrayOut(BSTR, outUnits),
-                                        ComSafeArrayOut(ULONG, outScales),
-                                        ComSafeArrayOut(ULONG, outSequenceNumbers),
-                                        ComSafeArrayOut(ULONG, outDataIndices),
-                                        ComSafeArrayOut(ULONG, outDataLengths),
-                                        ComSafeArrayOut(LONG, outData))
+STDMETHODIMP PerformanceCollector::QueryMetricsData(ComSafeArrayIn (IN_BSTR, metricNames),
+                                                    ComSafeArrayIn (IUnknown *, objects),
+                                                    ComSafeArrayOut(BSTR, outMetricNames),
+                                                    ComSafeArrayOut(IUnknown *, outObjects),
+                                                    ComSafeArrayOut(BSTR, outUnits),
+                                                    ComSafeArrayOut(ULONG, outScales),
+                                                    ComSafeArrayOut(ULONG, outSequenceNumbers),
+                                                    ComSafeArrayOut(ULONG, outDataIndices),
+                                                    ComSafeArrayOut(ULONG, outDataLengths),
+                                                    ComSafeArrayOut(LONG, outData))
 {
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    pm::Filter filter (ComSafeArrayInArg (metricNames),
-                       ComSafeArrayInArg (objects));
+    pm::Filter filter(ComSafeArrayInArg(metricNames),
+                      ComSafeArrayInArg(objects));
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -416 +408 @@
     size_t flatIndex = 0;
     size_t numberOfMetrics = filteredMetrics.size();
-    com::SafeArray<BSTR> retNames (numberOfMetrics);
-    com::SafeIfaceArray<IUnknown> retObjects (numberOfMetrics);
-    com::SafeArray<BSTR> retUnits (numberOfMetrics);
-    com::SafeArray<ULONG> retScales (numberOfMetrics);
-    com::SafeArray<ULONG> retSequenceNumbers (numberOfMetrics);
-    com::SafeArray<ULONG> retIndices (numberOfMetrics);
-    com::SafeArray<ULONG> retLengths (numberOfMetrics);
-    com::SafeArray<LONG> retData (flatSize);
+    com::SafeArray<BSTR> retNames(numberOfMetrics);
+    com::SafeIfaceArray<IUnknown> retObjects(numberOfMetrics);
+    com::SafeArray<BSTR> retUnits(numberOfMetrics);
+    com::SafeArray<ULONG> retScales(numberOfMetrics);
+    com::SafeArray<ULONG> retSequenceNumbers(numberOfMetrics);
+    com::SafeArray<ULONG> retIndices(numberOfMetrics);
+    com::SafeArray<ULONG> retLengths(numberOfMetrics);
+    com::SafeArray<LONG> retData(flatSize);
 
     for (it = filteredMetrics.begin(); it != filteredMetrics.end(); ++it, ++i)
@@ -459 +451 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-void PerformanceCollector::registerBaseMetric (pm::BaseMetric *baseMetric)
+void PerformanceCollector::registerBaseMetric(pm::BaseMetric *baseMetric)
 {
     //LogFlowThisFuncEnter();
@@ -471 +463 @@
 }
 
-void PerformanceCollector::registerMetric (pm::Metric *metric)
+void PerformanceCollector::registerMetric(pm::Metric *metric)
 {
     //LogFlowThisFuncEnter();
@@ -483 +475 @@
 }
 
-void PerformanceCollector::unregisterBaseMetricsFor (const ComPtr<IUnknown> &aObject)
+void PerformanceCollector::unregisterBaseMetricsFor(const ComPtr<IUnknown> &aObject)
 {
     //LogFlowThisFuncEnter();
@@ -504 +496 @@
 }
 
-void PerformanceCollector::unregisterMetricsFor (const ComPtr<IUnknown> &aObject)
+void PerformanceCollector::unregisterMetricsFor(const ComPtr<IUnknown> &aObject)
 {
     //LogFlowThisFuncEnter();
@@ -547 +539 @@
 
 /* static */
-void PerformanceCollector::staticSamplerCallback (RTTIMERLR hTimerLR, void *pvUser,
-                                                  uint64_t /* iTick */)
+void PerformanceCollector::staticSamplerCallback(RTTIMERLR hTimerLR, void *pvUser,
+                                                 uint64_t /* iTick */)
 {
     AssertReturnVoid (pvUser != NULL);
     PerformanceCollector *collector = static_cast <PerformanceCollector *> (pvUser);
-    Assert (collector->mMagic == MAGIC);
+    Assert(collector->mMagic == MAGIC);
     if (collector->mMagic == MAGIC)
     {
@@ -621 +613 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-HRESULT PerformanceMetric::init (pm::Metric *aMetric)
+HRESULT PerformanceMetric::init(pm::Metric *aMetric)
 {
     m.name        = aMetric->getName();
@@ -634 +626 @@
 }
 
-HRESULT PerformanceMetric::init (pm::BaseMetric *aMetric)
+HRESULT PerformanceMetric::init(pm::BaseMetric *aMetric)
 {
     m.name        = aMetric->getName();
@@ -651 +643 @@
 }
 
-STDMETHODIMP PerformanceMetric::COMGETTER(MetricName) (BSTR *aMetricName)
+STDMETHODIMP PerformanceMetric::COMGETTER(MetricName)(BSTR *aMetricName)
 {
     /// @todo (r=dmik) why do all these getters not do AutoCaller and
@@ -660 +652 @@
 }
 
-STDMETHODIMP PerformanceMetric::COMGETTER(Object) (IUnknown **anObject)
+STDMETHODIMP PerformanceMetric::COMGETTER(Object)(IUnknown **anObject)
 {
     m.object.queryInterfaceTo(anObject);
@@ -666 +658 @@
 }
 
-STDMETHODIMP PerformanceMetric::COMGETTER(Description) (BSTR *aDescription)
+STDMETHODIMP PerformanceMetric::COMGETTER(Description)(BSTR *aDescription)
 {
     m.description.cloneTo(aDescription);
@@ -672 +664 @@
 }
 
-STDMETHODIMP PerformanceMetric::COMGETTER(Period) (ULONG *aPeriod)
+STDMETHODIMP PerformanceMetric::COMGETTER(Period)(ULONG *aPeriod)
 {
     *aPeriod = m.period;
@@ -678 +670 @@
 }
 
-STDMETHODIMP PerformanceMetric::COMGETTER(Count) (ULONG *aCount)
+STDMETHODIMP PerformanceMetric::COMGETTER(Count)(ULONG *aCount)
 {
     *aCount = m.count;
@@ -684 +676 @@
 }
 
-STDMETHODIMP PerformanceMetric::COMGETTER(Unit) (BSTR *aUnit)
+STDMETHODIMP PerformanceMetric::COMGETTER(Unit)(BSTR *aUnit)
 {
     m.unit.cloneTo(aUnit);
@@ -690 +682 @@
 }
 
-STDMETHODIMP PerformanceMetric::COMGETTER(MinimumValue) (LONG *aMinValue)
+STDMETHODIMP PerformanceMetric::COMGETTER(MinimumValue)(LONG *aMinValue)
 {
     *aMinValue = m.min;
@@ -696 +688 @@
 }
 
-STDMETHODIMP PerformanceMetric::COMGETTER(MaximumValue) (LONG *aMaxValue)
+STDMETHODIMP PerformanceMetric::COMGETTER(MaximumValue)(LONG *aMaxValue)
 {
     *aMaxValue = m.max;

trunk/src/VBox/Main/ProgressImpl.cpp

@@ -140 +140 @@
     /* add to the global collection of progress operations (note: after
      * creating mId) */
-    mParent->addProgress (this);
+    mParent->addProgress(this);
 #endif
 
@@ -402 +402 @@
 
     if (!mCompleted)
-        return setError (E_FAIL,
-            tr ("Result code is not available, operation is still in progress"));
+        return setError(E_FAIL,
+                        tr("Result code is not available, operation is still in progress"));
 
     *aResultCode = mResultCode;
@@ -420 +420 @@
 
     if (!mCompleted)
-        return setError (E_FAIL,
-            tr ("Error info is not available, operation is still in progress"));
+        return setError(E_FAIL,
+                        tr("Error info is not available, operation is still in progress"));
 
     mErrorInfo.queryInterfaceTo(aErrorInfo);
@@ -1087 +1087 @@
  * Marks the whole task as complete and sets the result code.
  *
- * If the result code indicates a failure (|FAILED (@a aResultCode)|) then this
+ * If the result code indicates a failure (|FAILED(@a aResultCode)|) then this
  * method will import the error info from the current thread and assign it to
  * the errorInfo attribute (it will return an error if no info is available in
@@ -1172 +1172 @@
     mResultCode = aResultCode;
 
-    AssertReturn(FAILED (aResultCode), E_FAIL);
+    AssertReturn(FAILED(aResultCode), E_FAIL);
 
     ComObjPtr<VirtualBoxErrorInfo> errorInfo;
@@ -1286 +1286 @@
 
     m_ulCurrentOperation = 0;
-    rc = mProgresses [0]->COMGETTER(OperationDescription) (
-        m_bstrOperationDescription.asOutParam());
+    rc = mProgresses[0]->COMGETTER(OperationDescription)(m_bstrOperationDescription.asOutParam());
     if (FAILED(rc)) return rc;
 
@@ -1295 +1294 @@
         {
             BOOL cancelable = FALSE;
-            rc = mProgresses [i]->COMGETTER(Cancelable) (&cancelable);
+            rc = mProgresses[i]->COMGETTER(Cancelable)(&cancelable);
             if (FAILED(rc)) return rc;
 
@@ -1304 +1303 @@
         {
             ULONG opCount = 0;
-            rc = mProgresses [i]->COMGETTER(OperationCount) (&opCount);
+            rc = mProgresses[i]->COMGETTER(OperationCount)(&opCount);
             if (FAILED(rc)) return rc;
 
@@ -1328 +1327 @@
  * @param aId           See ProgressBase::init().
  */
-HRESULT CombinedProgress::init (
+HRESULT CombinedProgress::init(
 #if !defined (VBOX_COM_INPROC)
-                                VirtualBox *aParent,
+                               VirtualBox *aParent,
 #endif
-                                IUnknown *aInitiator,
-                                CBSTR aDescription,
-                                IProgress *aProgress1, IProgress *aProgress2,
-                                OUT_GUID aId /* = NULL */)
+                               IUnknown *aInitiator,
+                               CBSTR aDescription,
+                               IProgress *aProgress1,
+                               IProgress *aProgress2,
+                               OUT_GUID aId /* = NULL */)
 {
     /* Enclose the state transition NotReady->InInit->Ready */
@@ -1341 +1341 @@
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
 
-    mProgresses.resize (2);
-    mProgresses [0] = aProgress1;
-    mProgresses [1] = aProgress2;
-
-    HRESULT rc =  protectedInit (autoInitSpan,
+    mProgresses.resize(2);
+    mProgresses[0] = aProgress1;
+    mProgresses[1] = aProgress2;
+
+    HRESULT rc =  protectedInit(autoInitSpan,
 #if !defined (VBOX_COM_INPROC)
-                                 aParent,
+                                aParent,
 #endif
-                                 aInitiator, aDescription, aId);
+                                aInitiator,
+                                aDescription,
+                                aId);
 
     /* Confirm a successful initialization when it's the case */
@@ -1608 +1610 @@
 
     if (aOperation >= m_cOperations)
-        return setError (E_FAIL,
-            tr ("Operation number must be in range [0, %d]"), m_ulCurrentOperation - 1);
+        return setError(E_FAIL,
+                        tr("Operation number must be in range [0, %d]"), m_ulCurrentOperation - 1);
 
     /* if we're already completed or if the given operation is already done,
@@ -1623 +1625 @@
         {
             ULONG opCount = 0;
-            rc = mProgresses [progress]->COMGETTER(OperationCount) (&opCount);
-            if (FAILED (rc))
+            rc = mProgresses[progress]->COMGETTER(OperationCount)(&opCount);
+            if (FAILED(rc))
                 return rc;
 
@@ -1688 +1690 @@
 
     if (!mCancelable)
-        return setError (E_FAIL, tr ("Operation cannot be canceled"));
+        return setError(E_FAIL, tr("Operation cannot be canceled"));
 
     if (!mCanceled)
@@ -1731 +1733 @@
     {
         rc = progress->COMGETTER(Completed)(&fCompleted);
-        if (FAILED (rc))
+        if (FAILED(rc))
             return rc;
 
@@ -1737 +1739 @@
         {
             rc = progress->COMGETTER(Canceled)(&mCanceled);
-            if (FAILED (rc))
+            if (FAILED(rc))
                 return rc;
 
             LONG iRc;
             rc = progress->COMGETTER(ResultCode)(&iRc);
-            if (FAILED (rc))
+            if (FAILED(rc))
                 return rc;
             mResultCode = iRc;
 
-            if (FAILED (mResultCode))
+            if (FAILED(mResultCode))
             {
                 rc = progress->COMGETTER(ErrorInfo) (mErrorInfo.asOutParam());
-                if (FAILED (rc))
+                if (FAILED(rc))
                     return rc;
             }
 
-            if (FAILED (mResultCode) || mCanceled)
+            if (FAILED(mResultCode) || mCanceled)
             {
                 mCompleted = TRUE;
@@ -1761 +1763 @@
                 ULONG opCount = 0;
                 rc = progress->COMGETTER(OperationCount) (&opCount);
-                if (FAILED (rc))
+                if (FAILED(rc))
                     return rc;
 
@@ -1768 +1770 @@
 
                 if (mProgress < mProgresses.size())
-                    progress = mProgresses [mProgress];
+                    progress = mProgresses[mProgress];
                 else
                     mCompleted = TRUE;

trunk/src/VBox/Main/SerialPortImpl.cpp

@@ -349 +349 @@
      * (when changing this, make sure it corresponds to XML schema */
     if (aIRQ > 255)
-        return setError (E_INVALIDARG,
-            tr ("Invalid IRQ number of the serial port %d: "
-                "%lu (must be in range [0, %lu])"),
-            m->bd->ulSlot, aIRQ, 255);
+        return setError(E_INVALIDARG,
+                        tr("Invalid IRQ number of the serial port %d: %lu (must be in range [0, %lu])"),
+                        m->bd->ulSlot, aIRQ, 255);
 
     AutoCaller autoCaller(this);
@@ -401 +400 @@
      * (when changing this, make sure it corresponds to XML schema */
     if (aIOBase > 0xFFFF)
-        return setError (E_INVALIDARG,
-            tr ("Invalid I/O port base address of the serial port %d: "
-                "%lu (must be in range [0, 0x%X])"),
-            m->bd->ulSlot, aIOBase, 0, 0xFFFF);
+        return setError(E_INVALIDARG,
+                        tr("Invalid I/O port base address of the serial port %d: %lu (must be in range [0, 0x%X])"),
+                        m->bd->ulSlot, aIOBase, 0, 0xFFFF);
 
     AutoCaller autoCaller(this);

trunk/src/VBox/Main/SessionImpl.cpp

@@ -40 +40 @@
 #if defined(RT_OS_WINDOWS) || defined (RT_OS_OS2)
 /** VM IPC mutex holder thread */
-static DECLCALLBACK(int) IPCMutexHolderThread (RTTHREAD Thread, void *pvUser);
+static DECLCALLBACK(int) IPCMutexHolderThread(RTTHREAD Thread, void *pvUser);
 #endif
 
@@ -51 +51 @@
     do { \
         if (mState != SessionState_Open) \
-            return setError (E_UNEXPECTED, \
-                tr ("The session is not open (session state: %s)"), \
-                Global::stringifySessionState(mState)); \
+            return setError(E_UNEXPECTED, tr ("The session is not open (session state: %s)"), Global::stringifySessionState(mState)); \
     } while (0)
 
@@ -70 +68 @@
     LogFlowThisFunc(("\n"));
 
-    uninit (true /* aFinalRelease */);
+    uninit(true /* aFinalRelease */);
 }
 
@@ -115 +113 @@
  *  @note Locks this object for writing.
  */
-void Session::uninit (bool aFinalRelease)
+void Session::uninit(bool aFinalRelease)
 {
     LogFlowThisFuncEnter();
@@ -134 +132 @@
     if (mState != SessionState_Closed)
     {
-        Assert (mState == SessionState_Open ||
-                mState == SessionState_Spawning);
-
-        HRESULT rc = close (aFinalRelease, false /* aFromServer */);
-        AssertComRC (rc);
+        Assert(mState == SessionState_Open ||
+               mState == SessionState_Spawning);
+
+        HRESULT rc = close(aFinalRelease, false /* aFromServer */);
+        AssertComRC(rc);
     }
 
@@ -147 +145 @@
 /////////////////////////////////////////////////////////////////////////////
 
-STDMETHODIMP Session::COMGETTER(State) (SessionState_T *aState)
+STDMETHODIMP Session::COMGETTER(State)(SessionState_T *aState)
 {
     CheckComArgOutPointerValid(aState);
@@ -161 +159 @@
 }
 
-STDMETHODIMP Session::COMGETTER(Type) (SessionType_T *aType)
+STDMETHODIMP Session::COMGETTER(Type)(SessionType_T *aType)
 {
     CheckComArgOutPointerValid(aType);
@@ -176 +174 @@
 }
 
-STDMETHODIMP Session::COMGETTER(Machine) (IMachine **aMachine)
+STDMETHODIMP Session::COMGETTER(Machine)(IMachine **aMachine)
 {
     CheckComArgOutPointerValid(aMachine);
@@ -193 +191 @@
     else
         rc = mRemoteMachine.queryInterfaceTo(aMachine);
-    ComAssertComRC (rc);
+    ComAssertComRC(rc);
 
     return rc;
 }
 
-STDMETHODIMP Session::COMGETTER(Console) (IConsole **aConsole)
+STDMETHODIMP Session::COMGETTER(Console)(IConsole **aConsole)
 {
     CheckComArgOutPointerValid(aConsole);
@@ -215 +213 @@
     else
         rc = mRemoteConsole.queryInterfaceTo(aConsole);
-    ComAssertComRC (rc);
+    ComAssertComRC(rc);
 
     return rc;
@@ -235 +233 @@
     CHECK_OPEN();
 
-    return close (false /* aFinalRelease */, false /* aFromServer */);
+    return close(false /* aFinalRelease */, false /* aFromServer */);
 }
 
@@ -241 +239 @@
 /////////////////////////////////////////////////////////////////////////////
 
-STDMETHODIMP Session::GetPID (ULONG *aPid)
+STDMETHODIMP Session::GetPID(ULONG *aPid)
 {
     AssertReturn(aPid, E_POINTER);
 
     AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    *aPid = (ULONG) RTProcSelf();
-    AssertCompile (sizeof (*aPid) == sizeof (RTPROCESS));
+    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    *aPid = (ULONG)RTProcSelf();
+    AssertCompile(sizeof(*aPid) == sizeof(RTPROCESS));
 
     return S_OK;
 }
 
-STDMETHODIMP Session::GetRemoteConsole (IConsole **aConsole)
+STDMETHODIMP Session::GetRemoteConsole(IConsole **aConsole)
 {
     LogFlowThisFuncEnter();
@@ -262 +260 @@
 
     AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
+    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -268 +266 @@
     AssertReturn(mState != SessionState_Closed, VBOX_E_INVALID_VM_STATE);
 
-    AssertMsgReturn (mType == SessionType_Direct && !!mConsole,
-      ("This is not a direct session!\n"), VBOX_E_INVALID_OBJECT_STATE);
+    AssertMsgReturn(mType == SessionType_Direct && !!mConsole,
+                    ("This is not a direct session!\n"),
+                    VBOX_E_INVALID_OBJECT_STATE);
 
     /* return a failure if the session already transitioned to Closing
@@ -283 +282 @@
 }
 
-STDMETHODIMP Session::AssignMachine (IMachine *aMachine)
+STDMETHODIMP Session::AssignMachine(IMachine *aMachine)
 {
     LogFlowThisFuncEnter();
@@ -289 +288 @@
 
     AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
+    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -319 +318 @@
 
     rc = mConsole.createObject();
-    AssertComRCReturn (rc, rc);
-
-    rc = mConsole->init (aMachine, mControl);
-    AssertComRCReturn (rc, rc);
+    AssertComRCReturn(rc, rc);
+
+    rc = mConsole->init(aMachine, mControl);
+    AssertComRCReturn(rc, rc);
 
     rc = grabIPCSemaphore();
@@ -331 +330 @@
      */
     if (SUCCEEDED(rc))
-       rc = aMachine->COMGETTER(Parent) (mVirtualBox.asOutParam());
+       rc = aMachine->COMGETTER(Parent)(mVirtualBox.asOutParam());
 
     if (SUCCEEDED(rc))
@@ -352 +351 @@
 }
 
-STDMETHODIMP Session::AssignRemoteMachine (IMachine *aMachine, IConsole *aConsole)
+STDMETHODIMP Session::AssignRemoteMachine(IMachine *aMachine, IConsole *aConsole)
 {
     LogFlowThisFuncEnter();
@@ -360 +359 @@
 
     AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
+    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -396 +395 @@
      *  until the session is closed
      */
-    rc = aMachine->COMGETTER(Parent) (mVirtualBox.asOutParam());
+    rc = aMachine->COMGETTER(Parent)(mVirtualBox.asOutParam());
 
     if (SUCCEEDED(rc))
@@ -407 +406 @@
             mType = SessionType_Existing;
         else
-            Assert (mState == SessionState_Spawning);
+            Assert(mState == SessionState_Spawning);
 
         mState = SessionState_Open;
@@ -425 +424 @@
 }
 
-STDMETHODIMP Session::UpdateMachineState (MachineState_T aMachineState)
+STDMETHODIMP Session::UpdateMachineState(MachineState_T aMachineState)
 {
     AutoCaller autoCaller(this);
@@ -453 +452 @@
     AssertReturn(!mConsole.isNull(), E_FAIL);
 
-    return mConsole->updateMachineState (aMachineState);
+    return mConsole->updateMachineState(aMachineState);
 }
 
@@ -481 +480 @@
 
         /* close ourselves */
-        rc = close (false /* aFinalRelease */, true /* aFromServer */);
+        rc = close(false /* aFinalRelease */, true /* aFromServer */);
     }
     else if (autoCaller.state() == InUninit)
@@ -508 +507 @@
 
     AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
+    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -522 +521 @@
 
     AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
+    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -536 +535 @@
 
     AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
+    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -550 +549 @@
 
     AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
+    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -564 +563 @@
 
     AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
+    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -578 +577 @@
 
     AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
+    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -592 +591 @@
 
     AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
+    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -606 +605 @@
 
     AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
+    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -615 +614 @@
 }
 
-STDMETHODIMP Session::OnSharedFolderChange (BOOL aGlobal)
-{
-    LogFlowThisFunc(("\n"));
-
-    AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
+STDMETHODIMP Session::OnSharedFolderChange(BOOL aGlobal)
+{
+    LogFlowThisFunc(("\n"));
+
+    AutoCaller autoCaller(this);
+    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -626 +625 @@
     AssertReturn(mType == SessionType_Direct, VBOX_E_INVALID_OBJECT_STATE);
 
-    return mConsole->onSharedFolderChange (aGlobal);
-}
-
-STDMETHODIMP Session::OnUSBDeviceAttach (IUSBDevice *aDevice,
-                                         IVirtualBoxErrorInfo *aError,
-                                         ULONG aMaskedIfs)
-{
-    LogFlowThisFunc(("\n"));
-
-    AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
+    return mConsole->onSharedFolderChange(aGlobal);
+}
+
+STDMETHODIMP Session::OnUSBDeviceAttach(IUSBDevice *aDevice,
+                                        IVirtualBoxErrorInfo *aError,
+                                        ULONG aMaskedIfs)
+{
+    LogFlowThisFunc(("\n"));
+
+    AutoCaller autoCaller(this);
+    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -642 +641 @@
     AssertReturn(mType == SessionType_Direct, VBOX_E_INVALID_OBJECT_STATE);
 
-    return mConsole->onUSBDeviceAttach (aDevice, aError, aMaskedIfs);
-}
-
-STDMETHODIMP Session::OnUSBDeviceDetach (IN_BSTR aId,
-                                         IVirtualBoxErrorInfo *aError)
-{
-    LogFlowThisFunc(("\n"));
-
-    AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
+    return mConsole->onUSBDeviceAttach(aDevice, aError, aMaskedIfs);
+}
+
+STDMETHODIMP Session::OnUSBDeviceDetach(IN_BSTR aId,
+                                        IVirtualBoxErrorInfo *aError)
+{
+    LogFlowThisFunc(("\n"));
+
+    AutoCaller autoCaller(this);
+    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -657 +656 @@
     AssertReturn(mType == SessionType_Direct, VBOX_E_INVALID_OBJECT_STATE);
 
-    return mConsole->onUSBDeviceDetach (aId, aError);
-}
-
-STDMETHODIMP Session::OnShowWindow (BOOL aCheck, BOOL *aCanShow, ULONG64 *aWinId)
-{
-    AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
+    return mConsole->onUSBDeviceDetach(aId, aError);
+}
+
+STDMETHODIMP Session::OnShowWindow(BOOL aCheck, BOOL *aCanShow, ULONG64 *aWinId)
+{
+    AutoCaller autoCaller(this);
+    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -680 +679 @@
     }
 
-    return mConsole->onShowWindow (aCheck, aCanShow, aWinId);
-}
-
-STDMETHODIMP Session::AccessGuestProperty (IN_BSTR aName, IN_BSTR aValue, IN_BSTR aFlags,
-                                           BOOL aIsSetter, BSTR *aRetValue, ULONG64 *aRetTimestamp, BSTR *aRetFlags)
+    return mConsole->onShowWindow(aCheck, aCanShow, aWinId);
+}
+
+STDMETHODIMP Session::AccessGuestProperty(IN_BSTR aName, IN_BSTR aValue, IN_BSTR aFlags,
+                                          BOOL aIsSetter, BSTR *aRetValue, ULONG64 *aRetTimestamp, BSTR *aRetFlags)
 {
 #ifdef VBOX_WITH_GUEST_PROPS
     AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
+    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
 
     if (mState != SessionState_Open)
-        return setError (VBOX_E_INVALID_VM_STATE,
-            tr ("Machine session is not open (session state: %s)."),
-            Global::stringifySessionState(mState));
+        return setError(VBOX_E_INVALID_VM_STATE,
+                        tr("Machine session is not open (session state: %s)."),
+                        Global::stringifySessionState(mState));
     AssertReturn(mType == SessionType_Direct, VBOX_E_INVALID_OBJECT_STATE);
     CheckComArgNotNull(aName);
-    if (!aIsSetter && !VALID_PTR (aRetValue))
+    if (!aIsSetter && !VALID_PTR(aRetValue))
         return E_POINTER;
-    if (!aIsSetter && !VALID_PTR (aRetTimestamp))
+    if (!aIsSetter && !VALID_PTR(aRetTimestamp))
         return E_POINTER;
-    if (!aIsSetter && !VALID_PTR (aRetFlags))
+    if (!aIsSetter && !VALID_PTR(aRetFlags))
         return E_POINTER;
     /* aValue can be NULL for a setter call if the property is to be deleted. */
-    if (aIsSetter && (aValue != NULL) && !VALID_PTR (aValue))
+    if (aIsSetter && (aValue != NULL) && !VALID_PTR(aValue))
         return E_INVALIDARG;
     /* aFlags can be null if it is to be left as is */
-    if (aIsSetter && (aFlags != NULL) && !VALID_PTR (aFlags))
+    if (aIsSetter && (aFlags != NULL) && !VALID_PTR(aFlags))
         return E_INVALIDARG;
     if (!aIsSetter)
-        return mConsole->getGuestProperty (aName, aRetValue, aRetTimestamp, aRetFlags);
+        return mConsole->getGuestProperty(aName, aRetValue, aRetTimestamp, aRetFlags);
     else
-        return mConsole->setGuestProperty (aName, aValue, aFlags);
+        return mConsole->setGuestProperty(aName, aValue, aFlags);
 #else /* VBOX_WITH_GUEST_PROPS not defined */
     ReturnComNotImplemented();
@@ -717 +716 @@
 }
 
-STDMETHODIMP Session::EnumerateGuestProperties (IN_BSTR aPatterns,
-                                                ComSafeArrayOut(BSTR, aNames),
-                                                ComSafeArrayOut(BSTR, aValues),
-                                                ComSafeArrayOut(ULONG64, aTimestamps),
-                                                ComSafeArrayOut(BSTR, aFlags))
+STDMETHODIMP Session::EnumerateGuestProperties(IN_BSTR aPatterns,
+                                               ComSafeArrayOut(BSTR, aNames),
+                                               ComSafeArrayOut(BSTR, aValues),
+                                               ComSafeArrayOut(ULONG64, aTimestamps),
+                                               ComSafeArrayOut(BSTR, aFlags))
 {
 #ifdef VBOX_WITH_GUEST_PROPS
     AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
+    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
 
     if (mState != SessionState_Open)
-        return setError (VBOX_E_INVALID_VM_STATE,
-            tr ("Machine session is not open (session state: %s)."),
-            Global::stringifySessionState(mState));
-    AssertReturn(mType == SessionType_Direct, VBOX_E_INVALID_OBJECT_STATE);
-    if (!VALID_PTR (aPatterns) && (aPatterns != NULL))
+        return setError(VBOX_E_INVALID_VM_STATE,
+                        tr("Machine session is not open (session state: %s)."),
+                        Global::stringifySessionState(mState));
+    AssertReturn(mType == SessionType_Direct, VBOX_E_INVALID_OBJECT_STATE);
+    if (!VALID_PTR(aPatterns) && (aPatterns != NULL))
         return E_POINTER;
     if (ComSafeArrayOutIsNull(aNames))
@@ -764 +763 @@
  *  @note Locks this object for writing.
  */
-HRESULT Session::close (bool aFinalRelease, bool aFromServer)
+HRESULT Session::close(bool aFinalRelease, bool aFromServer)
 {
     LogFlowThisFuncEnter();
@@ -779 +778 @@
     if (mState != SessionState_Open)
     {
-        Assert (mState == SessionState_Spawning);
+        Assert(mState == SessionState_Spawning);
 
         /* The session object is going to be uninitialized before it has been
@@ -789 +788 @@
          * trying to close the session before waiting for the progress object it
          * got from IVirtualBox:: openRemoteSession() to complete, so assert. */
-        Assert (aFromServer);
+        Assert(aFromServer);
 
         mState = SessionState_Closed;
         mType = SessionType_Null;
 #if defined(RT_OS_WINDOWS)
-        Assert (!mIPCSem && !mIPCThreadSem);
+        Assert(!mIPCSem && !mIPCThreadSem);
 #elif defined(RT_OS_OS2)
-        Assert (mIPCThread == NIL_RTTHREAD &&
-                mIPCThreadSem == NIL_RTSEMEVENT);
+        Assert(mIPCThread == NIL_RTTHREAD &&
+               mIPCThreadSem == NIL_RTSEMEVENT);
 #elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER)
-        Assert (mIPCSem == -1);
+        Assert(mIPCSem == -1);
 #else
 # error "Port me!"
@@ -845 +844 @@
 
         LogFlowThisFunc(("Calling mControl->OnSessionEnd()...\n"));
-        HRESULT rc = mControl->OnSessionEnd (this, progress.asOutParam());
+        HRESULT rc = mControl->OnSessionEnd(this, progress.asOutParam());
         LogFlowThisFunc(("mControl->OnSessionEnd()=%08X\n", rc));
 
@@ -857 +856 @@
             rc = S_OK;
 
-        AssertComRC (rc);
+        AssertComRC(rc);
     }
 
@@ -872 +871 @@
              *  once this method returns)
              */
-            Assert (!!progress);
+            Assert(!!progress);
             if (progress)
-                progress->WaitForCompletion (-1);
+                progress->WaitForCompletion(-1);
         }
     }
@@ -895 +894 @@
     /* open the IPC semaphore based on the sessionId and try to grab it */
     Bstr ipcId;
-    rc = mControl->GetIPCId (ipcId.asOutParam());
+    rc = mControl->GetIPCId(ipcId.asOutParam());
     AssertComRCReturnRC(rc);
 
@@ -909 +908 @@
      */
 
-    mIPCThreadSem = ::CreateEvent (NULL, FALSE, FALSE, NULL);
-    AssertMsgReturn (mIPCThreadSem,
-                     ("Cannot create an event sem, err=%d", ::GetLastError()),
-                     E_FAIL);
-
-    void *data [3];
-    data [0] = (void *) (BSTR) ipcId;
-    data [1] = (void *) mIPCThreadSem;
-    data [2] = 0; /* will get an output from the thread */
+    mIPCThreadSem = ::CreateEvent(NULL, FALSE, FALSE, NULL);
+    AssertMsgReturn(mIPCThreadSem,
+                    ("Cannot create an event sem, err=%d", ::GetLastError()),
+                    E_FAIL);
+
+    void *data[3];
+    data[0] = (void*)(BSTR)ipcId;
+    data[1] = (void*)mIPCThreadSem;
+    data[2] = 0; /* will get an output from the thread */
 
     /* create a thread to hold the IPC mutex until signalled to release it */
     RTTHREAD tid;
-    int vrc = RTThreadCreate (&tid, IPCMutexHolderThread, (void *) data,
-                              0, RTTHREADTYPE_MAIN_WORKER, 0, "IPCHolder");
-    AssertRCReturn (vrc, E_FAIL);
+    int vrc = RTThreadCreate(&tid, IPCMutexHolderThread, (void*)data, 0, RTTHREADTYPE_MAIN_WORKER, 0, "IPCHolder");
+    AssertRCReturn(vrc, E_FAIL);
 
     /* wait until thread init is completed */
-    DWORD wrc = ::WaitForSingleObject (mIPCThreadSem, INFINITE);
-    AssertMsg (wrc == WAIT_OBJECT_0, ("Wait failed, err=%d\n", ::GetLastError()));
-    Assert (data [2]);
-
-    if (wrc == WAIT_OBJECT_0 && data [2])
+    DWORD wrc = ::WaitForSingleObject(mIPCThreadSem, INFINITE);
+    AssertMsg(wrc == WAIT_OBJECT_0, ("Wait failed, err=%d\n", ::GetLastError()));
+    Assert(data[2]);
+
+    if (wrc == WAIT_OBJECT_0 && data[2])
     {
         /* memorize the event sem we should signal in close() */
-        mIPCSem = (HANDLE) data [2];
+        mIPCSem = (HANDLE)data[2];
         rc = S_OK;
     }
     else
     {
-        ::CloseHandle (mIPCThreadSem);
+        ::CloseHandle(mIPCThreadSem);
         mIPCThreadSem = NULL;
         rc = E_FAIL;
@@ -950 +948 @@
      * and then release it in close(). */
 
-    int vrc = RTSemEventCreate (&mIPCThreadSem);
-    AssertRCReturn (vrc, E_FAIL);
-
-    void *data [3];
-    data [0] = (void *) ipcId.raw();
-    data [1] = (void *) mIPCThreadSem;
-    data [2] = (void *) false; /* will get the thread result here */
+    int vrc = RTSemEventCreate(&mIPCThreadSem);
+    AssertRCReturn(vrc, E_FAIL);
+
+    void *data[3];
+    data[0] = (void*)ipcId.raw();
+    data[1] = (void*)mIPCThreadSem;
+    data[2] = (void*)false; /* will get the thread result here */
 
     /* create a thread to hold the IPC mutex until signalled to release it */
-    vrc = RTThreadCreate (&mIPCThread, IPCMutexHolderThread, (void *) data,
-                          0, RTTHREADTYPE_MAIN_WORKER, 0, "IPCHolder");
-    AssertRCReturn (vrc, E_FAIL);
+    vrc = RTThreadCreate(&mIPCThread, IPCMutexHolderThread, (void *) data,
+                         0, RTTHREADTYPE_MAIN_WORKER, 0, "IPCHolder");
+    AssertRCReturn(vrc, E_FAIL);
 
     /* wait until thread init is completed */
@@ -968 +966 @@
 
     /* the thread must succeed */
-    AssertReturn((bool) data [2], E_FAIL);
+    AssertReturn((bool)data[2], E_FAIL);
 
 #elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER)
@@ -1034 +1032 @@
         /* tell the thread holding the IPC mutex to release it */
         int vrc = RTSemEventSignal (mIPCThreadSem);
-        AssertRC (vrc == NO_ERROR);
+        AssertRC(vrc == NO_ERROR);
 
         /* wait for the thread to finish */
@@ -1073 +1071 @@
     void **data = (void **) pvUser;
 
-    BSTR sessionId = (BSTR) data [0];
-    HANDLE initDoneSem = (HANDLE) data [1];
+    BSTR sessionId = (BSTR)data[0];
+    HANDLE initDoneSem = (HANDLE)data[1];
 
     HANDLE ipcMutex = ::OpenMutex (MUTEX_ALL_ACCESS, FALSE, sessionId);
@@ -1090 +1088 @@
             if (finishSem)
             {
-                data [2] = (void *) finishSem;
+                data[2] = (void*)finishSem;
                 /* signal we're done with init */
                 ::SetEvent (initDoneSem);
@@ -1123 +1121 @@
     void **data = (void **) pvUser;
 
-    Utf8Str ipcId = (BSTR) data [0];
-    RTSEMEVENT finishSem = (RTSEMEVENT) data [1];
+    Utf8Str ipcId = (BSTR)data[0];
+    RTSEMEVENT finishSem = (RTSEMEVENT)data[1];
 
     LogFlowFunc (("ipcId='%s', finishSem=%p\n", ipcId.raw(), finishSem));
@@ -1141 +1139 @@
         {
             /* store the answer */
-            data [2] = (void *) true;
+            data[2] = (void*)true;
             /* signal we're done */
             int vrc = RTThreadUserSignal (Thread);
-            AssertRC (vrc);
+            AssertRC(vrc);
 
             /* wait until we're signaled to release the IPC mutex */
@@ -1161 +1159 @@
 
     /* store the answer */
-    data [1] = (void *) false;
+    data[1] = (void*)false;
     /* signal we're done */
     int vrc = RTThreadUserSignal (Thread);
-    AssertRC (vrc);
+    AssertRC(vrc);
 
     LogFlowFuncLeave();

trunk/src/VBox/Main/SharedFolderImpl.cpp

@@ -209 +209 @@
 
     /* Check whether the path is full (absolute) */
-    char hostPathFull [RTPATH_MAX];
+    char hostPathFull[RTPATH_MAX];
     int vrc = RTPathAbsEx(NULL,
                           hostPath.c_str(),
@@ -215 +215 @@
                           sizeof (hostPathFull));
     if (RT_FAILURE(vrc))
-        return setError (E_INVALIDARG,
-            tr ("Invalid shared folder path: '%s' (%Rrc)"), hostPath.raw(), vrc);
+        return setError(E_INVALIDARG,
+                        tr("Invalid shared folder path: '%s' (%Rrc)"),
+                        hostPath.raw(), vrc);
 
     if (RTPathCompare(hostPath.c_str(), hostPathFull) != 0)
-        return setError (E_INVALIDARG,
-            tr ("Shared folder path '%s' is not absolute"), hostPath.raw());
+        return setError(E_INVALIDARG,
+                        tr("Shared folder path '%s' is not absolute"),
+                        hostPath.raw());
 
     unconst(mParent) = aParent;

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -106 +106 @@
 HRESULT Snapshot::FinalConstruct()
 {
-    LogFlowMember (("Snapshot::FinalConstruct()\n"));
+    LogFlowMember(("Snapshot::FinalConstruct()\n"));
     return S_OK;
 }
@@ -112 +112 @@
 void Snapshot::FinalRelease()
 {
-    LogFlowMember (("Snapshot::FinalRelease()\n"));
+    LogFlowMember(("Snapshot::FinalRelease()\n"));
     uninit();
 }
@@ -136 +136 @@
     LogFlowMember(("Snapshot::init(uuid: %s, aParent->uuid=%s)\n", aId.toString().c_str(), (aParent) ? aParent->m->uuid.toString().c_str() : ""));
 
-    ComAssertRet (!aId.isEmpty() && !aName.isEmpty() && aMachine, E_INVALIDARG);
+    ComAssertRet(!aId.isEmpty() && !aName.isEmpty() && aMachine, E_INVALIDARG);
 
     /* Enclose the state transition NotReady->InInit->Ready */
@@ -174 +174 @@
 void Snapshot::uninit()
 {
-    LogFlowMember (("Snapshot::uninit()\n"));
+    LogFlowMember(("Snapshot::uninit()\n"));
 
     /* Enclose the state transition Ready->InUninit->NotReady */
@@ -310 +310 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-STDMETHODIMP Snapshot::COMGETTER(Id) (BSTR *aId)
+STDMETHODIMP Snapshot::COMGETTER(Id)(BSTR *aId)
 {
     CheckComArgOutPointerValid(aId);
@@ -323 +323 @@
 }
 
-STDMETHODIMP Snapshot::COMGETTER(Name) (BSTR *aName)
+STDMETHODIMP Snapshot::COMGETTER(Name)(BSTR *aName)
 {
     CheckComArgOutPointerValid(aName);
@@ -363 +363 @@
 }
 
-STDMETHODIMP Snapshot::COMGETTER(Description) (BSTR *aDescription)
+STDMETHODIMP Snapshot::COMGETTER(Description)(BSTR *aDescription)
 {
     CheckComArgOutPointerValid(aDescription);
@@ -376 +376 @@
 }
 
-STDMETHODIMP Snapshot::COMSETTER(Description) (IN_BSTR aDescription)
+STDMETHODIMP Snapshot::COMSETTER(Description)(IN_BSTR aDescription)
 {
     CheckComArgNotNull(aDescription);
@@ -399 +399 @@
 }
 
-STDMETHODIMP Snapshot::COMGETTER(TimeStamp) (LONG64 *aTimeStamp)
+STDMETHODIMP Snapshot::COMGETTER(TimeStamp)(LONG64 *aTimeStamp)
 {
     CheckComArgOutPointerValid(aTimeStamp);
@@ -425 +425 @@
 }
 
-STDMETHODIMP Snapshot::COMGETTER(Machine) (IMachine **aMachine)
+STDMETHODIMP Snapshot::COMGETTER(Machine)(IMachine **aMachine)
 {
     CheckComArgOutPointerValid(aMachine);
@@ -438 +438 @@
 }
 
-STDMETHODIMP Snapshot::COMGETTER(Parent) (ISnapshot **aParent)
+STDMETHODIMP Snapshot::COMGETTER(Parent)(ISnapshot **aParent)
 {
     CheckComArgOutPointerValid(aParent);
@@ -451 +451 @@
 }
 
-STDMETHODIMP Snapshot::COMGETTER(Children) (ComSafeArrayOut(ISnapshot *, aChildren))
+STDMETHODIMP Snapshot::COMGETTER(Children)(ComSafeArrayOut(ISnapshot *, aChildren))
 {
     CheckComArgOutSafeArrayPointerValid(aChildren);
@@ -816 +816 @@
     LogFlowThisFunc(("mName={%ls}\n", aSessionMachine->mUserData->mName.raw()));
 
-    AssertReturn(aSessionMachine && !Guid (aSnapshotId).isEmpty(), E_INVALIDARG);
+    AssertReturn(aSessionMachine && !Guid(aSnapshotId).isEmpty(), E_INVALIDARG);
 
     /* Enclose the state transition NotReady->InInit->Ready */
@@ -832 +832 @@
 
     /* take the pointer to Data to share */
-    mData.share (mPeer->mData);
+    mData.share(mPeer->mData);
 
     /* take the pointer to UserData to share (our UserData must always be the
      * same as Machine's data) */
-    mUserData.share (mPeer->mUserData);
+    mUserData.share(mPeer->mUserData);
     /* make a private copy of all other data (recent changes from SessionMachine) */
-    mHWData.attachCopy (aSessionMachine->mHWData);
+    mHWData.attachCopy(aSessionMachine->mHWData);
     mMediaData.attachCopy(aSessionMachine->mMediaData);
 
@@ -855 +855 @@
         ComObjPtr<SharedFolder> folder;
         folder.createObject();
-        rc = folder->initCopy (this, *it);
+        rc = folder->initCopy(this, *it);
         if (FAILED(rc)) return rc;
         *it = folder;
@@ -885 +885 @@
         ComObjPtr<StorageController> ctrl;
         ctrl.createObject();
-        ctrl->initCopy (this, *it);
+        ctrl->initCopy(this, *it);
         mStorageControllers->push_back(ctrl);
     }
@@ -892 +892 @@
 
     unconst(mBIOSSettings).createObject();
-    mBIOSSettings->initCopy (this, mPeer->mBIOSSettings);
+    mBIOSSettings->initCopy(this, mPeer->mBIOSSettings);
 
 #ifdef VBOX_WITH_VRDP
     unconst(mVRDPServer).createObject();
-    mVRDPServer->initCopy (this, mPeer->mVRDPServer);
+    mVRDPServer->initCopy(this, mPeer->mVRDPServer);
 #endif
 
     unconst(mAudioAdapter).createObject();
-    mAudioAdapter->initCopy (this, mPeer->mAudioAdapter);
+    mAudioAdapter->initCopy(this, mPeer->mAudioAdapter);
 
     unconst(mUSBController).createObject();
     mUSBController->initCopy(this, mPeer->mUSBController);
 
-    for (ULONG slot = 0; slot < RT_ELEMENTS (mNetworkAdapters); slot++)
+    for (ULONG slot = 0; slot < RT_ELEMENTS(mNetworkAdapters); slot++)
     {
         unconst(mNetworkAdapters[slot]).createObject();
-        mNetworkAdapters[slot]->initCopy (this, mPeer->mNetworkAdapters [slot]);
-    }
-
-    for (ULONG slot = 0; slot < RT_ELEMENTS (mSerialPorts); slot++)
-    {
-        unconst(mSerialPorts [slot]).createObject();
-        mSerialPorts[slot]->initCopy (this, mPeer->mSerialPorts[slot]);
-    }
-
-    for (ULONG slot = 0; slot < RT_ELEMENTS (mParallelPorts); slot++)
+        mNetworkAdapters[slot]->initCopy(this, mPeer->mNetworkAdapters[slot]);
+    }
+
+    for (ULONG slot = 0; slot < RT_ELEMENTS(mSerialPorts); slot++)
+    {
+        unconst(mSerialPorts[slot]).createObject();
+        mSerialPorts[slot]->initCopy(this, mPeer->mSerialPorts[slot]);
+    }
+
+    for (ULONG slot = 0; slot < RT_ELEMENTS(mParallelPorts); slot++)
     {
         unconst(mParallelPorts[slot]).createObject();
-        mParallelPorts[slot]->initCopy (this, mPeer->mParallelPorts[slot]);
+        mParallelPorts[slot]->initCopy(this, mPeer->mParallelPorts[slot]);
     }
 
@@ -967 +967 @@
 
     /* take the pointer to Data to share */
-    mData.share (mPeer->mData);
+    mData.share(mPeer->mData);
     /*
      *  take the pointer to UserData to share
      *  (our UserData must always be the same as Machine's data)
      */
-    mUserData.share (mPeer->mUserData);
+    mUserData.share(mPeer->mUserData);
     /* allocate private copies of all other data (will be loaded from settings) */
     mHWData.allocate();
@@ -1079 +1079 @@
  *  @note Locks this object for writing.
  */
-HRESULT SnapshotMachine::onSnapshotChange (Snapshot *aSnapshot)
+HRESULT SnapshotMachine::onSnapshotChange(Snapshot *aSnapshot)
 {
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -1538 +1538 @@
 
     AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
+    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -1952 +1952 @@
 
     AutoCaller autoCaller(this);
-    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
+    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
 
     /* saveSettings() needs mParent lock */
@@ -2208 +2208 @@
                     /* The below assert would be nice but I don't want to move
                      * Medium::MergeChain to the header just for that
-                     * Assert (!chain->isForward()); */
+                     * Assert(!chain->isForward()); */
 
                     // prepareDiscard() should have raised an error already

trunk/src/VBox/Main/StorageControllerImpl.cpp

@@ -123 +123 @@
     if (   (aStorageBus <= StorageBus_Null)
         || (aStorageBus >  StorageBus_SAS))
-        return setError (E_INVALIDARG,
-            tr ("Invalid storage connection type"));
+        return setError(E_INVALIDARG,
+                        tr("Invalid storage connection type"));
 
     /* Enclose the state transition NotReady->InInit->Ready */
@@ -137 +137 @@
     /* register with parent early, since uninit() will unconditionally
      * unregister on failure */
-    m->pParent->addDependentChild (this);
+    m->pParent->addDependentChild(this);
 
     m->bd.allocate();
@@ -211 +211 @@
     /* register with parent early, since uninit() will unconditionally
      * unregister on failure */
-    m->pParent->addDependentChild (this);
+    m->pParent->addDependentChild(this);
 
     /* sanity */
@@ -258 +258 @@
     /* m->pPeer is left null */
 
-    m->pParent->addDependentChild (this);
-
-    AutoCaller thatCaller (aThat);
+    m->pParent->addDependentChild(this);
+
+    AutoCaller thatCaller(aThat);
     AssertComRCReturnRC(thatCaller.rc());
 
     AutoReadLock thatlock(aThat COMMA_LOCKVAL_SRC_POS);
-    m->bd.attachCopy (aThat->m->bd);
+    m->bd.attachCopy(aThat->m->bd);
 
     /* Confirm a successful initialization */
@@ -288 +288 @@
     m->bd.free();
 
-    m->pParent->removeDependentChild (this);
+    m->pParent->removeDependentChild(this);
 
     unconst(m->pPeer).setNull();
@@ -494 +494 @@
             /* AHCI SATA supports a maximum of 30 ports. */
             if ((aPortCount < 1) || (aPortCount > 30))
-                return setError (E_INVALIDARG,
-                    tr ("Invalid port count: %lu (must be in range [%lu, %lu])"),
-                        aPortCount, 1, 30);
+                return setError(E_INVALIDARG,
+                                tr("Invalid port count: %lu (must be in range [%lu, %lu])"),
+                                aPortCount, 1, 30);
             break;
         }
@@ -508 +508 @@
              */
             if (aPortCount != 16)
-                return setError (E_INVALIDARG,
-                    tr ("Invalid port count: %lu (must be in range [%lu, %lu])"),
-                        aPortCount, 16, 16);
+                return setError(E_INVALIDARG,
+                                tr("Invalid port count: %lu (must be in range [%lu, %lu])"),
+                                aPortCount, 16, 16);
             break;
         }
@@ -519 +519 @@
              */
             if (aPortCount != 2)
-                return setError (E_INVALIDARG,
-                    tr ("Invalid port count: %lu (must be in range [%lu, %lu])"),
-                        aPortCount, 2, 2);
+                return setError(E_INVALIDARG,
+                                tr("Invalid port count: %lu (must be in range [%lu, %lu])"),
+                                aPortCount, 2, 2);
             break;
         }
@@ -531 +531 @@
              */
             if (aPortCount != 1)
-                return setError (E_INVALIDARG,
-                    tr ("Invalid port count: %lu (must be in range [%lu, %lu])"),
-                        aPortCount, 1, 1);
+                return setError(E_INVALIDARG,
+                                tr("Invalid port count: %lu (must be in range [%lu, %lu])"),
+                                aPortCount, 1, 1);
             break;
         }
@@ -542 +542 @@
              */
             if (aPortCount != 8)
-                return setError (E_INVALIDARG,
-                    tr ("Invalid port count: %lu (must be in range [%lu, %lu])"),
-                        aPortCount, 8, 8);
+                return setError(E_INVALIDARG,
+                                tr("Invalid port count: %lu (must be in range [%lu, %lu])"),
+                                aPortCount, 8, 8);
             break;
         }
@@ -617 +617 @@
 
     if (m->bd->mStorageControllerType != StorageControllerType_IntelAhci)
-        return setError (E_NOTIMPL,
-            tr ("Invalid controller type"));
+        return setError(E_NOTIMPL,
+                        tr("Invalid controller type"));
 
     switch (DevicePosition)
@@ -652 +652 @@
 
     if (m->bd->mStorageControllerType != StorageControllerType_IntelAhci)
-        return setError (E_NOTIMPL,
-            tr ("Invalid controller type"));
+        return setError(E_NOTIMPL,
+                        tr("Invalid controller type"));
 
     if ((aPortNumber < 0) || (aPortNumber >= 30))
-        return setError (E_INVALIDARG,
-            tr ("Invalid port number: %l (must be in range [%lu, %lu])"),
-                aPortNumber, 0, 29);
+        return setError(E_INVALIDARG,
+                        tr("Invalid port number: %l (must be in range [%lu, %lu])"),
+                        aPortNumber, 0, 29);
 
     switch (DevicePosition)

trunk/src/VBox/Main/SystemPropertiesImpl.cpp

@@ -97 +97 @@
     /// free in structures returned by VDBackendInfo. Must be fixed ASAP!
 
-    VDBACKENDINFO aVDInfo [100];
+    VDBACKENDINFO aVDInfo[100];
     unsigned cEntries;
-    int vrc = VDBackendInfo (RT_ELEMENTS (aVDInfo), aVDInfo, &cEntries);
-    AssertRC (vrc);
+    int vrc = VDBackendInfo(RT_ELEMENTS (aVDInfo), aVDInfo, &cEntries);
+    AssertRC(vrc);
     if (RT_SUCCESS(vrc))
     {
@@ -109 +109 @@
             if (FAILED(rc)) break;
 
-            rc = hdf->init (&aVDInfo [i]);
+            rc = hdf->init(&aVDInfo[i]);
             if (FAILED(rc)) break;
 
-            mMediumFormats.push_back (hdf);
+            mMediumFormats.push_back(hdf);
         }
     }

trunk/src/VBox/Main/USBControllerImpl.cpp

@@ -560 +560 @@
 
     if (!m->llDeviceFilters->size())
-        return setError (E_INVALIDARG,
-            tr ("The USB device filter list is empty"));
+        return setError(E_INVALIDARG,
+                        tr("The USB device filter list is empty"));
 
     if (aPosition >= m->llDeviceFilters->size())
-        return setError (E_INVALIDARG,
-            tr ("Invalid position: %lu (must be in range [0, %lu])"),
-            aPosition, m->llDeviceFilters->size() - 1);
+        return setError(E_INVALIDARG,
+                        tr("Invalid position: %lu (must be in range [0, %lu])"),
+                        aPosition, m->llDeviceFilters->size() - 1);
 
     /* backup the list before modification */

trunk/src/VBox/Main/VirtualBoxBase.cpp

@@ -63 +63 @@
     if (mObjectLock)
         delete mObjectLock;
-    Assert (mInitUninitWaiters == 0);
-    Assert (mInitUninitSem == NIL_RTSEMEVENTMULTI);
+    Assert(mInitUninitWaiters == 0);
+    Assert(mInitUninitSem == NIL_RTSEMEVENTMULTI);
     if (mZeroCallersSem != NIL_RTSEMEVENT)
         RTSemEventDestroy (mZeroCallersSem);
@@ -217 +217 @@
             {
                 RTSemEventMultiCreate (&mInitUninitSem);
-                Assert (mInitUninitWaiters == 0);
+                Assert(mInitUninitWaiters == 0);
             }
 
@@ -242 +242 @@
             else
             {
-                Assert (mCallers != 0);
+                Assert(mCallers != 0);
                 -- mCallers;
                 if (mCallers == 0 && mState == InUninit)
@@ -272 +272 @@
     {
         /* if Ready or Limited, decrease the number of callers */
-        AssertMsgReturn (mCallers != 0, ("mCallers is ZERO!"), (void) 0);
-        -- mCallers;
+        AssertMsgReturn(mCallers != 0, ("mCallers is ZERO!"), (void) 0);
+        --mCallers;
 
         return;
@@ -291 +291 @@
             /* the caller is being released after AutoUninitSpan or
              * AutoMayUninitSpan has begun */
-            AssertMsgReturn (mCallers != 0, ("mCallers is ZERO!"), (void) 0);
-            -- mCallers;
+            AssertMsgReturn(mCallers != 0, ("mCallers is ZERO!"), (void) 0);
+            --mCallers;
 
             if (mCallers == 0)
-            {
                 /* inform the Auto*UninitSpan ctor there are no more callers */
-                RTSemEventSignal (mZeroCallersSem);
-            }
+                RTSemEventSignal(mZeroCallersSem);
 
             return;
@@ -600 +598 @@
              * something else but set error info. */
             mRC = mObj->addCaller();
-            Assert(FAILED (mRC));
+            Assert(FAILED(mRC));
             return;
     }
@@ -634 +632 @@
 {
     /* if we did nothing in the constructor, do nothing here */
-    if (mAlreadyInProgress || FAILED (mRC))
+    if (mAlreadyInProgress || FAILED(mRC))
         return;
 
@@ -730 +728 @@
 bool VirtualBoxSupportTranslationBase::cutClassNameFrom__PRETTY_FUNCTION__ (char *fn)
 {
-    Assert (fn);
+    Assert(fn);
     if (!fn)
         return false;
@@ -752 +750 @@
 #endif
 
-    char *start = strstr (fn, START);
-    Assert (start);
+    char *start = strstr(fn, START);
+    Assert(start);
     if (start)
     {
-        start += sizeof (START) - 1;
-        char *end = strstr (start, END);
-        Assert (end && (end > start));
+        start += sizeof(START) - 1;
+        char *end = strstr(start, END);
+        Assert(end && (end > start));
         if (end && (end > start))
         {
             size_t len = end - start;
-            memmove (fn, start, len);
-            fn [len] = 0;
+            memmove(fn, start, len);
+            fn[len] = 0;
             return true;
         }
@@ -827 +825 @@
 
     /* these are mandatory, others -- not */
-    AssertReturn((!aWarning && FAILED (aResultCode)) ||
+    AssertReturn((!aWarning && FAILED(aResultCode)) ||
                   (aWarning && aResultCode != S_OK),
                   E_FAIL);
@@ -854 +852 @@
             if (FAILED(rc)) break;
             rc = err.queryInterfaceTo(curInfo.asOutParam());
-            if (FAILED (rc))
+            if (FAILED(rc))
             {
                 /* create a IVirtualBoxErrorInfo wrapper for the native
@@ -869 +867 @@
         }
         /* 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 */
@@ -913 +911 @@
             }
             /* 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 */
@@ -991 +989 @@
         DependentChildren::iterator it = mDependentChildren.begin();
         ComPtr<IUnknown> unk = it->first;
-        Assert (!unk.isNull());
+        Assert(!unk.isNull());
 
         VirtualBoxBase *child = it->second;
@@ -1003 +1001 @@
          * uninit() call will wait until the first one has done so
          * (thanks to AutoUninitSpan). */
-        Assert (child);
+        Assert(child);
         if (child)
             child->uninit();
@@ -1017 +1015 @@
             mDependentChildren.erase (it);
 
-        Assert (count == mDependentChildren.size());
+        Assert(count == mDependentChildren.size());
     }
 }

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -314 +314 @@
         int vrc = com::GetVBoxUserHomeDirectory(szHomeDir, sizeof(szHomeDir));
         if (RT_FAILURE(vrc))
-            return setError (E_FAIL,
-                tr ("Could not create the VirtualBox home directory '%s'"
-                    "(%Rrc)"),
-                szHomeDir, vrc);
+            return setError(E_FAIL,
+                            tr("Could not create the VirtualBox home directory '%s' (%Rrc)"),
+                            szHomeDir, vrc);
 
         unconst(m->strHomeDir) = szHomeDir;
@@ -380 +379 @@
             if (SUCCEEDED(rc))
             {
-                rc = guestOSTypeObj->init(Global::sOSTypes [i].familyId,
-                                          Global::sOSTypes [i].familyDescription,
-                                          Global::sOSTypes [i].id,
-                                          Global::sOSTypes [i].description,
-                                          Global::sOSTypes [i].osType,
-                                          Global::sOSTypes [i].osHint,
-                                          Global::sOSTypes [i].recommendedRAM,
-                                          Global::sOSTypes [i].recommendedVRAM,
-                                          Global::sOSTypes [i].recommendedHDD,
-                                          Global::sOSTypes [i].networkAdapterType,
-                                          Global::sOSTypes [i].numSerialEnabled);
+                rc = guestOSTypeObj->init(Global::sOSTypes[i].familyId,
+                                          Global::sOSTypes[i].familyDescription,
+                                          Global::sOSTypes[i].id,
+                                          Global::sOSTypes[i].description,
+                                          Global::sOSTypes[i].osType,
+                                          Global::sOSTypes[i].osHint,
+                                          Global::sOSTypes[i].recommendedRAM,
+                                          Global::sOSTypes[i].recommendedVRAM,
+                                          Global::sOSTypes[i].recommendedHDD,
+                                          Global::sOSTypes[i].networkAdapterType,
+                                          Global::sOSTypes[i].numSerialEnabled);
                 if (SUCCEEDED(rc))
                     m->ollGuestOSTypes.addChild(guestOSTypeObj);
@@ -456 +455 @@
                                  RTTHREADFLAGS_WAITABLE,
                                  "Watcher");
-        ComAssertRC (vrc);
+        ComAssertRC(vrc);
         if (RT_FAILURE(vrc))
             rc = E_FAIL;
@@ -887 +886 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    return setError (E_NOTIMPL, "Not yet implemented");
+    return setError(E_NOTIMPL, "Not yet implemented");
 }
 
@@ -1365 +1364 @@
         imageId = Guid(aImageId);
         if (imageId.isEmpty())
-            return setError (E_INVALIDARG, tr ("Argument %s is empty"), "aImageId");
+            return setError(E_INVALIDARG, tr("Argument %s is empty"), "aImageId");
     }
     if (aSetParentId)
@@ -1624 +1623 @@
     for (size_t i = 0; i < RT_ELEMENTS (kOldNewIDs) / 2; i += 2)
     {
-        if (id == kOldNewIDs [i])
-        {
-            id = kOldNewIDs [i + 1];
+        if (id == kOldNewIDs[i])
+        {
+            id = kOldNewIDs[i + 1];
             break;
         }
@@ -1648 +1647 @@
 
     return (*aType) ? S_OK :
-        setError (E_INVALIDARG,
-            tr ("'%ls' is not a valid Guest OS type"),
-            aId);
+        setError(E_INVALIDARG,
+                 tr("'%ls' is not a valid Guest OS type"),
+                 aId);
 }
 
@@ -1661 +1660 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    return setError (E_NOTIMPL, "Not yet implemented");
+    return setError(E_NOTIMPL, "Not yet implemented");
 }
 
@@ -1671 +1670 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    return setError (E_NOTIMPL, "Not yet implemented");
+    return setError(E_NOTIMPL, "Not yet implemented");
 }
 
@@ -1830 +1829 @@
 
     if (state != SessionState_Closed)
-        return setError (VBOX_E_INVALID_OBJECT_STATE,
-            tr ("The given session is already open or being opened"));
+        return setError(VBOX_E_INVALID_OBJECT_STATE,
+                        tr("The given session is already open or being opened"));
 
     /* get the IInternalSessionControl interface */
@@ -1886 +1885 @@
 
     if (state != SessionState_Closed)
-        return setError (VBOX_E_INVALID_OBJECT_STATE,
-            tr ("The given session is already open or being opened"));
+        return setError(VBOX_E_INVALID_OBJECT_STATE,
+                        tr("The given session is already open or being opened"));
 
     /* get the IInternalSessionControl interface */
@@ -1940 +1939 @@
 
     if (state != SessionState_Closed)
-        return setError (VBOX_E_INVALID_OBJECT_STATE,
-            tr ("The given session is already open or being opened"));
+        return setError(VBOX_E_INVALID_OBJECT_STATE,
+                        tr("The given session is already open or being opened"));
 
     /* get the IInternalSessionControl interface */
@@ -2271 +2270 @@
 
         /* get the path to the executable */
-        char exePathBuf [RTPATH_MAX];
+        char exePathBuf[RTPATH_MAX];
         char *exePath = RTProcGetExecutableName (exePathBuf, RTPATH_MAX);
         ComAssertBreak (exePath, E_FAIL);
@@ -2307 +2306 @@
                  * (pressing the Cancel button to close the Run As dialog) */
                 if (vrc2 == VERR_CANCELLED)
-                    rc = setError (E_FAIL,
-                        tr ("Operation cancelled by the user"));
+                    rc = setError(E_FAIL,
+                                  tr("Operation cancelled by the user"));
                 else
-                    rc = setError (E_FAIL,
-                        tr ("Could not launch a privileged process '%s' (%Rrc)"),
-                        exePath, vrc2);
+                    rc = setError(E_FAIL,
+                                  tr("Could not launch a privileged process '%s' (%Rrc)"),
+                                  exePath, vrc2);
                 break;
             }
@@ -2322 +2321 @@
             if (RT_FAILURE(vrc))
             {
-                rc = setError (E_FAIL,
-                    tr ("Could not launch a process '%s' (%Rrc)"), exePath, vrc);
+                rc = setError(E_FAIL,
+                              tr("Could not launch a process '%s' (%Rrc)"), exePath, vrc);
                 break;
             }
@@ -2346 +2345 @@
         if (SUCCEEDED(rc) && RT_FAILURE(vrc))
         {
-            rc = setError (E_FAIL,
-                tr ("Could not operate the communication channel (%Rrc)"), vrc);
+            rc = setError(E_FAIL,
+                          tr("Could not operate the communication channel (%Rrc)"), vrc);
             break;
         }
@@ -2353 +2352 @@
     while (0);
 
-    if (FAILED (rc) && !userFuncCalled)
+    if (FAILED(rc) && !userFuncCalled)
     {
         /* call the user function in the "cleanup only" mode
@@ -2499 +2498 @@
         HRESULT rc = (*it++)->OnExtraDataCanChange (id, aKey, aValue,
                                                     aError.asOutParam(), &allowChange);
-        if (FAILED (rc))
+        if (FAILED(rc))
         {
             /* if a call to this method fails for some reason (for ex., because
@@ -2978 +2977 @@
         int vrc = calculateFullPath(Utf8Str(aLocation), location);
         if (RT_FAILURE(vrc))
-            return setError (VBOX_E_FILE_ERROR,
-                tr ("Invalid image file location '%ls' (%Rrc)"),
-                aLocation, vrc);
+            return setError(VBOX_E_FILE_ERROR,
+                            tr("Invalid image file location '%ls' (%Rrc)"),
+                            aLocation, vrc);
     }
 
@@ -3869 +3868 @@
             {
                 /* spawned VM process has terminated (normally or abnormally) */
-                (spawnedMachines [rc - WAIT_OBJECT_0 - cnt - 1])->
+                (spawnedMachines[rc - WAIT_OBJECT_0 - cnt - 1])->
                     checkForSpawnFailure();
                 update = true;
@@ -3945 +3944 @@
     /* close old process handles */
     for (size_t i = 1 + cnt; i < 1 + cnt + cntSpawned; ++ i)
-        CloseHandle (handles [i]);
+        CloseHandle (handles[i]);
 
     /* release sets of machines if any */
@@ -3958 +3957 @@
 
     /* according to PMREF, 64 is the maximum for the muxwait list */
-    SEMRECORD handles [64];
+    SEMRECORD handles[64];
 
     HMUX muxSem = NULLHANDLE;
@@ -4008 +4007 @@
                     {
                         /* machine mutex is normally released */
-                        Assert (semId >= 0 && semId < cnt);
+                        Assert(semId >= 0 && semId < cnt);
                         if (semId >= 0 && semId < cnt)
                         {
@@ -4031 +4030 @@
                             PID pid; TID tid;
                             unsigned long reqCnt;
-                            arc = DosQueryMutexSem ((HMTX) handles [i].hsemCur, &pid,
-                                                    &tid, &reqCnt);
+                            arc = DosQueryMutexSem((HMTX)handles[i].hsemCur, &pid, &tid, &reqCnt);
                             if (arc == ERROR_SEM_OWNER_DIED)
                             {
                                 /* close the dead mutex as asked by PMREF */
-                                ::DosCloseMutexSem ((HMTX) handles [i].hsemCur);
-
-                                Assert (i >= 0 && i < cnt);
+                                ::DosCloseMutexSem((HMTX)handles[i].hsemCur);
+
+                                Assert(i >= 0 && i < cnt);
                                 if (i >= 0 && i < cnt)
                                 {
@@ -4063 +4061 @@
                 {
                     for (size_t i = 0; i < cntSpawned; ++ i)
-                        updateSpawned |= (spawnedMachines [i])->
+                        updateSpawned |= (spawnedMachines[i])->
                             checkForSpawnFailure();
                 }
@@ -4217 +4215 @@
             update = false;
             for (size_t i = 0; i < cnt; ++ i)
-                update |= (machines [i])->checkForDeath();
+                update |= (machines[i])->checkForDeath();
 
             updateSpawned = false;
             for (size_t i = 0; i < cntSpawned; ++ i)
-                updateSpawned |= (spawnedMachines [i])->checkForSpawnFailure();
+                updateSpawned |= (spawnedMachines[i])->checkForSpawnFailure();
 
             /* reap child processes */
@@ -4470 +4468 @@
     {
         rc = saveSettings();
-        if (FAILED (rc))
+        if (FAILED(rc))
             unregisterDHCPServer(aDHCPServer, false /* aSaveRegistry */);
     }
@@ -4512 +4510 @@
     {
         rc = saveSettings();
-        if (FAILED (rc))
+        if (FAILED(rc))
             registerDHCPServer(aDHCPServer, false /* aSaveRegistry */);
     }

trunk/src/VBox/Main/generic/NetIf-generic.cpp

@@ -231 +231 @@
         Bstr ifname;
         ComPtr<IHostNetworkInterface> iface;
-        if (FAILED (host->FindHostNetworkInterfaceById (Guid(aId).toUtf16(), iface.asOutParam())))
+        if (FAILED(host->FindHostNetworkInterfaceById (Guid(aId).toUtf16(), iface.asOutParam())))
             return VERR_INVALID_PARAMETER;
-        iface->COMGETTER (Name) (ifname.asOutParam());
+        iface->COMGETTER(Name) (ifname.asOutParam());
         if (ifname.isNull())
             return VERR_INTERNAL_ERROR;

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

@@ -145 +145 @@
 void ErrorInfo::init (IUnknown *aI, const GUID &aIID, bool aKeepObj /* = false */)
 {
-    Assert (aI);
+    Assert(aI);
     if (!aI)
         return;
@@ -210 +210 @@
     {
         mNext.reset (new ErrorInfo (next));
-        Assert (mNext.get());
+        Assert(mNext.get());
         if (!mNext.get())
             rc = E_OUTOFMEMORY;
@@ -235 +235 @@
     ErrorInfo (false /* aDummy */)
 {
-    Assert (progress);
+    Assert(progress);
     if (!progress)
         return;

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

@@ -485 +485 @@
 BOOL EventQueue::waitForEvent (Event **event)
 {
-    Assert (event);
+    Assert(event);
     if (!event)
         return FALSE;
@@ -518 +518 @@
         rc = mEventQ->WaitForEvent (&ev);
         // check for error
-        if (FAILED (rc))
+        if (FAILED(rc))
             return FALSE;
         // check for EINTR signal
@@ -545 +545 @@
 BOOL EventQueue::handleEvent (Event *event)
 {
-    Assert (event);
+    Assert(event);
     if (!event)
         return FALSE;

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

@@ -50 +50 @@
     {
         sCounter = RTTlsAlloc();
-        AssertReturnVoid (sCounter != NIL_RTTLS);
+        AssertReturnVoid(sCounter != NIL_RTTLS);
     }
 
-    uintptr_t counter = (uintptr_t) RTTlsGet (sCounter);
-    ++ counter;
-    RTTlsSet (sCounter, (void *) counter);
+    uintptr_t counter = (uintptr_t)RTTlsGet(sCounter);
+    ++counter;
+    RTTlsSet(sCounter, (void*)counter);
 }
 
@@ -61 +61 @@
 void MultiResult::decCounter()
 {
-    uintptr_t counter = (uintptr_t) RTTlsGet (sCounter);
-    AssertReturnVoid (counter != 0);
-    -- counter;
-    RTTlsSet (sCounter, (void *) counter);
+    uintptr_t counter = (uintptr_t)RTTlsGet(sCounter);
+    AssertReturnVoid(counter != 0);
+    --counter;
+    RTTlsSet(sCounter, (void*)counter);
 }
 
@@ -106 +106 @@
 {
     /* whether multi-error mode is turned on */
-    bool preserve = ((uintptr_t) RTTlsGet (MultiResult::sCounter)) > 0;
+    bool preserve = ((uintptr_t)RTTlsGet(MultiResult::sCounter)) > 0;
 
     LogRel(("ERROR [COM]: aRC=%#08x aIID={%RTuuid} aComponent={%s} aText={%s} aWarning=%RTbool, aInfo=%p, preserve=%RTbool\n",
@@ -120 +120 @@
     {
         /* these are mandatory, others -- not */
-        AssertReturn((!aWarning && FAILED (aResultCode)) ||
+        AssertReturn((!aWarning && FAILED(aResultCode)) ||
                       (aWarning && aResultCode != S_OK),
                       E_FAIL);
@@ -143 +143 @@
             /* get the current error info if any */
             ComPtr<IErrorInfo> err;
-            rc = ::GetErrorInfo (0, err.asOutParam());
+            rc = ::GetErrorInfo(0, err.asOutParam());
             if (FAILED(rc)) break;
             rc = err.queryInterfaceTo(curInfo.asOutParam());
-            if (FAILED (rc))
+            if (FAILED(rc))
             {
                 /* create a IVirtualBoxErrorInfo wrapper for the native
@@ -154 +154 @@
                 if (SUCCEEDED(rc))
                 {
-                    rc = wrapper->init (err);
+                    rc = wrapper->init(err);
                     if (SUCCEEDED(rc))
                         curInfo = wrapper;
@@ -176 +176 @@
                 if (FAILED(rc)) break;
 
-                rc = infoObj->init (aInfo, curInfo);
+                rc = infoObj->init(aInfo, curInfo);
                 if (FAILED(rc)) break;
 
@@ -183 +183 @@
 
             /* we want to return the head's result code */
-            rc = info->COMGETTER(ResultCode) (&aResultCode);
+            rc = info->COMGETTER(ResultCode)(&aResultCode);
             if (FAILED(rc)) break;
         }
@@ -192 +192 @@
             if (FAILED(rc)) break;
 
-            rc = infoObj->init (aResultCode, aIID, aComponent, strText.c_str(), curInfo);
+            rc = infoObj->init(aResultCode, aIID, aComponent, strText.c_str(), curInfo);
             if (FAILED(rc)) break;
 
@@ -201 +201 @@
         rc = info.queryInterfaceTo(err.asOutParam());
         if (SUCCEEDED(rc))
-            rc = ::SetErrorInfo (0, err);
+            rc = ::SetErrorInfo(0, err);
 
 #else // !defined (VBOX_WITH_XPCOM)
 
         nsCOMPtr <nsIExceptionService> es;
-        es = do_GetService (NS_EXCEPTIONSERVICE_CONTRACTID, &rc);
+        es = do_GetService(NS_EXCEPTIONSERVICE_CONTRACTID, &rc);
         if (NS_SUCCEEDED(rc))
         {
             nsCOMPtr <nsIExceptionManager> em;
-            rc = es->GetCurrentExceptionManager (getter_AddRefs (em));
+            rc = es->GetCurrentExceptionManager(getter_AddRefs(em));
             if (FAILED(rc)) break;
 
@@ -218 +218 @@
                 /* get the current error info if any */
                 ComPtr<nsIException> ex;
-                rc = em->GetCurrentException (ex.asOutParam());
+                rc = em->GetCurrentException(ex.asOutParam());
                 if (FAILED(rc)) break;
                 rc = ex.queryInterfaceTo(curInfo.asOutParam());
-                if (FAILED (rc))
+                if (FAILED(rc))
                 {
                     /* create a IVirtualBoxErrorInfo wrapper for the native
@@ -229 +229 @@
                     if (SUCCEEDED(rc))
                     {
-                        rc = wrapper->init (ex);
+                        rc = wrapper->init(ex);
                         if (SUCCEEDED(rc))
                             curInfo = wrapper;
@@ -236 +236 @@
             }
             /* 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 */
@@ -251 +251 @@
                     if (FAILED(rc)) break;
 
-                    rc = infoObj->init (aInfo, curInfo);
+                    rc = infoObj->init(aInfo, curInfo);
                     if (FAILED(rc)) break;
 
@@ -259 +259 @@
                 /* we want to return the head's result code */
                 PRInt32 lrc;
-                rc = info->COMGETTER(ResultCode) (&lrc); aResultCode = lrc;
+                rc = info->COMGETTER(ResultCode)(&lrc); aResultCode = lrc;
                 if (FAILED(rc)) break;
             }
@@ -277 +277 @@
             rc = info.queryInterfaceTo(ex.asOutParam());
             if (SUCCEEDED(rc))
-                rc = em->SetCurrentException (ex);
+                rc = em->SetCurrentException(ex);
         }
         else if (rc == NS_ERROR_UNEXPECTED)
@@ -301 +301 @@
     while (0);
 
-    AssertComRC (rc);
+    AssertComRC(rc);
 
     return SUCCEEDED(rc) ? aResultCode : rc;
@@ -307 +307 @@
 
 /* static */
-HRESULT SupportErrorInfoBase::setError (HRESULT aResultCode, const GUID &aIID,
-                                        const char *aComponent, const char *aText,
-                                        ...)
-{
-    va_list args;
-    va_start (args, aText);
-    HRESULT rc = setErrorV (aResultCode, aIID, aComponent, aText, args);
-    va_end (args);
+HRESULT SupportErrorInfoBase::setError(HRESULT aResultCode, const GUID &aIID,
+                                       const char *aComponent, const char *aText,
+                                       ...)
+{
+    va_list args;
+    va_start(args, aText);
+    HRESULT rc = setErrorV(aResultCode, aIID, aComponent, aText, args);
+    va_end(args);
     return rc;
 }
 
 /* static */
-HRESULT SupportErrorInfoBase::setWarning (HRESULT aResultCode, const GUID &aIID,
-                                          const char *aComponent, const char *aText,
-                                          ...)
-{
-    va_list args;
-    va_start (args, aText);
-    HRESULT rc = setWarningV (aResultCode, aIID, aComponent, aText, args);
-    va_end (args);
-    return rc;
-}
-
-HRESULT SupportErrorInfoBase::setError (HRESULT aResultCode, const char *aText, ...)
-{
-    va_list args;
-    va_start (args, aText);
-    HRESULT rc = setErrorV (aResultCode, mainInterfaceID(), componentName(),
-                            aText, args);
-    va_end (args);
-    return rc;
-}
-
-HRESULT SupportErrorInfoBase::setError (HRESULT aResultCode, const Utf8Str &strText)
+HRESULT SupportErrorInfoBase::setWarning(HRESULT aResultCode, const GUID &aIID,
+                                         const char *aComponent, const char *aText,
+                                         ...)
+{
+    va_list args;
+    va_start(args, aText);
+    HRESULT rc = setWarningV(aResultCode, aIID, aComponent, aText, args);
+    va_end(args);
+    return rc;
+}
+
+HRESULT SupportErrorInfoBase::setError(HRESULT aResultCode, const char *aText, ...)
+{
+    va_list args;
+    va_start(args, aText);
+    HRESULT rc = setErrorV(aResultCode, mainInterfaceID(), componentName(),
+                           aText, args);
+    va_end(args);
+    return rc;
+}
+
+HRESULT SupportErrorInfoBase::setError(HRESULT aResultCode, const Utf8Str &strText)
 {
     HRESULT rc = setError(aResultCode,
@@ -349 +349 @@
 }
 
-HRESULT SupportErrorInfoBase::setWarning (HRESULT aResultCode, const char *aText, ...)
-{
-    va_list args;
-    va_start (args, aText);
-    HRESULT rc = setWarningV (aResultCode, mainInterfaceID(), componentName(),
-                              aText, args);
-    va_end (args);
-    return rc;
-}
-
-HRESULT SupportErrorInfoBase::setError (HRESULT aResultCode, const GUID &aIID,
-                                        const char *aText, ...)
-{
-    va_list args;
-    va_start (args, aText);
-    HRESULT rc = setErrorV (aResultCode, aIID, componentName(), aText, args);
-    va_end (args);
-    return rc;
-}
-
-HRESULT SupportErrorInfoBase::setWarning (HRESULT aResultCode, const GUID &aIID,
-                                          const char *aText, ...)
-{
-    va_list args;
-    va_start (args, aText);
-    HRESULT rc = setWarningV (aResultCode, aIID, componentName(), aText, args);
-    va_end (args);
+HRESULT SupportErrorInfoBase::setWarning(HRESULT aResultCode, const char *aText, ...)
+{
+    va_list args;
+    va_start(args, aText);
+    HRESULT rc = setWarningV(aResultCode, mainInterfaceID(), componentName(),
+                             aText, args);
+    va_end(args);
+    return rc;
+}
+
+HRESULT SupportErrorInfoBase::setError(HRESULT aResultCode, const GUID &aIID,
+                                       const char *aText, ...)
+{
+    va_list args;
+    va_start(args, aText);
+    HRESULT rc = setErrorV(aResultCode, aIID, componentName(), aText, args);
+    va_end(args);
+    return rc;
+}
+
+HRESULT SupportErrorInfoBase::setWarning(HRESULT aResultCode, const GUID &aIID,
+                                         const char *aText, ...)
+{
+    va_list args;
+    va_start(args, aText);
+    HRESULT rc = setWarningV(aResultCode, aIID, componentName(), aText, args);
+    va_end(args);
     return rc;
 }

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

@@ -444 +444 @@
             /* Use RTPathAppPrivateArch() first */
             vrc = RTPathAppPrivateArch(szAppHomeDir, sizeof(szAppHomeDir));
-            AssertRC (vrc);
+            AssertRC(vrc);
         }
         else
@@ -450 +450 @@
             /* Iterate over all other paths */
             szAppHomeDir[RTPATH_MAX - 1] = '\0';
-            strncpy(szAppHomeDir, kAppPathsToProbe [i], RTPATH_MAX - 1);
+            strncpy(szAppHomeDir, kAppPathsToProbe[i], RTPATH_MAX - 1);
             vrc = VINF_SUCCESS;
         }

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

@@ -77 +77 @@
 };
 
-void Utf8StrFmt::init (const char *format, va_list args)
+void Utf8StrFmt::init(const char *format, va_list args)
 {
     if (!format)
@@ -83 +83 @@
 
     // assume an extra byte for a terminating zero
-    size_t fmtlen = strlen (format) + 1;
+    size_t fmtlen = strlen(format) + 1;
 
     FormatData data;
@@ -90 +90 @@
         data.size += fmtlen;
     data.pos = 0;
-    data.cache = (char *) ::RTMemTmpAllocZ (data.size);
+    data.cache = (char*)::RTMemTmpAllocZ(data.size);
 
-    size_t n = ::RTStrFormatV (strOutput, &data, NULL, NULL, format, args);
+    size_t n = ::RTStrFormatV(strOutput, &data, NULL, NULL, format, args);
 
-    AssertMsg (n == data.pos,
-               ("The number of bytes formatted doesn't match: %d and %d!",
-                n, data.pos));
-    NOREF (n);
+    AssertMsg(n == data.pos,
+              ("The number of bytes formatted doesn't match: %d and %d!", n, data.pos));
+    NOREF(n);
 
     // finalize formatting
-    data.cache [data.pos] = 0;
-    (*static_cast <Utf8Str *> (this)) = data.cache;
-    ::RTMemTmpFree (data.cache);
+    data.cache[data.pos] = 0;
+    (*static_cast<Utf8Str*>(this)) = data.cache;
+    ::RTMemTmpFree(data.cache);
 }
 
 // static
-DECLCALLBACK(size_t) Utf8StrFmt::strOutput (void *pvArg, const char *pachChars,
-                                            size_t cbChars)
+DECLCALLBACK(size_t) Utf8StrFmt::strOutput(void *pvArg, const char *pachChars,
+                                           size_t cbChars)
 {
-    Assert (pvArg);
+    Assert(pvArg);
     FormatData &data = *(FormatData *) pvArg;
 
     if (!(pachChars == NULL && cbChars == 0))
     {
-        Assert (pachChars);
+        Assert(pachChars);
 
         // append to cache (always assume an extra byte for a terminating zero)
@@ -123 +122 @@
             if (needed >= FormatData::CacheIncrement)
                 data.size += needed;
-            data.cache = (char *) ::RTMemRealloc (data.cache, data.size);
+            data.cache = (char*)::RTMemRealloc(data.cache, data.size);
         }
-        strncpy (data.cache + data.pos, pachChars, cbChars);
+        strncpy(data.cache + data.pos, pachChars, cbChars);
         data.pos += cbChars;
     }

trunk/src/VBox/Main/hgcm/HGCMThread.cpp

@@ -194 +194 @@
     pThread->m_fu32ThreadFlags &= ~HGCMMSG_TF_INITIALIZING;
     rc = RTThreadUserSignal (ThreadSelf);
-    AssertRC (rc);
+    AssertRC(rc);
 
     pThread->m_pfnThread (pThread->Handle (), pThread->m_pvUser);
@@ -300 +300 @@
                     /* Wait until the thread is ready. */
                     rc = RTThreadUserWait (thread, 30000);
-                    AssertRC (rc);
-                    Assert (!(m_fu32ThreadFlags & HGCMMSG_TF_INITIALIZING) || RT_FAILURE(rc));
+                    AssertRC(rc);
+                    Assert(!(m_fu32ThreadFlags & HGCMMSG_TF_INITIALIZING) || RT_FAILURE(rc));
                 }
                 else
@@ -484 +484 @@
 
             /* Remove the message from the head of Queue list. */
-            Assert (m_pMsgInputQueueHead->m_pPrev == NULL);
+            Assert(m_pMsgInputQueueHead->m_pPrev == NULL);
 
             if (m_pMsgInputQueueHead->m_pNext)
@@ -493 +493 @@
             else
             {
-                Assert (m_pMsgInputQueueHead == m_pMsgInputQueueTail);
+                Assert(m_pMsgInputQueueHead == m_pMsgInputQueueTail);
 
                 m_pMsgInputQueueHead = NULL;

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

@@ -90 +90 @@
 
     /**
-     * Returns |true| if |SUCCEEDED (rc())| is |true|, for convenience.
+     * Returns |true| if |SUCCEEDED(rc())| is |true|, for convenience.
      * |true| means the number of callers was successfully increased.
      */
@@ -245 +245 @@
  *     AssertReturn (autoInitSpan.isOk(), E_FAIL);
  *     ...
- *     if (FAILED (rc))
+ *     if (FAILED(rc))
  *         return rc;
  *     ...
- *     if (SUCCEEDED (rc))
+ *     if (SUCCEEDED(rc))
  *         autoInitSpan.setSucceeded();
  *     return rc;
@@ -341 +341 @@
  *     AssertReturn (autoReinitSpan.isOk(), E_FAIL);
  *     ...
- *     if (FAILED (rc))
+ *     if (FAILED(rc))
  *         return rc;
  *     ...
- *     if (SUCCEEDED (rc))
+ *     if (SUCCEEDED(rc))
  *         autoReinitSpan.setSucceeded();
  *     return rc;
@@ -478 +478 @@
  *          return S_OK;
  *     ...
- *     if (FAILED (rc))
+ *     if (FAILED(rc))
  *         return rc; // will go back to Ready
  *     ...
- *     if (SUCCEEDED (rc))
+ *     if (SUCCEEDED(rc))
  *         mayUninitSpan.acceptUninit(); // will call uninit()
  *     return rc;

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

@@ -69 +69 @@
     do { \
         if (!(drv)) \
-            return setError (E_ACCESSDENIED, tr ("The console is not powered up")); \
+            return setError(E_ACCESSDENIED, tr("The console is not powered up")); \
     } while (0)
 
@@ -217 +217 @@
     static const PDMDRVREG DrvStatusReg;
 
-    void reportAuthLibraryError (const char *filename, int rc)
+    void reportAuthLibraryError(const char *filename, int rc)
     {
-        setError (E_FAIL, tr("Could not load the external authentication library '%s' (%Rrc)"), filename, rc);
+        setError(E_FAIL, tr("Could not load the external authentication library '%s' (%Rrc)"), filename, rc);
     }
 
@@ -242 +242 @@
         AutoVMCallerBase (Console *aThat) : mThat (aThat), mRC (S_OK)
         {
-            Assert (aThat);
+            Assert(aThat);
             mRC = aThat->addVMCaller (taQuiet, taAllowNullVM);
         }
         ~AutoVMCallerBase()
         {
-            if (SUCCEEDED (mRC))
+            if (SUCCEEDED(mRC))
                 mThat->releaseVMCaller();
         }
@@ -253 +253 @@
         void release()
         {
-            AssertReturnVoid (SUCCEEDED (mRC));
+            AssertReturnVoid(SUCCEEDED(mRC));
             mThat->releaseVMCaller();
             mRC = E_FAIL;
@@ -261 +261 @@
         void add()
         {
-            AssertReturnVoid (!SUCCEEDED (mRC));
+            AssertReturnVoid(!SUCCEEDED(mRC));
             mRC = mThat->addVMCaller (taQuiet, taAllowNullVM);
         }
         /** Returns the result of Console::addVMCaller() */
         HRESULT rc() const { return mRC; }
-        /** Shortcut to SUCCEEDED (rc()) */
-        bool isOk() const { return SUCCEEDED (mRC); }
+        /** Shortcut to SUCCEEDED(rc()) */
+        bool isOk() const { return SUCCEEDED(mRC); }
     protected:
         Console *mThat;
@@ -328 +328 @@
         SafeVMPtrBase (Console *aThat) : Base (aThat), mpVM (NULL)
         {
-            if (SUCCEEDED (Base::mRC))
+            if (SUCCEEDED(Base::mRC))
                 mpVM = aThat->mpVM;
         }

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

@@ -131 +131 @@
 
         /* Confirm a successful initialization when it's the case */
-        if (SUCCEEDED (rc))
+        if (SUCCEEDED(rc))
             autoInitSpan.setSucceeded();
 

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

@@ -149 +149 @@
  *
  *  In the debug build, this macro is equivalent to Assert.
- *  In the release build, this macro uses |setError (E_FAIL, ...)| to set the
+ *  In the release build, this macro uses |setError(E_FAIL, ...)| to set the
  *  error info from the asserted expression.
  *
@@ -960 +960 @@
  *  On all platforms, the template argument must also define the following
  *  method: |public static const wchar_t *C::getComponentName()|. See
- *  #setError (HRESULT, const char *, ...) for a description on how it is
+ *  #setError(HRESULT, const char *, ...) for a description on how it is
  *  used.
  *
@@ -1041 +1041 @@
      *  overloaded versions, that automatically substitute some arguments
      *  taking their values from the template parameters. See
-     *  #setError (HRESULT, const char *, ...) for an example.
+     *  #setError(HRESULT, const char *, ...) for an example.
      *
      *  @param  aResultCode result (error) code, must not be S_OK
@@ -1094 +1094 @@
      *  (a value of C::getComponentName()).
      *
-     *  See #setError (HRESULT, const GUID &, const wchar_t *, const char *text, ...)
+     *  See #setError(HRESULT, const GUID &, const wchar_t *, const char *text, ...)
      *  for details.
      *
@@ -1102 +1102 @@
      *
      *  <code>
-     *      return setError (E_FAIL, "Terrible Error");
+     *      return setError(E_FAIL, "Terrible Error");
      *  </code>
      *  or
      *  <code>
-     *      HRESULT rc = setError (E_FAIL, "Terrible Error");
+     *      HRESULT rc = setError(E_FAIL, "Terrible Error");
      *      ...
      *      return rc;
@@ -1146 +1146 @@
      *  (a value of C::getComponentName()).
      *
-     *  See #setError (HRESULT, const GUID &, const wchar_t *, const char *text, ...)
-     *  and #setError (HRESULT, const char *, ...)  for details.
+     *  See #setError(HRESULT, const GUID &, const wchar_t *, const char *text, ...)
+     *  and #setError(HRESULT, const char *, ...)  for details.
      */
     static HRESULT setErrorV(HRESULT aResultCode, const char *aText,
@@ -1183 +1183 @@
      *  Bstr string, because it omits an extra conversion Utf8Str -> Bstr.
      *
-     *  See #setError (HRESULT, const GUID &, const wchar_t *, const char *text, ...)
-     *  and #setError (HRESULT, const char *, ...)  for details.
+     *  See #setError(HRESULT, const GUID &, const wchar_t *, const char *text, ...)
+     *  and #setError(HRESULT, const char *, ...)  for details.
      */
     static HRESULT setErrorBstr(HRESULT aResultCode, const Bstr &aText)
@@ -1215 +1215 @@
      *  id manually.
      *
-     *  See #setError (HRESULT, const GUID &, const wchar_t *, const char *text, ...)
+     *  See #setError(HRESULT, const GUID &, const wchar_t *, const char *text, ...)
      *  for details.
      */
@@ -1254 +1254 @@
      *  harmless error from causing confusion.
      *
-     *  It is otherwise identical to #setError (HRESULT, const char *text, ...).
+     *  It is otherwise identical to #setError(HRESULT, const char *text, ...).
      */
     static HRESULT setErrorNoLog(HRESULT aResultCode, const char *aText, ...)

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

@@ -78 +78 @@
     //        is available in this class.
     static const char *tr (const char *a) { return a; }
-    static HRESULT setError (HRESULT rc,
-                             const char * /* a */,
-                             const char * /* b */,
-                             void *       /* c */) { return rc; }
+    static HRESULT setError(HRESULT rc,
+                            const char * /* a */,
+                            const char * /* b */,
+                            void *       /* c */) { return rc; }
 
     HRESULT mResultCode;

trunk/src/VBox/Main/linux/HostHardwareLinux.cpp

@@ -1166 +1166 @@
     bool IsSet ()
     {
-        Assert ((mError.name == NULL) == (mError.message == NULL));
+        Assert((mError.name == NULL) == (mError.message == NULL));
         return (mError.name != NULL);
     }
     bool HasName (const char *pcszName)
     {
-        Assert ((mError.name == NULL) == (mError.message == NULL));
+        Assert((mError.name == NULL) == (mError.message == NULL));
         return (RTStrCmp (mError.name, pcszName) == 0);
     }
@@ -1624 +1624 @@
     if (RT_SUCCESS(rc) && halSuccess)
     {
-        Assert (pMatches->size() == cProps);
-        AssertForEach (j, size_t, 0, cProps,    (pfMatches == NULL)
-                                             || (pfMatches[j] == true)
-                                             || ((pfMatches[j] == false) && (pMatches[j].size() == 0)));
+        Assert(pMatches->size() == cProps);
+        AssertForEach(j, size_t, 0, cProps,    (pfMatches == NULL)
+                                            || (pfMatches[j] == true)
+                                            || ((pfMatches[j] == false) && (pMatches[j].size() == 0)));
     }
     LogFlowFunc (("rc=%Rrc, halSuccess=%d\n", rc, halSuccess));
@@ -1654 +1654 @@
     autoDBusError dbusError;
 
-    RTMemAutoPtr <DBusMessage, VBoxDBusMessageUnref> message, replyFind, replyGet;
-    RTMemAutoPtr <DBusConnection, VBoxHalShutdown> dbusConnection;
+    RTMemAutoPtr<DBusMessage, VBoxDBusMessageUnref> message, replyFind, replyGet;
+    RTMemAutoPtr<DBusConnection, VBoxHalShutdown> dbusConnection;
     DBusMessageIter iterFind, iterUdis;
 
@@ -1665 +1665 @@
     if (halSuccess && RT_SUCCESS(rc))
     {
-        rc = halFindDeviceStringMatch (dbusConnection.get(), "info.subsystem",
-                                       "usb_device", &replyFind);
+        rc = halFindDeviceStringMatch(dbusConnection.get(), "info.subsystem",
+                                      "usb_device", &replyFind);
         if (!replyFind)
             halSuccess = false;
@@ -1672 +1672 @@
     if (halSuccess && RT_SUCCESS(rc))
     {
-        dbus_message_iter_init (replyFind.get(), &iterFind);
+        dbus_message_iter_init(replyFind.get(), &iterFind);
         if (dbus_message_iter_get_arg_type (&iterFind) != DBUS_TYPE_ARRAY)
             halSuccess = false;
@@ -1679 +1679 @@
      * entries. */
     if (halSuccess && RT_SUCCESS(rc))
-        dbus_message_iter_recurse (&iterFind, &iterUdis);
+        dbus_message_iter_recurse(&iterFind, &iterUdis);
     for (;    halSuccess && RT_SUCCESS(rc)
-           && dbus_message_iter_get_arg_type (&iterUdis) == DBUS_TYPE_STRING;
+           && dbus_message_iter_get_arg_type(&iterUdis) == DBUS_TYPE_STRING;
          dbus_message_iter_next(&iterUdis))
     {
@@ -1688 +1688 @@
         dbus_message_iter_get_basic (&iterUdis, &pszUdi);
         static const char *papszKeys[] = { "linux.device_file", "linux.sysfs_path" };
-        char *papszValues[RT_ELEMENTS (papszKeys)];
-        rc = halGetPropertyStrings (dbusConnection.get(), pszUdi, RT_ELEMENTS (papszKeys),
-                                    papszKeys, papszValues, &replyGet);
+        char *papszValues[RT_ELEMENTS(papszKeys)];
+        rc = halGetPropertyStrings(dbusConnection.get(), pszUdi, RT_ELEMENTS(papszKeys),
+                                   papszKeys, papszValues, &replyGet);
         const char *pszDevice = papszValues[0], *pszSysfsPath = papszValues[1];
         /* Get the interfaces. */
         if (!!replyGet && pszDevice && pszSysfsPath)
         {
-            USBDeviceInfo info (pszDevice, pszSysfsPath);
+            USBDeviceInfo info(pszDevice, pszSysfsPath);
             bool ifaceSuccess = true;  /* If we can't get the interfaces, just
                                         * skip this one device. */
-            rc = getUSBInterfacesFromHal (&info.mInterfaces, pszUdi, &ifaceSuccess);
+            rc = getUSBInterfacesFromHal(&info.mInterfaces, pszUdi, &ifaceSuccess);
             if (RT_SUCCESS(rc) && halSuccess && ifaceSuccess)
                 try
                 {
-                    pList->push_back (info);
+                    pList->push_back(info);
                 }
                 catch(std::bad_alloc &e)
@@ -1714 +1714 @@
     if (pfSuccess != NULL)
         *pfSuccess = halSuccess;
-    LogFlow (("rc=%Rrc, halSuccess=%d\n", rc, halSuccess));
+    LogFlow(("rc=%Rrc, halSuccess=%d\n", rc, halSuccess));
     dbusError.FlowLog();
     return rc;
@@ -1739 +1739 @@
     autoDBusError dbusError;
 
-    RTMemAutoPtr <DBusMessage, VBoxDBusMessageUnref> message, replyFind, replyGet;
-    RTMemAutoPtr <DBusConnection, VBoxHalShutdown> dbusConnection;
+    RTMemAutoPtr<DBusMessage, VBoxDBusMessageUnref> message, replyFind, replyGet;
+    RTMemAutoPtr<DBusConnection, VBoxHalShutdown> dbusConnection;
     DBusMessageIter iterFind, iterUdis;
 
     /* Connect to hal */
-    rc = halInit (&dbusConnection);
+    rc = halInit(&dbusConnection);
     if (!dbusConnection)
         halSuccess = false;
@@ -1750 +1750 @@
     if (halSuccess && RT_SUCCESS(rc))
     {
-        rc = halFindDeviceStringMatch (dbusConnection.get(), "info.category",
+        rc = halFindDeviceStringMatch(dbusConnection.get(), "info.category",
                                        "usbraw", &replyFind);
         if (!replyFind)
@@ -1757 +1757 @@
     if (halSuccess && RT_SUCCESS(rc))
     {
-        dbus_message_iter_init (replyFind.get(), &iterFind);
-        if (dbus_message_iter_get_arg_type (&iterFind) != DBUS_TYPE_ARRAY)
+        dbus_message_iter_init(replyFind.get(), &iterFind);
+        if (dbus_message_iter_get_arg_type(&iterFind) != DBUS_TYPE_ARRAY)
             halSuccess = false;
     }
@@ -1764 +1764 @@
      * entries. */
     if (halSuccess && RT_SUCCESS(rc))
-        dbus_message_iter_recurse (&iterFind, &iterUdis);
+        dbus_message_iter_recurse(&iterFind, &iterUdis);
     for (;    halSuccess && RT_SUCCESS(rc)
-           && dbus_message_iter_get_arg_type (&iterUdis) == DBUS_TYPE_STRING;
+           && dbus_message_iter_get_arg_type(&iterUdis) == DBUS_TYPE_STRING;
          dbus_message_iter_next(&iterUdis))
     {
         /* Get the device node and the sysfs path for the current entry. */
         const char *pszUdi;
-        dbus_message_iter_get_basic (&iterUdis, &pszUdi);
+        dbus_message_iter_get_basic(&iterUdis, &pszUdi);
         static const char *papszKeys[] = { "linux.device_file", "info.parent" };
-        char *papszValues[RT_ELEMENTS (papszKeys)];
-        rc = halGetPropertyStrings (dbusConnection.get(), pszUdi, RT_ELEMENTS (papszKeys),
-                                    papszKeys, papszValues, &replyGet);
+        char *papszValues[RT_ELEMENTS(papszKeys)];
+        rc = halGetPropertyStrings(dbusConnection.get(), pszUdi, RT_ELEMENTS(papszKeys),
+                                   papszKeys, papszValues, &replyGet);
         const char *pszDevice = papszValues[0], *pszSysfsPath = papszValues[1];
         /* Get the interfaces. */
         if (!!replyGet && pszDevice && pszSysfsPath)
         {
-            USBDeviceInfo info (pszDevice, pszSysfsPath);
+            USBDeviceInfo info(pszDevice, pszSysfsPath);
             bool ifaceSuccess = false;  /* If we can't get the interfaces, just
                                          * skip this one device. */
-            rc = getUSBInterfacesFromHal (&info.mInterfaces, pszSysfsPath,
-                                          &ifaceSuccess);
+            rc = getUSBInterfacesFromHal(&info.mInterfaces, pszSysfsPath,
+                                         &ifaceSuccess);
             if (RT_SUCCESS(rc) && halSuccess && ifaceSuccess)
                 try
                 {
-                    pList->push_back (info);
+                    pList->push_back(info);
                 }
                 catch(std::bad_alloc &e)
@@ -1796 +1796 @@
         }
     }
-    if (dbusError.HasName (DBUS_ERROR_NO_MEMORY))
+    if (dbusError.HasName(DBUS_ERROR_NO_MEMORY))
         rc = VERR_NO_MEMORY;
     if (pfSuccess != NULL)
         *pfSuccess = halSuccess;
-    LogFlow (("rc=%Rrc, halSuccess=%d\n", rc, halSuccess));
+    LogFlow(("rc=%Rrc, halSuccess=%d\n", rc, halSuccess));
     dbusError.FlowLog();
     return rc;
@@ -1822 +1822 @@
                             const char *pcszUdi, bool *pfSuccess)
 {
-    AssertReturn(VALID_PTR (pList) && VALID_PTR (pcszUdi) &&
+    AssertReturn(VALID_PTR(pList) && VALID_PTR(pcszUdi) &&
                  (pfSuccess == NULL || VALID_PTR (pfSuccess)),
                  VERR_INVALID_POINTER);
-    LogFlowFunc (("pList=%p, pcszUdi=%s, pfSuccess=%p\n", pList, pcszUdi,
-                  pfSuccess));
+    LogFlowFunc(("pList=%p, pcszUdi=%s, pfSuccess=%p\n", pList, pcszUdi,
+                 pfSuccess));
     int rc = VINF_SUCCESS;  /* We set this to failure on fatal errors. */
     bool halSuccess = true;  /* We set this to false to abort the operation. */
@@ -1835 +1835 @@
     DBusMessageIter iterFind, iterUdis;
 
-    rc = halInit (&dbusConnection);
+    rc = halInit(&dbusConnection);
     if (!dbusConnection)
         halSuccess = false;
@@ -1841 +1841 @@
     {
         /* Look for children of the current UDI. */
-        rc = halFindDeviceStringMatch (dbusConnection.get(), "info.parent",
-                                       pcszUdi, &replyFind);
+        rc = halFindDeviceStringMatch(dbusConnection.get(), "info.parent",
+                                      pcszUdi, &replyFind);
         if (!replyFind)
             halSuccess = false;
@@ -1848 +1848 @@
     if (halSuccess && RT_SUCCESS(rc))
     {
-        dbus_message_iter_init (replyFind.get(), &iterFind);
-        if (dbus_message_iter_get_arg_type (&iterFind) != DBUS_TYPE_ARRAY)
+        dbus_message_iter_init(replyFind.get(), &iterFind);
+        if (dbus_message_iter_get_arg_type(&iterFind) != DBUS_TYPE_ARRAY)
             halSuccess = false;
     }
     if (halSuccess && RT_SUCCESS(rc))
-        dbus_message_iter_recurse (&iterFind, &iterUdis);
+        dbus_message_iter_recurse(&iterFind, &iterUdis);
     for (;    halSuccess && RT_SUCCESS(rc)
-           && dbus_message_iter_get_arg_type (&iterUdis) == DBUS_TYPE_STRING;
+           && dbus_message_iter_get_arg_type(&iterUdis) == DBUS_TYPE_STRING;
          dbus_message_iter_next(&iterUdis))
     {
         /* Now get the sysfs path and the subsystem from the iterator */
         const char *pszUdi;
-        dbus_message_iter_get_basic (&iterUdis, &pszUdi);
+        dbus_message_iter_get_basic(&iterUdis, &pszUdi);
         static const char *papszKeys[] = { "linux.sysfs_path", "info.subsystem",
                                            "linux.subsystem" };
-        char *papszValues[RT_ELEMENTS (papszKeys)];
-        rc = halGetPropertyStrings (dbusConnection.get(), pszUdi, RT_ELEMENTS (papszKeys),
-                                    papszKeys, papszValues, &replyGet);
+        char *papszValues[RT_ELEMENTS(papszKeys)];
+        rc = halGetPropertyStrings(dbusConnection.get(), pszUdi, RT_ELEMENTS(papszKeys),
+                                   papszKeys, papszValues, &replyGet);
         const char *pszSysfsPath = papszValues[0], *pszInfoSubsystem = papszValues[1],
                    *pszLinuxSubsystem = papszValues[2];
@@ -1877 +1877 @@
             try
             {
-                pList->push_back (pszSysfsPath);
+                pList->push_back(pszSysfsPath);
             }
             catch(std::bad_alloc &e)
@@ -1884 +1884 @@
             }
     }
-    if (dbusError.HasName (DBUS_ERROR_NO_MEMORY))
+    if (dbusError.HasName(DBUS_ERROR_NO_MEMORY))
         rc = VERR_NO_MEMORY;
     if (pfSuccess != NULL)
         *pfSuccess = halSuccess;
-    LogFlow (("rc=%Rrc, halSuccess=%d\n", rc, halSuccess));
+    LogFlow(("rc=%Rrc, halSuccess=%d\n", rc, halSuccess));
     dbusError.FlowLog();
     return rc;
@@ -1906 +1906 @@
  */
 /* static */
-DBusHandlerResult dbusFilterFunction (DBusConnection * /* pConnection */,
-                                      DBusMessage *pMessage, void *pvUser)
-{
-    volatile bool *pTriggered = reinterpret_cast<volatile bool *> (pvUser);
-    if (   dbus_message_is_signal (pMessage, "org.freedesktop.Hal.Manager",
-                                   "DeviceAdded")
-        || dbus_message_is_signal (pMessage, "org.freedesktop.Hal.Manager",
-                                   "DeviceRemoved"))
+DBusHandlerResult dbusFilterFunction(DBusConnection * /* pConnection */,
+                                     DBusMessage *pMessage, void *pvUser)
+{
+    volatile bool *pTriggered = reinterpret_cast<volatile bool *>(pvUser);
+    if (   dbus_message_is_signal(pMessage, "org.freedesktop.Hal.Manager",
+                                  "DeviceAdded")
+        || dbus_message_is_signal(pMessage, "org.freedesktop.Hal.Manager",
+                                  "DeviceRemoved"))
     {
         *pTriggered = true;

trunk/src/VBox/Main/testcase/tstVBoxAPILinux.cpp

@@ -124 +124 @@
         for (PRUint32 i = 0; i < machineCnt; ++ i)
         {
-            IMachine *machine = machines [i];
+            IMachine *machine = machines[i];
             if (machine)
             {
                 PRBool isAccessible = PR_FALSE;
-                machine->GetAccessible (&isAccessible);
+                machine->GetAccessible(&isAccessible);
 
                 if (isAccessible)

trunk/src/VBox/Main/win/NetIf-win.cpp

@@ -877 +877 @@
                         0, KEY_QUERY_VALUE, &hKey);
 
-    Assert (rc == ERROR_SUCCESS || rc == ERROR_PATH_NOT_FOUND);
+    Assert(rc == ERROR_SUCCESS || rc == ERROR_PATH_NOT_FOUND);
     if (rc == ERROR_SUCCESS)
     {
@@ -887 +887 @@
         RegCloseKey (hKey);
 
-        Assert (rc == ERROR_SUCCESS || rc == ERROR_FILE_NOT_FOUND);
+        Assert(rc == ERROR_SUCCESS || rc == ERROR_FILE_NOT_FOUND);
     }
 

trunk/src/VBox/Main/win/svchlp.cpp

@@ -235 +235 @@
 
     aVal.reserve(len + 1);
-    aVal.mutableRaw() [len] = 0;
+    aVal.mutableRaw()[len] = 0;
 
     /* read string data */
@@ -283 +283 @@
             {
 #ifdef VBOX_WITH_NETFLT
-                vrc = netIfNetworkInterfaceHelperServer (this, msgCode);
+                vrc = netIfNetworkInterfaceHelperServer(this, msgCode);
 #endif
                 break;
             }
             default:
-                AssertMsgFailedReturn ((
-                    "Invalid message code %d (%08lX)\n", msgCode, msgCode),
-                    VERR_GENERAL_FAILURE);
+                AssertMsgFailedReturn(("Invalid message code %d (%08lX)\n", msgCode, msgCode),
+                                      VERR_GENERAL_FAILURE);
         }
 

trunk/src/VBox/Main/win/svcmain.cpp

@@ -233 +233 @@
                 {
                     Bstr str (lpszToken);
-                    LPCTSTR lpszToken2 = FindOneOf (lpszToken, szTokens);
+                    LPCTSTR lpszToken2 = FindOneOf(lpszToken, szTokens);
                     if (lpszToken2)
-                        str.mutableRaw() [lpszToken2 - lpszToken] = '\0';
+                        str.mutableRaw()[lpszToken2 - lpszToken] = '\0';
                     pipeName = Utf8Str(lpszToken);
                 }

trunk/src/VBox/Main/xpcom/server.cpp

@@ -978 +978 @@
 
         nsCOMPtr<ipcIService> ipcServ (do_GetService(IPC_SERVICE_CONTRACTID, &rc));
-        if (NS_FAILED (rc))
+        if (NS_FAILED(rc))
         {
             RTMsgError("Failed to get IPC service! (rc=%Rhrc)", rc);

trunk/src/VBox/Main/xpcom/server_module.cpp

@@ -84 +84 @@
  *  Full path to the VBoxSVC executable.
  */
-static char VBoxSVCPath [RTPATH_MAX];
+static char VBoxSVCPath[RTPATH_MAX];
 static bool IsVBoxSVCPathSet = false;
 
@@ -160 +160 @@
                 }
             }
-            if (NS_FAILED (rc))
+            if (NS_FAILED(rc))
                 break;
         }
 
         nsCOMPtr <ipcIService> ipcServ = do_GetService (IPC_SERVICE_CONTRACTID, &rc);
-        if (NS_FAILED (rc))
+        if (NS_FAILED(rc))
             break;
 
@@ -179 +179 @@
             PRUint32 serverID = 0;
             rc = ipcServ->ResolveClientName (VBOXSVC_IPC_NAME, &serverID);
-            if (NS_FAILED (rc))
+            if (NS_FAILED(rc))
             {
                 LogFlowFunc (("Starting server \"%s\"...\n", VBoxSVCPath));
@@ -241 +241 @@
             nsCOMPtr <ipcIDConnectService> dconServ =
                 do_GetService (IPC_DCONNECTSERVICE_CONTRACTID, &rc);
-            if (NS_FAILED (rc))
+            if (NS_FAILED(rc))
                 break;