Merge "Clean up the code to build successfully on macOS" into devel/master

[platform/core/uifw/dali-core.git] / dali / internal / update / gestures / gesture-properties.h

diff --git a/dali/internal/update/gestures/gesture-properties.h b/dali/internal/update/gestures/gesture-properties.h
index 4657685..41eb695 100644 (file)
--- a/dali/internal/update/gestures/gesture-properties.h
+++ b/dali/internal/update/gestures/gesture-properties.h
@@ -62,14 +62,12 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~GestureProperty()
-  {
-  }
+  ~GestureProperty() override = default;
 
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
    */
-  virtual Dali::Property::Type GetType() const
+  Dali::Property::Type GetType() const override
   {
     return Dali::PropertyTypes::Get< T >();
   }
@@ -85,7 +83,7 @@ public:
   /**
    * @copydoc Dali::Internal::PropertyInputImpl::InputInitialized()
    */
-  virtual bool InputInitialized() const
+  bool InputInitialized() const override
   {
     // A constraint cannot use the property until it has been inherited (at least once).
     return true;
@@ -95,7 +93,7 @@ public:
    * @copydoc Dali::Internal::PropertyInputImpl::InputChanged()
    * @note A constraint can only receive the inherited property from the previous frame.
    */
-  virtual bool InputChanged() const
+  bool InputChanged() const override
   {
     return mInputChanged;
   }
@@ -151,14 +149,12 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~GesturePropertyVector2()
-  {
-  }
+  ~GesturePropertyVector2() override = default;
 
   /**
    * @copydoc Dali::PropertyInput::GetVector2()
    */
-  virtual const Vector2& GetVector2( BufferIndex bufferIndex ) const
+  const Vector2& GetVector2( BufferIndex bufferIndex ) const override
   {
     return mValue;
   }
@@ -174,14 +170,12 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~GesturePropertyBool()
-  {
-  }
+  ~GesturePropertyBool() override = default;
 
   /**
    * @copydoc Dali::PropertyInput::GetBoolean()
    */
-  virtual const bool& GetBoolean( BufferIndex bufferIndex ) const
+  const bool& GetBoolean( BufferIndex bufferIndex ) const override
   {
     return mValue;
   }