Changeset 30551 in vbox for trunk/src

Timestamp:

Jul 1, 2010 1:50:52 AM (15 years ago)

Author:

vboxsync

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

63259

Message:

FE/Qt: New running VM core: Just some code cosmetics for UIMachineView.

Location:

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

Files:

• UIMachineView.cpp (modified) (9 diffs)
• UIMachineView.h (modified) (2 diffs)

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

@@ -84 +84 @@
 #endif /* Q_WS_MAC */
 
-class VBoxViewport: public QWidget
+class UIViewport: public QWidget
 {
 public:
 
-    VBoxViewport(QWidget *pParent) : QWidget(pParent)
+    UIViewport(QWidget *pParent) : QWidget(pParent)
     {
         /* No need for background drawing: */
@@ -114 +114 @@
                                      )
 {
-    UIMachineView *view = 0;
+    UIMachineView *pMachineView = 0;
     switch (visualStateType)
     {
         case UIVisualStateType_Normal:
-            view = new UIMachineViewNormal(  pMachineWindow
-                                           , uScreenId
+            pMachineView = new UIMachineViewNormal(  pMachineWindow
+                                                   , uScreenId
 #ifdef VBOX_WITH_VIDEOHWACCEL
-                                           , bAccelerate2DVideo
+                                                   , bAccelerate2DVideo
 #endif /* VBOX_WITH_VIDEOHWACCEL */
-                                           );
+                                                   );
             break;
         case UIVisualStateType_Fullscreen:
-            view = new UIMachineViewFullscreen(  pMachineWindow
-                                               , uScreenId
+            pMachineView = new UIMachineViewFullscreen(  pMachineWindow
+                                                       , uScreenId
 #ifdef VBOX_WITH_VIDEOHWACCEL
-                                               , bAccelerate2DVideo
+                                                       , bAccelerate2DVideo
 #endif /* VBOX_WITH_VIDEOHWACCEL */
-                                               );
+                                                       );
             break;
         case UIVisualStateType_Seamless:
-            view = new UIMachineViewSeamless(  pMachineWindow
-                                             , uScreenId
+            pMachineView = new UIMachineViewSeamless(  pMachineWindow
+                                                     , uScreenId
 #ifdef VBOX_WITH_VIDEOHWACCEL
-                                             , bAccelerate2DVideo
+                                                     , bAccelerate2DVideo
 #endif /* VBOX_WITH_VIDEOHWACCEL */
-                                             );
+                                                     );
             break;
         default:
             break;
     }
-    return view;
+    return pMachineView;
 }
 
@@ -222 +222 @@
             break;
     }
-
     m_previousState = state;
 }
@@ -263 +262 @@
     /* Prepare viewport: */
 #ifdef VBOX_GUI_USE_QGLFB
-    QWidget *pViewport;
+    QWidget *pViewport = 0;
     switch (vboxGlobal().vmRenderMode())
     {
@@ -270 +269 @@
             break;
         default:
-            pViewport = new VBoxViewport(this);
+            pViewport = new UIViewport(this);
     }
 #else /* VBOX_GUI_USE_QGLFB */
-    VBoxViewport *pViewport = new VBoxViewport(this);
+    UIViewport *pViewport = new UIViewport(this);
 #endif /* !VBOX_GUI_USE_QGLFB */
     setViewport(pViewport);
@@ -1111 +1110 @@
             return true;
         }
-
-#ifdef VBOX_WITH_VIDEOHWACCEL
-        case VBoxDefs::VHWACommandProcessType:
-        {
-            m_pFrameBuffer->doProcessVHWACommand(pEvent);
-            return true;
-        }
-#endif /* VBOX_WITH_VIDEOHWACCEL */
 
         case QEvent::KeyPress:
@@ -1173 +1164 @@
 
 #ifdef Q_WS_MAC
-        /* posted OnShowWindow */
+        /* Event posted OnShowWindow: */
         case VBoxDefs::ShowWindowEventType:
         {
@@ -1186 +1177 @@
         }
 #endif /* Q_WS_MAC */
+
+#ifdef VBOX_WITH_VIDEOHWACCEL
+        case VBoxDefs::VHWACommandProcessType:
+        {
+            m_pFrameBuffer->doProcessVHWACommand(pEvent);
+            return true;
+        }
+#endif /* VBOX_WITH_VIDEOHWACCEL */
 
         default:
@@ -1269 +1268 @@
     }
 
-    return QAbstractScrollArea::eventFilter (pWatched, pEvent);
+    return QAbstractScrollArea::eventFilter(pWatched, pEvent);
 }
 

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

@@ -34 +34 @@
 /* Local forwards */
 class UISession;
+class UIMachineLogic;
+class UIMachineWindow;
 class UIFrameBuffer;
-class UIMachineWindow;
-class UIMachineLogic;
 class VBoxGlobalSettings;
 
@@ -176 +176 @@
     static LRESULT CALLBACK lowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam);
     bool winLowKeyboardEvent(UINT msg, const KBDLLHOOKSTRUCT &event);
-    bool winEvent(MSG *aMsg, long *aResult);
+    bool winEvent(MSG *pMsg, long *puResult);
 #elif defined(Q_WS_X11)
     bool x11Event(XEvent *event);