Revert "Revert "Removed TouchEvent from actor & stage""

[platform/core/uifw/dali-core.git] / automated-tests / src / dali / dali-test-suite-utils / test-custom-actor.h

diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-custom-actor.h b/automated-tests/src/dali/dali-test-suite-utils/test-custom-actor.h
index 58e3f5c..907072f 100644 (file)
--- a/automated-tests/src/dali/dali-test-suite-utils/test-custom-actor.h
+++ b/automated-tests/src/dali/dali-test-suite-utils/test-custom-actor.h
@@ -131,28 +131,27 @@ public:
   virtual void OnInitialize( const char* name );
   void ResetCallStack();
   void AddToCallStacks( const char* method );
-  virtual void OnSceneConnection( int depth );
-  virtual void OnSceneDisconnection();
-  virtual void OnChildAdd(Dali::Actor& child);
-  virtual void OnChildRemove(Dali::Actor& child);
-  virtual void OnPropertySet( Dali::Property::Index index, Dali::Property::Value propertyValue );
-  virtual void OnSizeSet(const Dali::Vector3& targetSize);
-  virtual void OnSizeAnimation(Dali::Animation& animation, const Dali::Vector3& targetSize);
-  virtual bool OnTouchEvent(const Dali::TouchEvent& event);
-  virtual bool OnHoverEvent(const Dali::HoverEvent& event);
-  virtual bool OnWheelEvent(const Dali::WheelEvent& event);
-  virtual bool OnKeyEvent(const Dali::KeyEvent& event);
+  void OnSceneConnection( int depth ) override;
+  void OnSceneDisconnection() override;
+  void OnChildAdd(Dali::Actor& child) override;
+  void OnChildRemove(Dali::Actor& child) override;
+  void OnPropertySet( Dali::Property::Index index, Dali::Property::Value propertyValue ) override;
+  void OnSizeSet(const Dali::Vector3& targetSize) override;
+  void OnSizeAnimation(Dali::Animation& animation, const Dali::Vector3& targetSize) override;
+  bool OnHoverEvent(const Dali::HoverEvent& event) override;
+  bool OnWheelEvent(const Dali::WheelEvent& event) override;
+  bool OnKeyEvent(const Dali::KeyEvent& event) override;
   virtual void OnKeyInputFocusGained();
   virtual void OnKeyInputFocusLost();
-  virtual Dali::Vector3 GetNaturalSize();
-  virtual float GetHeightForWidth( float width );
-  virtual float GetWidthForHeight( float height );
-  virtual void OnRelayout( const Dali::Vector2& size, Dali::RelayoutContainer& container );
-  virtual void OnSetResizePolicy( Dali::ResizePolicy::Type policy, Dali::Dimension::Type dimension );
-  virtual void OnCalculateRelayoutSize( Dali::Dimension::Type dimension );
-  virtual float CalculateChildSize( const Dali::Actor& child, Dali::Dimension::Type dimension );
-  virtual void OnLayoutNegotiated( float size, Dali::Dimension::Type dimension );
-  virtual bool RelayoutDependentOnChildren( Dali::Dimension::Type dimension = Dali::Dimension::ALL_DIMENSIONS );
+  Dali::Vector3 GetNaturalSize() override;
+  float GetHeightForWidth( float width ) override;
+  float GetWidthForHeight( float height ) override;
+  void OnRelayout( const Dali::Vector2& size, Dali::RelayoutContainer& container ) override;
+  void OnSetResizePolicy( Dali::ResizePolicy::Type policy, Dali::Dimension::Type dimension ) override;
+  void OnCalculateRelayoutSize( Dali::Dimension::Type dimension ) override;
+  float CalculateChildSize( const Dali::Actor& child, Dali::Dimension::Type dimension ) override;
+  void OnLayoutNegotiated( float size, Dali::Dimension::Type dimension ) override;
+  bool RelayoutDependentOnChildren( Dali::Dimension::Type dimension = Dali::Dimension::ALL_DIMENSIONS ) override;
   static void SetProperty( Dali::BaseObject* object, Dali::Property::Index index, const Dali::Property::Value& value );
   static Dali::Property::Value GetProperty( Dali::BaseObject* object, Dali::Property::Index index );
 
