Changeset 54528 in vbox

Timestamp:

Feb 26, 2015 1:17:25 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: Build fix for r98641.

Location:

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

Files:

• UIMenuBarEditorWindow.cpp (modified) (11 diffs)
• UIMenuBarEditorWindow.h (modified) (4 diffs)

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

@@ -24 +24 @@
 # include <QPaintEvent>
 # include <QMetaEnum>
-# include <QCheckBox>
 # include <QMenuBar>
 # include <QPainter>
 # include <QMenu>
+# ifndef Q_WS_MAC
+#  include <QCheckBox>
+# endif /* !Q_WS_MAC */
 
 /* GUI includes: */
@@ -55 +57 @@
     , m_pToolBar(0)
     , m_pButtonClose(0)
+#ifndef Q_WS_MAC
     , m_pCheckBoxEnable(0)
+#endif /* !Q_WS_MAC */
 {
     /* Prepare: */
@@ -83 +87 @@
         return;
 
+#ifndef Q_WS_MAC
     /* Update enable-checkbox: */
     updateEnableCheckbox();
+#endif /* !Q_WS_MAC */
 
     /* Update menus: */
@@ -90 +96 @@
 }
 
+#ifndef RT_OS_DARWIN
 void UIMenuBarEditorWidget::sltHandleMenuBarEnableToggle(bool fEnabled)
 {
@@ -104 +111 @@
     }
 }
+#endif /* !RT_OS_DARWIN */
 
 void UIMenuBarEditorWidget::sltHandleMenuBarMenuClick()
@@ -266 +274 @@
         if (iTop >= 5)
             iTop -= 5;
+#ifndef Q_WS_MAC
         /* Right margin should be bigger for the settings case: */
         if (m_fStartedFromVMSettings)
             iRight += 5;
+#endif /* !Q_WS_MAC */
         /* Apply margins/spacing finally: */
         m_pMainLayout->setContentsMargins(iLeft, iTop, iRight, iBottom);
@@ -298 +308 @@
             }
         }
+#ifndef Q_WS_MAC
         /* Create enable-checkbox if necessary: */
         else
@@ -313 +324 @@
             }
         }
+#endif /* !Q_WS_MAC */
     }
 
@@ -638 +650 @@
 }
 
+#ifndef Q_WS_MAC
 void UIMenuBarEditorWidget::updateEnableCheckbox()
 {
@@ -648 +661 @@
     }
 }
+#endif /* !Q_WS_MAC */
 
 void UIMenuBarEditorWidget::updateMenus()
@@ -937 +951 @@
     if (!m_fStartedFromVMSettings && m_pButtonClose)
         m_pButtonClose->setToolTip(tr("Close"));
+#ifndef Q_WS_MAC
     /* Translate enable-checkbox if necessary: */
     if (m_fStartedFromVMSettings && m_pCheckBoxEnable)
         m_pCheckBoxEnable->setToolTip(tr("Enable Menu Bar"));
+#endif /* !Q_WS_MAC */
 }
 

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

@@ -31 +31 @@
 class UIAction;
 class QIToolButton;
+#ifndef Q_WS_MAC
 class QCheckBox;
+#endif /* !Q_WS_MAC */
 class QHBoxLayout;
 class QAction;
@@ -87 +89 @@
     void sltHandleConfigurationChange(const QString &strMachineID);
 
-    /** Handles menu-bar enable toggle. */
+#ifndef RT_OS_DARWIN
+    /** Non Mac OS X: Handles menu-bar enable toggle. */
     void sltHandleMenuBarEnableToggle(bool fEnabled);
+#endif /* !RT_OS_DARWIN */
     /** Handles menu-bar menu click. */
     void sltHandleMenuBarMenuClick();
@@ -138 +142 @@
     void prepareMenuHelp();
 
-    /** Update enable-checkbox routine. */
+#ifndef Q_WS_MAC
+    /** Non Mac OS X: Update enable-checkbox routine. */
     void updateEnableCheckbox();
+#endif /* !Q_WS_MAC */
     /** Update menus routine. */
     void updateMenus();
@@ -191 +197 @@
         /** Holds the close-button instance. */
         QIToolButton *m_pButtonClose;
-        /** Holds the enable-checkbox instance. */
+#ifndef Q_WS_MAC
+        /** Non Mac OS X: Holds the enable-checkbox instance. */
         QCheckBox *m_pCheckBoxEnable;
+#endif /* !Q_WS_MAC */
         /** Holds tool-bar action references. */
         QMap<QString, QAction*> m_actions;