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

Timestamp:

Feb 12, 2016 1:57:09 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Qt5 migration (part 87): Implementing keyboard handling for Qt5: Resolve some naming conflict with Qt5 stuff.

Location:

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

Files:

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

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

@@ -944 +944 @@
 #else /* QT_VERSION >= 0x050000 */
 
-bool UIKeyboardHandler::nativeEventFilter(void *pMessage, ulong uScreenId)
+bool UIKeyboardHandler::nativeEventPostprocessor(void *pMessage, ulong uScreenId)
 {
     /* Check if some system event should be filtered out.

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

@@ -118 +118 @@
 # endif /* Q_WS_X11 */
 #else /* QT_VERSION >= 0x050000 */
-    /** Qt5: Performs final pre-processing of all the native events. */
-    bool nativeEventFilter(void *pMessage, ulong uScreenId);
+    /** Qt5: Performs post-processing of all the native events. */
+    bool nativeEventPostprocessor(void *pMessage, ulong uScreenId);
 #endif /* QT_VERSION >= 0x050000 */
 

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

@@ -1911 +1911 @@
                 {
                     /* Delegate key-event handling to the keyboard-handler: */
-                    return machineLogic()->keyboardHandler()->nativeEventFilter(pMessage, screenId());
+                    return machineLogic()->keyboardHandler()->nativeEventPostprocessor(pMessage, screenId());
                 }
                 default:
@@ -1941 +1941 @@
         {
             /* Delegate key-event handling to the keyboard-handler: */
-            return machineLogic()->keyboardHandler()->nativeEventFilter(pMessage, screenId());
+            return machineLogic()->keyboardHandler()->nativeEventPostprocessor(pMessage, screenId());
         }
         default:
@@ -1964 +1964 @@
         {
             /* Delegate key-event handling to the keyboard-handler: */
-            return machineLogic()->keyboardHandler()->nativeEventFilter(pMessage, screenId());
+            return machineLogic()->keyboardHandler()->nativeEventPostprocessor(pMessage, screenId());
         }
         default: