Changeset 30407 in vbox

Timestamp:

Jun 24, 2010 2:16:55 AM (15 years ago)

Author:

vboxsync

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

63033

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (3 diffs)
• src/runtime/UIMachineView.cpp (modified) (5 diffs)
• src/runtime/fullscreen/UIMachineLogicFullscreen.cpp (modified) (2 diffs)
• src/runtime/normal/UIMachineLogicNormal.cpp (modified) (1 diff)
• src/runtime/seamless/UIMachineLogicSeamless.cpp (modified) (2 diffs)
• src/runtime/seamless/UIMachineViewSeamless.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -323 +323 @@
         src/widgets/VBoxProgressDialog.h \
         src/widgets/VBoxWarningPane.h \
+        src/runtime/UIMachine.h \
         src/runtime/UISession.h \
         src/runtime/UIActionsPool.h \
         src/runtime/UIIndicatorsPool.h \
-        src/runtime/UIMachine.h \
         src/runtime/UIMachineLogic.h \
         src/runtime/UIMachineView.h \
@@ -456 +456 @@
         src/widgets/VBoxProgressDialog.cpp \
         src/widgets/VBoxWarningPane.cpp \
+        src/runtime/UIMachine.cpp \
         src/runtime/UISession.cpp \
         src/runtime/UIActionsPool.cpp \
@@ -463 +464 @@
         src/runtime/UIFrameBufferQImage.cpp \
         src/runtime/UIFrameBufferSDL.cpp \
-        src/runtime/UIMachine.cpp \
         src/runtime/UIMachineLogic.cpp \
         src/runtime/UIMachineWindow.cpp \

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

@@ -231 +231 @@
 UISession* UIMachineView::uisession() const
 {
-    return machineWindowWrapper()->machineLogic()->uisession();
+    return machineLogic()->uisession();
 }
 
@@ -1105 +1105 @@
                 break;
             }
-#if defined (Q_WS_WIN32)
+#ifdef Q_WS_WIN
             /* Install/uninstall low-level kbd hook on every activation/deactivation to:
              * a) avoid excess hook calls when we're not active and
@@ -1127 +1127 @@
                 break;
             }
-#endif /* defined (Q_WS_WIN32) */
+#endif /* Q_WS_WIN */
 #ifdef Q_WS_MAC
             /* Install/remove the keyboard event handler: */
@@ -1173 +1173 @@
                 viewport()->repaint();
             }
-            /* reuse the focus event handler to uncapture everything */
+            /* Reuse the focus event handler to uncapture everything: */
             if (hasFocus())
-                focusEvent (false /* aHasFocus*/, false /* aReleaseHostKey */);
+                focusEvent(false /* aHasFocus*/, false /* aReleaseHostKey */);
             break;
         }
@@ -1201 +1201 @@
                 }
             }
-            /* Reuse the focus event handler to capture input: */
+            /* Reuse the focus event handler to capture keyboard: */
             if (hasFocus())
                 focusEvent(true /* aHasFocus */);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp

@@ -195 +195 @@
 
     /* Create machine window(s): */
-    for (int screenId = 0; screenId < m_pScreenLayout->guestScreenCount(); ++screenId)
-        addMachineWindow(UIMachineWindow::create(this, visualStateType(), screenId));
+    for (int cScreenId = 0; cScreenId < m_pScreenLayout->guestScreenCount(); ++cScreenId)
+        addMachineWindow(UIMachineWindow::create(this, visualStateType(), cScreenId));
 
     /* Connect screen-layout change handler: */
-    foreach (UIMachineWindow *pMachineWindow, machineWindows())
+    for (int i = 0; i < machineWindows().size(); ++i)
         connect(m_pScreenLayout, SIGNAL(screenLayoutChanged()),
-                static_cast<UIMachineWindowFullscreen*>(pMachineWindow), SLOT(sltPlaceOnScreen()));
+                static_cast<UIMachineWindowFullscreen*>(machineWindows()[i]), SLOT(sltPlaceOnScreen()));
 
 #ifdef Q_WS_MAC
@@ -218 +218 @@
 void UIMachineLogicFullscreen::cleanupMachineWindows()
 {
-    /* Do not cleanup machine window if it is not present: */
+    /* Do not cleanup machine window(s) if not present: */
     if (!isMachineWindowsCreated())
         return;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

@@ -157 +157 @@
 void UIMachineLogicNormal::cleanupMachineWindow()
 {
-    /* Do not cleanup machine window if it is not present: */
+    /* Do not cleanup machine window(s) if not present: */
     if (!isMachineWindowsCreated())
         return;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp

@@ -181 +181 @@
 #endif /* Q_WS_MAC */
 
-    /* Update the multi screen layout */
+    /* Update the multi screen layout: */
     m_pScreenLayout->update();
 
     /* Create machine window(s): */
-    for (int screenId = 0; screenId < m_pScreenLayout->guestScreenCount(); ++screenId)
-        addMachineWindow(UIMachineWindow::create(this, visualStateType(), screenId));
-
-    foreach (UIMachineWindow *pMachineWindow, machineWindows())
+    for (int cScreenId = 0; cScreenId < m_pScreenLayout->guestScreenCount(); ++cScreenId)
+        addMachineWindow(UIMachineWindow::create(this, visualStateType(), cScreenId));
+
+    /* Connect screen-layout change handler: */
+    for (int i = 0; i < machineWindows().size(); ++i)
         connect(m_pScreenLayout, SIGNAL(screenLayoutChanged()),
-                static_cast<UIMachineWindowSeamless*>(pMachineWindow), SLOT(sltPlaceOnScreen()));
+                static_cast<UIMachineWindowSeamless*>(machineWindows()[i]), SLOT(sltPlaceOnScreen()));
 
     /* Remember what machine window(s) created: */
@@ -198 +199 @@
 void UIMachineLogicSeamless::cleanupMachineWindows()
 {
-    /* Do not cleanup machine window if it is not present: */
+    /* Do not cleanup machine window(s) if not present: */
     if (!isMachineWindowsCreated())
         return;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.h

@@ -66 +66 @@
     //void prepareConnections() {}
     //void cleanupFilters() {}
-    //void cleanupCommon();
+    //void cleanupCommon() {}
 
     /* Private helpers: */