Ticket #7994: BScreen_style_update_and_variable_renaming_2.diff

headers/os/interface/Screen.h

@@ -52 +52 @@
                                     BRect* frame = NULL);
 
             rgb_color           DesktopColor();
-            rgb_color           DesktopColor(uint32 index);
+            rgb_color           DesktopColor(uint32 workspace);
             void                SetDesktopColor(rgb_color color,
                                     bool makeDefault = true);
             void                SetDesktopColor(rgb_color color,
-                                    uint32 index, bool makeDefault = true);
+                                    uint32 workspace, bool makeDefault = true);
 
             status_t            ProposeMode(display_mode* target,
                                     const display_mode* low,
                                     const display_mode* high);
             status_t            GetModeList(display_mode** _modeList,
                                     uint32* _count);
-            status_t            GetMode(display_mode* _mode);
+            status_t            GetMode(display_mode* mode);
             status_t            GetMode(uint32 workspace,
-                                    display_mode* _mode);
+                                    display_mode* mode);
             status_t            SetMode(display_mode* mode,
                                     bool makeDefault = false);
             status_t            SetMode(uint32 workspace,
@@ -74 +74 @@
             status_t            GetDeviceInfo(accelerant_device_info* info);
             status_t            GetMonitorInfo(monitor_info* info);
             status_t            GetPixelClockLimits(display_mode* mode,
-                                    uint32* low, uint32* high);
+                                    uint32* _low, uint32* _high);
             status_t            GetTimingConstraints(
                                     display_timing_constraints*
                                         timingConstraints);

src/kits/interface/Screen.cpp

@@ -8 +8 @@
  */
 
 
-/*! BScreen lets you retrieve and change the display settings. */
-
-
 #include <Screen.h>
 
 #include <Window.h>
@@ -21 +18 @@
 using namespace BPrivate;
 
 
-/*! \brief Creates a BScreen object which represents the display with the given
-        screen_id
-    \param id The screen_id of the screen to get.
-
-    In the current implementation, there is only one display (B_MAIN_SCREEN_ID).
-    To be sure that the object was correctly constructed, call IsValid().
-*/
 BScreen::BScreen(screen_id id)
 {
     fScreen = BPrivateScreen::Get(id.id);
 }
 
 
-/*! \brief Creates a BScreen object which represents the display which contains
-    the given BWindow.
-    \param window A BWindow.
-*/
 BScreen::BScreen(BWindow* window)
 {
     fScreen = BPrivateScreen::Get(window);
 }
 
 
-/*! \brief Releases the resources allocated by the constructor.
-*/
 BScreen::~BScreen()
 {
     BPrivateScreen::Put(fScreen);
 }
 
 
-/*! \brief Checks if the BScreen object represents a real screen connected to
-        the computer.
-    \return \c true if the BScreen object is valid, \c false if not.
-*/
 bool
 BScreen::IsValid()
 {
@@ -63 +43 @@
 }
 
 
-/*! \brief In the current implementation, this function always returns B_ERROR.
-    \return Always \c B_ERROR.
-*/
 status_t
 BScreen::SetToNext()
 {
@@ -80 +57 @@
 }
 
 
-/*! \brief Returns the color space of the screen display.
-    \return \c B_CMAP8, \c B_RGB15, or \c B_RGB32, or \c B_NO_COLOR_SPACE
-        if the screen object is invalid.
-*/
 color_space
 BScreen::ColorSpace()
 {
     if (fScreen != NULL)
         return fScreen->ColorSpace();
+
     return B_NO_COLOR_SPACE;
 }
 
 
-/*! \brief Returns the rectangle that locates the screen in the screen
-        coordinate system.
-    \return a BRect that locates the screen in the screen coordinate system.
-*/
 BRect
 BScreen::Frame()
 {
     if (fScreen != NULL)
         return fScreen->Frame();
+
     return BRect(0, 0, 0, 0);
 }
 
 
-/*! \brief Returns the identifier for the screen.
-    \return A screen_id struct that identifies the screen.
-
-    In the current implementation, this function always returns
-    \c B_MAIN_SCREEN_ID, even if the object is invalid.
-*/
 screen_id
 BScreen::ID()
 {
@@ -124 +89 @@
 }
 
 
-/*! \brief Blocks until the monitor has finished the current vertical retrace.
-    \return \c B_OK, or \c B_ERROR if the screen object is invalid.
-*/
 status_t
 BScreen::WaitForRetrace()
 {
@@ -134 +96 @@
 }
 
 
