Merge "Remove use of boost thread local storage from debug" into tizen

[platform/core/uifw/dali-core.git] / dali / public-api / object / object-registry.cpp

diff --git a/dali/public-api/object/object-registry.cpp b/dali/public-api/object/object-registry.cpp
index 4d1f8b2..6bb320f 100644 (file)
--- a/dali/public-api/object/object-registry.cpp
+++ b/dali/public-api/object/object-registry.cpp
@@ -24,9 +24,6 @@
 namespace Dali
 {
 
-const char* const ObjectRegistry::SIGNAL_OBJECT_CREATED = "object-created";
-const char* const ObjectRegistry::SIGNAL_OBJECT_DESTROYED = "object-destroyed";
-
 ObjectRegistry::ObjectRegistry()
 {
 }
@@ -46,19 +43,12 @@ ObjectRegistry& ObjectRegistry::operator=(const ObjectRegistry& rhs)
   return *this;
 }
 
-ObjectRegistry& ObjectRegistry::operator=(BaseHandle::NullType* rhs)
-{
-  DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle");
-  Reset();
-  return *this;
-}
-
-ObjectRegistry::ObjectCreatedSignalV2& ObjectRegistry::ObjectCreatedSignal()
+ObjectRegistry::ObjectCreatedSignalType& ObjectRegistry::ObjectCreatedSignal()
 {
   return GetImplementation(*this).ObjectCreatedSignal();
 }
 
-ObjectRegistry::ObjectDestroyedSignalV2& ObjectRegistry::ObjectDestroyedSignal()
+ObjectRegistry::ObjectDestroyedSignalType& ObjectRegistry::ObjectDestroyedSignal()
 {
   return GetImplementation(*this).ObjectDestroyedSignal();
 }