X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-editor-impl.h;h=d51ba2a09109f5bad65bfcae2b9dc2a3bead0fec;hp=c8bae9c6dce6157bc05c1dd33652284af21fc315;hb=73e02f6f3ea83cbdf3d894a7d067c4dafc0ac54d;hpb=f5061da0b7fc81c93a598fe1062e6efb44358f7e

diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.h b/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
index c8bae9c..d51ba2a 100755
--- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_TEXT_EDITOR_H
 
 /*
- * Copyright (c) 2017 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.
@@ -116,91 +116,91 @@ private: // From Control
   /**
    * @copydoc Control::OnInitialize()
    */
-  virtual void OnInitialize();
+  void OnInitialize() override;
 
   /**
    * @copydoc Control::OnStyleChange()
    */
-  virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change );
+  void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ) override;
 
   /**
    * @copydoc Control::GetNaturalSize()
    */
-  virtual Vector3 GetNaturalSize();
+  Vector3 GetNaturalSize() override;
 
   /**
    * @copydoc Control::GetHeightForWidth()
    */
-  virtual float GetHeightForWidth( float width );
+  float GetHeightForWidth( float width ) override;
 
   /**
    * @copydoc Control::OnInitialize()
    */
-  virtual void OnRelayout( const Vector2& size, RelayoutContainer& container );
+  void OnRelayout( const Vector2& size, RelayoutContainer& container ) override;
 
   /**
    * @copydoc Control::OnKeyInputFocusGained()
    */
-  virtual void OnKeyInputFocusGained();
+  void OnKeyInputFocusGained() override;
 
   /**
    * @copydoc Control::OnKeyInputFocusLost()
    */
-  virtual void OnKeyInputFocusLost();
+  void OnKeyInputFocusLost() override;
 
   /**
    * @copydoc Control::OnTap()
    */
-  virtual void OnTap( const TapGesture& tap );
+  void OnTap( const TapGesture& tap ) override;
 
   /**
    * @copydoc Control::OnPan()
    */
-  virtual void OnPan( const PanGesture& gesture );
+  void OnPan( const PanGesture& gesture ) override;
 
   /**
    * @copydoc Control::OnLongPress()
    */
-  virtual void OnLongPress( const LongPressGesture& gesture );
+  void OnLongPress( const LongPressGesture& gesture ) override;
 
   /**
    * @copydoc Control::OnSceneConnection()
    */
-  virtual void OnSceneConnection( int depth );
+  void OnSceneConnection( int depth ) override;
 
   /**
    * @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&)
    */
-  virtual bool OnKeyEvent(const KeyEvent& event);
+  bool OnKeyEvent(const KeyEvent& event) override;
 
 // From ControlInterface
 
   /**
    * @copydoc Text::ControlInterface::RequestTextRelayout()
    */
-  virtual void RequestTextRelayout();
+  void RequestTextRelayout() override;
 
 // From EditableControlInterface
 
   /**
    * @copydoc Text::ControlInterface::TextChanged()
    */
-  virtual void TextChanged();
+  void TextChanged() override;
 
   /**
    * @copydoc Text::ControlInterface::MaxLengthReached()
    */
-  virtual void MaxLengthReached();
+  void MaxLengthReached() override;
 
   /**
    * @copydoc Text::ControlInterface::InputStyleChanged()
    */
-  virtual void InputStyleChanged( Text::InputStyle::Mask inputStyleMask );
+  void InputStyleChanged( Text::InputStyle::Mask inputStyleMask ) override;
 
   /**
    * @copydoc Text::ControlInterface::AddDecoration()
    */
-  virtual void AddDecoration( Actor& actor, bool needsClipping );
+  void AddDecoration( Actor& actor, bool needsClipping ) override;
 
 private: // Implementation
 
@@ -243,7 +243,7 @@ private: // Implementation
    * @param[in] actor TextEditor touched
    * @param[in] touch Touch information
    */
-  bool OnTouched( Actor actor, const TouchData& touch );
+  bool OnTouched( Actor actor, const TouchEvent& touch );
 
   /**
    * @brief Callbacks called on idle.