Fixed impl

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

diff --git a/src/FShellLiveboxFrame.cpp b/src/FShellLiveboxFrame.cpp
index 9c26bf0..4516eef 100644 (file)
--- a/src/FShellLiveboxFrame.cpp
+++ b/src/FShellLiveboxFrame.cpp
@@ -48,12 +48,10 @@ LiveboxFrame::Construct(const Dimension& size)
        result r = GetLastResult();
        SysTryReturn(NID_UI_CTRL, pImpl, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-       _pControlImpl = pImpl.get();
-
        r = pImpl->Initialize(size);
        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-       pImpl.release();
+       _pControlImpl = pImpl.release();
 
        return r;
 }
@@ -67,12 +65,10 @@ LiveboxFrame::Construct(const Layout& layout, const Dimension& size)
        result r = GetLastResult();
        SysTryReturn(NID_UI_CTRL, pImpl, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-       _pControlImpl = pImpl.get();
-
        r = pImpl->Initialize(size);
        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-       pImpl.release();
+       _pControlImpl = pImpl.release();
 
        return r;
 }

diff --git a/src/FShellLiveboxPopup.cpp b/src/FShellLiveboxPopup.cpp
index e7121ed..aed7585 100644 (file)
--- a/src/FShellLiveboxPopup.cpp
+++ b/src/FShellLiveboxPopup.cpp
@@ -49,12 +49,10 @@ LiveboxPopup::Construct(const Dimension& size)
        result r = GetLastResult();
        SysTryReturn(NID_UI_CTRL, pImpl, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-       _pControlImpl = pImpl.get();
-
        r = pImpl->Initialize(size);
        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-       pImpl.release();
+       _pControlImpl = pImpl.release();
 
        return r;
 }
@@ -68,12 +66,10 @@ LiveboxPopup::Construct(const Layout& layout, const Dimension& size)
        result r = GetLastResult();
        SysTryReturn(NID_UI_CTRL, pImpl, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-       _pControlImpl = pImpl.get();
-
        r = pImpl->Initialize(size);
        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-       pImpl.release();
+       _pControlImpl = pImpl.release();
 
        return r;
 }

diff --git a/src/FShellLiveboxView.cpp b/src/FShellLiveboxView.cpp
index a12f5c6..0ea475b 100644 (file)
--- a/src/FShellLiveboxView.cpp
+++ b/src/FShellLiveboxView.cpp
@@ -56,12 +56,10 @@ LiveboxView::Construct(const String& appId, const Tizen::Base::String& providerN
        result r = GetLastResult();
        SysTryReturn(NID_UI_CTRL, pImpl, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-       _pControlImpl = pImpl.get();
-
        r = pImpl->Initialize(appId, providerName, rect, userInfo);
        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-       pImpl.release();
+       _pControlImpl = pImpl.release();
 
        return r;
 }