Changeset 53068 in vbox for trunk/src/VBox/Frontends

Timestamp:

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

Author:

vboxsync

Message:

FE/Qt: Runtime UI rework/cleanup for 7115 (part #22): Using cached wrappers in UIMachineWindow classes.

Location:

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

Files:

• UIMachineWindow.cpp (modified) (6 diffs)
• UIMachineWindow.h (modified) (1 diff)
• fullscreen/UIMachineWindowFullscreen.cpp (modified) (1 diff)
• normal/UIMachineWindowNormal.cpp (modified) (2 diffs)
• scale/UIMachineWindowScale.cpp (modified) (2 diffs)
• seamless/UIMachineWindowSeamless.cpp (modified) (1 diff)

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

@@ -209 +209 @@
 }
 
-CMachine UIMachineWindow::machine() const
-{
-    return session().GetMachine();
+CMachine& UIMachineWindow::machine() const
+{
+    return uisession()->machine();
+}
+
+CConsole& UIMachineWindow::console() const
+{
+    return uisession()->console();
+}
+
+const QString& UIMachineWindow::machineName() const
+{
+    return uisession()->machineName();
 }
 
@@ -284 +294 @@
         return;
 
-    /* Get machine: */
-    CMachine m = machine();
-
     /* If there is a close hook script defined: */
     const QString strScript = gEDataManager->machineCloseHookScript(vboxGlobal().managedVMUuid());
@@ -292 +299 @@
     {
         /* Execute asynchronously and leave: */
-        QProcess::startDetached(strScript, QStringList() << m.GetId());
+        QProcess::startDetached(strScript, QStringList() << machine().GetId());
         return;
     }
@@ -325 +332 @@
         /* Prepare close-dialog: */
         QWidget *pParentDlg = windowManager().realParentWindow(this);
-        QPointer<UIVMCloseDialog> pCloseDlg = new UIVMCloseDialog(pParentDlg, m,
-                                                                  session().GetConsole().GetGuestEnteredACPIMode(),
+        QPointer<UIVMCloseDialog> pCloseDlg = new UIVMCloseDialog(pParentDlg, machine(),
+                                                                  console().GetGuestEnteredACPIMode(),
                                                                   restrictedCloseActions);
 
@@ -481 +488 @@
     if (iElement & UIVisualElement_WindowTitle)
     {
-        /* Get machine: */
-        const CMachine &m = machine();
         /* Get machine state: */
         KMachineState state = uisession()->machineState();
         /* Prepare full name: */
         QString strSnapshotName;
-        if (m.GetSnapshotCount() > 0)
-        {
-            CSnapshot snapshot = m.GetCurrentSnapshot();
+        if (machine().GetSnapshotCount() > 0)
+        {
+            CSnapshot snapshot = machine().GetCurrentSnapshot();
             strSnapshotName = " (" + snapshot.GetName() + ")";
         }
-        QString strMachineName = m.GetName() + strSnapshotName;
+        QString strMachineName = machineName() + strSnapshotName;
         if (state != KMachineState_Null)
             strMachineName += " [" + gpConverter->toString(state) + "]";
@@ -500 +505 @@
         strMachineName += " - " + (strUserProductName.isEmpty() ? defaultWindowTitle() : strUserProductName);
 #endif /* !Q_WS_MAC */
-        if (m.GetMonitorCount() > 1)
+        if (machine().GetMonitorCount() > 1)
             strMachineName += QString(" : %1").arg(m_uScreenId + 1);
         setWindowTitle(strMachineName);

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

@@ -65 +65 @@
     UIActionPool* actionPool() const;
     UISession* uisession() const;
+
+    /** Returns the session reference. */
     CSession& session() const;
-    CMachine machine() const;
+    /** Returns the session's machine reference. */
+    CMachine& machine() const;
+    /** Returns the session's console reference. */
+    CConsole& console() const;
+
+    /** Returns the machine name. */
+    const QString& machineName() const;
 
     /** Adjusts machine-window size to correspond current machine-view size.

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

@@ -502 +502 @@
         if (m_pMiniToolBar)
         {
-            /* Get machine: */
-            const CMachine &m = machine();
             /* Get snapshot(s): */
             QString strSnapshotName;
-            if (m.GetSnapshotCount() > 0)
+            if (machine().GetSnapshotCount() > 0)
             {
-                CSnapshot snapshot = m.GetCurrentSnapshot();
+                CSnapshot snapshot = machine().GetCurrentSnapshot();
                 strSnapshotName = " (" + snapshot.GetName() + ")";
             }
             /* Update mini-toolbar text: */
-            m_pMiniToolBar->setText(m.GetName() + strSnapshotName);
+            m_pMiniToolBar->setText(machineName() + strSnapshotName);
         }
     }

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

@@ -317 +317 @@
     UIMachineWindow::loadSettings();
 
-    /* Get machine: */
-    CMachine m = machine();
-
     /* Load GUI customizations: */
     {
@@ -341 +338 @@
         {
             /* If previous machine-state was SAVED: */
-            if (m.GetState() == KMachineState_Saved)
+            if (machine().GetState() == KMachineState_Saved)
             {
                 /* Restore window geometry: */

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

@@ -81 +81 @@
     UIMachineWindow::loadSettings();
 
-    /* Load scale window settings: */
-    CMachine m = machine();
-
     /* Load extra-data settings: */
     {
@@ -121 +118 @@
 void UIMachineWindowScale::saveSettings()
 {
-    /* Get machine: */
-    CMachine m = machine();
-
     /* Save window geometry: */
     {

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

@@ -269 +269 @@
         if (m_pMiniToolBar)
         {
-            /* Get machine: */
-            const CMachine &m = machine();
             /* Get snapshot(s): */
             QString strSnapshotName;
-            if (m.GetSnapshotCount() > 0)
+            if (machine().GetSnapshotCount() > 0)
             {
-                CSnapshot snapshot = m.GetCurrentSnapshot();
+                CSnapshot snapshot = machine().GetCurrentSnapshot();
                 strSnapshotName = " (" + snapshot.GetName() + ")";
             }
             /* Update mini-toolbar text: */
-            m_pMiniToolBar->setText(m.GetName() + strSnapshotName);
+            m_pMiniToolBar->setText(machineName() + strSnapshotName);
         }
     }