Don't use String::EMPTY

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / text-controller.cpp

diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp
index d86d4f5..626f451 100644 (file)
--- 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;
 };
 
   std::string text;
 };
 

+const std::string EMPTY_STRING("");
+

 } // namespace
 
 namespace Dali
 } // namespace
 
 namespace Dali


@@ -648,8 +650,8 @@ struct Controller::TextInput
       FontId defaultFontId = 0u;
       if( NULL == mFontDefaults )
       {
       FontId defaultFontId = 0u;
       if( NULL == mFontDefaults )
       {

-        defaultFontId = mFontClient.GetFontId( String::EMPTY,
-                                               String::EMPTY );
+        defaultFontId = mFontClient.GetFontId( EMPTY_STRING,
+                                               EMPTY_STRING );

       }
       else
       {
       }
       else
       {


@@ -1097,7 +1099,7 @@ const std::string& Controller::GetDefaultFontFamily() const
     return mImpl->mFontDefaults->mDefaultFontFamily;
   }
 
     return mImpl->mFontDefaults->mDefaultFontFamily;
   }
 

-  return String::EMPTY;;
+  return EMPTY_STRING;

 }
 
 void Controller::SetDefaultFontStyle( const std::string& defaultFontStyle )
 }
 
 void Controller::SetDefaultFontStyle( const std::string& defaultFontStyle )


@@ -1133,7 +1135,7 @@ const std::string& Controller::GetDefaultFontStyle() const
     return mImpl->mFontDefaults->mDefaultFontStyle;
   }
 
     return mImpl->mFontDefaults->mDefaultFontStyle;
   }
 

-  return String::EMPTY;
+  return EMPTY_STRING;

 }
 
 void Controller::SetDefaultPointSize( float pointSize )
 }
 
 void Controller::SetDefaultPointSize( float pointSize )