Changeset 53065 in vbox for trunk

Timestamp:

Oct 15, 2014 1:00:00 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI rework/cleanup for 7115 (part #21): Using cached getters in UIMachineLogic sub-classes.

Location:

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

Files:

• fullscreen/UIMachineLogicFullscreen.cpp (modified) (2 diffs)
• normal/UIMachineLogicNormal.cpp (modified) (4 diffs)
• scale/UIMachineLogicScale.cpp (modified) (1 diff)
• seamless/UIMachineLogicSeamless.cpp (modified) (2 diffs)

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

@@ -67 +67 @@
 bool UIMachineLogicFullscreen::checkAvailability()
 {
-    /* Temporary get a machine object: */
-    const CMachine &machine = uisession()->session().GetMachine();
-
     /* Check if there is enough physical memory to enter fullscreen: */
     if (uisession()->isGuestAdditionsActive())
     {
-        quint64 availBits = machine.GetVRAMSize() /* VRAM */ * _1M /* MiB to bytes */ * 8 /* to bits */;
+        quint64 availBits = machine().GetVRAMSize() /* VRAM */ * _1M /* MiB to bytes */ * 8 /* to bits */;
         quint64 usedBits = m_pScreenLayout->memoryRequirements();
         if (availBits < usedBits)
@@ -536 +533 @@
 
     /* Create machine-window(s): */
-    for (uint cScreenId = 0; cScreenId < session().GetMachine().GetMonitorCount(); ++cScreenId)
+    for (uint cScreenId = 0; cScreenId < machine().GetMonitorCount(); ++cScreenId)
         addMachineWindow(UIMachineWindow::create(this, cScreenId));
 

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

@@ -206 +206 @@
     LONG uOriginX, uOriginY;
     KGuestMonitorStatus monitorStatus = KGuestMonitorStatus_Enabled;
-    CDisplay display = session().GetConsole().GetDisplay();
-    display.GetScreenResolution(iIndex, uWidth, uHeight, uBitsPerPixel, uOriginX, uOriginY, monitorStatus);
+    display().GetScreenResolution(iIndex, uWidth, uHeight, uBitsPerPixel, uOriginX, uOriginY, monitorStatus);
     if (!fEnabled)
-        display.SetVideoModeHint(iIndex, false, false, 0, 0, 0, 0, 0);
+        display().SetVideoModeHint(iIndex, false, false, 0, 0, 0, 0, 0);
     else
     {
@@ -217 +216 @@
         if (!uHeight)
             uHeight = 600;
-        display.SetVideoModeHint(iIndex, true, false, 0, 0, uWidth, uHeight, 32);
+        display().SetVideoModeHint(iIndex, true, false, 0, 0, uWidth, uHeight, 32);
     }
 }
@@ -224 +223 @@
 {
     /* Resize guest to required size: */
-    CDisplay display = session().GetConsole().GetDisplay();
-    display.SetVideoModeHint(iIndex, uisession()->isScreenVisible(iIndex),
+    display().SetVideoModeHint(iIndex, uisession()->isScreenVisible(iIndex),
                              false, 0, 0, size.width(), size.height(), 0);
 }
@@ -268 +266 @@
 
     /* Get monitors count: */
-    ulong uMonitorCount = session().GetMachine().GetMonitorCount();
+    ulong uMonitorCount = machine().GetMonitorCount();
     /* Create machine window(s): */
     for (ulong uScreenId = 0; uScreenId < uMonitorCount; ++ uScreenId)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp

@@ -126 +126 @@
 
     /* Get monitors count: */
-    ulong uMonitorCount = session().GetMachine().GetMonitorCount();
+    ulong uMonitorCount = machine().GetMonitorCount();
     /* Create machine window(s): */
     for (ulong uScreenId = 0; uScreenId < uMonitorCount; ++ uScreenId)

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

@@ -65 +65 @@
 bool UIMachineLogicSeamless::checkAvailability()
 {
-    /* Temporary get a machine object: */
-    const CMachine &machine = uisession()->session().GetMachine();
-
     /* Check if there is enough physical memory to enter seamless: */
     if (uisession()->isGuestAdditionsActive())
     {
-        quint64 availBits = machine.GetVRAMSize() /* VRAM */ * _1M /* MiB to bytes */ * 8 /* to bits */;
+        quint64 availBits = machine().GetVRAMSize() /* VRAM */ * _1M /* MiB to bytes */ * 8 /* to bits */;
         quint64 usedBits = m_pScreenLayout->memoryRequirements();
         if (availBits < usedBits)
@@ -261 +258 @@
 
     /* Create machine-window(s): */
-    for (uint cScreenId = 0; cScreenId < session().GetMachine().GetMonitorCount(); ++cScreenId)
+    for (uint cScreenId = 0; cScreenId < machine().GetMonitorCount(); ++cScreenId)
         addMachineWindow(UIMachineWindow::create(this, cScreenId));