*
*/
-// EXTERNAL INCLUDES
-#include <boost/function.hpp>
-
// INTERNAL INCLUDES
#include <dali/public-api/object/handle.h>
-#include <dali/public-api/signals/dali-signal-v2.h>
+#include <dali/public-api/signals/dali-signal.h>
-namespace Dali DALI_IMPORT_API
+namespace Dali
{
namespace Internal DALI_INTERNAL
* ObjectRegistry registry = Stage::GetObjectRegistry();
* registry.ObjectCreatedSignal().Connect( ObjectCreatedCallbackFunc );
*
+ * Signals
+ * | %Signal Name | Method |
+ * |------------------|------------------------------|
+ * | object-created | @ref ObjectCreatedSignal() |
+ * | object-destroyed | @ref ObjectDestroyedSignal() |
*/
-class ObjectRegistry : public BaseHandle
+class DALI_IMPORT_API ObjectRegistry : public BaseHandle
{
public:
- //Signal Names
- static const char* const SIGNAL_OBJECT_CREATED; ///< Created signal name
- static const char* const SIGNAL_OBJECT_DESTROYED; ///< Destroyed signal name
-
// Typedefs
/**
* @brief Object created signal
*/
- typedef SignalV2< void (BaseHandle) > ObjectCreatedSignalV2;
+ typedef Signal< void ( BaseHandle ) > ObjectCreatedSignalType;
/**
* @brief Object destroyed signal
*/
- typedef SignalV2< void (const Dali::RefObject*) > ObjectDestroyedSignalV2;
+ typedef Signal< void ( const Dali::RefObject* ) > ObjectDestroyedSignalType;
/**
* @brief Allows the creation of an empty objectRegistry handle.
*/
ObjectRegistry& operator=(const ObjectRegistry& rhs);
- /**
- * @brief This method is defined to allow assignment of the NULL value,
- * and will throw an exception if passed any other value.
- *
- * Assigning to NULL is an alias for Reset().
- * @param [in] rhs A NULL pointer
- * @return A reference to this handle
- */
- ObjectRegistry& operator=(BaseHandle::NullType* rhs);
-
public: // Signals
/**
* @pre The Object has been initialized.
* @return The signal to connect to.
*/
- ObjectCreatedSignalV2& ObjectCreatedSignal();
+ ObjectCreatedSignalType& ObjectCreatedSignal();
/**
* @brief This signal is emitted when an object is destroyed.
* @pre The Object has been initialized.
* @return The signal to connect to.
*/
- ObjectDestroyedSignalV2& ObjectDestroyedSignal();
+ ObjectDestroyedSignalType& ObjectDestroyedSignal();
public: // Not intended for application developers