Renamed TouchSignal to TouchedSignal

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

diff --git a/dali/public-api/signals/dali-signal.h b/dali/public-api/signals/dali-signal.h
index f8ed21e..4812ca9 100644 (file)
--- a/dali/public-api/signals/dali-signal.h
+++ b/dali/public-api/signals/dali-signal.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_SIGNAL_H__
-#define __DALI_SIGNAL_H__
+#ifndef DALI_SIGNAL_H
+#define DALI_SIGNAL_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.
@@ -163,10 +163,10 @@ public:
   }
 
   /**
-   * @brief Query whether there are any connected slots.
+   * @brief Queries whether there are any connected slots.
    *
    * @SINCE_1_0.0
-   * @return True if there are any slots connected to the signal.
+   * @return True if there are any slots connected to the signal
    */
   bool Empty() const
   {
@@ -174,10 +174,10 @@ public:
   }
 
   /**
-   * @brief Query the number of slots.
+   * @brief Queries the number of slots.
    *
    * @SINCE_1_0.0
-   * @return The number of slots connected to this signal.
+   * @return The number of slots connected to this signal
    */
   std::size_t GetConnectionCount() const
   {
@@ -185,10 +185,10 @@ public:
   }
 
   /**
-   * @brief Connect a function.
+   * @brief Connects a function.
    *
    * @SINCE_1_0.0
-   * @param[in] func The function to connect.
+   * @param[in] func The function to connect
    */
   void Connect( void (*func)() )
   {
@@ -196,10 +196,10 @@ public:
   }
 
   /**
-   * @brief Disconnect a function.
+   * @brief Disconnects a function.
    *
    * @SINCE_1_0.0
-   * @param[in] func The function to disconnect.
+   * @param[in] func The function to disconnect
    */
   void Disconnect( void (*func)() )
   {
@@ -207,11 +207,11 @@ public:
   }
 
   /**
-   * @brief Connect a member function.
+   * @brief Connects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] obj An object which must implement the ConnectionTrackerInterface.
-   * @param[in] func The member function to connect.
+   * @param[in] obj An object which must implement the ConnectionTrackerInterface
+   * @param[in] func The member function to connect
    */
   template<class X>
   void Connect( X* obj, void (X::*func)() )
@@ -220,11 +220,11 @@ public:
   }
 
   /**
-   * @brief Disconnect a member function.
+   * @brief Disconnects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] obj An object which must implement the ConnectionTrackerInterface.
-   * @param[in] func The member function to disconnect.
+   * @param[in] obj An object which must implement the ConnectionTrackerInterface
+   * @param[in] func The member function to disconnect
    */
   template<class X>
   void Disconnect( X* obj, void (X::*func)() )
@@ -233,11 +233,11 @@ public:
   }
 
   /**
-   * @brief Connect a member function.
+   * @brief Connects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] delegate A slot delegate.
-   * @param[in] func The member function to connect.
+   * @param[in] delegate A slot delegate
+   * @param[in] func The member function to connect
    */
   template<class X>
   void Connect( SlotDelegate<X>& delegate, void (X::*func)() )
@@ -246,11 +246,11 @@ public:
   }
 
   /**
-   * @brief Disconnect a member function.
+   * @brief Disconnects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] delegate A slot delegate.
-   * @param[in] func The member function to disconnect.
+   * @param[in] delegate A slot delegate
+   * @param[in] func The member function to disconnect
    */
   template<class X>
   void Disconnect( SlotDelegate<X>& delegate, void (X::*func)() )
@@ -259,11 +259,11 @@ public:
   }
 
   /**
-   * @brief Connect a function object.
+   * @brief Connects a function object.
    *
    * @SINCE_1_0.0
-   * @param[in] connectionTracker A connection tracker which can be used to disconnect.
-   * @param[in] func The function object to copy.
+   * @param[in] connectionTracker A connection tracker which can be used to disconnect
+   * @param[in] func The function object to copy
    */
   template<class X>
   void Connect( ConnectionTrackerInterface* connectionTracker, const X& func )
@@ -272,11 +272,11 @@ public:
   }
 
   /**
-   * @brief Connect a function object using FunctorDelegate.
+   * @brief Connects a function object using FunctorDelegate.
    *
    * @SINCE_1_0.0
-   * @param[in] connectionTracker A connection tracker which can be used to disconnect.
-   * @param[in] delegate A newly allocated FunctorDelegate (ownership is taken).
+   * @param[in] connectionTracker A connection tracker which can be used to disconnect
+   * @param[in] delegate A newly allocated FunctorDelegate (ownership is taken)
    */
   void Connect( ConnectionTrackerInterface* connectionTracker, FunctorDelegate* delegate )
   {
@@ -284,7 +284,7 @@ public:
   }
 
   /**
-   * @brief Emit the signal.
+   * @brief Emits the signal.
    * @SINCE_1_0.0
    */
   void Emit()
@@ -294,8 +294,10 @@ public:
 
 private:
 
-  Signal( const Signal& );                   ///< undefined copy constructor, signals don't support copying. @SINCE_1_0.0
-  Signal& operator=( const Signal& );        ///< undefined assignment operator @SINCE_1_0.0
+  Signal( const Signal& ) = delete; ///< Deleted copy constructor, signals don't support copying. @SINCE_1_0.0
+  Signal( Signal&& ) = delete; ///< Deleted move constructor, signals don't support moving. @SINCE_1_9.25
+  Signal& operator=( const Signal& ) = delete; ///< Deleted copy assignment operator @SINCE_1_0.0
+  Signal& operator=( Signal&& ) = delete; ///< Deleted move assignment operator @SINCE_1_9.25
 
 private:
 
