Changeset 59413 in vbox

Timestamp:

Jan 20, 2016 10:19:03 AM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Qt5 migration (part 67): Implementing keyboard handling for Qt5: Do not throw out event type, still required.

Location:

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

Files:

• UIKeyboardHandler.cpp (modified) (1 diff)
• UIMachineView.cpp (modified) (4 diffs)
• UIMachineView.h (modified) (1 diff)

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

@@ -1651 +1651 @@
     return m_views[m_iKeyboardHookViewIndex]->winEvent(&message, &dummyResult);
 #else /* QT_VERSION >= 0x050000 */
-    return m_views[m_iKeyboardHookViewIndex]->nativeEvent(&message);
+    QByteArray eventType("windows_generic_MSG");
+    return m_views[m_iKeyboardHookViewIndex]->nativeEvent(eventType, &message);
 #endif /* QT_VERSION >= 0x050000 */
 }

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

@@ -147 +147 @@
     {
         /* Redirect event to parent: */
-        Q_UNUSED(eventType); Q_UNUSED(pResult);
-        return m_pParent->nativeEvent(pMessage);
+        Q_UNUSED(pResult);
+        return m_pParent->nativeEvent(eventType, pMessage);
     }
 
@@ -1885 +1885 @@
 #else /* QT_VERSION >= 0x050000 */
 
-bool UIMachineView::nativeEvent(void *pMessage)
+bool UIMachineView::nativeEvent(const QByteArray &eventType, void *pMessage)
 {
 # if defined(Q_WS_MAC)
@@ -1893 +1893 @@
 # elif defined(Q_WS_WIN)
 
-    /* Cast to generic MSG event: */
+    /* Make sure it's generic MSG event: */
+    if (eventType != "windows_generic_MSG")
+        return false;
     MSG *pEvent = static_cast<MSG*>(pMessage);
 
@@ -1918 +1920 @@
     /* Make sure it's generic XCB event: */
     if (eventType != "xcb_generic_event_t")
-        return QAbstractScrollArea::nativeEvent(eventType, pMessage, pResult);
+        return false;
     xcb_generic_event_t *pEvent = static_cast<xcb_generic_event_t*>(pMessage);
 

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

@@ -375 +375 @@
       *           the Qt itself because it has another signature,
       *           only by the keyboard-hook of the keyboard-handler. */
-    virtual bool nativeEvent(void *pMessage);
+    virtual bool nativeEvent(const QByteArray &eventType, void *pMessage);
 #endif /* QT_VERSION >= 0x050000 */