Changeset 59743 in vbox

Timestamp:

Feb 19, 2016 3:29:32 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

105612

Message:

FE/Qt: Qt5 migration (part 97): Implementing keyboard handling for Qt5: Unpleasant name conflict in Qt5 event-filter code.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• runtime/UIKeyboardHandler.cpp (modified) (2 diffs)
• runtime/UIKeyboardHandler.h (modified) (2 diffs)
• widgets/UIHostComboEditor.cpp (modified) (2 diffs)
• widgets/UIHostComboEditor.h (modified) (2 diffs)

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

@@ -105 +105 @@
 /** QAbstractNativeEventFilter extension
   * allowing to pre-process native platform events. */
-class PrivateEventFilter : public QAbstractNativeEventFilter
+class KeyboardHandlerEventFilter : public QAbstractNativeEventFilter
 {
 public:
 
     /** Constructor which takes the passed @a pParent to redirect events to. */
-    PrivateEventFilter(UIKeyboardHandler *pParent)
+    KeyboardHandlerEventFilter(UIKeyboardHandler *pParent)
         : m_pParent(pParent)
     {}
@@ -1653 +1653 @@
                     }
                     /* Install new private event-filter: */
-                    m_pPrivateEventFilter = new PrivateEventFilter(this);
+                    m_pPrivateEventFilter = new KeyboardHandlerEventFilter(this);
                     qApp->installNativeEventFilter(m_pPrivateEventFilter);
                 }

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

@@ -53 +53 @@
 #endif /* Q_WS_X11 */
 #if QT_VERSION >= 0x050000
-class PrivateEventFilter;
+class KeyboardHandlerEventFilter;
 #endif /* QT_VERSION >= 0x050000 */
 
@@ -238 +238 @@
 #if QT_VERSION >= 0x050000
     /** Win: Holds the native event filter instance. */
-    PrivateEventFilter *m_pPrivateEventFilter;
+    KeyboardHandlerEventFilter *m_pPrivateEventFilter;
     /** Win: Allows the native event filter to
       * redirect events directly to nativeEvent handler. */
-    friend class PrivateEventFilter;
+    friend class KeyboardHandlerEventFilter;
 #endif /* QT_VERSION >= 0x050000 */
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp

@@ -93 +93 @@
   * not the sub-widget we expect, so that's probably the reason Qt devs
   * haven't fixed that bug so far for Windows and Mac OS X hosts. */
-class PrivateEventFilter : public QAbstractNativeEventFilter
+class ComboEditorEventFilter : public QAbstractNativeEventFilter
 {
 public:
 
     /** Constructor which takes the passed @a pParent to redirect events to. */
-    PrivateEventFilter(UIHostComboEditorPrivate *pParent)
+    ComboEditorEventFilter(UIHostComboEditorPrivate *pParent)
         : m_pParent(pParent)
     {}
@@ -493 +493 @@
 # if QT_VERSION >= 0x050000
     /* Prepare private event filter: */
-    m_pPrivateEventFilter = new PrivateEventFilter(this);
+    m_pPrivateEventFilter = new ComboEditorEventFilter(this);
     qApp->installNativeEventFilter(m_pPrivateEventFilter);
 # endif /* QT_VERSION >= 0x050000 */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.h

@@ -33 +33 @@
 #if defined(Q_WS_MAC) || defined(Q_WS_WIN)
 # if QT_VERSION >= 0x050000
-class PrivateEventFilter;
+class ComboEditorEventFilter;
 # endif /* QT_VERSION >= 0x050000 */
 #endif /* Q_WS_MAC || Q_WS_WIN */
@@ -190 +190 @@
 # if QT_VERSION >= 0x050000
     /** Mac, Win: Holds the native event filter instance. */
-    PrivateEventFilter *m_pPrivateEventFilter;
+    ComboEditorEventFilter *m_pPrivateEventFilter;
     /** Mac, Win: Allows the native event filter to
       * redirect events directly to nativeEvent handler. */
-    friend class PrivateEventFilter;
+    friend class ComboEditorEventFilter;
 # endif /* QT_VERSION >= 0x050000 */
 #endif /* Q_WS_MAC || Q_WS_WIN */