Changeset 27768 in vbox

Timestamp:

Mar 29, 2010 9:17:52 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: 2D: coding style; spelling; never ever forward declare inline, use *one* rule at the file header

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineView.cpp (modified) (3 diffs)
• UISession.cpp (modified) (1 diff)
• UISession.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -490 +490 @@
             if (m_fAccelerate2DVideo)
             {
-                class UIFrameBuffer* pFramebuffer = uisession()->persistedBrameBuffer(screenId());
+                UIFrameBuffer* pFramebuffer = uisession()->frameBuffer(screenId());
                 if (pFramebuffer)
                     pFramebuffer->setView(this);
@@ -498 +498 @@
                      * @todo: they are to be removed once VBox stuff is gone */
                     pFramebuffer = new VBoxOverlayFrameBuffer<UIFrameBufferQImage, UIMachineView, UIResizeEvent>(this, &machineWindowWrapper()->session());
-                    uisession()->setPersistedBrameBuffer(screenId(), pFramebuffer);
+                    uisession()->setFrameBuffer(screenId(), pFramebuffer);
                 }
                 m_pFrameBuffer = pFramebuffer;
@@ -744 +744 @@
              * 1. avoid 2D command loss during the time slot when no framebuffer is assigned to the display
              * 2. make it easier to preserve the current 2D state */
-            Assert (m_pFrameBuffer == uisession()->persistedBrameBuffer(screenId()));
+            Assert(m_pFrameBuffer == uisession()->frameBuffer(screenId()));
             m_pFrameBuffer->setView(NULL);
         }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -1513 +1513 @@
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
-class UIFrameBuffer* UISession::persistedBrameBuffer(ulong screenId)
-{
-    Assert (screenId < (ulong)m_FrameBufferVector.size());
+UIFrameBuffer* UISession::frameBuffer(ulong screenId) const
+{
+    Assert(screenId < (ulong)m_FrameBufferVector.size());
     if (screenId < (ulong)m_FrameBufferVector.size())
-        return m_FrameBufferVector[((int)screenId)];
+        return m_FrameBufferVector.at((int)screenId);
     return NULL;
 }
 
-int UISession::setPersistedBrameBuffer(ulong screenId, class UIFrameBuffer* pFrameBuffer)
-{
-    Assert (screenId < (ulong)m_FrameBufferVector.size());
+int UISession::setFrameBuffer(ulong screenId, UIFrameBuffer* pFrameBuffer)
+{
+    Assert(screenId < (ulong)m_FrameBufferVector.size());
     if (screenId < (ulong)m_FrameBufferVector.size())
     {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -39 +39 @@
 class UIActionsPool;
 class UIConsoleCallback;
+class UIFrameBuffer;
 class UIMachine;
 class UIMachineMenuBar;
@@ -143 +144 @@
     /* return a persisted framebuffer for the given screen
      * see comment below for the m_FrameBufferVector field */
-    class UIFrameBuffer* persistedBrameBuffer(ulong screenId);
+    UIFrameBuffer* frameBuffer(ulong screenId) const;
     /* @return VINF_SUCCESS - on success
      * VERR_INVALID_PARAMETER - if screenId is invalid */
-    int setPersistedBrameBuffer(ulong screenId, class UIFrameBuffer* pFrameBuffer);
+    int setFrameBuffer(ulong screenId, UIFrameBuffer* pFrameBuffer);
 #endif
 
@@ -214 +215 @@
 #ifdef VBOX_WITH_VIDEOHWACCEL
     /* When 2D is enabled we do not re-create Framebuffers. This is done
-     * 1. to avoid 2D command loss during the time slot when no framebuffer is assigned to the display
+     * 1. to avoid 2D command loss during the time slot when no framebuffer is
+     *    assigned to the display
      * 2. to make it easier to preserve the current 2D state */
-    QVector<class UIFrameBuffer*> m_FrameBufferVector;
+    QVector<UIFrameBuffer*> m_FrameBufferVector;
 #endif