[dali_1.2.20] Merge branch 'devel/master'

[platform/core/uifw/dali-core.git] / dali / public-api / signals / slot-delegate.h

diff --git a/dali/public-api/signals/slot-delegate.h b/dali/public-api/signals/slot-delegate.h
index ee04c58..a91e154 100644 (file)
--- a/dali/public-api/signals/slot-delegate.h
+++ b/dali/public-api/signals/slot-delegate.h
@@ -2,7 +2,7 @@
 #define __DALI_SLOT_DELEGATE_H__
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 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.
@@ -24,6 +24,10 @@
 
 namespace Dali
 {
+/**
+ * @addtogroup dali_core_signals
+ * @{
+ */
 
 /**
  * @brief SlotDelegates can be used to connect member functions to signals, without inheriting from SlotDelegateInterface.
@@ -66,6 +70,7 @@ namespace Dali
  * };
  *
  * @endcode
+ * @SINCE_1_0.0
  */
 template <typename Slot>
 class SlotDelegate
@@ -75,6 +80,7 @@ public:
   /**
    * @brief Constructor.
    *
+   * @SINCE_1_0.0
    * @param[in] slot The object with a callback.
    */
   SlotDelegate( Slot* slot )
@@ -85,6 +91,7 @@ public:
   /**
    * @brief Non-virtual destructor.
    *
+   * @SINCE_1_0.0
    */
   ~SlotDelegate()
   {
@@ -93,6 +100,7 @@ public:
   /**
    * @brief Disconnect all signals from this object.
    *
+   * @SINCE_1_0.0
    */
   void DisconnectAll()
   {
@@ -110,6 +118,7 @@ public:
   /**
    * @brief Retrieve the slot object.
    *
+   * @SINCE_1_0.0
    * @return The object with a callback.
    */
   Slot* GetSlot()
@@ -120,6 +129,7 @@ public:
   /**
    * @brief Retrieve the connection tracker component.
    *
+   * @SINCE_1_0.0
    * @return The connection tracker component.
    */
   ConnectionTracker* GetConnectionTracker()
@@ -129,8 +139,8 @@ public:
 
 private:
 
-  SlotDelegate( const SlotDelegate& );            ///< undefined copy constructor
-  SlotDelegate& operator=( const SlotDelegate& ); ///< undefined assignment operator
+  SlotDelegate( const SlotDelegate& );            ///< undefined copy constructor @SINCE_1_0.0
+  SlotDelegate& operator=( const SlotDelegate& ); ///< undefined assignment operator @SINCE_1_0.0
 
 private:
 
@@ -140,6 +150,9 @@ private:
   ConnectionTracker mConnectionTracker; ///< A connection tracker
 };
 
+/**
+ * @}
+ */
 } // namespace Dali
 
 #endif // __DALI_SLOT_DELEGATE_H__