X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-controller.cpp;fp=dali-toolkit%2Finternal%2Ftext%2Ftext-controller.cpp;h=2a3631fe8bd45d5d15e394f6f0ee8454f3226d11;hp=7d05f52af3ccaafe33978ecaa854ebcba54c9431;hb=c25b3c40178dadf12dc5e8f77c17413df0a55099;hpb=9aa36e970b71cdfa780945e484e216aac1443493

diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp
index 7d05f52..2a3631f 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
       {
@@ -1096,7 +1098,7 @@ const std::string& Controller::GetDefaultFontFamily() const
     return mImpl->mFontDefaults->mDefaultFontFamily;
   }
 
-  return String::EMPTY;;
+  return EMPTY_STRING;
 }
 
 void Controller::SetDefaultFontStyle( const std::string& defaultFontStyle )
@@ -1132,7 +1134,7 @@ const std::string& Controller::GetDefaultFontStyle() const
     return mImpl->mFontDefaults->mDefaultFontStyle;
   }
 
-  return String::EMPTY;
+  return EMPTY_STRING;
 }
 
 void Controller::SetDefaultPointSize( float pointSize )