Apply ACR

Change-Id: I8942fae9bd700e4041c643fd30ef396740fe7f05
Signed-off-by: HeeJu Kang <mobum.kang@samsung.com>

diff --git a/inc/FShellLiveboxPopup.h b/inc/FShellLiveboxPopup.h
index 7589983..d93619a 100644 (file)
--- a/inc/FShellLiveboxPopup.h
+++ b/inc/FShellLiveboxPopup.h
@@ -106,90 +106,57 @@ public:
         * @see LiveboxProvider::OnLiveboxPopupProviderInitialize()\r
         */\r
        result ConstructF(const Tizen::Ui::Layout& layout, const Tizen::Graphics::FloatDimension& size);\r
-
-       /*\r
-        * Gets the bounds of the client area.\r
-        *\r
-        * @since               2.1\r
-        *\r
-        * @return              The bounds of the client area in a Rectangle instance\r
-        */\r
-       Tizen::Graphics::Rectangle GetClientAreaBounds(void) const;\r
 \r
-       /*\r
+       /**\r
         * Gets the bounds of the client area.\r
         *\r
-        * @since               2.1\r
+        * @since               2.1\r
         *\r
-        * @return              The bounds of the client area in a FloatRectangle instance\r
+        * @return              The bounds of the client area in a FloatRectangle instance\r
         */\r
-       Tizen::Graphics::FloatRectangle GetClientAreaBoundsF(void) const;\r
+       Tizen::Graphics::FloatRectangle GetClientAreaBounds(void) const;
 \r
-       /*\r
+       /**\r
         * Creates and returns a graphics canvas whose bounds (position and size) are equal to the bounds of the client area of the %LiveboxPopup.\r
         *\r
-        * @since              2.1\r
-        *\r
-        * @return             The graphic canvas of the %LiveboxPopup, @n\r
-        *                            else @c null if an error occurs\r
-        * @exception  E_SUCCESS                                        The method is successful.\r
-        * @exception  E_RESOURCE_UNAVAILABLE           The required resource is currently unavailable.\r
-        * @remarks            The method allocates a Tizen::Graphics::Canvas whose bounds are equal to that of the client area of the % LiveboxPopup. @n\r
-        *                            It is the responsibility of the developers to deallocate the canvas after use.\r
-        * @remarks            The canvas is valid only if the properties of the parent control of the canvas remain unchanged. @n\r
-        *                            Therefore, delete the previously allocated canvas and create a new canvas using the GetCanvasN() method if the size or position of the\r
-        *                            control is changed.\r
-        * @remarks            The specific error code can be accessed using the GetLastResult() method.\r
+        * @since               2.1\r
+        *\r
+        * @return              The graphic canvas of the %LiveboxPopup, @n\r
+        *                              else @c null if an error occurs\r
+        * @exception   E_SUCCESS                                       The method is successful.\r
+        * @exception   E_RESOURCE_UNAVAILABLE          The required resource is currently unavailable.\r
+        * @remarks             The method allocates a Tizen::Graphics::Canvas whose bounds are equal to that of the client area of the % LiveboxPopup. @n\r
+        *                              It is the responsibility of the developers to deallocate the canvas after use.\r
+        * @remarks             The canvas is valid only if the properties of the parent control of the canvas remain unchanged. @n\r
+        *                              Therefore, delete the previously allocated canvas and create a new canvas using the GetClientAreaCanvasN() method if the size or position of the
+        *                              control is changed.\r
+        * @remarks             The specific error code can be accessed using the GetLastResult() method.\r
         */\r
        Tizen::Graphics::Canvas* GetClientAreaCanvasN(void) const;\r
 \r
-       /*\r
-        * Translates the specified position to the client coordinates.\r
-        *\r
-        * @since       2.1\r
-        *\r
-        * @return      The position in relative to the top-left corner of the client-area, @n\r
-        *                            else @c (-1,-1) if the instance is invalid\r
-        * @param[in]   position       The position relative to the top-left corner of the %LiveboxPopup.\r
-        * @see         TranslateFromClientAreaPosition()\r
-        */\r
-       Tizen::Graphics::Point TranslateToClientAreaPosition(const Tizen::Graphics::Point& position) const;\r
-\r
-       /*\r
+       /**\r
         * Translates the specified position to the client coordinates.\r
         *\r
         * @since       2.1\r
         *\r
         * @return      The float position in relative to the top-left corner of the client-area, @n\r
-        *                            else @c (-1.0f,-1.0f) if the instance is invalid\r
-        * @param[in]   position       The float position relative to the top-left corner of the %LiveboxPopup.\r
-        * @see         TranslateFromClientAreaPositionF()\r
-        */\r
-       Tizen::Graphics::FloatPoint TranslateToClientAreaPositionF(const Tizen::Graphics::FloatPoint& position) const;\r
-\r
-       /*\r
-        * Translates the specified client position to the control coordinate.\r
-        *\r
-        * @since       2.1\r
-        *\r
-        * @return      The position in relative to the top-left corner of the %Popup control, @n\r
-        *                            else @c (-1,-1) if the instance is invalid\r
-        * @param[in]   clientPosition        The position relative to the top-left corner of the client area\r
-        * @see         TranslateToClientAreaPosition()\r
+        *                              else @c (-1.0f,-1.0f) if the instance is invalid\r
+        * @param[in]   controlPosition       The float position relative to the top-left corner of the %LiveboxPopup.
+        * @see         TranslateToControlPosition()
         */\r
-       Tizen::Graphics::Point TranslateFromClientAreaPosition(const Tizen::Graphics::Point& clientPosition) const;\r
+       Tizen::Graphics::FloatPoint TranslateToClientAreaPosition(const Tizen::Graphics::FloatPoint& controlPosition) const;
 \r
-       /*\r
+       /**\r
         * Translates the specified client position to the control coordinate.\r
         *\r
         * @since       2.1\r
         *\r
         * @return      The float position in relative to the top-left corner of the %Popup control, @n\r
-        *                            else @c (-1.0f,-1.0f) if the instance is invalid\r
+        *                              else @c (-1.0f,-1.0f) if the instance is invalid\r
         * @param[in]   clientPosition        The float position relative to the top-left corner of the client area\r
-        * @see         TranslateToClientAreaPositionF()\r
+        * @see         TranslateToClientAreaPosition()
         */\r
-       Tizen::Graphics::FloatPoint TranslateFromClientAreaPositionF(const Tizen::Graphics::FloatPoint& clientPosition) const;
+       Tizen::Graphics::FloatPoint TranslateToControlPosition(const Tizen::Graphics::FloatPoint& clientPosition) const;
 
 protected:
        //

diff --git a/src/FShellLiveboxPopup.cpp b/src/FShellLiveboxPopup.cpp
index 0bb5e9f..fbe9b11 100644 (file)
--- a/src/FShellLiveboxPopup.cpp
+++ b/src/FShellLiveboxPopup.cpp
@@ -86,17 +86,9 @@ LiveboxPopup::ConstructF(const Layout& layout, const FloatDimension& size)
        return r;
 }
 
-Rectangle\r
+FloatRectangle
 LiveboxPopup::GetClientAreaBounds(void) const\r
 {\r
-       FloatRectangle floatRect = GetClientAreaBoundsF();\r
-\r
-       return Rectangle(floatRect.x, floatRect.y, floatRect.width, floatRect.height);\r
-}\r
-\r
-FloatRectangle\r
-LiveboxPopup::GetClientAreaBoundsF(void) const\r
-{\r
        const _LiveboxPopupImpl* pImpl = _LiveboxPopupImpl::GetInstance(*this);
        SysAssertf(pImpl != null, "Not yet constructed. Construct() should be called before use.");\r
 \r
@@ -116,38 +108,22 @@ LiveboxPopup::GetClientAreaCanvasN(void) const
        return pCanvas;\r
 }\r
 \r
-Point\r
-LiveboxPopup::TranslateToClientAreaPosition(const Point& position) const\r
-{\r
-       FloatPoint floatPoint = TranslateToClientAreaPositionF(FloatPoint(static_cast<float>(position.x), static_cast<float>(position.y)));\r
-\r
-       return Point(floatPoint.x, floatPoint.y);\r
-}\r
-\r
 FloatPoint\r
-LiveboxPopup::TranslateToClientAreaPositionF(const FloatPoint& position) const\r
+LiveboxPopup::TranslateToClientAreaPosition(const FloatPoint& controlPosition) const
 {\r
        const _LiveboxPopupImpl* pImpl = _LiveboxPopupImpl::GetInstance(*this);
        SysAssertf(pImpl != null, "Not yet constructed. Construct() should be called before use.");\r
 \r
-       return pImpl->TranslateToClientAreaPosition(position);\r
-}\r
-\r
-Point\r
-LiveboxPopup::TranslateFromClientAreaPosition(const Point& clientPosition) const\r
-{\r
-       FloatPoint floatPoint = TranslateFromClientAreaPositionF(FloatPoint(static_cast<float>(clientPosition.x), static_cast<float>(clientPosition.y)));\r
-\r
-       return Point(floatPoint.x, floatPoint.y);\r
+       return pImpl->TranslateToClientAreaPosition(controlPosition);
 }\r
 \r
 FloatPoint
-LiveboxPopup::TranslateFromClientAreaPositionF(const FloatPoint& clientPosition) const
+LiveboxPopup::TranslateToControlPosition(const FloatPoint& clientPosition) const
 {
        const _LiveboxPopupImpl* pImpl = _LiveboxPopupImpl::GetInstance(*this);
        SysAssertf(pImpl != null, "Not yet constructed. Construct() should be called before use.");
 
-       return pImpl->TranslateFromClientAreaPosition(clientPosition);
+       return pImpl->TranslateToControlPosition(clientPosition);
 }
 
 }} // Tizen::Shell

