Remove String::EMPTY

Change-Id: I76d3f352b4c3d7c8c801b9edd70f4b970d3ba0aa

diff --git a/automated-tests/src/dali/utc-Dali-BaseHandle.cpp b/automated-tests/src/dali/utc-Dali-BaseHandle.cpp
index b0fb0c0..607ce87 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-BaseHandle.cpp
+++ b/automated-tests/src/dali/utc-Dali-BaseHandle.cpp
@@ -456,7 +456,7 @@ int UtcDaliBaseHandleGetTypeNameN(void)
   FakeObject object;
   std::string typeName = object.GetTypeName();
 
-  DALI_TEST_CHECK( typeName == Dali::String::EMPTY );
+  DALI_TEST_CHECK( typeName.empty() );
   END_TEST;
 }
 

diff --git a/dali/internal/event/images/image-factory.cpp b/dali/internal/event/images/image-factory.cpp
index ca397f6..c3ee746 100644 (file)
--- a/dali/internal/event/images/image-factory.cpp
+++ b/dali/internal/event/images/image-factory.cpp
@@ -247,7 +247,9 @@ const std::string& ImageFactory::GetRequestPath( const ImageFactoryCache::Reques
     return request->url;
   }
 
-  return String::EMPTY;
+  // Only create empty string if required
+  static std::string empty;
+  return empty;
 }
 
 const ImageAttributes& ImageFactory::GetActualAttributes( const ResourceTicketPtr& ticket ) const

diff --git a/dali/public-api/common/constants.cpp b/dali/public-api/common/constants.cpp
index ac017fa..ca1d222 100644 (file)
--- a/dali/public-api/common/constants.cpp
+++ b/dali/public-api/common/constants.cpp
@@ -73,6 +73,4 @@ const float Math::MACHINE_EPSILON_100   = Epsilon<100>::value;
 const float Math::MACHINE_EPSILON_1000  = Epsilon<1000>::value;
 const float Math::MACHINE_EPSILON_10000 = Epsilon<10000>::value;
 
-const std::string String::EMPTY("");
-
 } // namespace Dali

diff --git a/dali/public-api/common/constants.h b/dali/public-api/common/constants.h
index 75b9474..7a14681 100644 (file)
--- a/dali/public-api/common/constants.h
+++ b/dali/public-api/common/constants.h
@@ -124,14 +124,6 @@ static const float ONE80_OVER_PI = 180.0f/Dali::Math::PI; ///< Constant used to
 
 } // namespace Math
 
-/**
- * @brief String Constants
- */
-namespace String
-{
-extern const std::string EMPTY; ///< The empty string
-}
-
 } // namespace Dali
 
 #endif // __DALI_CONSTANTS_H__

diff --git a/dali/public-api/object/base-object.cpp b/dali/public-api/object/base-object.cpp
index f86cd81..b33ad37 100644 (file)
--- a/dali/public-api/object/base-object.cpp
+++ b/dali/public-api/object/base-object.cpp
@@ -82,7 +82,8 @@ const std::string& BaseObject::GetTypeName() const
 
   // Return an empty string if type-name not found.
   DALI_LOG_WARNING( "TypeName Not Found\n" );
-  return String::EMPTY;
+  static std::string empty;
+  return empty;
 }
 
 bool BaseObject::GetTypeInfo(Dali::TypeInfo& typeInfo) const