@@ -329,10 +331,10 @@ public:
   }
 
   /**
-   * @brief Query whether there are any connected slots.
+   * @brief Queries whether there are any connected slots.
    *
    * @SINCE_1_0.0
-   * @return True if there are any slots connected to the signal.
+   * @return True if there are any slots connected to the signal
    */
   bool Empty() const
   {
@@ -340,20 +342,20 @@ public:
   }
 
   /**
-   * @brief Query the number of slots.
+   * @brief Queries the number of slots.
    *
    * @SINCE_1_0.0
-   * @return The number of slots connected to this signal.
+   * @return The number of slots connected to this signal
    */
   std::size_t GetConnectionCount() const
   {
     return mImpl.GetConnectionCount();
   }
   /**
-   * @brief Connect a function.
+   * @brief Connects a function.
    *
    * @SINCE_1_0.0
-   * @param[in] func The function to connect.
+   * @param[in] func The function to connect
    */
   void Connect( Ret (*func)() )
   {
@@ -361,10 +363,10 @@ public:
   }
 
   /**
-   * @brief Disconnect a function.
+   * @brief Disconnects a function.
    *
    * @SINCE_1_0.0
-   * @param[in] func The function to disconnect.
+   * @param[in] func The function to disconnect
    */
   void Disconnect( Ret (*func)() )
   {
@@ -372,11 +374,11 @@ public:
   }
 
   /**
-   * @brief Connect a member function.
+   * @brief Connects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] obj An object which must implement the ConnectionTrackerInterface.
-   * @param[in] func The member function to connect.
+   * @param[in] obj An object which must implement the ConnectionTrackerInterface
+   * @param[in] func The member function to connect
    */
   template<class X>
   void Connect( X* obj, Ret (X::*func)() )
@@ -385,11 +387,11 @@ public:
   }
 
   /**
-   * @brief Disconnect a member function.
+   * @brief Disconnects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] obj An object which must implement the ConnectionTrackerInterface.
-   * @param[in] func The member function to disconnect.
+   * @param[in] obj An object which must implement the ConnectionTrackerInterface
+   * @param[in] func The member function to disconnect
    */
   template<class X>
   void Disconnect( X* obj, Ret (X::*func)() )
@@ -398,11 +400,11 @@ public:
   }
 
   /**
-   * @brief Connect a member function.
+   * @brief Connects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] delegate A slot delegate.
-   * @param[in] func The member function to connect.
+   * @param[in] delegate A slot delegate
+   * @param[in] func The member function to connect
    */
   template<class X>
   void Connect( SlotDelegate<X>& delegate, Ret (X::*func)() )
@@ -411,11 +413,11 @@ public:
   }
 
   /**
-   * @brief Disconnect a member function.
+   * @brief Disconnects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] delegate A slot delegate.
-   * @param[in] func The member function to disconnect.
+   * @param[in] delegate A slot delegate
+   * @param[in] func The member function to disconnect
    */
   template<class X>
   void Disconnect( SlotDelegate<X>& delegate, Ret (X::*func)() )
@@ -424,11 +426,11 @@ public:
   }
 
   /**
-   * @brief Connect a function object.
+   * @brief Connects a function object.
    *
    * @SINCE_1_0.0
-   * @param[in] connectionTracker A connection tracker which can be used to disconnect.
-   * @param[in] func The function object to copy.
+   * @param[in] connectionTracker A connection tracker which can be used to disconnect
+   * @param[in] func The function object to copy
    */
   template<class X>
   void Connect( ConnectionTrackerInterface* connectionTracker, const X& func )
@@ -437,11 +439,11 @@ public:
   }
 
   /**
-   * @brief Connect a function object using FunctorDelegate.
+   * @brief Connects a function object using FunctorDelegate.
    *
    * @SINCE_1_0.0
-   * @param[in] connectionTracker A connection tracker which can be used to disconnect.
-   * @param[in] delegate A newly allocated FunctorDelegate (ownership is taken).
+   * @param[in] connectionTracker A connection tracker which can be used to disconnect
+   * @param[in] delegate A newly allocated FunctorDelegate (ownership is taken)
    */
   void Connect( ConnectionTrackerInterface* connectionTracker, FunctorDelegate* delegate )
   {
@@ -449,10 +451,10 @@ public:
   }
 
   /**
-   * @brief Emit the signal.
+   * @brief Emits the signal.
    *
    * @SINCE_1_0.0
-   * @return The value returned by the last callback, or a default constructed value if no callbacks are connected.
+   * @return The value returned by the last callback, or a default constructed value if no callbacks are connected
    */
   Ret Emit()
   {
@@ -461,8 +463,10 @@ public:
 
 private:
 
-  Signal( const Signal& );                   ///< undefined copy constructor, signals don't support copying. @SINCE_1_0.0
-  Signal& operator=( const Signal& );        ///< undefined assignment operator @SINCE_1_0.0
+  Signal( const Signal& ) = delete; ///< Deleted copy constructor, signals don't support copying. @SINCE_1_0.0
+  Signal( Signal&& ) = delete; ///< Deleted move constructor, signals don't support moving. @SINCE_1_9.25
+  Signal& operator=( const Signal& ) = delete; ///< Deleted copy assignment operator @SINCE_1_0.0
+  Signal& operator=( Signal&& ) = delete; ///< Deleted move assignment operator @SINCE_1_9.25
 
 private:
 
@@ -496,10 +500,10 @@ public:
   }
 
   /**
-   * @brief Query whether there are any connected slots.
+   * @brief Queries whether there are any connected slots.
    *
    * @SINCE_1_0.0
-   * @return True if there are any slots connected to the signal.
+   * @return True if there are any slots connected to the signal
    */
   bool Empty() const
   {
@@ -507,20 +511,20 @@ public:
   }
 
   /**
-   * @brief Query the number of slots.
+   * @brief Queries the number of slots.
    *
    * @SINCE_1_0.0
-   * @return The number of slots connected to this signal.
+   * @return The number of slots connected to this signal
    */
   std::size_t GetConnectionCount() const
   {
     return mImpl.GetConnectionCount();
   }
   /**
-   * @brief Connect a function.
+   * @brief Connects a function.
    *
    * @SINCE_1_0.0
-   * @param[in] func The function to connect.
+   * @param[in] func The function to connect
    */
   void Connect( void (*func)( Arg0 arg0 ) )
   {
@@ -528,10 +532,10 @@ public:
   }
 
   /**
-   * @brief Disconnect a function.
+   * @brief Disconnects a function.
    *
    * @SINCE_1_0.0
-   * @param[in] func The function to disconnect.
+   * @param[in] func The function to disconnect
    */
   void Disconnect( void (*func)( Arg0 arg0 ) )
   {
@@ -539,11 +543,11 @@ public:
   }
 
   /**
-   * @brief Connect a member function.
+   * @brief Connects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] obj An object which must implement the ConnectionTrackerInterface.
-   * @param[in] func The member function to connect.
+   * @param[in] obj An object which must implement the ConnectionTrackerInterface
+   * @param[in] func The member function to connect
    */
   template<class X>
   void Connect( X* obj, void (X::*func)( Arg0 arg0 ) )
@@ -552,11 +556,11 @@ public:
   }
 
   /**
-   * @brief Disconnect a member function.
+   * @brief Disconnects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] obj An object which must implement the ConnectionTrackerInterface.
-   * @param[in] func The member function to disconnect.
+   * @param[in] obj An object which must implement the ConnectionTrackerInterface
+   * @param[in] func The member function to disconnect
    */
   template<class X>
   void Disconnect( X* obj, void (X::*func)( Arg0 arg0 ) )
@@ -565,11 +569,11 @@ public:
   }
 
   /**
-   * @brief Connect a member function.
+   * @brief Connects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] delegate A slot delegate.
-   * @param[in] func The member function to connect.
+   * @param[in] delegate A slot delegate
+   * @param[in] func The member function to connect
    */
   template<class X>
   void Connect( SlotDelegate<X>& delegate, void (X::*func)( Arg0 arg0 ) )
@@ -578,11 +582,11 @@ public:
   }
 
   /**
-   * @brief Disconnect a member function.
+   * @brief Disconnects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] delegate A slot delegate.
-   * @param[in] func The member function to disconnect.
+   * @param[in] delegate A slot delegate
+   * @param[in] func The member function to disconnect
    */
   template<class X>
   void Disconnect( SlotDelegate<X>& delegate, void (X::*func)( Arg0 arg0 ) )
@@ -591,11 +595,11 @@ public:
   }
 
   /**
-   * @brief Connect a function object.
+   * @brief Connects a function object.
    *
    * @SINCE_1_0.0
-   * @param[in] connectionTracker A connection tracker which can be used to disconnect.
-   * @param[in] func The function object to copy.
+   * @param[in] connectionTracker A connection tracker which can be used to disconnect
+   * @param[in] func The function object to copy
    */
   template<class X>
   void Connect( ConnectionTrackerInterface* connectionTracker, const X& func )
@@ -604,11 +608,11 @@ public:
   }
 
   /**
-   * @brief Connect a function object using FunctorDelegate.
+   * @brief Connects a function object using FunctorDelegate.
    *
    * @SINCE_1_0.0
-   * @param[in] connectionTracker A connection tracker which can be used to disconnect.
-   * @param[in] delegate A newly allocated FunctorDelegate (ownership is taken).
+   * @param[in] connectionTracker A connection tracker which can be used to disconnect
+   * @param[in] delegate A newly allocated FunctorDelegate (ownership is taken)
    */
   void Connect( ConnectionTrackerInterface* connectionTracker, FunctorDelegate* delegate )
   {
@@ -616,10 +620,10 @@ public:
   }
 
   /**
-   * @brief Emit the signal.
+   * @brief Emits the signal.
    *
    * @SINCE_1_0.0
-   * @param[in] arg0 The first value to pass to callbacks.
+   * @param[in] arg0 The first value to pass to callbacks
    */
   void Emit( Arg0 arg0 )
   {
@@ -628,8 +632,10 @@ public:
 
 private:
 
-  Signal( const Signal& );                   ///< undefined copy constructor, signals don't support copying. @SINCE_1_0.0
-  Signal& operator=( const Signal& );        ///< undefined assignment operator @SINCE_1_0.0
+  Signal( const Signal& ) = delete; ///< Deleted copy constructor, signals don't support copying. @SINCE_1_0.0
+  Signal( Signal&& ) = delete; ///< Deleted move constructor, signals don't support moving. @SINCE_1_9.25
+  Signal& operator=( const Signal& ) = delete; ///< Deleted copy assignment operator @SINCE_1_0.0
+  Signal& operator=( Signal&& ) = delete; ///< Deleted move assignment operator @SINCE_1_9.25
 
 private:
 
@@ -663,10 +669,10 @@ public:
   }
 
   /**
-   * @brief Query whether there are any connected slots.
+   * @brief Queries whether there are any connected slots.
    *
    * @SINCE_1_0.0
-   * @return True if there are any slots connected to the signal.
+   * @return True if there are any slots connected to the signal
    */
   bool Empty() const
   {
@@ -674,20 +680,20 @@ public:
   }
 
   /**
-   * @brief Query the number of slots.
+   * @brief Queries the number of slots.
    *
    * @SINCE_1_0.0
-   * @return The number of slots connected to this signal.
+   * @return The number of slots connected to this signal
    */
   std::size_t GetConnectionCount() const
   {
     return mImpl.GetConnectionCount();
   }
   /**
-   * @brief Connect a function.
+   * @brief Connects a function.
    *
    * @SINCE_1_0.0
-   * @param[in] func The function to connect.
+   * @param[in] func The function to connect
    */
   void Connect( Ret (*func)( Arg0 arg0 ) )
   {
@@ -695,10 +701,10 @@ public:
   }
 
   /**
-   * @brief Disconnect a function.
+   * @brief Disconnects a function.
    *
    * @SINCE_1_0.0
-   * @param[in] func The function to disconnect.
+   * @param[in] func The function to disconnect
    */
   void Disconnect( Ret (*func)( Arg0 arg0 ) )
   {
@@ -706,11 +712,11 @@ public:
   }
 
   /**
-   * @brief Connect a member function.
+   * @brief Connects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] obj An object which must implement the ConnectionTrackerInterface.
-   * @param[in] func The member function to connect.
+   * @param[in] obj An object which must implement the ConnectionTrackerInterface
+   * @param[in] func The member function to connect
    */
   template<class X>
   void Connect( X* obj, Ret (X::*func)( Arg0 arg0 ) )
@@ -719,11 +725,11 @@ public:
   }
 
   /**
-   * @brief Disconnect a member function.
+   * @brief Disconnects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] obj An object which must implement the ConnectionTrackerInterface.
-   * @param[in] func The member function to disconnect.
+   * @param[in] obj An object which must implement the ConnectionTrackerInterface
+   * @param[in] func The member function to disconnect
    */
   template<class X>
   void Disconnect( X* obj, Ret (X::*func)( Arg0 arg0 ) )
@@ -732,11 +738,11 @@ public:
   }
 
   /**
-   * @brief Connect a member function.
+   * @brief Connects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] delegate A slot delegate.
-   * @param[in] func The member function to connect.
+   * @param[in] delegate A slot delegate
+   * @param[in] func The member function to connect
    */
   template<class X>
   void Connect( SlotDelegate<X>& delegate, Ret (X::*func)( Arg0 arg0 ) )
@@ -745,11 +751,11 @@ public:
   }
 
   /**
-   * @brief Disconnect a member function.
+   * @brief Disconnects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] delegate A slot delegate.
-   * @param[in] func The member function to disconnect.
+   * @param[in] delegate A slot delegate
+   * @param[in] func The member function to disconnect
    */
   template<class X>
   void Disconnect( SlotDelegate<X>& delegate, Ret (X::*func)( Arg0 arg0 ) )
@@ -758,11 +764,11 @@ public:
   }
 
   /**
-   * @brief Connect a function object.
+   * @brief Connects a function object.
    *
    * @SINCE_1_0.0
-   * @param[in] connectionTracker A connection tracker which can be used to disconnect.
-   * @param[in] func The function object to copy.
+   * @param[in] connectionTracker A connection tracker which can be used to disconnect
+   * @param[in] func The function object to copy
    */
   template<class X>
   void Connect( ConnectionTrackerInterface* connectionTracker, const X& func )
@@ -771,11 +777,11 @@ public:
   }
 
   /**
-   * @brief Connect a function object using FunctorDelegate.
+   * @brief Connects a function object using FunctorDelegate.
    *
    * @SINCE_1_0.0
-   * @param[in] connectionTracker A connection tracker which can be used to disconnect.
-   * @param[in] delegate A newly allocated FunctorDelegate (ownership is taken).
+   * @param[in] connectionTracker A connection tracker which can be used to disconnect
+   * @param[in] delegate A newly allocated FunctorDelegate (ownership is taken)
    */
   void Connect( ConnectionTrackerInterface* connectionTracker, FunctorDelegate* delegate )
   {
@@ -783,11 +789,11 @@ public:
   }
 
   /**
-   * @brief Emit the signal.
+   * @brief Emits the signal.
    *
    * @SINCE_1_0.0
-   * @param[in] arg0 The first value to pass to callbacks.
-   * @return The value returned by the last callback, or a default constructed value if no callbacks are connected.
+   * @param[in] arg0 The first value to pass to callbacks
+   * @return The value returned by the last callback, or a default constructed value if no callbacks are connected
    */
   Ret Emit( Arg0 arg0 )
   {
@@ -796,8 +802,10 @@ public:
 
 private:
 
-  Signal( const Signal& );                   ///< undefined copy constructor, signals don't support copying. @SINCE_1_0.0
-  Signal& operator=( const Signal& );        ///< undefined assignment operator @SINCE_1_0.0
+  Signal( const Signal& ) = delete; ///< Deleted copy constructor, signals don't support copying. @SINCE_1_0.0
+  Signal( Signal&& ) = delete; ///< Deleted move constructor, signals don't support moving. @SINCE_1_9.25
+  Signal& operator=( const Signal& ) = delete; ///< Deleted copy assignment operator @SINCE_1_0.0
+  Signal& operator=( Signal&& ) = delete; ///< Deleted move assignment operator @SINCE_1_9.25
 
 private:
 
@@ -834,10 +842,10 @@ public:
   }
 
   /**
-   * @brief Query whether there are any connected slots.
+   * @brief Queries whether there are any connected slots.
    *
    * @SINCE_1_0.0
-   * @return True if there are any slots connected to the signal.
+   * @return True if there are any slots connected to the signal
    */
   bool Empty() const
   {
@@ -845,20 +853,20 @@ public:
   }
 
   /**
-   * @brief Query the number of slots.
+   * @brief Queries the number of slots.
    *
    * @SINCE_1_0.0
-   * @return The number of slots connected to this signal.
+   * @return The number of slots connected to this signal
    */
   std::size_t GetConnectionCount() const
   {
     return mImpl.GetConnectionCount();
   }
   /**
-   * @brief Connect a function.
+   * @brief Connects a function.
    *
    * @SINCE_1_0.0
-   * @param[in] func The function to connect.
+   * @param[in] func The function to connect
    */
   void Connect( void (*func)( Arg0 arg0, Arg1 arg1 ) )
   {
@@ -866,10 +874,10 @@ public:
   }
 
   /**
-   * @brief Disconnect a function.
+   * @brief Disconnects a function.
    *
    * @SINCE_1_0.0
-   * @param[in] func The function to disconnect.
+   * @param[in] func The function to disconnect
    */
   void Disconnect( void (*func)( Arg0 arg0, Arg1 arg1 ) )
   {
@@ -877,11 +885,11 @@ public:
   }
 
   /**
-   * @brief Connect a member function.
+   * @brief Connects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] obj An object which must implement the ConnectionTrackerInterface.
-   * @param[in] func The member function to connect.
+   * @param[in] obj An object which must implement the ConnectionTrackerInterface
+   * @param[in] func The member function to connect
    */
   template<class X>
   void Connect( X* obj, void (X::*func)( Arg0 arg0, Arg1 arg1 ) )
