Merge "Removed TouchEvent from actor & stage" into devel/master

[platform/core/uifw/dali-core.git] / dali / internal / event / common / scene-impl.h

diff --git a/dali/internal/event/common/scene-impl.h b/dali/internal/event/common/scene-impl.h
index 99a3e50..9b95c2a 100644 (file)
--- a/dali/internal/event/common/scene-impl.h
+++ b/dali/internal/event/common/scene-impl.h
@@ -205,10 +205,9 @@ public:
 
   /**
    * Emits the touched signal.
-   * @param[in] touchEvent The touch event details (Old API).
    * @param[in] touch The touch event details.
    */
-  void EmitTouchedSignal( const TouchEvent& touchEvent, const Dali::TouchData& touch );
+  void EmitTouchedSignal( const Dali::TouchData& touch );
 
   /**
    * Used by the EventProcessor to emit wheel event signals.
@@ -217,6 +216,26 @@ public:
   void EmitWheelEventSignal( const WheelEvent& event );
 
   /**
+   * @copydoc Dali::Integration::Scene::AddFrameRenderedCallback
+   */
+  void AddFrameRenderedCallback( std::unique_ptr< CallbackBase > callback, int32_t frameId );
+
+  /**
+   * @copydoc Dali::Integration::Scene::AddFramePresentedCallback
+   */
+  void AddFramePresentedCallback( std::unique_ptr< CallbackBase > callback, int32_t frameId );
+
+  /**
+   * @copydoc Dali::Integration::Scene::GetFrameRenderedCallback
+   */
+  void GetFrameRenderedCallback( Dali::Integration::Scene::FrameCallbackContainer& callbacks );
+
+  /**
+   * @copydoc Dali::Integration::Scene::GetFramePresentedCallback
+   */
+  void GetFramePresentedCallback( Dali::Integration::Scene::FrameCallbackContainer& callbacks );
+
+  /**
    * @copydoc Integration::Scene::KeyEventSignal()
    */
   Integration::Scene::KeyEventSignalType& KeyEventSignal();
@@ -231,14 +250,6 @@ public:
    */
   Integration::Scene::EventProcessingFinishedSignalType& EventProcessingFinishedSignal();
 
-  // The touched signal, to support Stage touched signal, will be removed when deprecated in public Stage API
-  using TouchedSignalType = Signal< void (const TouchEvent&) >;
-
-  /**
-   * Touched signal to support deprecated stage touched signal.
-   */
-  TouchedSignalType& TouchedSignal();
-
   /**
     * @copydoc Integration::Scene::TouchSignal()
     */
@@ -314,9 +325,6 @@ private:
   // The touch signal
   Integration::Scene::TouchSignalType mTouchSignal;
 
-  // The touched signal
-  TouchedSignalType mTouchedSignal;
-
   // The wheel event signal
   Integration::Scene::WheelEventSignalType mWheelEventSignal;
 };