Merge branch 'devel/master' into tizen

[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 8b5f260..a757da6 100644 (file)
--- a/dali/public-api/signals/slot-delegate.h
+++ b/dali/public-api/signals/slot-delegate.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_SLOT_DELEGATE_H__
-#define __DALI_SLOT_DELEGATE_H__
+#ifndef DALI_SLOT_DELEGATE_H
+#define DALI_SLOT_DELEGATE_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.
@@ -72,19 +72,18 @@ namespace Dali
  * @endcode
  * @SINCE_1_0.0
  */
-template <typename Slot>
+template<typename Slot>
 class SlotDelegate
 {
 public:
-
   /**
    * @brief Constructor.
    *
    * @SINCE_1_0.0
    * @param[in] slot The object with a callback
    */
-  SlotDelegate( Slot* slot )
-  : mSlot( slot )
+  SlotDelegate(Slot* slot)
+  : mSlot(slot)
   {
   }
 
@@ -93,9 +92,7 @@ public:
    *
    * @SINCE_1_0.0
    */
-  ~SlotDelegate()
-  {
-  }
+  ~SlotDelegate() = default;
 
   /**
    * @brief Disconnects all signals from this object.
@@ -138,12 +135,12 @@ public:
   }
 
 private:
-
-  SlotDelegate( const SlotDelegate& );            ///< undefined copy constructor @SINCE_1_0.0
-  SlotDelegate& operator=( const SlotDelegate& ); ///< undefined assignment operator @SINCE_1_0.0
+  SlotDelegate(const SlotDelegate&) = delete;            ///< Deleted copy constructor. @SINCE_1_0.0
+  SlotDelegate(SlotDelegate&&)      = delete;            ///< Deleted move constructor. @SINCE_1_9.25
+  SlotDelegate& operator=(const SlotDelegate&) = delete; ///< Deleted copy assignment operator. @SINCE_1_0.0
+  SlotDelegate& operator=(SlotDelegate&&) = delete;      ///< Deleted move assignment operator. @SINCE_1_9.25
 
 private:
-
   Slot* mSlot; ///< The slot object
 
   // Use composition instead of inheritance (virtual methods don't mix well with templates)
@@ -155,4 +152,4 @@ private:
  */
 } // namespace Dali
 
-#endif // __DALI_SLOT_DELEGATE_H__
+#endif // DALI_SLOT_DELEGATE_H