-/*! \brief Blocks until the monitor has finished the current vertical retrace,
-    or until the given timeout has passed.
-    \param timeout A bigtime_t which indicates the time to wait before
-        returning.
-    \return \c B_OK if the monitor has retraced in the given amount of time,
-        \c B_ERROR otherwise.
-*/
 status_t
 BScreen::WaitForRetrace(bigtime_t timeout)
 {
     if (fScreen != NULL)
         return fScreen->WaitForRetrace(timeout);
+
     return B_ERROR;
 }
 
 
-/*! \brief Returns the index of the 8-bit color that,
-        most closely matches the given 32-bit color.
-    \param r The red value for a 32-bit color.
-    \param g The green value for a 32-bit color.
-    \param b The blue value for a 32-bit color.
-    \param a The alpha value for a 32-bit color.
-    \return An index for a 8-bit color in the screen's color map.
-*/
 uint8
-BScreen::IndexForColor(uint8 r, uint8 g, uint8 b, uint8 a)
+BScreen::IndexForColor(uint8 red, uint8 green, uint8 blue, uint8 alpha)
 {
     if (fScreen != NULL)
-        return fScreen->IndexForColor(r, g, b, a);
+        return fScreen->IndexForColor(red, green, blue, alpha);
+
     return 0;
 }
 
 
-/*! \brief Returns the 32-bit color representation of a given 8-bit color index.
-    \param index The 8-bit color index to convert.
-    \return A rgb_color struct which represents the given 8-bit color index.
-*/
 rgb_color
 BScreen::ColorForIndex(const uint8 index)
 {
     if (fScreen != NULL)
         return fScreen->ColorForIndex(index);
+
     return rgb_color();
 }
 
 
-/*! \brief Returns the "inversion" of the given 8-bit color.
-    \param index An 8-bit color index.
-    \return An 8-bit color index that represents the "inversion" of the given
-        color.
-*/
 uint8
 BScreen::InvertIndex(uint8 index)
 {
     if (fScreen != NULL)
         return fScreen->InvertIndex(index);
+
     return 0;
 }
 
 
-/*! \brief Returns the color map of the current display.
-    \return A pointer to the object's color_map.
-*/
 const color_map*
 BScreen::ColorMap()
 {
     if (fScreen != NULL)
         return fScreen->ColorMap();
+
     return NULL;
 }
 
 
-/*! \brief Copies the screen's contents into the first argument BBitmap.
-    \param screen_shot A pointer to a BBitmap pointer, where the function will
-        allocate a BBitmap for you.
-    \param draw_cursor Specifies if you want the cursor to be drawn.
-    \param bound Let you specify the area you want copied. If it's NULL, the
-        entire screen is copied.
-    \return \c B_OK if the operation was succesful, \c B_ERROR on failure.
-*/
 status_t
 BScreen::GetBitmap(BBitmap** _bitmap, bool drawCursor, BRect* bounds)
 {
     if (fScreen != NULL)
         return fScreen->GetBitmap(_bitmap, drawCursor, bounds);
+
     return B_ERROR;
 }
 
 
-/*! \brief Copies the screen's contents into the first argument BBitmap.
-    \param screen_shot A pointer to an allocated BBitmap, where the function
-        will store the screen's content.
-    \param draw_cursor Specifies if you want the cursor to be drawn.
-    \param bound Let you specify the area you want copied. If it's NULL, the
-        entire screen is copied.
-    \return \c B_OK if the operation was succesful, \c B_ERROR on failure.
-
-    The only difference between this method and GetBitmap() is that ReadBitmap
-    requires you to allocate a BBitmap, while the latter will allocate a BBitmap
-    for you.
-*/
 status_t
-BScreen::ReadBitmap(BBitmap* buffer, bool drawCursor, BRect* bounds)
+BScreen::ReadBitmap(BBitmap* bitmap, bool drawCursor, BRect* bounds)
 {
     if (fScreen != NULL)
-        return fScreen->ReadBitmap(buffer, drawCursor, bounds);
+        return fScreen->ReadBitmap(bitmap, drawCursor, bounds);
+
     return B_ERROR;
 }
 
 
-/*! \brief Returns the color of the desktop.
-    \return An rgb_color structure which is the color of the desktop.
-*/
 rgb_color
 BScreen::DesktopColor()
 {
@@ -257 +176 @@
 }
 
 
