Changeset 30330 in vbox for trunk

Timestamp:

Jun 21, 2010 1:30:27 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt: New running VM core: reworking some UIMachineLogic(+specific part) code to bring it to common form.

Location:

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

Files:

• UIMachineLogic.cpp (modified) (1 diff)
• UIMachineLogic.h (modified) (1 diff)
• fullscreen/UIMachineLogicFullscreen.cpp (modified) (2 diffs)
• normal/UIMachineLogicNormal.cpp (modified) (3 diffs)
• seamless/UIMachineLogicSeamless.cpp (modified) (2 diffs)

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

@@ -630 +630 @@
 }
 
-void UIMachineLogic::cleanupMachineWindows()
-{
-#ifdef Q_WS_MAC
-    /* We need to clean up the dock stuff before the machine windows. */
-    cleanupDock();
-#endif /* Q_WS_MAC */
-}
-
 #ifdef Q_WS_MAC
 void UIMachineLogic::cleanupDock()

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

@@ -119 +119 @@
     /* Cleanup helpers: */
     //virtual void cleanupRequiredFeatures() {}
-    virtual void cleanupMachineWindows();
 #ifdef Q_WS_MAC
     virtual void cleanupDock();

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

@@ -47 +47 @@
 UIMachineLogicFullscreen::~UIMachineLogicFullscreen()
 {
-    /* Cleanup machine window: */
+#ifdef Q_WS_MAC
+    /* Cleanup the dock stuff before the machine window(s): */
+    cleanupDock();
+#endif /* Q_WS_MAC */
+
+    /* Cleanup machine window(s): */
     cleanupMachineWindows();
 
@@ -217 +222 @@
         return;
 
-    /* Base class cleanup: */
-    UIMachineLogic::cleanupMachineWindows();
-
-    /* Cleanup normal machine window: */
+    /* Cleanup machine window(s): */
     foreach (UIMachineWindow *pMachineWindow, machineWindows())
         UIMachineWindow::destroy(pMachineWindow);

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

@@ -42 +42 @@
 UIMachineLogicNormal::~UIMachineLogicNormal()
 {
-    /* Cleanup normal machine window: */
+#ifdef Q_WS_MAC
+    /* Cleanup the dock stuff before the machine window(s): */
+    cleanupDock();
+#endif /* Q_WS_MAC */
+
+    /* Cleanup machine window(s): */
     cleanupMachineWindow();
 }
@@ -131 +136 @@
         return;
 
-    /* Base class cleanup: */
-    UIMachineLogic::cleanupMachineWindows();
-
 #ifdef Q_WS_MAC // TODO: Is that really need here?
     /* We have to make sure that we are getting the front most process.
@@ -159 +161 @@
         return;
 
-    /* Cleanup normal machine window: */
+    /* Cleanup machine window(s): */
     foreach (UIMachineWindow *pMachineWindow, machineWindows())
         UIMachineWindow::destroy(pMachineWindow);

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

@@ -45 +45 @@
 UIMachineLogicSeamless::~UIMachineLogicSeamless()
 {
-    /* Cleanup normal machine window: */
+#ifdef Q_WS_MAC
+    /* Cleanup the dock stuff before the machine window(s): */
+    cleanupDock();
+#endif /* Q_WS_MAC */
+
+    /* Cleanup machine window(s): */
     cleanupMachineWindows();
 
@@ -197 +202 @@
         return;
 
-    /* Base class cleanup: */
-    UIMachineLogic::cleanupMachineWindows();
-
-    /* Cleanup normal machine window: */
+    /* Cleanup machine window(s): */
     foreach (UIMachineWindow *pMachineWindow, machineWindows())
         UIMachineWindow::destroy(pMachineWindow);