[dali_2.3.29] Merge branch 'devel/master'

[platform/core/uifw/dali-core.git] / dali / internal / event / common / object-registry-impl.cpp

diff --git a/dali/internal/event/common/object-registry-impl.cpp b/dali/internal/event/common/object-registry-impl.cpp
index a4ba77c..74bc803 100644 (file)
--- a/dali/internal/event/common/object-registry-impl.cpp
+++ b/dali/internal/event/common/object-registry-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,52 +20,66 @@
 
 // EXTERNAL INCLUDES
 #include <algorithm>
+#include <cstring> // for strcmp
 
 // INTERNAL INCLUDES
 #include <dali/internal/event/common/thread-local-storage.h>
 #include <dali/public-api/object/object-registry.h>
+#include <dali/public-api/object/type-registry.h>
 
 namespace Dali
 {
-
 namespace Internal
 {
+namespace
+{
+// Signals
+
+const char* const SIGNAL_OBJECT_CREATED   = "objectCreated";
+const char* const SIGNAL_OBJECT_DESTROYED = "objectDestroyed";
+
+TypeRegistration mType(typeid(Dali::ObjectRegistry), typeid(Dali::BaseHandle), nullptr);
+
+SignalConnectorType signalConnector1(mType, SIGNAL_OBJECT_CREATED, &ObjectRegistry::DoConnectSignal);
+SignalConnectorType signalConnector2(mType, SIGNAL_OBJECT_DESTROYED, &ObjectRegistry::DoConnectSignal);
+
+} // namespace
 
 ObjectRegistryPtr ObjectRegistry::New()
 {
   return ObjectRegistryPtr(new ObjectRegistry());
 }
 
-ObjectRegistry::ObjectRegistry()
-{
-}
+ObjectRegistry::ObjectRegistry() = default;
 
-ObjectRegistry::~ObjectRegistry()
-{
-}
+ObjectRegistry::~ObjectRegistry() = default;
 
-void ObjectRegistry::RegisterObject( Dali::BaseObject* object )
+void ObjectRegistry::RegisterObject(Dali::BaseObject* object)
 {
-  if ( !mObjectCreatedSignal.Empty() )
+  if(!mObjectCreatedSignal.Empty())
   {
-    Dali::BaseHandle handle( object );
-    mObjectCreatedSignal.Emit( handle );
+    Dali::BaseHandle handle(object);
+    mObjectCreatedSignal.Emit(handle);
   }
 }
 
-void ObjectRegistry::UnregisterObject( Dali::BaseObject* object )
+void ObjectRegistry::UnregisterObject(Dali::BaseObject* object)
 {
-  mObjectDestroyedSignal.Emit( object );
+  mObjectDestroyedSignal.Emit(object);
 }
 
-bool ObjectRegistry::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
+bool ObjectRegistry::DoConnectSignal(BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor)
 {
-  bool connected( true );
-  ObjectRegistry* objectRegistry = dynamic_cast<ObjectRegistry*>(object);
+  bool            connected(true);
+  ObjectRegistry* objectRegistry = static_cast<ObjectRegistry*>(object); // TypeRegistry guarantees that this is the correct type.
 
-  if(Dali::ObjectRegistry::SIGNAL_OBJECT_CREATED == signalName)
+  if(0 == strcmp(signalName.c_str(), SIGNAL_OBJECT_CREATED))
+  {
+    objectRegistry->ObjectCreatedSignal().Connect(tracker, functor);
+  }
+  else if(0 == strcmp(signalName.c_str(), SIGNAL_OBJECT_DESTROYED))
   {
-    objectRegistry->ObjectCreatedSignal().Connect( tracker, functor );
+    objectRegistry->ObjectDestroyedSignal().Connect(tracker, functor);
   }
   else
   {