-/*! \brief Returns the color of the desktop in the given workspace.
-    \param workspace The workspace of which you want to have the color.
-    \return An rgb_color structure which is the color of the desktop in the
-        given workspace.
-*/
 rgb_color
 BScreen::DesktopColor(uint32 workspace)
 {
@@ -272 +186 @@
 }
 
 
-/*! \brief Set the color of the desktop.
-    \param rgb The color you want to paint the desktop background.
-    \param stick If you pass \c true here, the color will be maintained across
-        boots.
-*/
 void
-BScreen::SetDesktopColor(rgb_color rgb, bool stick)
+BScreen::SetDesktopColor(rgb_color color, bool stick)
 {
     if (fScreen != NULL)
-        fScreen->SetDesktopColor(rgb, B_CURRENT_WORKSPACE_INDEX, stick);
+        fScreen->SetDesktopColor(color, B_CURRENT_WORKSPACE_INDEX, stick);
 }
 
 
-/*! \brief Set the color of the desktop in the given workspace.
-    \param rgb The color you want to paint the desktop background.
-    \param index The workspace you want to change the color.
-    \param stick If you pass \c true here, the color will be maintained across
-        boots.
-*/
 void
-BScreen::SetDesktopColor(rgb_color rgb, uint32 index, bool stick)
+BScreen::SetDesktopColor(rgb_color color, uint32 workspace, bool stick)
 {
     if (fScreen != NULL)
-        fScreen->SetDesktopColor(rgb, index, stick);
+        fScreen->SetDesktopColor(color, workspace, stick);
 }
 
 
-/*! \brief Attempts to adjust the supplied mode so that it's a supported mode.
-    \param target The mode you want to be adjusted.
-    \param low The lower limit you want target to be adjusted.
-    \param high The higher limit you want target to be adjusted.
-    \return
-        - \c B_OK if target (as returned) is supported and falls into the
-            limits.
-        - \c B_BAD_VALUE if target (as returned) is supported but doesn't fall
-            into the limits.
-        - \c B_ERROR if target isn't supported.
-*/
 status_t
 BScreen::ProposeMode(display_mode* target, const display_mode* low,
     const display_mode* high)
 {
     if (fScreen != NULL)
         return fScreen->ProposeMode(target, low, high);
+
     return B_ERROR;
 }
 
 
-/*! \brief allocates and returns a list of the display_modes
-        that the graphics card supports.
-    \param mode_list A pointer to a mode_list pointer, where the function will
-        allocate an array of display_mode structures.
-    \param count A pointer to an integer, where the function will store the
-        amount of available display modes.
-    \return \c B_OK.
-*/
 status_t
 BScreen::GetModeList(display_mode** _modeList, uint32* _count)
 {
     if (fScreen != NULL)
         return fScreen->GetModeList(_modeList, _count);
+
     return B_ERROR;
 }
 
 
-/*! \brief Copies the current display_mode into mode.
-    \param mode A pointer to a display_mode structure,
-        where the current display_mode will be copied.
-    \return \c B_OK if the operation was succesful.
-*/
 status_t
 BScreen::GetMode(display_mode* mode)
 {
     if (fScreen != NULL)
         return fScreen->GetMode(B_CURRENT_WORKSPACE_INDEX, mode);
+
     return B_ERROR;
 }
 
 
-/*! \brief Copies the current display_mode of the given workspace into mode.
-    \param workspace The index of the workspace to query.
-    \param mode A pointer to a display_mode structure,
-        where the current display_mode will be copied.
-    \return \c B_OK if the operation was succesful.
-*/
 status_t
 BScreen::GetMode(uint32 workspace, display_mode* mode)
 {
     if (fScreen != NULL)
         return fScreen->GetMode(workspace, mode);
+
     return B_ERROR;
 }
 
 
-/*! \brief Set the screen to the given mode.
-    \param mode A pointer to a display_mode.
-    \param makeDefault If true, the mode becomes the default for the screen.
-    \return \c B_OK.
-*/
 status_t
 BScreen::SetMode(display_mode* mode, bool makeDefault)
 {
     if (fScreen != NULL)
         return fScreen->SetMode(B_CURRENT_WORKSPACE_INDEX, mode, makeDefault);
+
     return B_ERROR;
 }
 
 
