Changeset 103315 in vbox

Timestamp:

Feb 12, 2024 3:23:30 PM (12 months ago)

Author:

vboxsync

Message:

FE/Qt: Machine settings / Display page / Recording tab and corresponding editors: Wiping out unwanted dependencies.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• settings/editors/UIRecordingSettingsEditor.cpp (modified) (2 diffs)
• settings/editors/UIRecordingSettingsEditor.h (modified) (3 diffs)
• settings/machine/UIMachineSettingsDisplay.cpp (modified) (2 diffs)
• widgets/UIFilmContainer.cpp (modified) (7 diffs)
• widgets/UIFilmContainer.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIRecordingSettingsEditor.cpp

@@ -274 +274 @@
 }
 
-void UIRecordingSettingsEditor::setScreens(const QVector<BOOL> &screens)
+void UIRecordingSettingsEditor::setScreens(const QVector<bool> &screens)
 {
     /* Update cached value and
@@ -286 +286 @@
 }
 
-QVector<BOOL> UIRecordingSettingsEditor::screens() const
+QVector<bool> UIRecordingSettingsEditor::screens() const
 {
     return m_pScrollerScreens ? m_pScrollerScreens->value() : m_screens;

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIRecordingSettingsEditor.h

@@ -35 +35 @@
 #include "UIEditor.h"
 #include "UISettingsDefs.h"
-
-/* COM includes: */
-#include "COMEnums.h"
 
 /* Forward declarations: */
@@ -108 +105 @@
 
     /** Defines enabled @a screens. */
-    void setScreens(const QVector<BOOL> &screens);
+    void setScreens(const QVector<bool> &screens);
     /** Returns enabled screens. */
-    QVector<BOOL> screens() const;
+    QVector<bool> screens() const;
 
 protected:
@@ -198 +195 @@
 
         /** Holds the screens. */
-        QVector<BOOL>  m_screens;
+        QVector<bool>  m_screens;
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp

@@ -288 +288 @@
     int m_iRecordingVideoBitRate;
     /** Holds which of the guest screens should be recorded. */
-    QVector<BOOL> m_vecRecordingScreens;
+    QVector<bool> m_vecRecordingScreens;
     /** Holds the video recording options. */
     QString m_strRecordingVideoOptions;
@@ -1048 +1048 @@
 {
     /* Update copy of the cached item to get the desired result: */
-    QVector<BOOL> screens = m_pCache->base().m_vecRecordingScreens;
+    QVector<bool> screens = m_pCache->base().m_vecRecordingScreens;
     screens.resize(m_pEditorMonitorCount->value());
     m_pEditorRecordingSettings->setScreens(screens);

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilmContainer.cpp

@@ -31 +31 @@
 #include <QPainter>
 #include <QScrollArea>
-#include <QScrollBar>
-#include <QStyle>
 #include <QVBoxLayout>
+#ifndef VBOX_WS_MAC
+# include <QStyle>
+#endif
 
 /* GUI includes: */
+#include "QIWithRetranslateUI.h"
 #include "UIFilmContainer.h"
 
@@ -50 +52 @@
       * @param  iScreenIndex  Brings the guest-screen index this film referencing.
       * @param  fEnabled      Brings whether the guest-screen mentioned above is enabled. */
-    UIFilm(int iScreenIndex, BOOL fEnabled, QWidget *pParent = 0);
+    UIFilm(int iScreenIndex, bool fEnabled, QWidget *pParent = 0);
 
     /** Returns whether guest-screen is enabled. */
@@ -78 +80 @@
     int  m_iScreenIndex;
     /** Holds whether guest-screen was enabled. */
-    BOOL m_fWasEnabled;
+    bool m_fWasEnabled;
 
     /** Holds the main-layout instance. */
@@ -91 +93 @@
 *********************************************************************************************************************************/
 
-UIFilm::UIFilm(int iScreenIndex, BOOL fEnabled, QWidget *pParent /* = 0*/)
+UIFilm::UIFilm(int iScreenIndex, bool fEnabled, QWidget *pParent /* = 0*/)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_iScreenIndex(iScreenIndex)
@@ -225 +227 @@
 }
 
-QVector<BOOL> UIFilmContainer::value() const
+QVector<bool> UIFilmContainer::value() const
 {
     /* Enumerate all the existing widgets: */
-    QVector<BOOL> value;
+    QVector<bool> value;
     foreach (UIFilm *pWidget, m_widgets)
-        value << static_cast<BOOL>(pWidget->checked());
+        value << static_cast<bool>(pWidget->checked());
 
     /* Return value: */
@@ -236 +238 @@
 }
 
-void UIFilmContainer::setValue(const QVector<BOOL> &value)
+void UIFilmContainer::setValue(const QVector<bool> &value)
 {
     /* Cleanup viewport/widget list: */
@@ -293 +295 @@
 
     /* Append with 'default' value: */
-    setValue(QVector<BOOL>() << true);
+    setValue(QVector<bool>() << true);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilmContainer.h

@@ -36 +36 @@
 
 /* GUI includes: */
-#include "QIWithRetranslateUI.h"
 #include "UILibraryDefs.h"
 
-/* Other VBox includes: */
-#include <VBox/com/com.h>
-
 /* Forward declarations: */
-class QCheckBox;
 class QScrollArea;
 class QVBoxLayout;
@@ -60 +55 @@
 
     /** Returns the film-container check-box values. */
-    QVector<BOOL> value() const;
+    QVector<bool> value() const;
     /** Defines the film-container check-box @a values. */
-    void setValue(const QVector<BOOL> &values);
+    void setValue(const QVector<bool> &values);
 
 private: