Changeset 45167 in vbox

Timestamp:

Mar 25, 2013 12:41:25 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Little cleanup related to main machine-window accessibility stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (1 diff)
• runtime/UIMachine.cpp (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -472 +472 @@
 QWidget* VBoxGlobal::vmWindow()
 {
-    if (isVMConsoleProcess() && m_pVirtualMachine)
-        return m_pVirtualMachine->mainWindow();
-    return 0;
+    /* Null if that is NOT console-process or machine not yet created: */
+    if (!isVMConsoleProcess() || !m_pVirtualMachine)
+        return 0;
+    /* Main machine-window otherwise: */
+    return m_pVirtualMachine->mainWindow();
 }
 

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

@@ -417 +417 @@
 QWidget* UIMachine::mainWindow() const
 {
-    if (machineLogic() && machineLogic()->mainMachineWindow())
-        return machineLogic()->mainMachineWindow();
-    else
+    /* Null if machine-logic not yet created: */
+    if (!machineLogic())
         return 0;
+    /* Main machine-window otherwise: */
+    return machineLogic()->mainMachineWindow();
 }
 

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

@@ -235 +235 @@
 UIMachineWindow* UIMachineLogic::mainMachineWindow() const
 {
-    /* Return null if windows are not created yet: */
+    /* Null if machine-window(s) not yet created: */
     if (!isMachineWindowsCreated())
         return 0;
-
-    /* Otherwise return first of windows: */
-    return machineWindows()[0];
+    /* First machine-window otherwise: */
+    return machineWindows().first();
 }