Change Construct to float version

Change-Id: Ifaeaa0d49a4bbcc6852adc45b56e2b8024930f58
Signed-off-by: Choi Munseok <ms47.choi@samsung.com>

diff --git a/inc/FShellLiveboxFrame.h b/inc/FShellLiveboxFrame.h
index 34ab138..631b1b8 100644 (file)
--- a/inc/FShellLiveboxFrame.h
+++ b/inc/FShellLiveboxFrame.h
@@ -67,19 +67,7 @@ public:
         * @exception   E_INVALID_ARG           A specified input parameter is invalid.
         * @see LiveboxProvider::OnLiveboxProviderInitialize()
         */
-       result Construct(const Tizen::Graphics::Dimension& size);
-
-       /*\r
-       * Initializes this instance of %LiveboxFrame with the specified parameter.\r
-       *\r
-       * @since       2.1\r
-       * @return      An error code\r
-       * @param[in]   size                                     The new width and height\r
-       * @exception   E_SUCCESS                        The method is successful.\r
-       * @exception   E_INVALID_ARG            A specified input parameter is invalid.\r
-       * @see LiveboxProvider::OnLiveboxProviderInitialize()\r
-       */\r
-       result ConstructF(const Tizen::Graphics::FloatDimension& size);
+       result Construct(const Tizen::Graphics::FloatDimension& size);
 
        /**
         * Initializes this instance of %LiveboxFrame with the specified parameter.
@@ -92,20 +80,7 @@ public:
         * @exception   E_INVALID_ARG           A specified input parameter is invalid.
         * @see LiveboxProvider::OnLiveboxProviderInitialize()
         */
-       result Construct(const Tizen::Ui::Layout& layout, const Tizen::Graphics::Dimension& size);
-
-       /*\r
-        * Initializes this instance of %LiveboxFrame with the specified parameter.\r
-        *\r
-        * @since       2.1\r
-        * @return      An error code\r
-        * @param[in]   layout                          The layout for both the portrait and landscape mode\r
-        * @param[in]   size                            The new width and height\r
-        * @exception   E_SUCCESS           The method is successful.\r
-        * @exception   E_INVALID_ARG           A specified input parameter is invalid.\r
-        * @see LiveboxProvider::OnLiveboxProviderInitialize()\r
-        */\r
-       result ConstructF(const Tizen::Ui::Layout& layout, const Tizen::Graphics::FloatDimension& size);
+       result Construct(const Tizen::Ui::Layout& layout, const Tizen::Graphics::FloatDimension& size);
 
 protected:
        //

diff --git a/inc/FShellLiveboxPopup.h b/inc/FShellLiveboxPopup.h
index d93619a..72bcdd9 100644 (file)
--- a/inc/FShellLiveboxPopup.h
+++ b/inc/FShellLiveboxPopup.h
@@ -67,19 +67,7 @@ public:
         * @exception   E_INVALID_ARG           A specified input parameter is invalid.
         * @see LiveboxProvider::OnLiveboxPopupProviderInitialize()
         */
-       result Construct(const Tizen::Graphics::Dimension& size);
-
-       /*\r
-        * Initializes this instance of %LiveboxFrame with the specified parameter.\r
-        *\r
-        * @since       2.1\r
-        * @return      An error code\r
-        * @param[in]   size                            The new width and height\r
-        * @exception   E_SUCCESS           The method is successful.\r
-        * @exception   E_INVALID_ARG           A specified input parameter is invalid.\r
-        * @see LiveboxProvider::OnLiveboxPopupProviderInitialize()\r
-        */\r
-       result ConstructF(const Tizen::Graphics::FloatDimension& size);\r
+       result Construct(const Tizen::Graphics::FloatDimension& size);
 
        /**
         * Initializes this instance of %LiveboxFrame with the specified parameter.
@@ -92,20 +80,7 @@ public:
         * @exception   E_INVALID_ARG           A specified input parameter is invalid.
         * @see LiveboxProvider::OnLiveboxPopupProviderInitialize()
         */
-       result Construct(const Tizen::Ui::Layout& layout, const Tizen::Graphics::Dimension& size);
-
-       /*\r
-        * Initializes this instance of %LiveboxFrame with the specified parameter.\r
-        *\r
-        * @since       2.1\r
-        * @return      An error code\r
-        * @param[in]   layout                          The layout for both the portrait and landscape mode\r
-        * @param[in]   size                            The new width and height\r
-        * @exception   E_SUCCESS           The method is successful.\r
-        * @exception   E_INVALID_ARG           A specified input parameter is invalid.\r
-        * @see LiveboxProvider::OnLiveboxPopupProviderInitialize()\r
-        */\r
-       result ConstructF(const Tizen::Ui::Layout& layout, const Tizen::Graphics::FloatDimension& size);\r
+       result Construct(const Tizen::Ui::Layout& layout, const Tizen::Graphics::FloatDimension& size);
 \r
        /**\r
         * Gets the bounds of the client area.\r

diff --git a/inc/FShellLiveboxView.h b/inc/FShellLiveboxView.h
index 1cf05c5..c728581 100644 (file)
--- a/inc/FShellLiveboxView.h
+++ b/inc/FShellLiveboxView.h
@@ -31,7 +31,7 @@
 namespace Tizen { namespace Base
 {
 class String;
-}} //Tizen::Base
+}} // Tizen::Base
 
 namespace Tizen { namespace Shell
 {
@@ -70,23 +70,6 @@ public:
         * @return      An error code
         * @param[in]   appId                           The AppId of the installed application
         * @param[in]   providerName            The name of the Livebox provider
-        * @param[in]   rect                            An instance of the Rectangle class @n
-        *                                                                      This instance represents the x and y coordinates of the top-left corner @n
-        *                                                                      of the created window along with its width and height. @n
-        * @exception   E_SUCCESS           The method is successful.
-        * @exception   E_INVALID_ARG           A specified input parameter is invalid.
-        * @exception   E_APP_NOT_INSTALLED     The application is not installed.
-        * @exception   E_OBJ_NOT_FOUND         The specified Livebox provider is not found.
-        */
-       result Construct(const Tizen::App::AppId& appId, const Tizen::Base::String& providerName, const Tizen::Graphics::Rectangle& rect);
-
-       /*\r
-        * Initializes this instance of %LiveboxView with the specified parameter.\r
-        *\r
-        * @since       2.1\r
-        * @return      An error code\r
-        * @param[in]   appId                           The AppId of the installed application\r
-        * @param[in]   providerName            The name of the Livebox provider\r
         * @param[in]   rect                            An instance of the FloatRectangle class @n\r
         *                                                                      This instance represents the x and y coordinates of the top-left corner @n\r
         *                                                                      of the created window along with its width and height. @n\r
@@ -95,25 +78,7 @@ public:
         * @exception   E_APP_NOT_INSTALLED     The application is not installed.\r
         * @exception   E_OBJ_NOT_FOUND         The specified Livebox provider is not found.\r
         */\r
-       result ConstructF(const Tizen::App::AppId& appId, const Tizen::Base::String& providerName, const Tizen::Graphics::FloatRectangle& rect);\r
-
-       /**
-        * Initializes this instance of %LiveboxView with the specified parameter.
-        *
-        * @since       2.1
-        * @return      An error code
-        * @param[in]   appId                           The AppId of the installed application
-        * @param[in]   providerName            The name of the Livebox provider
-        * @param[in]   rect                            An instance of the Rectangle class @n
-        *                                                                      This instance represents the x and y coordinates of the top-left corner @n
-        *                                                                      of the created window along with its width and height. @n
-        * @param[in]   userInfo                        Extra data to be delivered to Livebox provider
-        * @exception   E_SUCCESS           The method is successful.
-        * @exception   E_INVALID_ARG           A specified input parameter is invalid.
-        * @exception   E_APP_NOT_INSTALLED     The application is not installed.
-        * @exception   E_OBJ_NOT_FOUND         The specified Livebox provider is not found.
-        */
-       result Construct(const Tizen::App::AppId& appId, const Tizen::Base::String& providerName, const Tizen::Graphics::Rectangle& rect, const Tizen::Base::String& userInfo);
+       result Construct(const Tizen::App::AppId& appId, const Tizen::Base::String& providerName, const Tizen::Graphics::FloatRectangle& rect);
 
        /**\r
         * Initializes this instance of %LiveboxView with the specified parameter.\r
@@ -131,7 +96,7 @@ public:
         * @exception   E_APP_NOT_INSTALLED     The application is not installed.\r
         * @exception   E_OBJ_NOT_FOUND         The specified Livebox provider is not found.\r
         */\r
-       result ConstructF(const Tizen::App::AppId& appId, const Tizen::Base::String& providerName, const Tizen::Graphics::FloatRectangle& rect, const Tizen::Base::String& userInfo);\r
+       result Construct(const Tizen::App::AppId& appId, const Tizen::Base::String& providerName, const Tizen::Graphics::FloatRectangle& rect, const Tizen::Base::String& userInfo);
 
 protected:
        //

diff --git a/src/FShellLiveboxFrame.cpp b/src/FShellLiveboxFrame.cpp
index a680816..ee6f64c 100644 (file)
--- a/src/FShellLiveboxFrame.cpp
+++ b/src/FShellLiveboxFrame.cpp
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
+
 /**
  *     @file           FShellLiveboxFrame.cpp
  *     @brief          This is the implementation for the LiveboxFrame class.
@@ -41,13 +42,7 @@ LiveboxFrame::~LiveboxFrame(void)
 }
 
 result
-LiveboxFrame::Construct(const Dimension& size)
-{
-       return ConstructF(FloatDimension(static_cast<float>(size.width), static_cast<float>(size.height)));
-}
-
-result
-LiveboxFrame::ConstructF(const FloatDimension& size)
+LiveboxFrame::Construct(const FloatDimension& size)
 {
        SysAssertf(_pControlImpl == null, "Already constructed. Calling Construct() twice or more on a same instance is not allowed for this class.");
        unique_ptr<_LiveboxFrameImpl> pImpl(_LiveboxFrameImpl::CreateLiveboxFrameImplN(*this, null, null));
@@ -63,13 +58,7 @@ LiveboxFrame::ConstructF(const FloatDimension& size)
 }
 
 result
-LiveboxFrame::Construct(const Layout& layout, const Dimension& size)
-{
-       return ConstructF(layout, FloatDimension(static_cast<float>(size.width), static_cast<float>(size.height)));
-}
-
-result
-LiveboxFrame::ConstructF(const Layout& layout, const FloatDimension& size)
+LiveboxFrame::Construct(const Layout& layout, const FloatDimension& size)
 {
        SysAssertf(_pControlImpl == null, "Already constructed. Calling Construct() twice or more on a same instance is not allowed for this class.");
 

diff --git a/src/FShellLiveboxPopup.cpp b/src/FShellLiveboxPopup.cpp
index fbe9b11..a2effbd 100644 (file)
--- a/src/FShellLiveboxPopup.cpp
+++ b/src/FShellLiveboxPopup.cpp
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
+
 /**
  *     @file           FShellLiveboxPopup.cpp
  *     @brief          This is the implementation for the LiveboxPopup class.
@@ -41,13 +42,7 @@ LiveboxPopup::~LiveboxPopup(void)
 }
 
 result
-LiveboxPopup::Construct(const Dimension& size)
-{
-       return ConstructF(FloatDimension(static_cast<float>(size.width), static_cast<float>(size.height)));
-}
-
-result
-LiveboxPopup::ConstructF(const FloatDimension& size)
+LiveboxPopup::Construct(const FloatDimension& size)
 {
        SysAssertf(_pControlImpl == null, "Already constructed. Calling Construct() twice or more on a same instance is not allowed for this class.");
 
@@ -64,13 +59,7 @@ LiveboxPopup::ConstructF(const FloatDimension& size)
 }
 
 result
-LiveboxPopup::Construct(const Layout& layout, const Dimension& size)
-{
-       return ConstructF(layout, FloatDimension(static_cast<float>(size.width), static_cast<float>(size.height)));
-}
-
-result
-LiveboxPopup::ConstructF(const Layout& layout, const FloatDimension& size)
+LiveboxPopup::Construct(const Layout& layout, const FloatDimension& size)
 {
        SysAssertf(_pControlImpl == null, "Already constructed. Calling Construct() twice or more on a same instance is not allowed for this class.");
 

diff --git a/src/FShellLiveboxView.cpp b/src/FShellLiveboxView.cpp
index dc2aac3..7c17b3c 100644 (file)
--- a/src/FShellLiveboxView.cpp
+++ b/src/FShellLiveboxView.cpp
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
+
 /**
  *     @file           FShellLiveboxView.cpp
  *     @brief          This is the implementation for the LiveboxView class.
@@ -44,25 +45,13 @@ LiveboxView::~LiveboxView(void)
 }
 
 result
-LiveboxView::Construct(const AppId& appId, const String& providerName, const Rectangle& rect)
-{
-       return ConstructF(appId, providerName, FloatRectangle(static_cast<float>(rect.x), static_cast<float>(rect.y), static_cast<float>(rect.width), static_cast<float>(rect.height)), L"");
-}
-
-result
-LiveboxView::ConstructF(const AppId& appId, const String& providerName, const FloatRectangle& rect)
-{
-       return ConstructF(appId, providerName, rect, L"");
-}
-
-result
-LiveboxView::Construct(const AppId& appId, const String& providerName, const Rectangle& rect, const String& userInfo)
+LiveboxView::Construct(const AppId& appId, const String& providerName, const FloatRectangle& rect)
 {
-       return ConstructF(appId, providerName, FloatRectangle(static_cast<float>(rect.x), static_cast<float>(rect.y), static_cast<float>(rect.width), static_cast<float>(rect.height)), userInfo);
+       return Construct(appId, providerName, rect, L"");
 }
 
 result
-LiveboxView::ConstructF(const AppId& appId, const String& providerName, const FloatRectangle& rect, const String& userInfo)
+LiveboxView::Construct(const AppId& appId, const String& providerName, const FloatRectangle& rect, const String& userInfo)
 {
        SysTryReturnResult(NID_UI_CTRL, _Aul::IsInstalled(appId) == true, E_APP_NOT_INSTALLED, "The application is not installed.");