Changeset 78003 in vbox for trunk/src/VBox

Timestamp:

Apr 3, 2019 4:03:54 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9072: Handle only events sent to required object and call to base-class afterwards, eventFilter is a virtual function first of all.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/logviewer

Files:

• UIVMLogViewerFilterPanel.cpp (modified) (2 diffs)
• UIVMLogViewerSearchPanel.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerFilterPanel.cpp

@@ -572 +572 @@
 bool UIVMLogViewerFilterPanel::eventFilter(QObject *pObject, QEvent *pEvent)
 {
+    /* Handle only events sent to viewer(): */
+    if (pObject != viewer())
+        return UIVMLogViewerPanel::eventFilter(pObject, pEvent);
+
     /* Depending on event-type: */
     switch (pEvent->type())
     {
         /* Process key press only: */
-    case QEvent::KeyPress:
+        case QEvent::KeyPress:
         {
             /* Cast to corresponding key press event: */
@@ -595 +599 @@
             break;
         }
-    default:
-        break;
-    }
+        default:
+            break;
+    }
+
     /* Call to base-class: */
     return UIVMLogViewerPanel::eventFilter(pObject, pEvent);

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerSearchPanel.cpp

@@ -334 +334 @@
 bool UIVMLogViewerSearchPanel::eventFilter(QObject *pObject, QEvent *pEvent)
 {
+    /* Handle only events sent to viewer(): */
+    if (pObject != viewer())
+        return UIVMLogViewerPanel::eventFilter(pObject, pEvent);
+
     /* Depending on event-type: */
     switch (pEvent->type())
@@ -387 +391 @@
             break;
         }
-    default:
-        break;
-    }
+        default:
+            break;
+    }
+
     /* Call to base-class: */
     return UIVMLogViewerPanel::eventFilter(pObject, pEvent);