use modern construct 'override' in the derive class.

[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 3c79d04..74a17f3 100644 (file)
--- a/dali/public-api/signals/connection-tracker.h
+++ b/dali/public-api/signals/connection-tracker.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_CONNECTION_TRACKER_H__
-#define __DALI_CONNECTION_TRACKER_H__
+#ifndef DALI_CONNECTION_TRACKER_H
+#define DALI_CONNECTION_TRACKER_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -35,10 +35,10 @@ class SlotObserver;
 class SlotConnection;
 
 /**
- * @brief Connection tracker concrete implementation
+ * @brief Connection tracker concrete implementation.
  * @SINCE_1_0.0
  */
-class DALI_IMPORT_API ConnectionTracker : public ConnectionTrackerInterface
+class DALI_CORE_API ConnectionTracker : public ConnectionTrackerInterface
 {
 public:
 
@@ -52,10 +52,10 @@ public:
    * @brief Virtual destructor.
    * @SINCE_1_0.0
    */
-  virtual ~ConnectionTracker();
+  ~ConnectionTracker() override;
 
   /**
-   * @brief Disconnect all signals from this object.
+   * @brief Disconnects all signals from this object.
    * @SINCE_1_0.0
    */
   void DisconnectAll();
@@ -63,24 +63,26 @@ public:
   /**
    * @copydoc ConnectionTrackerInterface::SignalConnected
    */
-  virtual void SignalConnected( SlotObserver* slotObserver, CallbackBase* callback );
+  void SignalConnected( SlotObserver* slotObserver, CallbackBase* callback ) override;
 
   /**
    * @copydoc ConnectionTrackerInterface::SignalDisconnected
    */
-  virtual void SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback );
+  void SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback ) override;
 
   /**
-   * @brief returns the connection count
+   * @brief Returns the connection count.
    * @SINCE_1_0.0
-   * @return the connection count
+   * @return The connection count
    */
   std::size_t GetConnectionCount() const;
 
 private:
 
-  ConnectionTracker( const ConnectionTracker& );            ///< undefined copy constructor @SINCE_1_0.0
-  ConnectionTracker& operator=( const ConnectionTracker& ); ///< undefined assignment operator @SINCE_1_0.0
+  ConnectionTracker( const ConnectionTracker& ) = delete; ///< Deleted copy constructor. @SINCE_1_0.0
+  ConnectionTracker( ConnectionTracker&& ) = delete; ///< Deleted move constructor. @SINCE_1_9.25
+  ConnectionTracker& operator=( const ConnectionTracker& ) = delete; ///< Deleted copy assignment operator. @SINCE_1_0.0
+  ConnectionTracker& operator=( ConnectionTracker&& ) = delete;///< Deleted move assignment operator. @SINCE_1_9.25
 
 private:
 
@@ -92,4 +94,4 @@ private:
  */
 } // namespace Dali
 
-#endif // __DALI_CONNECTION_TRACKER_H__
+#endif // DALI_CONNECTION_TRACKER_H