*/
// INTERNAL INCLUDES
-#ifdef DEBUG_ENABLED
-#include <dali/public-api/common/set-wrapper.h>
-#endif
#include <dali/public-api/object/ref-object.h>
#include <dali/public-api/object/object-registry.h>
#include <dali/public-api/object/base-object.h>
/**
* @copydoc Dali::ObjectRegistry::ObjectCreatedSignal()
*/
- Dali::ObjectRegistry::ObjectCreatedSignalV2& ObjectCreatedSignal()
+ Dali::ObjectRegistry::ObjectCreatedSignalType& ObjectCreatedSignal()
{
- return mObjectCreatedSignalV2;
+ return mObjectCreatedSignal;
}
/**
* @copydoc Dali::ObjectRegistry::ObjectDestroyedSignal()
*/
- Dali::ObjectRegistry::ObjectDestroyedSignalV2& ObjectDestroyedSignal()
+ Dali::ObjectRegistry::ObjectDestroyedSignalType& ObjectDestroyedSignal()
{
- return mObjectDestroyedSignalV2;
+ return mObjectDestroyedSignal;
}
/**
private:
- Dali::ObjectRegistry::ObjectCreatedSignalV2 mObjectCreatedSignalV2;
- Dali::ObjectRegistry::ObjectDestroyedSignalV2 mObjectDestroyedSignalV2;
-
-#ifdef DEBUG_ENABLED
- std::set< Dali::BaseObject* > mDebugRegistry; ///< This allows us to assert that an object is only registered once (debug builds only)
-#endif
+ Dali::ObjectRegistry::ObjectCreatedSignalType mObjectCreatedSignal;
+ Dali::ObjectRegistry::ObjectDestroyedSignalType mObjectDestroyedSignal;
};