Changeset 51453 in vbox for trunk/src/VBox

Timestamp:

May 28, 2014 5:46:46 PM (11 years ago)

Author:

vboxsync

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

94019

Message:

FE/Qt: Selector UI: Some prepare/cleanup code rework #1.

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

@@ -143 +143 @@
     UIVirtualBoxEventHandler::destroy();
 
+#ifdef Q_WS_MAC
+    UIWindowMenuManager::destroy();
+#endif /* Q_WS_MAC */
+
+    /* Cleanup connections: */
+    cleanupConnections();
+
     /* Save settings: */
     saveSettings();
@@ -1602 +1609 @@
         QString strWinPos = QString("%1,%2,%3,%4").arg(save.x()).arg(save.y()).arg(save.width()).arg(save.height());
 #ifdef Q_WS_MAC
-        UIWindowMenuManager::destroy();
-        ::darwinUnregisterForUnifiedToolbarContextMenuEvents(this);
         if (::darwinIsWindowMaximized(this))
 #else /* Q_WS_MAC */
@@ -1617 +1622 @@
         vbox.SetExtraDataIntList(GUI_SplitterSizes, m_pSplitter->sizes());
     }
+}
+
+void UISelectorWindow::cleanupConnections()
+{
+#ifdef Q_WS_MAC
+    /* Tool-bar connections: */
+    ::darwinUnregisterForUnifiedToolbarContextMenuEvents(this);
+#endif /* Q_WS_MAC */
 }
 

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

@@ -131 +131 @@
     void loadSettings();
     void saveSettings();
+    void cleanupConnections();
 
     /* Helpers: Current item stuff: */