@@ -890,11 +898,11 @@ public:
   }
 
   /**
-   * @brief Disconnect a member function.
+   * @brief Disconnects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] obj An object which must implement the ConnectionTrackerInterface.
-   * @param[in] func The member function to disconnect.
+   * @param[in] obj An object which must implement the ConnectionTrackerInterface
+   * @param[in] func The member function to disconnect
    */
   template<class X>
   void Disconnect( X* obj, void (X::*func)( Arg0 arg0, Arg1 arg1 ) )
@@ -903,11 +911,11 @@ public:
   }
 
   /**
-   * @brief Connect a member function.
+   * @brief Connects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] delegate A slot delegate.
-   * @param[in] func The member function to connect.
+   * @param[in] delegate A slot delegate
+   * @param[in] func The member function to connect
    */
   template<class X>
   void Connect( SlotDelegate<X>& delegate, void (X::*func)( Arg0 arg0, Arg1 arg1 ) )
@@ -916,11 +924,11 @@ public:
   }
 
   /**
-   * @brief Disconnect a member function.
+   * @brief Disconnects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] delegate A slot delegate.
-   * @param[in] func The member function to disconnect.
+   * @param[in] delegate A slot delegate
+   * @param[in] func The member function to disconnect
    */
   template<class X>
   void Disconnect( SlotDelegate<X>& delegate, void (X::*func)( Arg0 arg0, Arg1 arg1 ) )
@@ -929,11 +937,11 @@ public:
   }
 
   /**
-   * @brief Connect a function object.
+   * @brief Connects a function object.
    *
    * @SINCE_1_0.0
-   * @param[in] connectionTracker A connection tracker which can be used to disconnect.
-   * @param[in] func The function object to copy.
+   * @param[in] connectionTracker A connection tracker which can be used to disconnect
+   * @param[in] func The function object to copy
    */
   template<class X>
   void Connect( ConnectionTrackerInterface* connectionTracker, const X& func )
@@ -942,11 +950,11 @@ public:
   }
 
   /**
-   * @brief Connect a function object using FunctorDelegate.
+   * @brief Connects a function object using FunctorDelegate.
    *
    * @SINCE_1_0.0
-   * @param[in] connectionTracker A connection tracker which can be used to disconnect.
-   * @param[in] delegate A newly allocated FunctorDelegate (ownership is taken).
+   * @param[in] connectionTracker A connection tracker which can be used to disconnect
+   * @param[in] delegate A newly allocated FunctorDelegate (ownership is taken)
    */
   void Connect( ConnectionTrackerInterface* connectionTracker, FunctorDelegate* delegate )
   {
@@ -954,11 +962,11 @@ public:
   }
 
   /**
-   * @brief Emit the signal.
+   * @brief Emits the signal.
    *
    * @SINCE_1_0.0
-   * @param[in] arg0 The first value to pass to callbacks.
-   * @param[in] arg1 The second value to pass to callbacks.
+   * @param[in] arg0 The first value to pass to callbacks
+   * @param[in] arg1 The second value to pass to callbacks
    */
   void Emit( Arg0 arg0, Arg1 arg1 )
   {
@@ -967,8 +975,10 @@ public:
 
 private:
 
-  Signal( const Signal& );                   ///< undefined copy constructor, signals don't support copying. @SINCE_1_0.0
-  Signal& operator=( const Signal& );        ///< undefined assignment operator @SINCE_1_0.0
+  Signal( const Signal& ) = delete; ///< Deleted copy constructor, signals don't support copying. @SINCE_1_0.0
+  Signal( Signal&& ) = delete; ///< Deleted move constructor, signals don't support moving. @SINCE_1_9.25
+  Signal& operator=( const Signal& ) = delete; ///< Deleted copy assignment operator @SINCE_1_0.0
+  Signal& operator=( Signal&& ) = delete; ///< Deleted move assignment operator @SINCE_1_9.25
 
 private:
 
@@ -1002,10 +1012,10 @@ public:
   }
 
   /**
-   * @brief Query whether there are any connected slots.
+   * @brief Queries whether there are any connected slots.
    *
    * @SINCE_1_0.0
-   * @return True if there are any slots connected to the signal.
+   * @return True if there are any slots connected to the signal
    */
   bool Empty() const
   {
@@ -1013,19 +1023,19 @@ public:
   }
 
   /**
-   * @brief Query the number of slots.
+   * @brief Queries the number of slots.
    *
    * @SINCE_1_0.0
-   * @return The number of slots connected to this signal.
+   * @return The number of slots connected to this signal
    */
   std::size_t GetConnectionCount() const
   {
     return mImpl.GetConnectionCount();
   }
   /**
-   * @brief Connect a function.
+   * @brief Connects a function.
    * @SINCE_1_0.0
-   * @param[in] func The function to connect.
+   * @param[in] func The function to connect
    */
   void Connect( Ret (*func)( Arg0 arg0, Arg1 arg1 ) )
   {
@@ -1033,10 +1043,10 @@ public:
   }
 
   /**
-   * @brief Disconnect a function.
+   * @brief Disconnects a function.
    *
    * @SINCE_1_0.0
-   * @param[in] func The function to disconnect.
+   * @param[in] func The function to disconnect
    */
   void Disconnect( Ret (*func)( Arg0 arg0, Arg1 arg1 ) )
   {
@@ -1044,11 +1054,11 @@ public:
   }
 
   /**
-   * @brief Connect a member function.
+   * @brief Connects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] obj An object which must implement the ConnectionTrackerInterface.
-   * @param[in] func The member function to connect.
+   * @param[in] obj An object which must implement the ConnectionTrackerInterface
+   * @param[in] func The member function to connect
    */
   template<class X>
   void Connect( X* obj, Ret (X::*func)( Arg0 arg0, Arg1 arg1 ) )
