Changeset 46847 in vbox for trunk

Timestamp:

Jun 27, 2013 2:35:17 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac host: Removing old Qt4.7 stuff related to menu-bar.

Location:

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

Files:

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

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

@@ -102 +102 @@
     /* On the Mac we add some items only the first time, cause otherwise they
      * will be merged more than once to the application menu by Qt. */
-    : m_fIsFirstTime(true)
-    , m_machine(machine)
+    : m_machine(machine)
 {
 }
@@ -283 +282 @@
     pMenu->addAction(gActionPool->action(UIActionIndex_Simple_ResetWarnings));
     pMenu->addSeparator();
-
     pMenu->addAction(gActionPool->action(UIActionIndex_Simple_NetworkAccessManager));
-
 #ifndef Q_WS_MAC
     pMenu->addSeparator();
 #endif /* !Q_WS_MAC */
-#if defined(Q_WS_MAC) && (QT_VERSION < 0x040700)
-    if (m_fIsFirstTime)
-# endif
-        pMenu->addAction(gActionPool->action(UIActionIndex_Simple_About));
-
-#if defined(Q_WS_MAC) && (QT_VERSION < 0x040700)
-    /* Because this connections are done to VBoxGlobal, they are needed once only.
-     * Otherwise we will get the slots called more than once. */
-    if (m_fIsFirstTime)
-    {
-#endif
-        VBoxGlobal::connect(gActionPool->action(UIActionIndex_Simple_About), SIGNAL(triggered()),
-                            &msgCenter(), SLOT(sltShowHelpAboutDialog()));
-#if defined(Q_WS_MAC) && (QT_VERSION < 0x040700)
-    }
-#endif
-
+    pMenu->addAction(gActionPool->action(UIActionIndex_Simple_About));
+
+    /* Prepare connections: */
     VBoxGlobal::connect(gActionPool->action(UIActionIndex_Simple_Contents), SIGNAL(triggered()),
                         &msgCenter(), SLOT(sltShowHelpHelpDialog()));
@@ -314 +297 @@
     VBoxGlobal::connect(gActionPool->action(UIActionIndex_Simple_NetworkAccessManager), SIGNAL(triggered()),
                         gNetworkManager, SLOT(show()));
-
-    m_fIsFirstTime = false;
+    VBoxGlobal::connect(gActionPool->action(UIActionIndex_Simple_About), SIGNAL(triggered()),
+                        &msgCenter(), SLOT(sltShowHelpAboutDialog()));
 }
 

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

@@ -54 +54 @@
     void prepareMenuHelp(QMenu *pMenu);
 
-    bool m_fIsFirstTime;
     CMachine m_machine;
 };