-/*! \brief Set the given workspace to the given mode.
-    \param workspace The index of the workspace that you want to change.
-    \param mode A pointer to a display_mode.
-    \param makeDefault If true, the mode becomes the default for the workspace.
-    \return \c B_OK.
-*/
 status_t
 BScreen::SetMode(uint32 workspace, display_mode* mode, bool makeDefault)
 {
     if (fScreen != NULL)
         return fScreen->SetMode(workspace, mode, makeDefault);
+
     return B_ERROR;
 }
 
 
-/*! \brief Returns information about the graphics card.
-    \param info An accelerant_device_info struct where to store the retrieved
-        info.
-    \return \c B_OK if the operation went fine, otherwise an error code.
-*/
 status_t
 BScreen::GetDeviceInfo(accelerant_device_info* info)
 {
     if (fScreen != NULL)
         return fScreen->GetDeviceInfo(info);
+
     return B_ERROR;
 }
 
@@ -414 +278 @@
 {
     if (fScreen != NULL)
         return fScreen->GetMonitorInfo(info);
+
     return B_ERROR;
 }
 
 
-/*! \brief Returns, in low and high, the minimum and maximum pixel clock rates
-        that are possible for the given mode.
-    \param mode A pointer to a display_mode.
-    \param low A pointer to an int where the function will store the lowest
-        available pixel clock.
-    \param high A pointer to an int where the function wills tore the highest
-        available pixel clock.
-    \return \c B_OK if the operation went fine, otherwise an error code.
-*/
 status_t
 BScreen::GetPixelClockLimits(display_mode* mode, uint32* _low, uint32* _high)
 {
     if (fScreen != NULL)
         return fScreen->GetPixelClockLimits(mode, _low, _high);
+
     return B_ERROR;
 }
 
 
-/*! \brief Fills out the dtc structure with the timing constraints of the
-        current display mode.
-    \param dtc A pointer to a display_timing_constraints structure where the
-        function will store the timing constraints of the current mode.
-    \return \c B_OK if the operation went fine, otherwise an error code.
-*/
 status_t
 BScreen::GetTimingConstraints(display_timing_constraints* constraints)
 {
     if (fScreen != NULL)
         return fScreen->GetTimingConstraints(constraints);
+
     return B_ERROR;
 }
 
 
-/*! \brief Lets you set the VESA Display Power Management Signaling state for
-        the screen.
-    \param dpms_state The DPMS state you want to be set.
-        valid values are:
-        - \c B_DPMS_ON
-        - \c B_DPMS_STAND_BY
-        - \c B_DPMS_SUSPEND
-        - \c B_DPMS_OFF
-    \return \c B_OK if the operation went fine, otherwise an error code.
-*/
 status_t
 BScreen::SetDPMS(uint32 dpmsState)
 {
     if (fScreen != NULL)
         return fScreen->SetDPMS(dpmsState);
+
     return B_ERROR;
 }
 
 
-/*! \brief Returns the current DPMS state of the screen.
-*/
 uint32
 BScreen::DPMSState()
 {
     if (fScreen != NULL)
         return fScreen->DPMSState();
+
     return 0;
 }
 
 
-/*! \brief Indicates which DPMS modes the monitor supports.
-*/
 uint32
 BScreen::DPMSCapabilites()
 {
     if (fScreen != NULL)
         return fScreen->DPMSCapabilites();
+
     return 0;
 }
 
@@ -495 +336 @@
 //  #pragma mark - Deprecated methods
 
 
-/*! \brief Returns the BPrivateScreen used by the BScreen object.
-    \return A pointer to the BPrivateScreen class internally used by the BScreen
-        object.
-*/
 BPrivate::BPrivateScreen*
 BScreen::private_screen()
 {
@@ -506 +343 @@
 }
 
 
-/*! \brief Deprecated, use ProposeMode() instead.
-*/
 status_t
 BScreen::ProposeDisplayMode(display_mode* target, const display_mode* low,
     const display_mode* high)
@@ -516 +351 @@
 }
 
 
-/*! \brief Returns the base address of the framebuffer.
-*/
 void*
 BScreen::BaseAddress()
 {
     if (fScreen != NULL)
         return fScreen->BaseAddress();
+
     return NULL;
 }
 
 
-/*! \brief Returns the amount of bytes per row of the framebuffer.
-*/
 uint32
 BScreen::BytesPerRow()
 {
     if (fScreen != NULL)
         return fScreen->BytesPerRow();
+
     return 0;
 }