@@ -1057,11 +1067,11 @@ public:
   }
 
   /**
-   * @brief Disconnect a member function.
+   * @brief Disconnects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] obj An object which must implement the ConnectionTrackerInterface.
-   * @param[in] func The member function to disconnect.
+   * @param[in] obj An object which must implement the ConnectionTrackerInterface
+   * @param[in] func The member function to disconnect
    */
   template<class X>
   void Disconnect( X* obj, Ret (X::*func)( Arg0 arg0, Arg1 arg1 ) )
@@ -1070,11 +1080,11 @@ public:
   }
 
   /**
-   * @brief Connect a member function.
+   * @brief Connects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] delegate A slot delegate.
-   * @param[in] func The member function to connect.
+   * @param[in] delegate A slot delegate
+   * @param[in] func The member function to connect
    */
   template<class X>
   void Connect( SlotDelegate<X>& delegate, Ret (X::*func)( Arg0 arg0, Arg1 arg1 ) )
@@ -1083,11 +1093,11 @@ public:
   }
 
   /**
-   * @brief Disconnect a member function.
+   * @brief Disconnects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] delegate A slot delegate.
-   * @param[in] func The member function to disconnect.
+   * @param[in] delegate A slot delegate
+   * @param[in] func The member function to disconnect
    */
   template<class X>
   void Disconnect( SlotDelegate<X>& delegate, Ret (X::*func)( Arg0 arg0, Arg1 arg1 ) )
@@ -1096,11 +1106,11 @@ public:
   }
 
   /**
-   * @brief Connect a function object.
+   * @brief Connects a function object.
    *
    * @SINCE_1_0.0
-   * @param[in] connectionTracker A connection tracker which can be used to disconnect.
-   * @param[in] func The function object to copy.
+   * @param[in] connectionTracker A connection tracker which can be used to disconnect
+   * @param[in] func The function object to copy
    */
   template<class X>
   void Connect( ConnectionTrackerInterface* connectionTracker, const X& func )
@@ -1109,11 +1119,11 @@ public:
   }
 
   /**
-   * @brief Connect a function object using FunctorDelegate.
+   * @brief Connects a function object using FunctorDelegate.
    *
    * @SINCE_1_0.0
-   * @param[in] connectionTracker A connection tracker which can be used to disconnect.
-   * @param[in] delegate A newly allocated FunctorDelegate (ownership is taken).
+   * @param[in] connectionTracker A connection tracker which can be used to disconnect
+   * @param[in] delegate A newly allocated FunctorDelegate (ownership is taken)
    */
   void Connect( ConnectionTrackerInterface* connectionTracker, FunctorDelegate* delegate )
   {
@@ -1121,12 +1131,12 @@ public:
   }
 
   /**
-   * @brief Emit the signal.
+   * @brief Emits the signal.
    *
    * @SINCE_1_0.0
-   * @param[in] arg0 The first value to pass to callbacks.
-   * @param[in] arg1 The second value to pass to callbacks.
-   * @return The value returned by the last callback, or a default constructed value if no callbacks are connected.
+   * @param[in] arg0 The first value to pass to callbacks
+   * @param[in] arg1 The second value to pass to callbacks
+   * @return The value returned by the last callback, or a default constructed value if no callbacks are connected
    */
   Ret Emit( Arg0 arg0, Arg1 arg1 )
   {
@@ -1135,8 +1145,10 @@ public:
 
 private:
 
-  Signal( const Signal& );                   ///< undefined copy constructor, signals don't support copying. @SINCE_1_0.0
-  Signal& operator=( const Signal& );        ///< undefined assignment operator @SINCE_1_0.0
+  Signal( const Signal& ) = delete; ///< Deleted copy constructor, signals don't support copying. @SINCE_1_0.0
+  Signal( Signal&& ) = delete; ///< Deleted move constructor, signals don't support moving. @SINCE_1_9.25
+  Signal& operator=( const Signal& ) = delete; ///< Deleted copy assignment operator @SINCE_1_0.0
+  Signal& operator=( Signal&& ) = delete; ///< Deleted move assignment operator @SINCE_1_9.25
 
 private:
 
@@ -1170,10 +1182,10 @@ public:
   }
 
   /**
-   * @brief Query whether there are any connected slots.
+   * @brief Queries whether there are any connected slots.
    *
    * @SINCE_1_0.0
-   * @return True if there are any slots connected to the signal.
+   * @return True if there are any slots connected to the signal
    */
   bool Empty() const
   {
@@ -1181,20 +1193,20 @@ public:
   }
 
   /**
-   * @brief Query the number of slots.
+   * @brief Queries the number of slots.
    *
    * @SINCE_1_0.0
-   * @return The number of slots connected to this signal.
+   * @return The number of slots connected to this signal
    */
   std::size_t GetConnectionCount() const
   {
     return mImpl.GetConnectionCount();
   }
   /**
-   * @brief Connect a function.
+   * @brief Connects a function.
    *
    * @SINCE_1_0.0
-   * @param[in] func The function to connect.
+   * @param[in] func The function to connect
    */
   void Connect( void (*func)( Arg0 arg0, Arg1 arg1, Arg2 arg2 ) )
   {
@@ -1202,10 +1214,10 @@ public:
   }
 
   /**
-   * @brief Disconnect a function.
+   * @brief Disconnects a function.
    *
    * @SINCE_1_0.0
-   * @param[in] func The function to disconnect.
+   * @param[in] func The function to disconnect
    */
   void Disconnect( void (*func)( Arg0 arg0, Arg1 arg1, Arg2 arg2 ) )
   {
@@ -1213,11 +1225,11 @@ public:
   }
 
   /**
-   * @brief Connect a member function.
+   * @brief Connects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] obj An object which must implement the ConnectionTrackerInterface.
-   * @param[in] func The member function to connect.
+   * @param[in] obj An object which must implement the ConnectionTrackerInterface
+   * @param[in] func The member function to connect
    */
   template<class X>
   void Connect( X* obj, void (X::*func)( Arg0 arg0, Arg1 arg1, Arg2 arg2 ) )
