Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-core.git] / dali / public-api / signals / connection-tracker.h

diff --git a/dali/public-api/signals/connection-tracker.h b/dali/public-api/signals/connection-tracker.h
index a3d78a5..3c79d04 100644 (file)
--- a/dali/public-api/signals/connection-tracker.h
+++ b/dali/public-api/signals/connection-tracker.h
@@ -2,7 +2,7 @@
 #define __DALI_CONNECTION_TRACKER_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.
@@ -20,11 +20,15 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
-#include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/common/dali-vector.h>
 #include <dali/public-api/signals/connection-tracker-interface.h>
 
 namespace Dali
 {
+/**
+ * @addtogroup dali_core_signals
+ * @{
+ */
 
 class CallbackBase;
 class SlotObserver;
@@ -32,6 +36,7 @@ class SlotConnection;
 
 /**
  * @brief Connection tracker concrete implementation
+ * @SINCE_1_0.0
  */
 class DALI_IMPORT_API ConnectionTracker : public ConnectionTrackerInterface
 {
@@ -39,16 +44,19 @@ public:
 
   /**
    * @brief Constructor.
+   * @SINCE_1_0.0
    */
   ConnectionTracker();
 
   /**
    * @brief Virtual destructor.
+   * @SINCE_1_0.0
    */
   virtual ~ConnectionTracker();
 
   /**
    * @brief Disconnect all signals from this object.
+   * @SINCE_1_0.0
    */
   void DisconnectAll();
 
@@ -64,20 +72,24 @@ public:
 
   /**
    * @brief returns the connection count
+   * @SINCE_1_0.0
    * @return the connection count
    */
   std::size_t GetConnectionCount() const;
 
 private:
 
-  ConnectionTracker( const ConnectionTracker& );            ///< undefined copy constructor
-  ConnectionTracker& operator=( const ConnectionTracker& ); ///< undefined assignment operator
+  ConnectionTracker( const ConnectionTracker& );            ///< undefined copy constructor @SINCE_1_0.0
+  ConnectionTracker& operator=( const ConnectionTracker& ); ///< undefined assignment operator @SINCE_1_0.0
 
 private:
 
-  std::vector< SlotConnection* > mConnections; ///< Vector of connection pointers
+  Dali::Vector< SlotConnection* > mConnections; ///< Vector of connection pointers
 };
 
+/**
+ * @}
+ */
 } // namespace Dali
 
 #endif // __DALI_CONNECTION_TRACKER_H__