diff --git a/src/FShell_LiveboxPopup.cpp b/src/FShell_LiveboxPopup.cpp
index eb74b04..08ea1f7 100644 (file)
--- a/src/FShell_LiveboxPopup.cpp
+++ b/src/FShell_LiveboxPopup.cpp
@@ -247,15 +247,15 @@ _LiveboxPopup::GetClientAreaCanvasN(void) const
 }\r
 \r
 FloatPoint\r
-_LiveboxPopup::TranslateToClientAreaPosition(const FloatPoint& position) const\r
+_LiveboxPopup::TranslateToClientAreaPosition(const FloatPoint& controlPosition) const
 {\r
        FloatRectangle leftTop = GetClientBoundsF();
 
-       return FloatPoint(position.x - leftTop.x, position.y - leftTop.y);\r
+       return FloatPoint(controlPosition.x - leftTop.x, controlPosition.y - leftTop.y);\r
 }\r
 \r
 FloatPoint
-_LiveboxPopup::TranslateFromClientAreaPosition(const FloatPoint& clientPosition) const
+_LiveboxPopup::TranslateToControlPosition(const FloatPoint& clientPosition) const
 {
        FloatRectangle leftTop = GetClientBoundsF();
 

diff --git a/src/FShell_LiveboxPopup.h b/src/FShell_LiveboxPopup.h
index ab34911..c245f47 100644 (file)
--- a/src/FShell_LiveboxPopup.h
+++ b/src/FShell_LiveboxPopup.h
@@ -68,8 +68,8 @@ public:
        void SetAnchorPosition(const Tizen::Graphics::FloatPoint& position);
        Tizen::Graphics::FloatPoint GetAnchorPosition(void) const;
        Tizen::Graphics::Canvas* GetClientAreaCanvasN(void) const;\r
-       Tizen::Graphics::FloatPoint TranslateToClientAreaPosition(const Tizen::Graphics::FloatPoint& position) const;\r
-       Tizen::Graphics::FloatPoint TranslateFromClientAreaPosition(const Tizen::Graphics::FloatPoint& clientPosition) const;
+       Tizen::Graphics::FloatPoint TranslateToClientAreaPosition(const Tizen::Graphics::FloatPoint& controlPosition) const;
+       Tizen::Graphics::FloatPoint TranslateToControlPosition(const Tizen::Graphics::FloatPoint& clientPosition) const;
 
 protected:
        _LiveboxPopup(void);

diff --git a/src/FShell_LiveboxPopupImpl.cpp b/src/FShell_LiveboxPopupImpl.cpp
index f1f01da..ff066fd 100644 (file)
--- a/src/FShell_LiveboxPopupImpl.cpp
+++ b/src/FShell_LiveboxPopupImpl.cpp
@@ -146,15 +146,15 @@ _LiveboxPopupImpl::GetClientAreaCanvasN(void) const
 }\r
 \r
 FloatPoint\r
-_LiveboxPopupImpl::TranslateToClientAreaPosition(const FloatPoint& position) const\r
+_LiveboxPopupImpl::TranslateToClientAreaPosition(const FloatPoint& controlPosition) const
 {\r
-       return GetCore().TranslateToClientAreaPosition(position);\r
+       return GetCore().TranslateToClientAreaPosition(controlPosition);
 }\r
 \r
 FloatPoint
-_LiveboxPopupImpl::TranslateFromClientAreaPosition(const FloatPoint& clientPosition) const
+_LiveboxPopupImpl::TranslateToControlPosition(const FloatPoint& clientPosition) const
 {
-       return GetCore().TranslateFromClientAreaPosition(clientPosition);
+       return GetCore().TranslateToControlPosition(clientPosition);
 }
 
 }} // Tizen::Shell

diff --git a/src/FShell_LiveboxPopupImpl.h b/src/FShell_LiveboxPopupImpl.h
index 81b4613..0e2cb3c 100644 (file)
--- a/src/FShell_LiveboxPopupImpl.h
+++ b/src/FShell_LiveboxPopupImpl.h
@@ -54,8 +54,8 @@ public:
        Tizen::Graphics::FloatPoint GetAnchorPosition(void) const;\r
        Tizen::Graphics::FloatRectangle GetClientAreaBounds(void) const;\r
        Tizen::Graphics::Canvas* GetClientAreaCanvasN(void) const;\r
-       Tizen::Graphics::FloatPoint TranslateToClientAreaPosition(const Tizen::Graphics::FloatPoint& position) const;\r
-       Tizen::Graphics::FloatPoint TranslateFromClientAreaPosition(const Tizen::Graphics::FloatPoint& clientPosition) const;
+       Tizen::Graphics::FloatPoint TranslateToClientAreaPosition(const Tizen::Graphics::FloatPoint& controlPosition) const;
+       Tizen::Graphics::FloatPoint TranslateToControlPosition(const Tizen::Graphics::FloatPoint& clientPosition) const;
 
 protected:
        _LiveboxPopupImpl(LiveboxPopup* pPublic, _LiveboxPopup* pCore, const Tizen::Ui::Layout* pPortraitLayout, const Tizen::Ui::Layout* pLandscapeLayout);