Changeset 53029 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 10, 2014 2:28:02 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI rework/cleanup for 7115 (part #12): Update for r96509: Caching keyboard too.

Location:

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

Files:

• UISession.cpp (modified) (3 diffs)
• UISession.h (modified) (3 diffs)

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

@@ -981 +981 @@
         return false;
 
+    /* Get guest: */
+    m_guest = m_console.GetGuest();
+    if (m_guest.isNull())
+        return false;
+
     /* Get mouse: */
     m_mouse = m_console.GetMouse();
@@ -986 +991 @@
         return false;
 
-    /* Get guest: */
-    m_guest = m_console.GetGuest();
-    if (m_guest.isNull())
+    /* Get keyboard: */
+    m_keyboard = m_console.GetKeyboard();
+    if (m_keyboard.isNull())
         return false;
 
@@ -1362 +1367 @@
         m_debugger.detach();
 
+    /* Detach keyboard: */
+    if (!m_keyboard.isNull())
+        m_keyboard.detach();
+
+    /* Detach mouse: */
+    if (!m_mouse.isNull())
+        m_mouse.detach();
+
     /* Detach guest: */
     if (!m_guest.isNull())
         m_guest.detach();
-
-    /* Detach mouse: */
-    if (!m_mouse.isNull())
-        m_mouse.detach();
 
     /* Detach display: */

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

@@ -33 +33 @@
 #include "CConsole.h"
 #include "CDisplay.h"
+#include "CGuest.h"
 #include "CMouse.h"
-#include "CGuest.h"
+#include "CKeyboard.h"
 #include "CMachineDebugger.h"
 
@@ -103 +104 @@
     /** Returns the console's display instance. */
     CDisplay& display() { return m_display; }
+    /** Returns the console's guest instance. */
+    CGuest& guest() { return m_guest; }
     /** Returns the console's mouse instance. */
     CMouse& mouse() { return m_mouse; }
-    /** Returns the console's guest instance. */
-    CGuest& guest() { return m_guest; }
+    /** Returns the console's keyboard instance. */
+    CKeyboard& keyboard() { return m_keyboard; }
     /** Returns the console's debugger instance. */
     CMachineDebugger& debugger() { return m_debugger; }
@@ -385 +388 @@
     /** Holds the console's display instance. */
     CDisplay m_display;
+    /** Holds the console's guest instance. */
+    CGuest m_guest;
     /** Holds the console's mouse instance. */
     CMouse m_mouse;
-    /** Holds the console's guest instance. */
-    CGuest m_guest;
+    /** Holds the console's keyboard instance. */
+    CKeyboard m_keyboard;
     /** Holds the console's debugger instance. */
     CMachineDebugger m_debugger;