@@ -208,7 +207,7 @@ struct TestCustomActorVariant1 : public TestCustomActor
   }
 
   // From CustomActorImpl
-  virtual void OnSceneConnection( int depth )
+  void OnSceneConnection( int depth ) override
   {
     // Chain up first
     TestCustomActor::OnSceneConnection( depth );
@@ -444,37 +443,33 @@ public:
   }
 
   // From CustomActorImpl
-  virtual void OnSceneConnection( int depth )
+  void OnSceneConnection( int depth ) override
   {
   }
-  virtual void OnSceneDisconnection()
+  void OnSceneDisconnection() override
   {
   }
-  virtual void OnChildAdd(Dali::Actor& child)
+  void OnChildAdd(Dali::Actor& child) override
   {
   }
-  virtual void OnChildRemove(Dali::Actor& child)
+  void OnChildRemove(Dali::Actor& child) override
   {
   }
-  virtual void OnSizeSet(const Dali::Vector3& targetSize)
+  void OnSizeSet(const Dali::Vector3& targetSize) override
   {
   }
-  virtual void OnSizeAnimation(Dali::Animation& animation, const Dali::Vector3& targetSize)
+  void OnSizeAnimation(Dali::Animation& animation, const Dali::Vector3& targetSize) override
   {
   }
-  virtual bool OnTouchEvent(const Dali::TouchEvent& event)
-  {
-    return true;
-  }
-  virtual bool OnHoverEvent(const Dali::HoverEvent& event)
+  bool OnHoverEvent(const Dali::HoverEvent& event) override
   {
     return true;
   }
-  virtual bool OnWheelEvent(const Dali::WheelEvent& event)
+  bool OnWheelEvent(const Dali::WheelEvent& event) override
   {
     return true;
   }
-  virtual bool OnKeyEvent(const Dali::KeyEvent& event)
+  bool OnKeyEvent(const Dali::KeyEvent& event) override
   {
     return true;
   }
@@ -485,43 +480,43 @@ public:
   {
   }
 
-  virtual Dali::Vector3 GetNaturalSize()
+  Dali::Vector3 GetNaturalSize() override
   {
     return Dali::Vector3( 0.0f, 0.0f, 0.0f );
   }
 
-  virtual float GetHeightForWidth( float width )
+  float GetHeightForWidth( float width ) override
   {
     return 0.0f;
   }
 
-  virtual float GetWidthForHeight( float height )
+  float GetWidthForHeight( float height ) override
   {
     return 0.0f;
   }
 
-  virtual void OnRelayout( const Dali::Vector2& size, Dali::RelayoutContainer& container )
+  void OnRelayout( const Dali::Vector2& size, Dali::RelayoutContainer& container ) override
   {
   }
 
-  virtual void OnSetResizePolicy( Dali::ResizePolicy::Type policy, Dali::Dimension::Type dimension )
+  void OnSetResizePolicy( Dali::ResizePolicy::Type policy, Dali::Dimension::Type dimension ) override
   {
   }
 
-  virtual void OnCalculateRelayoutSize( Dali::Dimension::Type dimension )
+  void OnCalculateRelayoutSize( Dali::Dimension::Type dimension ) override
   {
   }
 
-  virtual float CalculateChildSize( const Dali::Actor& child, Dali::Dimension::Type dimension )
+  float CalculateChildSize( const Dali::Actor& child, Dali::Dimension::Type dimension ) override
   {
     return 0.0f;
   }
 
-  virtual void OnLayoutNegotiated( float size, Dali::Dimension::Type dimension )
+  void OnLayoutNegotiated( float size, Dali::Dimension::Type dimension ) override
   {
   }
 
-  virtual bool RelayoutDependentOnChildren( Dali::Dimension::Type dimension = Dali::Dimension::ALL_DIMENSIONS )
+  bool RelayoutDependentOnChildren( Dali::Dimension::Type dimension = Dali::Dimension::ALL_DIMENSIONS ) override
   {
     return false;
   }