@@ -1226,11 +1238,11 @@ public:
   }
 
   /**
-   * @brief Disconnect a member function.
+   * @brief Disconnects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] obj An object which must implement the ConnectionTrackerInterface.
-   * @param[in] func The member function to disconnect.
+   * @param[in] obj An object which must implement the ConnectionTrackerInterface
+   * @param[in] func The member function to disconnect
    */
   template<class X>
   void Disconnect( X* obj, void (X::*func)( Arg0 arg0, Arg1 arg1, Arg2 arg2 ) )
@@ -1239,11 +1251,11 @@ public:
   }
 
   /**
-   * @brief Connect a member function.
+   * @brief Connects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] delegate A slot delegate.
-   * @param[in] func The member function to connect.
+   * @param[in] delegate A slot delegate
+   * @param[in] func The member function to connect
    */
   template<class X>
   void Connect( SlotDelegate<X>& delegate, void (X::*func)( Arg0 arg0, Arg1 arg1, Arg2 arg2 ) )
@@ -1252,11 +1264,11 @@ public:
   }
 
   /**
-   * @brief Disconnect a member function.
+   * @brief Disconnects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] delegate A slot delegate.
-   * @param[in] func The member function to disconnect.
+   * @param[in] delegate A slot delegate
+   * @param[in] func The member function to disconnect
    */
   template<class X>
   void Disconnect( SlotDelegate<X>& delegate, void (X::*func)( Arg0 arg0, Arg1 arg1, Arg2 arg2 ) )
@@ -1265,11 +1277,11 @@ public:
   }
 
   /**
-   * @brief Connect a function object.
+   * @brief Connects a function object.
    *
    * @SINCE_1_0.0
-   * @param[in] connectionTracker A connection tracker which can be used to disconnect.
-   * @param[in] func The function object to copy.
+   * @param[in] connectionTracker A connection tracker which can be used to disconnect
+   * @param[in] func The function object to copy
    */
   template<class X>
   void Connect( ConnectionTrackerInterface* connectionTracker, const X& func )
@@ -1278,11 +1290,11 @@ public:
   }
 
   /**
-   * @brief Connect a function object using FunctorDelegate.
+   * @brief Connects a function object using FunctorDelegate.
    *
    * @SINCE_1_0.0
-   * @param[in] connectionTracker A connection tracker which can be used to disconnect.
-   * @param[in] delegate A newly allocated FunctorDelegate (ownership is taken).
+   * @param[in] connectionTracker A connection tracker which can be used to disconnect
+   * @param[in] delegate A newly allocated FunctorDelegate (ownership is taken)
    */
   void Connect( ConnectionTrackerInterface* connectionTracker, FunctorDelegate* delegate )
   {
@@ -1290,12 +1302,12 @@ public:
   }
 
   /**
-   * @brief Emit the signal.
+   * @brief Emits the signal.
    *
    * @SINCE_1_0.0
-   * @param[in] arg0 The first value to pass to callbacks.
-   * @param[in] arg1 The second value to pass to callbacks.
-   * @param[in] arg2 The third value to pass to callbacks.
+   * @param[in] arg0 The first value to pass to callbacks
+   * @param[in] arg1 The second value to pass to callbacks
+   * @param[in] arg2 The third value to pass to callbacks
    */
   void Emit( Arg0 arg0, Arg1 arg1, Arg2 arg2 )
   {
@@ -1304,8 +1316,10 @@ public:
 
 private:
 
-  Signal( const Signal& );                   ///< undefined copy constructor, signals don't support copying. @SINCE_1_0.0
-  Signal& operator=( const Signal& );        ///< undefined assignment operator @SINCE_1_0.0
+  Signal( const Signal& ) = delete; ///< Deleted copy constructor, signals don't support copying. @SINCE_1_0.0
+  Signal( Signal&& ) = delete; ///< Deleted move constructor, signals don't support moving. @SINCE_1_9.25
+  Signal& operator=( const Signal& ) = delete; ///< Deleted copy assignment operator @SINCE_1_0.0
+  Signal& operator=( Signal&& ) = delete; ///< Deleted move assignment operator @SINCE_1_9.25
 
 private:
 
@@ -1339,10 +1353,10 @@ public:
   }
 
   /**
-   * @brief Query whether there are any connected slots.
+   * @brief Queries whether there are any connected slots.
    *
    * @SINCE_1_0.0
-   * @return True if there are any slots connected to the signal.
+   * @return True if there are any slots connected to the signal
    */
   bool Empty() const
   {
@@ -1350,10 +1364,10 @@ public:
   }
 
   /**
-   * @brief Query the number of slots.
+   * @brief Queries the number of slots.
    *
    * @SINCE_1_0.0
-   * @return The number of slots connected to this signal.
+   * @return The number of slots connected to this signal
    */
   std::size_t GetConnectionCount() const
   {
@@ -1361,10 +1375,10 @@ public:
   }
 
   /**
-   * @brief Connect a function.
+   * @brief Connects a function.
    *
    * @SINCE_1_0.0
-   * @param[in] func The function to connect.
+   * @param[in] func The function to connect
    */
   void Connect( Ret (*func)( Arg0 arg0, Arg1 arg1, Arg2 arg2 ) )
   {
@@ -1372,10 +1386,10 @@ public:
   }
 
   /**
-   * @brief Disconnect a function.
+   * @brief Disconnects a function.
    *
    * @SINCE_1_0.0
-   * @param[in] func The function to disconnect.
+   * @param[in] func The function to disconnect
    */
   void Disconnect( Ret (*func)( Arg0 arg0, Arg1 arg1, Arg2 arg2 ) )
   {
@@ -1383,11 +1397,11 @@ public:
   }
 
   /**
-   * @brief Connect a member function.
+   * @brief Connects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] obj An object which must implement the ConnectionTrackerInterface.
-   * @param[in] func The member function to connect.
+   * @param[in] obj An object which must implement the ConnectionTrackerInterface
+   * @param[in] func The member function to connect
    */
   template<class X>
   void Connect( X* obj, Ret (X::*func)( Arg0 arg0, Arg1 arg1, Arg2 arg2 ) )
