Merge "Changed 'virtual' function override declarations to 'override' in automated...

[platform/core/uifw/dali-core.git] / dali / integration-api / scene.h

diff --git a/dali/integration-api/scene.h b/dali/integration-api/scene.h
old mode 100755 (executable)
new mode 100644 (file)
index c335154..6225563
--- a/dali/integration-api/scene.h
+++ b/dali/integration-api/scene.h
@@ -31,7 +31,7 @@ namespace Dali
 {
 
 class Actor;
-struct KeyEvent;
+class KeyEvent;
 class Layer;
 class RenderTaskList;
 class TouchEvent;
@@ -56,11 +56,11 @@ struct Event;
 class DALI_CORE_API Scene : public BaseHandle
 {
 public:
-  typedef Signal< void () > EventProcessingFinishedSignalType; ///< Event Processing finished signal type
-  typedef Signal< void (const Dali::KeyEvent&) > KeyEventSignalType; ///< Key event signal type
-  typedef Signal< bool (const Dali::KeyEvent&) > KeyEventGeneratedSignalType; ///< key event generated signal type
-  typedef Signal< void (const Dali::TouchEvent&) > TouchSignalType; ///< Touch signal type
-  typedef Signal< void (const Dali::WheelEvent&) > WheelEventSignalType; ///< Touched signal type
+  using EventProcessingFinishedSignalType = Signal<void()>;                          ///< Event Processing finished signal type
+  using KeyEventSignalType                = Signal<void( const Dali::KeyEvent& )>;   ///< Key event signal type
+  using KeyEventGeneratedSignalType       = Signal<bool( const Dali::KeyEvent& )>;   ///< key event generated signal type
+  using TouchEventSignalType              = Signal<void( const Dali::TouchEvent& )>; ///< Touch signal type
+  using WheelEventSignalType              = Signal<void( const Dali::WheelEvent& )>; ///< WheelEvent signal type
 
   using FrameCallbackContainer = std::vector< std::pair< std::unique_ptr< CallbackBase >, int32_t > >;
 
@@ -334,7 +334,7 @@ public:
    * @return The touch signal to connect to
    * @note Motion events are not emitted.
    */
-  TouchSignalType& TouchSignal();
+  TouchEventSignalType& TouchedSignal();
 
   /**
    * @brief This signal is emitted when wheel event is received.