From: Paul Wisbey Date: Thu, 9 Apr 2015 16:35:24 +0000 (+0100) Subject: Don't use String::EMPTY X-Git-Tag: dali_1.0.38~11^2~1 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=3dd71fec840b0b77278771a31b3152b732dc6682 Don't use String::EMPTY Change-Id: I4081a50f88b646c728c50987142c5cb22acdfc01 --- diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index d86d4f5..626f451 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -58,6 +58,8 @@ struct ModifyEvent std::string text; }; +const std::string EMPTY_STRING(""); + } // namespace namespace Dali @@ -648,8 +650,8 @@ struct Controller::TextInput FontId defaultFontId = 0u; if( NULL == mFontDefaults ) { - defaultFontId = mFontClient.GetFontId( String::EMPTY, - String::EMPTY ); + defaultFontId = mFontClient.GetFontId( EMPTY_STRING, + EMPTY_STRING ); } else { @@ -1097,7 +1099,7 @@ const std::string& Controller::GetDefaultFontFamily() const return mImpl->mFontDefaults->mDefaultFontFamily; } - return String::EMPTY;; + return EMPTY_STRING; } void Controller::SetDefaultFontStyle( const std::string& defaultFontStyle ) @@ -1133,7 +1135,7 @@ const std::string& Controller::GetDefaultFontStyle() const return mImpl->mFontDefaults->mDefaultFontStyle; } - return String::EMPTY; + return EMPTY_STRING; } void Controller::SetDefaultPointSize( float pointSize )