use modern construct 'override' in the derive class.

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

diff --git a/dali/internal/event/common/stage-impl.h b/dali/internal/event/common/stage-impl.h
index a64e964..c689057 100644 (file)
--- a/dali/internal/event/common/stage-impl.h
+++ b/dali/internal/event/common/stage-impl.h
@@ -132,13 +132,13 @@ public:
    * From RenderTaskDefaults; retrieve the default root actor.
    * @return The default root actor.
    */
-  virtual Actor& GetDefaultRootActor();
+  Actor& GetDefaultRootActor() override;
 
   /**
    * From RenderTaskDefaults; retrieve the default camera actor.
    * @return The default camera actor.
    */
-  virtual CameraActor& GetDefaultCameraActor();
+  CameraActor& GetDefaultCameraActor() override;
 
   // Layers
 
@@ -206,9 +206,9 @@ public:
   void OnKeyEvent( const Dali::KeyEvent& event );
 
   /**
-   * Callback for Internal::Scene TouchSignal signal
+   * Callback for Internal::Scene TouchedSignal signal
    */
-  void OnTouchEvent( const Dali::TouchData& touch );
+  void OnTouchEvent( const Dali::TouchEvent& touch );
 
   /**
    * Callback for Internal::Scene WheelEventSignal signal
@@ -239,7 +239,7 @@ public:
    * Emits the touched signal.
    * @param[in] touch The touch event details.
    */
-  void EmitTouchedSignal( const Dali::TouchData& touch );
+  void EmitTouchedSignal( const Dali::TouchEvent& touch );
 
   /**
    * Used by the EventProcessor to emit wheel event signals.
@@ -263,9 +263,9 @@ public:
   Dali::Stage::EventProcessingFinishedSignalType& EventProcessingFinishedSignal();
 
   /**
-    * @copydoc Dali::Stage::TouchSignal()
+    * @copydoc Dali::Stage::TouchedSignal()
     */
-  Dali::Stage::TouchSignalType& TouchSignal();
+  Dali::Stage::TouchEventSignalType& TouchedSignal();
 
   /**
    * @copydoc Dali::Stage::WheelEventSignal()
@@ -318,12 +318,12 @@ private: // Implementation of ContextNotificationInterface:
   /**
    * @copydoc Dali::Integration::NotifyContextLost();
    */
-  virtual void NotifyContextLost();
+  void NotifyContextLost() override;
 
   /**
    * @copydoc Dali::Integration::NotifyContextRegained();
    */
-  virtual void NotifyContextRegained();
+  void NotifyContextRegained() override;
 
 private:
 
@@ -335,7 +335,7 @@ private:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~Stage();
+  ~Stage() override;
 
 private:
 
@@ -351,7 +351,7 @@ private:
   Dali::Stage::EventProcessingFinishedSignalType  mEventProcessingFinishedSignal;
 
   // The touched signal
-  Dali::Stage::TouchSignalType                    mTouchSignal;
+  Dali::Stage::TouchEventSignalType               mTouchedSignal;
 
   // The wheel event signal
   Dali::Stage::WheelEventSignalType               mWheelEventSignal;