Changeset 21878 in vbox for trunk/src/VBox/Main/DisplayImpl.cpp

Timestamp:

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

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Main/DisplayImpl.cpp (modified) (20 diffs)

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -173 +173 @@
 HRESULT Display::init (Console *aParent)
 {
-    LogFlowThisFunc (("aParent=%p\n", aParent));
+    LogFlowThisFunc(("aParent=%p\n", aParent));
 
     ComAssertRet (aParent, E_INVALIDARG);
 
     /* Enclose the state transition NotReady->InInit->Ready */
-    AutoInitSpan autoInitSpan (this);
-    AssertReturn (autoInitSpan.isOk(), E_FAIL);
-
-    unconst (mParent) = aParent;
+    AutoInitSpan autoInitSpan(this);
+    AssertReturn(autoInitSpan.isOk(), E_FAIL);
+
+    unconst(mParent) = aParent;
 
     // by default, we have an internal framebuffer which is
@@ -229 +229 @@
 void Display::uninit()
 {
-    LogFlowThisFunc (("\n"));
+    LogFlowThisFunc(("\n"));
 
     /* Enclose the state transition Ready->InUninit->NotReady */
-    AutoUninitSpan autoUninitSpan (this);
+    AutoUninitSpan autoUninitSpan(this);
     if (autoUninitSpan.uninitDone())
         return;
@@ -243 +243 @@
         mParent->UnregisterCallback (this);
 
-    unconst (mParent).setNull();
+    unconst(mParent).setNull();
 
     if (mpDrv)
@@ -1317 +1317 @@
     CheckComArgNotNull(width);
 
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    AutoWriteLock alock (this);
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(this);
 
     CHECK_CONSOLE_DRV (mpDrv);
@@ -1339 +1339 @@
     CheckComArgNotNull(height);
 
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    AutoWriteLock alock (this);
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(this);
 
     CHECK_CONSOLE_DRV (mpDrv);
@@ -1362 +1362 @@
         return E_INVALIDARG;
 
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    AutoWriteLock alock (this);
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(this);
 
     CHECK_CONSOLE_DRV (mpDrv);
@@ -1389 +1389 @@
         CheckComArgOutPointerValid(aFramebuffer);
 
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    AutoWriteLock alock (this);
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(this);
 
     Console::SafeVMPtrQuiet pVM (mParent);
@@ -1405 +1405 @@
         int vrc = VMR3ReqCall (pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT,
             (PFNRT) changeFramebuffer, 3, this, aFramebuffer, aScreenId);
-        if (RT_SUCCESS (vrc))
+        if (RT_SUCCESS(vrc))
             vrc = pReq->iStatus;
         VMR3ReqFree (pReq);
@@ -1430 +1430 @@
     CheckComArgOutPointerValid(aFramebuffer);
 
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    AutoWriteLock alock (this);
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(this);
 
     /* @todo this should be actually done on EMT. */
@@ -1452 +1452 @@
     ULONG aBitsPerPixel, ULONG aDisplay)
 {
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    AutoWriteLock alock (this);
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(this);
 
     CHECK_CONSOLE_DRV (mpDrv);
@@ -1502 +1502 @@
 STDMETHODIMP Display::SetSeamlessMode (BOOL enabled)
 {
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    AutoWriteLock alock (this);
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(this);
 
     /* Have to leave the lock because the pfnRequestSeamlessChange will call EMT.  */
@@ -1532 +1532 @@
     CheckComArgExpr(height, height != 0);
 
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    AutoWriteLock alock (this);
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(this);
 
     CHECK_CONSOLE_DRV (mpDrv);
 
     Console::SafeVMPtr pVM (mParent);
-    CheckComRCReturnRC (pVM.rc());
+    CheckComRCReturnRC(pVM.rc());
 
     HRESULT rc = S_OK;
@@ -1588 +1588 @@
 
 STDMETHODIMP Display::TakeScreenShotSlow (ULONG width, ULONG height,
-                                          ComSafeArrayOut (BYTE, aScreenData))
+                                          ComSafeArrayOut(BYTE, aScreenData))
 {
      HRESULT rc = S_OK;
@@ -1615 +1615 @@
     CheckComArgExpr(height, height != 0);
 
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    AutoWriteLock alock (this);
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(this);
 
     CHECK_CONSOLE_DRV (mpDrv);
 
     Console::SafeVMPtr pVM (mParent);
-    CheckComRCReturnRC (pVM.rc());
+    CheckComRCReturnRC(pVM.rc());
 
     /*
@@ -1674 +1674 @@
     LogFlowFuncEnter();
 
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    AutoWriteLock alock (this);
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(this);
 
     CHECK_CONSOLE_DRV (mpDrv);
 
     Console::SafeVMPtr pVM (mParent);
-    CheckComRCReturnRC (pVM.rc());
+    CheckComRCReturnRC(pVM.rc());
 
     HRESULT rc = S_OK;
@@ -1719 +1719 @@
     LogFlowFunc (("\n"));
 
-    /// @todo (dmik) can we AutoWriteLock alock (this); here?
+    /// @todo (dmik) can we AutoWriteLock alock(this); here?
     //  do it when we switch this class to VirtualBoxBase_NEXT.
     //  This will require general code review and may add some details.
@@ -1727 +1727 @@
     //  (and therefore don't use Display lock at all here to save some
     //  milliseconds).
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
 
     /* this is only valid for external framebuffers */
@@ -1755 +1755 @@
     LogFlowFunc (("\n"));
 
-    /// @todo (dmik) can we AutoWriteLock alock (this); here?
+    /// @todo (dmik) can we AutoWriteLock alock(this); here?
     //  do it when we switch this class to VirtualBoxBase_NEXT.
     //  Tthis will require general code review and may add some details.
@@ -1763 +1763 @@
     //  (and therefore don't use Display lock at all here to save some
     //  milliseconds).
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
 
     /* this is only valid for external framebuffers */
@@ -1889 +1889 @@
     LogFlowFunc (("uScreenId = %d\n", uScreenId));
 
-    AssertReturn (that, VERR_INVALID_PARAMETER);
-    AssertReturn (uScreenId < that->mcMonitors, VERR_INVALID_PARAMETER);
-
-    AutoCaller autoCaller (that);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    AutoWriteLock alock (that);
+    AssertReturn(that, VERR_INVALID_PARAMETER);
+    AssertReturn(uScreenId < that->mcMonitors, VERR_INVALID_PARAMETER);
+
+    AutoCaller autoCaller(that);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(that);
 
     DISPLAYFBINFO *pDisplayFBInfo = &that->maFramebuffers[uScreenId];