@@ -1396,11 +1410,11 @@ public:
   }
 
   /**
-   * @brief Disconnect a member function.
+   * @brief Disconnects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] obj An object which must implement the ConnectionTrackerInterface.
-   * @param[in] func The member function to disconnect.
+   * @param[in] obj An object which must implement the ConnectionTrackerInterface
+   * @param[in] func The member function to disconnect
    */
   template<class X>
   void Disconnect( X* obj, Ret (X::*func)( Arg0 arg0, Arg1 arg1, Arg2 arg2 ) )
@@ -1409,11 +1423,11 @@ public:
   }
 
   /**
-   * @brief Connect a member function.
+   * @brief Connects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] delegate A slot delegate.
-   * @param[in] func The member function to connect.
+   * @param[in] delegate A slot delegate
+   * @param[in] func The member function to connect
    */
   template<class X>
   void Connect( SlotDelegate<X>& delegate, Ret (X::*func)( Arg0 arg0, Arg1 arg1, Arg2 arg2 ) )
@@ -1422,11 +1436,11 @@ public:
   }
 
   /**
-   * @brief Disconnect a member function.
+   * @brief Disconnects a member function.
    *
    * @SINCE_1_0.0
-   * @param[in] delegate A slot delegate.
-   * @param[in] func The member function to disconnect.
+   * @param[in] delegate A slot delegate
+   * @param[in] func The member function to disconnect
    */
   template<class X>
   void Disconnect( SlotDelegate<X>& delegate, Ret (X::*func)( Arg0 arg0, Arg1 arg1, Arg2 arg2 ) )
@@ -1435,11 +1449,11 @@ public:
   }
 
   /**
-   * @brief Connect a function object.
+   * @brief Connects a function object.
    *
    * @SINCE_1_0.0
-   * @param[in] connectionTracker A connection tracker which can be used to disconnect.
-   * @param[in] func The function object to copy.
+   * @param[in] connectionTracker A connection tracker which can be used to disconnect
+   * @param[in] func The function object to copy
    */
   template<class X>
   void Connect( ConnectionTrackerInterface* connectionTracker, const X& func )
@@ -1448,11 +1462,11 @@ public:
   }
 
   /**
-   * @brief Connect a function object using FunctorDelegate.
+   * @brief Connects a function object using FunctorDelegate.
    *
    * @SINCE_1_0.0
-   * @param[in] connectionTracker A connection tracker which can be used to disconnect.
-   * @param[in] delegate A newly allocated FunctorDelegate (ownership is taken).
+   * @param[in] connectionTracker A connection tracker which can be used to disconnect
+   * @param[in] delegate A newly allocated FunctorDelegate (ownership is taken)
    */
   void Connect( ConnectionTrackerInterface* connectionTracker, FunctorDelegate* delegate )
   {
@@ -1460,13 +1474,13 @@ public:
   }
 
   /**
-   * @brief Emit the signal.
+   * @brief Emits the signal.
    *
    * @SINCE_1_0.0
-   * @param[in] arg0 The first value to pass to callbacks.
-   * @param[in] arg1 The second value to pass to callbacks.
-   * @param[in] arg2 The third value to pass to callbacks.
-   * @return The value returned by the last callback, or a default constructed value if no callbacks are connected.
+   * @param[in] arg0 The first value to pass to callbacks
+   * @param[in] arg1 The second value to pass to callbacks
+   * @param[in] arg2 The third value to pass to callbacks
+   * @return The value returned by the last callback, or a default constructed value if no callbacks are connected
    */
   Ret Emit( Arg0 arg0, Arg1 arg1, Arg2 arg2 )
   {
@@ -1475,8 +1489,10 @@ public:
 
 private:
 
-  Signal( const Signal& );                   ///< undefined copy constructor, signals don't support copying. @SINCE_1_0.0
-  Signal& operator=( const Signal& );        ///< undefined assignment operator @SINCE_1_0.0
+  Signal( const Signal& ) = delete; ///< Deleted copy constructor, signals don't support copying. @SINCE_1_0.0
+  Signal( Signal&& ) = delete; ///< Deleted move constructor, signals don't support moving. @SINCE_1_9.25
+  Signal& operator=( const Signal& ) = delete; ///< Deleted copy assignment operator @SINCE_1_0.0
+  Signal& operator=( Signal&& ) = delete; ///< Deleted move assignment operator @SINCE_1_9.25
 
 private:
 
@@ -1489,4 +1505,4 @@ private:
  */
 } // namespace Dali
 
-#endif // __DALI_SIGNAL_H__
+#endif // DALI_SIGNAL_H