Changeset 26819 in vbox

Timestamp:

Feb 26, 2010 9:35:45 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: new core: fixes for r58086

Location:

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

Files:

• UIMachineView.cpp (modified) (5 diffs)
• UISession.cpp (modified) (1 diff)

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

@@ -2472 +2472 @@
 #elif defined(Q_WS_WIN32)
 
-    if (uisession()->numLockAdaptionCnt() && (m_fNumLock ^ !!(GetKeyState(VK_NUMLOCK))))
+    if (uisession()->numLockAdaptionCnt() && (uisession()->isNumLock() ^ !!(GetKeyState(VK_NUMLOCK))))
     {
         uisession()->setNumLockAdaptionCnt(uisession()->numLockAdaptionCnt() - 1);
@@ -2478 +2478 @@
         piCodes[(*puCount)++] = 0x45 | 0x80;
     }
-    if (uisession()->capsLockAdaptionCnt() && (m_fCapsLock ^ !!(GetKeyState(VK_CAPITAL))))
+    if (uisession()->capsLockAdaptionCnt() && (uisession()->isCapsLock() ^ !!(GetKeyState(VK_CAPITAL))))
     {
         uisession()->setCapsLockAdaptionCnt(uisession()->capsLockAdaptionCnt() - 1);
@@ -2486 +2486 @@
          * capslock.  For simplicity, only do this if shift is not
          * already held down. */
-        if (m_fCapsLock && !(m_pressedKeys[0x2a] & IsKeyPressed))
+        if (uisession()->isCapsLock() && !(m_pressedKeys[0x2a] & IsKeyPressed))
         {
             piCodes[(*puCount)++] = 0x2a;
@@ -2496 +2496 @@
 
     /* if (uisession()->numLockAdaptionCnt()) ... - NumLock isn't implemented by Mac OS X so ignore it. */
-    if (uisession()->capsLockAdaptionCnt() && (m_fCapsLock ^ !!(::GetCurrentEventKeyModifiers() & alphaLock)))
+    if (uisession()->capsLockAdaptionCnt() && (uisession()->isCapsLock() ^ !!(::GetCurrentEventKeyModifiers() & alphaLock)))
     {
         uisession()->setCapsLockAdaptionCnt(uisession()->capsLockAdaptionCnt() - 1);
@@ -2504 +2504 @@
          * capslock.  For simplicity, only do this if shift is not
          * already held down. */
-        if (m_fCapsLock && !(m_pressedKeys[0x2a] & IsKeyPressed))
+        if (uisession()->isCapsLock() && !(m_pressedKeys[0x2a] & IsKeyPressed))
         {
             piCodes[(*puCount)++] = 0x2a;

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

@@ -1162 +1162 @@
 
     /* Set the new cursor: */
-    m_cursor = cursor(QPixmap::fromImage(image), uXHot, uYHot);
+    m_cursor = QCursor(QPixmap::fromImage(image), uXHot, uYHot);
     NOREF(srcShapePtrScan);