Changeset 50081 in vbox for trunk

Timestamp:

Jan 15, 2014 12:45:30 PM (11 years ago)

Author:

vboxsync

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

91601

Message:

FE/Qt: Reverting r90988, r90825, 90818: That was the stuff for xTracker defect #7112 which we decided to revert.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector

Files:

• UISelectorWindow.cpp (modified) (3 diffs)
• UISelectorWindow.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -66 +66 @@
 # include "UIWindowMenuManager.h"
 # include "UIImageTools.h"
-# include "UICocoaApplication.h"
 #endif /* Q_WS_MAC */
 
@@ -336 +335 @@
 void UISelectorWindow::sltPerformExit()
 {
-    QApplication::quit();
+    close();
 }
 
@@ -1057 +1056 @@
 
 #ifdef Q_WS_MAC
-/** MacOS X host: Hides VM selector UI instead of closing. */
-void UISelectorWindow::closeEvent(QCloseEvent *pEvent)
-{
-    pEvent->ignore();
-    UICocoaApplication::instance()->hide();
-}
-
 bool UISelectorWindow::eventFilter(QObject *pObject, QEvent *pEvent)
 {
-    /* If we got broadcast qApp close-event, quit app.. */
-    if (pObject == qApp && pEvent->type() == QEvent::Close)
-        return true;
-
     /* Ignore for non-active window: */
     if (!isActiveWindow())

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h

@@ -111 +111 @@
     void polishEvent(QShowEvent *pEvent);
 #ifdef Q_WS_MAC
-    void closeEvent(QCloseEvent *pEvent);
     bool eventFilter(QObject *pObject, QEvent *pEvent);
 #endif /* Q_WS_MAC */