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

Timestamp:

May 27, 2016 12:58:10 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Fixing GUI warnings: Ok, we are not so strictly want that hide.

Location:

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

Files:

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

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

@@ -980 +980 @@
 {
     /* Redirect event to machine-view: */
-    return m_views.contains(m_iKeyboardHookViewIndex) ? m_views.value(m_iKeyboardHookViewIndex)->nativeEvent(eventType, pMessage) : false;
+    return m_views.contains(m_iKeyboardHookViewIndex) ? m_views.value(m_iKeyboardHookViewIndex)->nativeEventPreprocessor(eventType, pMessage) : false;
 }
 
@@ -1814 +1814 @@
     Q_UNUSED(event);
     QByteArray eventType("mac_generic_NSEvent");
-    return m_views[m_iKeyboardHookViewIndex]->nativeEvent(eventType, unconst(pvCocoaEvent));
+    return m_views[m_iKeyboardHookViewIndex]->nativeEventPreprocessor(eventType, unconst(pvCocoaEvent));
 #endif /* QT_VERSION >= 0x050000 */
 }
@@ -1880 +1880 @@
 #else /* QT_VERSION >= 0x050000 */
     QByteArray eventType("windows_generic_MSG");
-    return m_views[m_iKeyboardHookViewIndex]->nativeEvent(eventType, &message);
+    return m_views[m_iKeyboardHookViewIndex]->nativeEventPreprocessor(eventType, &message);
 #endif /* QT_VERSION >= 0x050000 */
 }

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

@@ -240 +240 @@
     KeyboardHandlerEventFilter *m_pPrivateEventFilter;
     /** Win: Allows the native event filter to
-      * redirect events directly to nativeEvent handler. */
+      * redirect events directly to nativeEventPreprocessor handler. */
     friend class KeyboardHandlerEventFilter;
 #endif /* QT_VERSION >= 0x050000 */

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

@@ -1820 +1820 @@
 #else /* QT_VERSION >= 0x050000 */
 
-bool UIMachineView::nativeEvent(const QByteArray &eventType, void *pMessage)
+bool UIMachineView::nativeEventPreprocessor(const QByteArray &eventType, void *pMessage)
 {
 # if defined(VBOX_WS_MAC)

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

@@ -368 +368 @@
 # endif /* VBOX_WS_X11 */
 #else /* QT_VERSION >= 0x050000 */
-    /** Qt5: Performs pre-processing of all the native events.
-      * @note     Take into account this function is _not_ called by
-      *           the Qt itself because it has another signature,
-      *           only by the keyboard-hook of the keyboard-handler. */
-    virtual bool nativeEvent(const QByteArray &eventType, void *pMessage);
+    /** Qt5: Performs pre-processing of all the native events. */
+    virtual bool nativeEventPreprocessor(const QByteArray &eventType, void *pMessage);
 #endif /* QT_VERSION >= 0x050000 */