Changeset 50734 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 10, 2014 1:54:03 PM (11 years ago)

Author:

vboxsync

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

92721

Message:

DnD: Bugfixes.

Location:

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

Files:

• UIDnDMIMEData.cpp (modified) (5 diffs)
• UIDnDMIMEData.h (modified) (1 diff)

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

@@ -185 +185 @@
 
 #ifndef RT_OS_WINDOWS
-bool UIDnDMimeData::eventFilter(QObject * /* pObject */, QEvent *pEvent)
+bool UIDnDMimeData::eventFilter(QObject *pObject, QEvent *pEvent)
 {
     if (pEvent)
@@ -198 +198 @@
                 LogFlowFunc(("MouseMove: x=%d, y=%d\n",
                              pMouseEvent->globalX(), pMouseEvent->globalY()));
-                break;
+                
+                return true;
+                /* Never reached. */
             }
 #endif
@@ -205 +207 @@
                 LogFlowFunc(("MouseButtonRelease\n"));
                 m_enmState = Dropped;
-                break;
+                
+                return true;
+                /* Never reached. */
             }
 
@@ -216 +220 @@
                     m_enmState = Canceled;
                 }
-                break;
+                
+                return true;
+                /* Never reached. */
             }
 
@@ -224 +230 @@
     }
 
-    /* Propagate the event further. */
-    return false;
+    return QObject::eventFilter(pObject, pEvent);
 }
 

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

@@ -81 +81 @@
 
 #ifndef RT_OS_WINDOWS
-    bool eventFilter(QObject * /* pObject */, QEvent *pEvent);
+    bool eventFilter(QObject *pObject, QEvent *pEvent);
 #endif
     /** @}  */