Changeset 27235 in vbox

Timestamp:

Mar 9, 2010 10:06:02 PM (15 years ago)

Author:

vboxsync

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

58617

Message:

FE/Qt4: New running VM core: some code cleanup.

Location:

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

Files:

• fullscreen/UIMachineViewFullscreen.cpp (modified) (2 diffs)
• normal/UIMachineViewNormal.cpp (modified) (3 diffs)
• seamless/UIMachineViewSeamless.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp

@@ -239 +239 @@
 bool UIMachineViewFullscreen::eventFilter(QObject *pWatched, QEvent *pEvent)
 {
+    /* Who are we watching? */
     QIMainDialog *pMainDialog = machineWindowWrapper() && machineWindowWrapper()->machineWindow() ?
-        qobject_cast<QIMainDialog*>(machineWindowWrapper()->machineWindow()) : 0;
+                                qobject_cast<QIMainDialog*>(machineWindowWrapper()->machineWindow()) : 0;
+
     if (pWatched != 0 && pWatched == pMainDialog)
     {
@@ -263 +265 @@
         }
     }
-#ifdef Q_WS_MAC // TODO: Is it really needed?
-    QMenuBar *pMenuBar = machineWindowWrapper() && machineWindowWrapper()->machineWindow() ?
-                         qobject_cast<QIMainDialog*>(machineWindowWrapper()->machineWindow())->menuBar() : 0;
-    if (pWatched != 0 && pWatched == pMenuBar)
-    {
-        /* Sometimes when we press ESC in the menu it brings the focus away (Qt bug?)
-         * causing no widget to have a focus, or holds the focus itself, instead of
-         * returning the focus to the console window. Here we fix this: */
-        switch (pEvent->type())
-        {
-            case QEvent::FocusOut:
-            {
-                if (qApp->focusWidget() == 0)
-                    setFocus();
-                break;
-            }
-            case QEvent::KeyPress:
-            {
-                QKeyEvent *pKeyEvent = static_cast<QKeyEvent*>(pEvent);
-                if (pKeyEvent->key() == Qt::Key_Escape && (pKeyEvent->modifiers() == Qt::NoModifier))
-                    if (pMenuBar->hasFocus())
-                        setFocus();
-                break;
-            }
-            default:
-                break;
-        }
-    }
-#endif /* Q_WS_MAC */
+
     return UIMachineView::eventFilter(pWatched, pEvent);
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp

@@ -264 +264 @@
 bool UIMachineViewNormal::eventFilter(QObject *pWatched, QEvent *pEvent)
 {
-    /* Who are we watchin? */
+    /* Who are we watching? */
     QIMainDialog *pMainDialog = machineWindowWrapper() && machineWindowWrapper()->machineWindow() ?
-        qobject_cast<QIMainDialog*>(machineWindowWrapper()->machineWindow()) : 0;
-    QMenuBar *pMenuBar = pMainDialog ? qobject_cast<QIMainDialog*>(pMainDialog)->menuBar() : 0;
+                                qobject_cast<QIMainDialog*>(machineWindowWrapper()->machineWindow()) : 0;
 
     if (pWatched != 0 && pWatched == pMainDialog)
@@ -292 +291 @@
                 break;
             }
-# endif
+# endif /* defined (VBOX_GUI_USE_DDRAW) */
 #endif /* defined (Q_WS_WIN32) */
             default:
@@ -298 +297 @@
         }
     }
-    else if (pWatched != 0 && pWatched == pMenuBar)
-    {
-        /* Sometimes when we press ESC in the menu it brings the focus away (Qt bug?)
-         * causing no widget to have a focus, or holds the focus itself, instead of
-         * returning the focus to the console window. Here we fix this: */
-        switch (pEvent->type())
-        {
-            case QEvent::FocusOut:
-            {
-                if (qApp->focusWidget() == 0)
-                    setFocus();
-                break;
-            }
-            case QEvent::KeyPress:
-            {
-                QKeyEvent *pKeyEvent = static_cast<QKeyEvent*>(pEvent);
-                if (pKeyEvent->key() == Qt::Key_Escape && (pKeyEvent->modifiers() == Qt::NoModifier))
-                    if (pMenuBar->hasFocus())
-                        setFocus();
-                break;
-            }
-            default:
-                break;
-        }
-    }
+
     return UIMachineView::eventFilter(pWatched, pEvent);
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp

@@ -246 +246 @@
 bool UIMachineViewSeamless::eventFilter(QObject *pWatched, QEvent *pEvent)
 {
+    /* Who are we watching? */
     QIMainDialog *pMainDialog = machineWindowWrapper() && machineWindowWrapper()->machineWindow() ?
-        qobject_cast<QIMainDialog*>(machineWindowWrapper()->machineWindow()) : 0;
+                                qobject_cast<QIMainDialog*>(machineWindowWrapper()->machineWindow()) : 0;
+
     if (pWatched != 0 && pWatched == pMainDialog)
     {
@@ -270 +272 @@
         }
     }
-#ifdef Q_WS_MAC // TODO: Is it really needed?
-    QMenuBar *pMenuBar = machineWindowWrapper() && machineWindowWrapper()->machineWindow() ?
-                         qobject_cast<QIMainDialog*>(machineWindowWrapper()->machineWindow())->menuBar() : 0;
-    if (pWatched != 0 && pWatched == pMenuBar)
-    {
-        /* Sometimes when we press ESC in the menu it brings the focus away (Qt bug?)
-         * causing no widget to have a focus, or holds the focus itself, instead of
-         * returning the focus to the console window. Here we fix this: */
-        switch (pEvent->type())
-        {
-            case QEvent::FocusOut:
-            {
-                if (qApp->focusWidget() == 0)
-                    setFocus();
-                break;
-            }
-            case QEvent::KeyPress:
-            {
-                QKeyEvent *pKeyEvent = static_cast<QKeyEvent*>(pEvent);
-                if (pKeyEvent->key() == Qt::Key_Escape && (pKeyEvent->modifiers() == Qt::NoModifier))
-                    if (pMenuBar->hasFocus())
-                        setFocus();
-                break;
-            }
-            default:
-                break;
-        }
-    }
-#endif /* Q_WS_MAC */
+
     return UIMachineView::eventFilter(pWatched, pEvent);
 }