From ee9abe474dfa668e83bb9e4c9c6ccab442eebd27 Mon Sep 17 00:00:00 2001 From: Hokwon Song Date: Tue, 30 Apr 2013 13:43:15 +0900 Subject: [PATCH] Apply unique_ptr on Text Change-Id: I8e772f069f1da0bfff36257e44b0b523dded8ece Signed-off-by: Hokwon Song --- src/locales/FLcl_NumberFormatterImpl.cpp | 1 - src/text/FTextEncoding.cpp | 11 +++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/locales/FLcl_NumberFormatterImpl.cpp b/src/locales/FLcl_NumberFormatterImpl.cpp index 725f121..ec564df 100644 --- a/src/locales/FLcl_NumberFormatterImpl.cpp +++ b/src/locales/FLcl_NumberFormatterImpl.cpp @@ -20,7 +20,6 @@ */ #include #include -#include #include #include diff --git a/src/text/FTextEncoding.cpp b/src/text/FTextEncoding.cpp index 023c85e..d6a2c5a 100644 --- a/src/text/FTextEncoding.cpp +++ b/src/text/FTextEncoding.cpp @@ -123,17 +123,12 @@ Encoding::GetEncodingN(const Tizen::Base::String& encodingType) ClearLastResult(); result r = E_SUCCESS; - _EncodingImpl* pEncodingImpl = new (std::nothrow) _EncodingImpl(); + std::unique_ptr< _EncodingImpl > pEncodingImpl(new (std::nothrow) _EncodingImpl()); SysTryReturn(NID_TEXT, pEncodingImpl != null, null, E_OUT_OF_MEMORY, "[%s] Memory allocation failed", GetErrorMessage(E_OUT_OF_MEMORY)); r = pEncodingImpl->Construct(encodingType); - SysTryCatch(NID_TEXT, (!IsFailed(r)), , r, "[%s] Encoder construct failed.", GetErrorMessage(r)); - - return pEncodingImpl; - -CATCH: - delete pEncodingImpl; - return null; + SysTryReturn(NID_TEXT, !IsFailed(r), null, r , "[%s] Encoder construct failed.", GetErrorMessage(r)); + return pEncodingImpl.release(); } String -- 2.7.4