From: Subhransu Mohanty <sub.mohanty@samsung.com>
Date: Mon, 7 Sep 2020 00:14:01 +0000 (+0900)
Subject: use modern construct 'override' in the derive class.
X-Git-Tag: dali_1.9.29~12^2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-core.git;a=commitdiff_plain;h=81fc2742b950ca4704c87769395c8e244e15fa52

use modern construct 'override' in the derive class.

this patch is auto generated by clang-tidy with modernize-use-override.

Change-Id: Id2a6abb4a6ce9725bd870dc6a846e8cea33b37ae
---

diff --git a/dali/integration-api/bitmap.h b/dali/integration-api/bitmap.h
index 80083b1..8d12661 100644
--- a/dali/integration-api/bitmap.h
+++ b/dali/integration-api/bitmap.h
@@ -349,7 +349,7 @@ protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~Bitmap();
+  ~Bitmap() override;
 
 protected:
 
diff --git a/dali/integration-api/events/hover-event-integ.h b/dali/integration-api/events/hover-event-integ.h
index 39c0d29..94f6b28 100644
--- a/dali/integration-api/events/hover-event-integ.h
+++ b/dali/integration-api/events/hover-event-integ.h
@@ -52,7 +52,7 @@ struct DALI_CORE_API HoverEvent : public MultiPointEvent
   /**
    * Virtual destructor
    */
-  virtual ~HoverEvent();
+  ~HoverEvent() override;
 };
 
 } // namespace Integration
diff --git a/dali/integration-api/events/key-event-integ.h b/dali/integration-api/events/key-event-integ.h
index c966eda..31a8dfd 100755
--- a/dali/integration-api/events/key-event-integ.h
+++ b/dali/integration-api/events/key-event-integ.h
@@ -80,7 +80,7 @@ struct DALI_CORE_API KeyEvent : public Event
   /**
    * Virtual destructor
    */
-  virtual ~KeyEvent();
+  ~KeyEvent() override;
 
   // Data
 
diff --git a/dali/integration-api/events/multi-point-event-integ.h b/dali/integration-api/events/multi-point-event-integ.h
index 14007a8..84d7799 100644
--- a/dali/integration-api/events/multi-point-event-integ.h
+++ b/dali/integration-api/events/multi-point-event-integ.h
@@ -46,7 +46,7 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~MultiPointEvent();
+  ~MultiPointEvent() override;
 
 protected:
   /**
diff --git a/dali/integration-api/events/touch-event-integ.h b/dali/integration-api/events/touch-event-integ.h
index 0c3a933..1dc354e 100644
--- a/dali/integration-api/events/touch-event-integ.h
+++ b/dali/integration-api/events/touch-event-integ.h
@@ -51,7 +51,7 @@ struct DALI_CORE_API TouchEvent : public MultiPointEvent
   /**
    * Virtual destructor
    */
-  virtual ~TouchEvent();
+  ~TouchEvent() override;
 };
 
 } // namespace Integration
diff --git a/dali/integration-api/events/wheel-event-integ.h b/dali/integration-api/events/wheel-event-integ.h
index eb47e2c..a5758b6 100644
--- a/dali/integration-api/events/wheel-event-integ.h
+++ b/dali/integration-api/events/wheel-event-integ.h
@@ -68,7 +68,7 @@ struct DALI_CORE_API WheelEvent : public Event
   /**
    * Virtual destructor
    */
-  virtual ~WheelEvent();
+  ~WheelEvent() override;
 
   // Data
 
diff --git a/dali/internal/common/core-impl.h b/dali/internal/common/core-impl.h
index 98cdc61..1e72470 100644
--- a/dali/internal/common/core-impl.h
+++ b/dali/internal/common/core-impl.h
@@ -92,7 +92,7 @@ public:
   /**
    * Destructor
    */
-  ~Core();
+  ~Core() override;
 
   /**
    * @copydoc Dali::Integration::Core::Initialize()
diff --git a/dali/internal/common/message.h b/dali/internal/common/message.h
index 48dac3f..382aa9d 100644
--- a/dali/internal/common/message.h
+++ b/dali/internal/common/message.h
@@ -90,14 +90,14 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~Message()
+  ~Message() override
   {
   }
 
   /**
    * @copydoc MessageBase::Process
    */
-  virtual void Process( BufferIndex /*bufferIndex*/ )
+  void Process( BufferIndex /*bufferIndex*/ ) override
   {
     (object->*memberFunction)();
   }
@@ -143,14 +143,14 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~MessageValue1()
+  ~MessageValue1() override
   {
   }
 
   /**
    * @copydoc MessageBase::Process
    */
-  virtual void Process( BufferIndex /*bufferIndex*/ )
+  void Process( BufferIndex /*bufferIndex*/ ) override
   {
     (object->*memberFunction)( param1 );
   }
@@ -201,14 +201,14 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~MessageValue2()
+  ~MessageValue2() override
   {
   }
 
   /**
    * @copydoc MessageBase::Process
    */
-  virtual void Process( BufferIndex /*bufferIndex*/ )
+  void Process( BufferIndex /*bufferIndex*/ ) override
   {
     (object->*memberFunction)( param1, param2 );
   }
@@ -262,14 +262,14 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~MessageValue3()
+  ~MessageValue3() override
   {
   }
 
   /**
    * @copydoc MessageBase::Process
    */
-  virtual void Process( BufferIndex /*bufferIndex*/ )
+  void Process( BufferIndex /*bufferIndex*/ ) override
   {
     (object->*memberFunction)( param1, param2, param3 );
   }
@@ -327,14 +327,14 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~MessageValue4()
+  ~MessageValue4() override
   {
   }
 
   /**
    * @copydoc MessageBase::Process
    */
-  virtual void Process( BufferIndex /*bufferIndex*/ )
+  void Process( BufferIndex /*bufferIndex*/ ) override
   {
     (object->*memberFunction)( param1, param2, param3, param4 );
   }
@@ -396,14 +396,14 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~MessageValue5()
+  ~MessageValue5() override
   {
   }
 
   /**
    * @copydoc MessageBase::Process
    */
-  virtual void Process( BufferIndex /*bufferIndex*/ )
+  void Process( BufferIndex /*bufferIndex*/ ) override
   {
     (object->*memberFunction)( param1, param2, param3, param4, param5 );
   }
@@ -469,14 +469,14 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~MessageValue6()
+  ~MessageValue6() override
   {
   }
 
   /**
    * @copydoc MessageBase::Process
    */
-  virtual void Process( BufferIndex /*bufferIndex*/ )
+  void Process( BufferIndex /*bufferIndex*/ ) override
   {
     (object->*memberFunction)( param1, param2, param3, param4, param5, param6 );
   }
@@ -522,14 +522,14 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~MessageDoubleBuffered0()
+  ~MessageDoubleBuffered0() override
   {
   }
 
   /**
    * @copydoc MessageBase::Process
    */
-  virtual void Process( BufferIndex bufferIndex )
+  void Process( BufferIndex bufferIndex ) override
   {
     (object->*memberFunction)( bufferIndex );
   }
@@ -576,14 +576,14 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~MessageDoubleBuffered1()
+  ~MessageDoubleBuffered1() override
   {
   }
 
   /**
    * @copydoc MessageBase::Process
    */
-  virtual void Process( BufferIndex bufferIndex )
+  void Process( BufferIndex bufferIndex ) override
   {
     (object->*memberFunction)( bufferIndex,  param );
   }
@@ -633,14 +633,14 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~MessageDoubleBuffered2()
+  ~MessageDoubleBuffered2() override
   {
   }
 
   /**
    * @copydoc MessageBase::Process
    */
-  virtual void Process( BufferIndex bufferIndex )
+  void Process( BufferIndex bufferIndex ) override
   {
     (object->*memberFunction)( bufferIndex, param2, param3 );
   }
@@ -695,14 +695,14 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~MessageDoubleBuffered3()
+  ~MessageDoubleBuffered3() override
   {
   }
 
   /**
    * @copydoc MessageBase::Process
    */
-  virtual void Process( BufferIndex bufferIndex )
+  void Process( BufferIndex bufferIndex ) override
   {
     (object->*memberFunction)( bufferIndex, param2, param3, param4 );
   }
@@ -760,14 +760,14 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~MessageDoubleBuffered4()
+  ~MessageDoubleBuffered4() override
   {
   }
 
   /**
    * @copydoc MessageBase::Process
    */
-  virtual void Process( BufferIndex bufferIndex )
+  void Process( BufferIndex bufferIndex ) override
   {
     (object->*memberFunction)( bufferIndex, param2, param3, param4, param5 );
   }
diff --git a/dali/internal/common/shader-data.h b/dali/internal/common/shader-data.h
index b555f5f..0dba6a1 100644
--- a/dali/internal/common/shader-data.h
+++ b/dali/internal/common/shader-data.h
@@ -60,7 +60,7 @@ protected:
    * Protected Destructor
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~ShaderData()
+  ~ShaderData() override
   {
     // vector releases its data
   }
diff --git a/dali/internal/event/actors/actor-impl.h b/dali/internal/event/actors/actor-impl.h
index 169c329..6573930 100644
--- a/dali/internal/event/actors/actor-impl.h
+++ b/dali/internal/event/actors/actor-impl.h
@@ -1563,7 +1563,7 @@ protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~Actor();
+  ~Actor() override;
 
   /**
    * Called on a child during Add() when the parent actor is connected to the Scene.
@@ -1641,42 +1641,42 @@ public:
   /**
    * @copydoc Dali::Internal::Object::SetDefaultProperty()
    */
-  virtual void SetDefaultProperty( Property::Index index, const Property::Value& propertyValue );
+  void SetDefaultProperty( Property::Index index, const Property::Value& propertyValue ) override;
 
   /**
    * @copydoc Dali::Internal::Object::SetSceneGraphProperty()
    */
-  virtual void SetSceneGraphProperty( Property::Index index, const PropertyMetadata& entry, const Property::Value& value );
+  void SetSceneGraphProperty( Property::Index index, const PropertyMetadata& entry, const Property::Value& value ) override;
 
   /**
    * @copydoc Dali::Internal::Object::GetDefaultProperty()
    */
-  virtual Property::Value GetDefaultProperty( Property::Index index ) const;
+  Property::Value GetDefaultProperty( Property::Index index ) const override;
 
   /**
    * @copydoc Dali::Internal::Object::GetDefaultPropertyCurrentValue()
    */
-  virtual Property::Value GetDefaultPropertyCurrentValue( Property::Index index ) const;
+  Property::Value GetDefaultPropertyCurrentValue( Property::Index index ) const override;
 
   /**
    * @copydoc Dali::Internal::Object::OnNotifyDefaultPropertyAnimation()
    */
-  virtual void OnNotifyDefaultPropertyAnimation( Animation& animation, Property::Index index, const Property::Value& value, Animation::Type animationType );
+  void OnNotifyDefaultPropertyAnimation( Animation& animation, Property::Index index, const Property::Value& value, Animation::Type animationType ) override;
 
   /**
    * @copydoc Dali::Internal::Object::GetSceneObjectAnimatableProperty()
    */
-  virtual const SceneGraph::PropertyBase* GetSceneObjectAnimatableProperty( Property::Index index ) const;
+  const SceneGraph::PropertyBase* GetSceneObjectAnimatableProperty( Property::Index index ) const override;
 
   /**
    * @copydoc Dali::Internal::Object::GetSceneObjectInputProperty()
    */
-  virtual const PropertyInputImpl* GetSceneObjectInputProperty( Property::Index index ) const;
+  const PropertyInputImpl* GetSceneObjectInputProperty( Property::Index index ) const override;
 
   /**
    * @copydoc Dali::Internal::Object::GetPropertyComponentIndex()
    */
-  virtual int32_t GetPropertyComponentIndex( Property::Index index ) const;
+  int32_t GetPropertyComponentIndex( Property::Index index ) const override;
 
   /**
    * Retrieve the actor's node.
@@ -1862,7 +1862,7 @@ private:
    * Retrieve the parent object of an Actor.
    * @return The parent object, or NULL if the Actor does not have a parent.
    */
-  virtual Object* GetParentObject() const;
+  Object* GetParentObject() const override;
 
   /**
    * Set Sibling order
diff --git a/dali/internal/event/actors/camera-actor-impl.h b/dali/internal/event/actors/camera-actor-impl.h
index da9ea71..4463ba1 100644
--- a/dali/internal/event/actors/camera-actor-impl.h
+++ b/dali/internal/event/actors/camera-actor-impl.h
@@ -209,22 +209,22 @@ public: // properties
   /**
    * copydoc Dali::Internal::Object::SetDefaultProperty()
    */
-  virtual void SetDefaultProperty( Property::Index index, const Property::Value& propertyValue );
+  void SetDefaultProperty( Property::Index index, const Property::Value& propertyValue ) override;
 
   /**
    * copydoc Dali::Internal::Object::GetDefaultProperty()
    */
-  virtual Property::Value GetDefaultProperty( Property::Index index ) const;
+  Property::Value GetDefaultProperty( Property::Index index ) const override;
 
   /**
    * copydoc Dali::Internal::Object::GetDefaultPropertyCurrentValue()
    */
-  virtual Property::Value GetDefaultPropertyCurrentValue( Property::Index index ) const;
+  Property::Value GetDefaultPropertyCurrentValue( Property::Index index ) const override;
 
   /**
    * @copydoc Dali::Internal::Object::GetSceneObjectInputProperty()
    */
-  virtual const PropertyInputImpl* GetSceneObjectInputProperty( Property::Index index ) const;
+  const PropertyInputImpl* GetSceneObjectInputProperty( Property::Index index ) const override;
 
 private:
 
@@ -237,7 +237,7 @@ private:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~CameraActor();
+  ~CameraActor() override;
 
 
   /**
diff --git a/dali/internal/event/actors/custom-actor-internal.h b/dali/internal/event/actors/custom-actor-internal.h
index a6363ba..49f4b97 100644
--- a/dali/internal/event/actors/custom-actor-internal.h
+++ b/dali/internal/event/actors/custom-actor-internal.h
@@ -70,14 +70,14 @@ protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~CustomActor();
+  ~CustomActor() override;
 
 private:
 
   /**
    * @copydoc Internal::Actor::OnSceneConnectionExternal
    */
-  virtual void OnSceneConnectionExternal( int32_t depth )
+  void OnSceneConnectionExternal( int32_t depth ) override
   {
     mImpl->OnSceneConnection( depth );
   }
@@ -85,7 +85,7 @@ private:
   /**
    * @copydoc Internal::Actor::OnSceneDisconnectionExternal
    */
-  virtual void OnSceneDisconnectionExternal()
+  void OnSceneDisconnectionExternal() override
   {
     mImpl->OnSceneDisconnection();
   }
@@ -93,7 +93,7 @@ private:
   /**
    * @copydoc Internal::Actor::OnChildAdd
    */
-  virtual void OnChildAdd(Actor& child)
+  void OnChildAdd(Actor& child) override
   {
     Dali::Actor handle(&child);
     mImpl->OnChildAdd(handle);
@@ -102,7 +102,7 @@ private:
   /**
    * @copydoc Internal::Actor::OnChildRemove
    */
-  virtual void OnChildRemove(Actor& child)
+  void OnChildRemove(Actor& child) override
   {
     Dali::Actor handle(&child);
     mImpl->OnChildRemove(handle);
@@ -111,7 +111,7 @@ private:
   /**
    * @copydoc Internal::Actor::OnPropertySet
    */
-  virtual void OnPropertySet( Property::Index index, const Property::Value& propertyValue )
+  void OnPropertySet( Property::Index index, const Property::Value& propertyValue ) override
   {
     mImpl->OnPropertySet(index, propertyValue);
   }
@@ -119,7 +119,7 @@ private:
   /**
    * @copydoc Internal::Actor::OnSizeSet
    */
-  virtual void OnSizeSet(const Vector3& targetSize)
+  void OnSizeSet(const Vector3& targetSize) override
   {
     mImpl->OnSizeSet(targetSize);
   }
@@ -127,7 +127,7 @@ private:
   /**
    * @copydoc Internal::Actor::OnSizeAnimation
    */
-  virtual void OnSizeAnimation(Animation& animation, const Vector3& targetSize)
+  void OnSizeAnimation(Animation& animation, const Vector3& targetSize) override
   {
     Dali::Animation animationHandle(&animation);
     mImpl->OnSizeAnimation(animationHandle, targetSize);
@@ -136,7 +136,7 @@ private:
   /**
    * @copydoc Internal::Actor::OnRelayout
    */
-  virtual void OnRelayout( const Vector2& size, RelayoutContainer& container )
+  void OnRelayout( const Vector2& size, RelayoutContainer& container ) override
   {
     mImpl->OnRelayout( size, container );
   }
@@ -144,7 +144,7 @@ private:
   /**
    * @copydoc Internal::Actor::OnSetResizePolicy
    */
-  virtual void OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension )
+  void OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension ) override
   {
     mImpl->OnSetResizePolicy( policy, dimension );
   }
@@ -152,7 +152,7 @@ private:
   /**
    * @copydoc Internal::Actor::GetNaturalSize
    */
-  virtual Vector3 GetNaturalSize() const
+  Vector3 GetNaturalSize() const override
   {
     return mImpl->GetNaturalSize();
   }
@@ -160,7 +160,7 @@ private:
   /**
    * @copydoc Internal::Actor::CalculateChildSize
    */
-  virtual float CalculateChildSize( const Dali::Actor& child, Dimension::Type dimension )
+  float CalculateChildSize( const Dali::Actor& child, Dimension::Type dimension ) override
   {
     return mImpl->CalculateChildSize( child, dimension );
   }
@@ -168,7 +168,7 @@ private:
   /**
    * @copydoc Internal::Actor::GetHeightForWidth
    */
-  virtual float GetHeightForWidth( float width )
+  float GetHeightForWidth( float width ) override
   {
     return mImpl->GetHeightForWidth( width );
   }
@@ -176,7 +176,7 @@ private:
   /**
    * @copydoc Internal::Actor::GetWidthForHeight
    */
-  virtual float GetWidthForHeight( float height )
+  float GetWidthForHeight( float height ) override
   {
     return mImpl->GetWidthForHeight( height );
   }
@@ -184,7 +184,7 @@ private:
   /**
    * @copydoc Internal::Actor::RelayoutDependentOnChildren
    */
-  virtual bool RelayoutDependentOnChildren( Dimension::Type dimension = Dimension::ALL_DIMENSIONS )
+  bool RelayoutDependentOnChildren( Dimension::Type dimension = Dimension::ALL_DIMENSIONS ) override
   {
     return mImpl->RelayoutDependentOnChildren( dimension );
   }
@@ -192,7 +192,7 @@ private:
   /**
    * @copydoc Internal::Actor::OnCalculateRelayoutSize
    */
-  virtual void OnCalculateRelayoutSize( Dimension::Type dimension )
+  void OnCalculateRelayoutSize( Dimension::Type dimension ) override
   {
     return mImpl->OnCalculateRelayoutSize( dimension );
   }
@@ -200,7 +200,7 @@ private:
   /**
    * @copydoc Internal::Actor::OnLayoutNegotiated
    */
-  virtual void OnLayoutNegotiated( float size, Dimension::Type dimension )
+  void OnLayoutNegotiated( float size, Dimension::Type dimension ) override
   {
     return mImpl->OnLayoutNegotiated( size, dimension );
   }
diff --git a/dali/internal/event/actors/layer-impl.h b/dali/internal/event/actors/layer-impl.h
index 864867e..0ada991 100644
--- a/dali/internal/event/actors/layer-impl.h
+++ b/dali/internal/event/actors/layer-impl.h
@@ -76,7 +76,7 @@ public:
   /**
    * @copydoc Dali::Internal::Actor::OnInitialize
    */
-  void OnInitialize();
+  void OnInitialize() override;
 
   /**
    * Query the current depth of the layer
@@ -214,17 +214,17 @@ public: // Default property extensions from Object
   /**
    * @copydoc Dali::Internal::Object::SetDefaultProperty()
    */
-  virtual void SetDefaultProperty(Property::Index index, const Property::Value& propertyValue);
+  void SetDefaultProperty(Property::Index index, const Property::Value& propertyValue) override;
 
   /**
    * @copydoc Dali::Internal::Object::GetDefaultProperty()
    */
-  virtual Property::Value GetDefaultProperty( Property::Index index ) const;
+  Property::Value GetDefaultProperty( Property::Index index ) const override;
 
   /**
    * @copydoc Dali::Internal::Object::GetDefaultProperty()
    */
-  virtual Property::Value GetDefaultPropertyCurrentValue( Property::Index index ) const;
+  Property::Value GetDefaultPropertyCurrentValue( Property::Index index ) const override;
 
 protected:
 
@@ -238,19 +238,19 @@ protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~Layer();
+  ~Layer() override;
 
 private: // From Actor
 
   /**
    * From Actor.
    */
-  virtual void OnSceneConnectionInternal();
+  void OnSceneConnectionInternal() override;
 
   /**
    * From Actor.
    */
-  virtual void OnSceneDisconnectionInternal();
+  void OnSceneDisconnectionInternal() override;
 
 private:
 
diff --git a/dali/internal/event/animation/animation-impl.h b/dali/internal/event/animation/animation-impl.h
index 959ed22..a23223e 100644
--- a/dali/internal/event/animation/animation-impl.h
+++ b/dali/internal/event/animation/animation-impl.h
@@ -456,7 +456,7 @@ protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~Animation();
+  ~Animation() override;
 
 private:
 
diff --git a/dali/internal/event/animation/animation-playlist.h b/dali/internal/event/animation/animation-playlist.h
index c31c11d..170d23d 100644
--- a/dali/internal/event/animation/animation-playlist.h
+++ b/dali/internal/event/animation/animation-playlist.h
@@ -51,7 +51,7 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~AnimationPlaylist();
+  ~AnimationPlaylist() override;
 
   /**
    * Called when an animation is constructed.
@@ -114,7 +114,7 @@ private: // from CompleteNotificationInterface
   /**
    * @copydoc CompleteNotificationInterface::NotifyCompleted()
    */
-  virtual void NotifyCompleted();
+  void NotifyCompleted() override;
 
 private:
 
diff --git a/dali/internal/event/animation/animator-connector-base.h b/dali/internal/event/animation/animator-connector-base.h
index 1bb2eab..8e839fb 100644
--- a/dali/internal/event/animation/animator-connector-base.h
+++ b/dali/internal/event/animation/animator-connector-base.h
@@ -71,7 +71,7 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~AnimatorConnectorBase()
+  ~AnimatorConnectorBase() override
   {
     if( mObject )
     {
@@ -181,7 +181,7 @@ private:
   /**
    * From Object::Observer
    */
-  virtual void SceneObjectAdded( Object& object ) override final
+  void SceneObjectAdded( Object& object ) final
   {
     // If the animator has not been created yet, create it now.
     if( !mAnimator && mObject )
@@ -193,14 +193,14 @@ private:
   /**
    * From Object::Observer
    */
-  virtual void SceneObjectRemoved( Object& object ) override final
+  void SceneObjectRemoved( Object& object ) final
   {
   }
 
   /**
    * From Object::Observer
    */
-  virtual void ObjectDestroyed( Object& object )
+  void ObjectDestroyed( Object& object ) override
   {
     mObject = nullptr;
   }
diff --git a/dali/internal/event/animation/animator-connector.h b/dali/internal/event/animation/animator-connector.h
index 846d45a..e0a2894 100644
--- a/dali/internal/event/animation/animator-connector.h
+++ b/dali/internal/event/animation/animator-connector.h
@@ -74,7 +74,7 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~AnimatorConnector()
+  ~AnimatorConnector() override
   {
   }
 
@@ -101,7 +101,7 @@ private:
   /**
    * @copydoc AnimatorConnectorBase::DoCreateAnimator()
    */
-  bool DoCreateAnimator( const SceneGraph::PropertyOwner& propertyOwner, const SceneGraph::PropertyBase& baseProperty ) override final
+  bool DoCreateAnimator( const SceneGraph::PropertyOwner& propertyOwner, const SceneGraph::PropertyBase& baseProperty ) final
   {
     bool resetterRequired = false;
     // components only supported for float property type
@@ -173,7 +173,7 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~AnimatorConnector()
+  ~AnimatorConnector() override
   {
   }
 
@@ -200,7 +200,7 @@ private:
   /**
    * @copydoc AnimatorConnectorBase::DoCreateAnimator()
    */
-  bool DoCreateAnimator( const SceneGraph::PropertyOwner& propertyOwner, const SceneGraph::PropertyBase& baseProperty ) override final
+  bool DoCreateAnimator( const SceneGraph::PropertyOwner& propertyOwner, const SceneGraph::PropertyBase& baseProperty ) final
   {
     bool resetterRequired = false;
     if( mComponentIndex == Property::INVALID_COMPONENT_INDEX )
diff --git a/dali/internal/event/animation/constrainer.h b/dali/internal/event/animation/constrainer.h
index aecc486..b695a3a 100644
--- a/dali/internal/event/animation/constrainer.h
+++ b/dali/internal/event/animation/constrainer.h
@@ -48,24 +48,24 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~Constrainer();
+  ~Constrainer() override;
 
 public: // Object::Observer methods
 
   /**
    * @copydoc Object::Observer::SceneObjectAdded()
    */
-  virtual void SceneObjectAdded( Object& object ){}
+  void SceneObjectAdded( Object& object ) override{}
 
   /**
    * @copydoc Object::Observer::SceneObjectRemoved()
    */
-  virtual void SceneObjectRemoved( Object& object ){}
+  void SceneObjectRemoved( Object& object ) override{}
 
   /**
    * @copydoc Object::Observer::ObjectDestroyed()
    */
-  virtual void ObjectDestroyed( Object& object );
+  void ObjectDestroyed( Object& object ) override;
 
 public:
 
diff --git a/dali/internal/event/animation/constraint-base.h b/dali/internal/event/animation/constraint-base.h
index 1af8443..9f7c394 100644
--- a/dali/internal/event/animation/constraint-base.h
+++ b/dali/internal/event/animation/constraint-base.h
@@ -72,7 +72,7 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~ConstraintBase();
+  ~ConstraintBase() override;
 
   /**
    * Adds a constraint source to the constraint
@@ -139,17 +139,17 @@ private: // Object::Observer methods
   /**
    * @copydoc Object::Observer::SceneObjectAdded()
    */
-  virtual void SceneObjectAdded( Object& object );
+  void SceneObjectAdded( Object& object ) override;
 
   /**
    * @copydoc Object::Observer::SceneObjectRemoved()
    */
-  virtual void SceneObjectRemoved( Object& object );
+  void SceneObjectRemoved( Object& object ) override;
 
   /**
    * @copydoc Object::Observer::ObjectDestroyed()
    */
-  virtual void ObjectDestroyed( Object& object );
+  void ObjectDestroyed( Object& object ) override;
 
 private:
 
diff --git a/dali/internal/event/animation/constraint-impl.h b/dali/internal/event/animation/constraint-impl.h
index a7cf1e2..ccce2f6 100644
--- a/dali/internal/event/animation/constraint-impl.h
+++ b/dali/internal/event/animation/constraint-impl.h
@@ -71,7 +71,7 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~Constraint()
+  ~Constraint() override
   {
     // This is not responsible for removing constraints.
   }
@@ -81,7 +81,7 @@ private:
   /**
    * @copydoc ConstraintBase::DoClone()
    */
-  ConstraintBase* DoClone( Object& object ) override final
+  ConstraintBase* DoClone( Object& object ) final
   {
     ConstraintFunctionPtr funcPtr( mUserFunction->Clone() );
     return new Constraint( object,
@@ -111,7 +111,7 @@ private:
   /**
    * @copydoc ConstraintBase::ConnectConstraint()
    */
-  void ConnectConstraint() override final
+  void ConnectConstraint() final
   {
     // Should not come here if target object has been destroyed
     DALI_ASSERT_DEBUG( nullptr != mTargetObject );
@@ -226,7 +226,7 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~Constraint()
+  ~Constraint() override
   {
     // This is not responsible for removing constraints.
   }
@@ -236,7 +236,7 @@ private:
   /**
    * @copydoc ConstraintBase::DoClone()
    */
-  virtual ConstraintBase* DoClone( Object& object ) override final
+  ConstraintBase* DoClone( Object& object ) final
   {
     ConstraintFunctionPtr funcPtr( mUserFunction->Clone() );
     return new Constraint( object,
@@ -265,7 +265,7 @@ private:
   /**
    * @copydoc ConstraintBase::ConnectConstraint()
    */
-  void ConnectConstraint() override final
+  void ConnectConstraint() final
   {
     // Should not come here if target object has been destroyed
     DALI_ASSERT_DEBUG( nullptr != mTargetObject );
diff --git a/dali/internal/event/animation/key-frame-channel.h b/dali/internal/event/animation/key-frame-channel.h
index 3116903..05e5fde 100644
--- a/dali/internal/event/animation/key-frame-channel.h
+++ b/dali/internal/event/animation/key-frame-channel.h
@@ -70,11 +70,11 @@ public:
   }
 
 
-  virtual ~KeyFrameChannel()
+  ~KeyFrameChannel() override
   {
   }
 
-  bool IsActive (float progress);
+  bool IsActive (float progress) override;
 
   V GetValue(float progress, Dali::Animation::Interpolation interpolation) const;
 
diff --git a/dali/internal/event/animation/key-frames-impl.h b/dali/internal/event/animation/key-frames-impl.h
index 5d9a222..78df8e8 100644
--- a/dali/internal/event/animation/key-frames-impl.h
+++ b/dali/internal/event/animation/key-frames-impl.h
@@ -49,7 +49,7 @@ public:
   KeyFrames();
 
 protected:
-  virtual ~KeyFrames();
+  ~KeyFrames() override;
 
 private:
   /**
@@ -132,7 +132,7 @@ protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~KeyFrameSpec() {}
+  ~KeyFrameSpec() override {}
 };
 
 
@@ -196,7 +196,7 @@ protected:
   /**
    * Destructor. Ensure progress value pairs are cleared down
    */
-  virtual ~KeyFrameBaseSpec<V>()
+  ~KeyFrameBaseSpec<V>() override
   {
     delete mKeyFrames;
     mPVs.clear();
@@ -219,7 +219,7 @@ public:
    * Get the number of key frames
    * @return The size of the progress value vector
    */
-  virtual std::size_t GetNumberOfKeyFrames() const
+  std::size_t GetNumberOfKeyFrames() const override
   {
     return mPVs.size();
   }
@@ -240,7 +240,7 @@ public:
   /**
    * @copydoc KeyFrameSpec::GetKeyFrameAsValue()
    */
-  virtual void GetKeyFrameAsValue( std::size_t index, Property::Value& value )
+  void GetKeyFrameAsValue( std::size_t index, Property::Value& value ) override
   {
     value = mPVs[index].mValue;
   }
diff --git a/dali/internal/event/animation/linear-constrainer-impl.h b/dali/internal/event/animation/linear-constrainer-impl.h
index a5ffe29..52e9198 100644
--- a/dali/internal/event/animation/linear-constrainer-impl.h
+++ b/dali/internal/event/animation/linear-constrainer-impl.h
@@ -159,31 +159,31 @@ protected:
   /**
    * virtual destructor
    */
-  virtual ~LinearConstrainer();
+  ~LinearConstrainer() override;
 
 private:
 
   /**
    * @copydoc Dali::Internal::Object::SetDefaultProperty()
    */
-  virtual void SetDefaultProperty(Property::Index index, const Property::Value& propertyValue);
+  void SetDefaultProperty(Property::Index index, const Property::Value& propertyValue) override;
 
   /**
    * @copydoc Dali::Internal::Object::GetDefaultProperty()
    */
-  virtual Property::Value GetDefaultProperty( Property::Index index ) const;
+  Property::Value GetDefaultProperty( Property::Index index ) const override;
 
  /**
   * @copydoc Dali::Internal::Object::GetDefaultPropertyCurrentValue()
   */
- virtual Property::Value GetDefaultPropertyCurrentValue( Property::Index index ) const;
+ Property::Value GetDefaultPropertyCurrentValue( Property::Index index ) const override;
 
 public:
 
   /**
    * @copydoc Dali::PathConstrainer::Apply
    */
-  void Apply( Property target, Property source, const Vector2& range, const Vector2& wrap );
+  void Apply( Property target, Property source, const Vector2& range, const Vector2& wrap ) override;
 
 private:
 
diff --git a/dali/internal/event/animation/path-constrainer-impl.h b/dali/internal/event/animation/path-constrainer-impl.h
index f663285..60c599e 100644
--- a/dali/internal/event/animation/path-constrainer-impl.h
+++ b/dali/internal/event/animation/path-constrainer-impl.h
@@ -131,31 +131,31 @@ protected:
   /**
    * virtual destructor
    */
-  virtual ~PathConstrainer();
+  ~PathConstrainer() override;
 
 private:
 
   /**
    * @copydoc Dali::Internal::Object::SetDefaultProperty()
    */
-  virtual void SetDefaultProperty(Property::Index index, const Property::Value& propertyValue);
+  void SetDefaultProperty(Property::Index index, const Property::Value& propertyValue) override;
 
   /**
    * @copydoc Dali::Internal::Object::GetDefaultProperty()
    */
-  virtual Property::Value GetDefaultProperty( Property::Index index ) const;
+  Property::Value GetDefaultProperty( Property::Index index ) const override;
 
  /**
   * @copydoc Dali::Internal::Object::GetDefaultPropertyCurrentValue()
   */
- virtual Property::Value GetDefaultPropertyCurrentValue( Property::Index index ) const;
+ Property::Value GetDefaultPropertyCurrentValue( Property::Index index ) const override;
 
 public:
 
   /**
    * @copydoc Dali::PathConstrainer::Apply
    */
-  void Apply( Property target, Property source, const Vector2& range, const Vector2& wrap );
+  void Apply( Property target, Property source, const Vector2& range, const Vector2& wrap ) override;
 
 private:
 
diff --git a/dali/internal/event/animation/path-impl.h b/dali/internal/event/animation/path-impl.h
index fe3f3d3..2371a3b 100644
--- a/dali/internal/event/animation/path-impl.h
+++ b/dali/internal/event/animation/path-impl.h
@@ -54,19 +54,19 @@ protected:
   /**
    * virtual destructor
    */
-  virtual ~Path();
+  ~Path() override;
 
 private:
 
   /**
    * @copydoc Dali::Internal::Object::SetDefaultProperty()
    */
-  virtual void SetDefaultProperty(Property::Index index, const Property::Value& propertyValue);
+  void SetDefaultProperty(Property::Index index, const Property::Value& propertyValue) override;
 
    /**
    * @copydoc Dali::Internal::Object::GetDefaultProperty()
    */
-  virtual Property::Value GetDefaultProperty( Property::Index index ) const;
+  Property::Value GetDefaultProperty( Property::Index index ) const override;
 
 public:
 
diff --git a/dali/internal/event/animation/property-input-indexer.h b/dali/internal/event/animation/property-input-indexer.h
index d1e24d0..e9088af 100644
--- a/dali/internal/event/animation/property-input-indexer.h
+++ b/dali/internal/event/animation/property-input-indexer.h
@@ -73,14 +73,14 @@ public:
   /**
    * Virtual Destructor
    */
-  virtual ~PropertyInputIndexer()
+  ~PropertyInputIndexer() override
   {
   }
 
   /**
    * @copydoc Dali::Internal::PropertyInput::GetType()
    */
-  virtual Property::Type GetType() const
+  Property::Type GetType() const override
   {
     return mInput->GetType();
   }
@@ -88,7 +88,7 @@ public:
   /**
    * @copydoc Dali::Internal::PropertyInput::GetBoolean()
    */
-  virtual const bool& GetBoolean() const
+  const bool& GetBoolean() const override
   {
     return mInput->GetConstraintInputBoolean( mBufferIndex );
   }
@@ -96,7 +96,7 @@ public:
   /**
    * @copydoc Dali::Internal::PropertyInput::GetInteger()
    */
-  virtual const int& GetInteger() const
+  const int& GetInteger() const override
   {
     return mInput->GetConstraintInputInteger( mBufferIndex );
   }
@@ -104,7 +104,7 @@ public:
   /**
    * @copydoc Dali::Internal::PropertyInput::GetFloat()
    */
-  virtual const float& GetFloat() const
+  const float& GetFloat() const override
   {
     return mInput->GetConstraintInputFloat( mBufferIndex );
   }
@@ -112,7 +112,7 @@ public:
   /**
    * @copydoc Dali::Internal::PropertyInput::GetVector2()
    */
-  virtual const Vector2& GetVector2() const
+  const Vector2& GetVector2() const override
   {
     return mInput->GetConstraintInputVector2( mBufferIndex );
   }
@@ -120,7 +120,7 @@ public:
   /**
    * @copydoc Dali::Internal::PropertyInput::GetVector3()
    */
-  virtual const Vector3& GetVector3() const
+  const Vector3& GetVector3() const override
   {
     return mInput->GetConstraintInputVector3( mBufferIndex );
   }
@@ -128,7 +128,7 @@ public:
   /**
    * @copydoc Dali::Internal::PropertyInput::GetVector4()
    */
-  virtual const Vector4& GetVector4() const
+  const Vector4& GetVector4() const override
   {
     return mInput->GetConstraintInputVector4( mBufferIndex );
   }
@@ -136,7 +136,7 @@ public:
   /**
    * @copydoc Dali::Internal::PropertyInput::GetMatrix3()
    */
-  virtual const Matrix3& GetMatrix3() const
+  const Matrix3& GetMatrix3() const override
   {
     return mInput->GetConstraintInputMatrix3( mBufferIndex );
   }
@@ -144,7 +144,7 @@ public:
   /**
    * @copydoc Dali::Internal::PropertyInput::GetMatrix()
    */
-  virtual const Matrix& GetMatrix() const
+  const Matrix& GetMatrix() const override
   {
     return mInput->GetConstraintInputMatrix( mBufferIndex );
   }
@@ -152,7 +152,7 @@ public:
   /**
    * @copydoc Dali::Internal::PropertyInput::Quaternion()
    */
-  virtual const Quaternion& GetQuaternion() const
+  const Quaternion& GetQuaternion() const override
   {
     return mInput->GetConstraintInputQuaternion( mBufferIndex );
   }
diff --git a/dali/internal/event/common/object-impl.h b/dali/internal/event/common/object-impl.h
index a7bac60..5e3afb1 100644
--- a/dali/internal/event/common/object-impl.h
+++ b/dali/internal/event/common/object-impl.h
@@ -365,7 +365,7 @@ protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~Object();
+  ~Object() override;
 
   /**
    * Called immediately by derived classes, after the scene-object has been created & passed to the scene-graph.
diff --git a/dali/internal/event/common/object-registry-impl.h b/dali/internal/event/common/object-registry-impl.h
index c2a0022..228ecaf 100644
--- a/dali/internal/event/common/object-registry-impl.h
+++ b/dali/internal/event/common/object-registry-impl.h
@@ -111,7 +111,7 @@ private:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  ~ObjectRegistry();
+  ~ObjectRegistry() override;
 
 private:
 
diff --git a/dali/internal/event/common/property-conditions-impl.h b/dali/internal/event/common/property-conditions-impl.h
index 6c25076..71c49fa 100644
--- a/dali/internal/event/common/property-conditions-impl.h
+++ b/dali/internal/event/common/property-conditions-impl.h
@@ -62,7 +62,7 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~PropertyCondition();
+  ~PropertyCondition() override;
 
 private:
 
diff --git a/dali/internal/event/common/property-metadata.h b/dali/internal/event/common/property-metadata.h
index 432122e..37e4cdb 100644
--- a/dali/internal/event/common/property-metadata.h
+++ b/dali/internal/event/common/property-metadata.h
@@ -233,7 +233,7 @@ public:
   /**
    * @brief Destructor.
    */
-  virtual ~AnimatablePropertyMetadata()
+  ~AnimatablePropertyMetadata() override
   {
   }
 
@@ -296,7 +296,7 @@ public:
   /**
    * @brief Destructor.
    */
-  virtual ~CustomPropertyMetadata()
+  ~CustomPropertyMetadata() override
   {
   }
 
diff --git a/dali/internal/event/common/property-notification-impl.h b/dali/internal/event/common/property-notification-impl.h
index 1f9e139..e89f413 100644
--- a/dali/internal/event/common/property-notification-impl.h
+++ b/dali/internal/event/common/property-notification-impl.h
@@ -167,7 +167,7 @@ protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~PropertyNotification();
+  ~PropertyNotification() override;
 
 private:
 
diff --git a/dali/internal/event/common/property-notification-manager.h b/dali/internal/event/common/property-notification-manager.h
index 1a8b0a0..ef67e64 100644
--- a/dali/internal/event/common/property-notification-manager.h
+++ b/dali/internal/event/common/property-notification-manager.h
@@ -49,7 +49,7 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~PropertyNotificationManager();
+  ~PropertyNotificationManager() override;
 
   /**
    * Called when a PropertyNotification is constructed.
@@ -66,7 +66,7 @@ private: // private virtual overrides
   /**
    * @copydoc PropertyNotifier::NotifyProperty
    */
-  virtual void NotifyProperty( SceneGraph::PropertyNotification* propertyNotification, bool validity );
+  void NotifyProperty( SceneGraph::PropertyNotification* propertyNotification, bool validity ) override;
 
 private:
 
diff --git a/dali/internal/event/common/scene-impl.h b/dali/internal/event/common/scene-impl.h
index 09d6369..96b8a8f 100644
--- a/dali/internal/event/common/scene-impl.h
+++ b/dali/internal/event/common/scene-impl.h
@@ -71,7 +71,7 @@ public:
   /**
    * virtual destructor
    */
-  virtual ~Scene();
+  ~Scene() override;
 
   /**
    * @copydoc Dali::Integration::Scene::Add
@@ -266,13 +266,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;
 
 private:
 
diff --git a/dali/internal/event/common/stage-impl.h b/dali/internal/event/common/stage-impl.h
index 734a2d6..c689057 100644
--- 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
 
@@ -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:
 
diff --git a/dali/internal/event/common/thread-local-storage.h b/dali/internal/event/common/thread-local-storage.h
index 725f6e0..f994a12 100644
--- a/dali/internal/event/common/thread-local-storage.h
+++ b/dali/internal/event/common/thread-local-storage.h
@@ -196,7 +196,7 @@ private:
   /**
    * Virtual Destructor
    */
-  virtual ~ThreadLocalStorage();
+  ~ThreadLocalStorage() override;
 
   // Undefined
   ThreadLocalStorage( const ThreadLocalStorage& );
diff --git a/dali/internal/event/common/type-info-impl.h b/dali/internal/event/common/type-info-impl.h
index 02643c4..6d90b75 100644
--- a/dali/internal/event/common/type-info-impl.h
+++ b/dali/internal/event/common/type-info-impl.h
@@ -68,7 +68,7 @@ public:
   /**
    * Destructor
    */
-  virtual ~TypeInfo();
+  ~TypeInfo() override;
 
   /**
    * @copydoc Dali::TypeInfo::GetName
diff --git a/dali/internal/event/common/type-registry-impl.h b/dali/internal/event/common/type-registry-impl.h
index be637a4..35018b9 100644
--- a/dali/internal/event/common/type-registry-impl.h
+++ b/dali/internal/event/common/type-registry-impl.h
@@ -252,7 +252,7 @@ private:
 
 private:
   TypeRegistry();
-  ~TypeRegistry();
+  ~TypeRegistry() override;
 
   /**
    * @brief Undefined Copy Constructor
diff --git a/dali/internal/event/effects/shader-factory.h b/dali/internal/event/effects/shader-factory.h
index c09f859..6cf6cf9 100644
--- a/dali/internal/event/effects/shader-factory.h
+++ b/dali/internal/event/effects/shader-factory.h
@@ -50,7 +50,7 @@ public:
   /**
    * Destructor
    */
-  virtual ~ShaderFactory();
+  ~ShaderFactory() override;
 
   /**
    * @brief Looks for precompiled binary version of shader program in memory and file caches.
@@ -77,7 +77,7 @@ public:
    * @param[in] shader The data to be saved.
    * @sa Load
    */
-  virtual void SaveBinary( Internal::ShaderDataPtr shader );
+  void SaveBinary( Internal::ShaderDataPtr shader ) override;
 
 private:
 
diff --git a/dali/internal/event/events/actor-observer.h b/dali/internal/event/events/actor-observer.h
index 31adc34..35e2302 100644
--- a/dali/internal/event/events/actor-observer.h
+++ b/dali/internal/event/events/actor-observer.h
@@ -62,7 +62,7 @@ public:
   /**
    * Non virtual destructor
    */
-  ~ActorObserver();
+  ~ActorObserver() override;
 
   // Movable
 
@@ -119,21 +119,21 @@ private:
    * @param[in] object The object object.
    * @see Object::Observer::SceneObjectAdded()
    */
-  virtual void SceneObjectAdded( Object& object );
+  void SceneObjectAdded( Object& object ) override;
 
   /**
    * This will be called when the actor is removed from the scene.
    * @param[in] object The object object.
    * @see Object::Observer::SceneObjectRemoved()
    */
-  virtual void SceneObjectRemoved( Object& object );
+  void SceneObjectRemoved( Object& object ) override;
 
   /**
    * This will be called when the actor is destroyed. We should clear the actor.
    * No need to stop observing as the object is being destroyed anyway.
    * @see Object::Observer::ObjectDestroyed()
    */
-  virtual void ObjectDestroyed( Object& object );
+  void ObjectDestroyed( Object& object ) override;
 
 private:
   Actor* mActor;                 ///< Raw pointer to an Actor.
diff --git a/dali/internal/event/events/gesture-detector-impl.h b/dali/internal/event/events/gesture-detector-impl.h
index 3556398..d09c609 100644
--- a/dali/internal/event/events/gesture-detector-impl.h
+++ b/dali/internal/event/events/gesture-detector-impl.h
@@ -123,7 +123,7 @@ protected: // Creation & Destruction
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~GestureDetector();
+  ~GestureDetector() override;
 
 private:
 
@@ -135,17 +135,17 @@ private:
   /**
    * @copydoc Dali::Internal::Object::Observer::SceneObjectAdded()
    */
-  virtual void SceneObjectAdded(Object& object);
+  void SceneObjectAdded(Object& object) override;
 
   /**
    * @copydoc Dali::Internal::Object::Observer::SceneObjectAdded()
    */
-  virtual void SceneObjectRemoved(Object& object) {}
+  void SceneObjectRemoved(Object& object) override {}
 
   /**
    * @copydoc Dali::Internal::Object::Observer::ObjectDestroyed()
    */
-  virtual void ObjectDestroyed(Object& object);
+  void ObjectDestroyed(Object& object) override;
 
   /**
    * For use in derived classes, called after an actor is attached.
diff --git a/dali/internal/event/events/gesture-impl.h b/dali/internal/event/events/gesture-impl.h
index 8a57696..0f208ef 100644
--- a/dali/internal/event/events/gesture-impl.h
+++ b/dali/internal/event/events/gesture-impl.h
@@ -111,7 +111,7 @@ protected:
    *
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~Gesture() = default;
+  ~Gesture() override = default;
 
 private:
   GestureType::Value mGestureType;
diff --git a/dali/internal/event/events/gesture-processor.cpp b/dali/internal/event/events/gesture-processor.cpp
index dab221d..87845c9 100644
--- a/dali/internal/event/events/gesture-processor.cpp
+++ b/dali/internal/event/events/gesture-processor.cpp
@@ -46,19 +46,19 @@ struct GestureHitTestCheck : public HitTestAlgorithm::HitTestInterface
   {
   }
 
-  virtual bool IsActorHittable( Actor* actor )
+  bool IsActorHittable( Actor* actor ) override
   {
     return actor->IsGestureRequired( mType ) && // Does the Application or derived actor type require the gesture?
            actor->IsHittable();                 // Is actor sensitive, visible and on the scene?
   }
 
-  virtual bool DescendActorHierarchy( Actor* actor )
+  bool DescendActorHierarchy( Actor* actor ) override
   {
     return actor->IsVisible() && // Actor is visible, if not visible then none of its children are visible.
            actor->IsSensitive(); // Actor is sensitive, if insensitive none of its children should be hittable either.
   }
 
-  virtual bool DoesLayerConsumeHit( Layer* layer )
+  bool DoesLayerConsumeHit( Layer* layer ) override
   {
     return layer->IsTouchConsumed();
   }
diff --git a/dali/internal/event/events/gesture-processor.h b/dali/internal/event/events/gesture-processor.h
index 7131b2f..fc05876 100644
--- a/dali/internal/event/events/gesture-processor.h
+++ b/dali/internal/event/events/gesture-processor.h
@@ -69,7 +69,7 @@ protected:
   /**
    * Virtual protected destructor.
    */
-  virtual ~GestureProcessor();
+  ~GestureProcessor() override;
 
   // Methods to be used by deriving classes
 
@@ -165,7 +165,7 @@ private:
    * @param[in] object The object object.
    * @see Object::Observer::SceneObjectAdded()
    */
-  virtual void SceneObjectAdded(Object& object) { }
+  void SceneObjectAdded(Object& object) override { }
 
   /**
    * This will be called when the actor is removed from the stage, we should clear and stop
@@ -173,14 +173,14 @@ private:
    * @param[in] object The object object.
    * @see Object::Observer::SceneObjectRemoved()
    */
-  virtual void SceneObjectRemoved(Object& object);
+  void SceneObjectRemoved(Object& object) override;
 
   /**
    * This will be called when the actor is destroyed. We should clear the actor.
    * No need to stop observing as the object is being destroyed anyway.
    * @see Object::Observer::ObjectDestroyed()
    */
-  virtual void ObjectDestroyed(Object& object);
+  void ObjectDestroyed(Object& object) override;
 
 
 protected:  //Data
diff --git a/dali/internal/event/events/gesture-recognizer.h b/dali/internal/event/events/gesture-recognizer.h
index 51f4bfc..f53e573 100644
--- a/dali/internal/event/events/gesture-recognizer.h
+++ b/dali/internal/event/events/gesture-recognizer.h
@@ -116,7 +116,7 @@ protected:
   /**
    * Virtual destructor.
    */
-  virtual ~GestureRecognizer() {}
+  ~GestureRecognizer() override {}
 
 protected:
   Vector2 mScreenSize;
diff --git a/dali/internal/event/events/gesture-requests.h b/dali/internal/event/events/gesture-requests.h
index c01c3d5..be7ab70 100644
--- a/dali/internal/event/events/gesture-requests.h
+++ b/dali/internal/event/events/gesture-requests.h
@@ -73,7 +73,7 @@ struct PanGestureRequest : public GestureRequest
   /**
    * Virtual destructor
    */
-  virtual ~PanGestureRequest()
+  ~PanGestureRequest() override
   {
   }
 
@@ -105,7 +105,7 @@ struct TapGestureRequest : public GestureRequest
   /**
    * Virtual destructor
    */
-  virtual ~TapGestureRequest()
+  ~TapGestureRequest() override
   {
   }
 
@@ -137,7 +137,7 @@ struct LongPressGestureRequest : public GestureRequest
   /**
    * Virtual destructor
    */
-  virtual ~LongPressGestureRequest()
+  ~LongPressGestureRequest() override
   {
   }
 
diff --git a/dali/internal/event/events/hit-test-algorithm-impl.cpp b/dali/internal/event/events/hit-test-algorithm-impl.cpp
index 943c6cd..755c869 100644
--- a/dali/internal/event/events/hit-test-algorithm-impl.cpp
+++ b/dali/internal/event/events/hit-test-algorithm-impl.cpp
@@ -73,17 +73,17 @@ struct HitTestFunctionWrapper : public HitTestInterface
   {
   }
 
-  virtual bool IsActorHittable( Actor* actor )
+  bool IsActorHittable( Actor* actor ) override
   {
     return mFunc( Dali::Actor( actor ), Dali::HitTestAlgorithm::CHECK_ACTOR );
   }
 
-  virtual bool DescendActorHierarchy( Actor* actor )
+  bool DescendActorHierarchy( Actor* actor ) override
   {
     return mFunc( Dali::Actor( actor ), Dali::HitTestAlgorithm::DESCEND_ACTOR_TREE );
   }
 
-  virtual bool DoesLayerConsumeHit( Layer* layer )
+  bool DoesLayerConsumeHit( Layer* layer ) override
   {
     // Layer::IsTouchConsumed() focuses on touch only. Here we are a wrapper for the public-api
     // where the caller may want to check for something completely different.
@@ -100,19 +100,19 @@ struct HitTestFunctionWrapper : public HitTestInterface
  */
 struct ActorTouchableCheck : public HitTestInterface
 {
-  virtual bool IsActorHittable( Actor* actor )
+  bool IsActorHittable( Actor* actor ) override
   {
     return actor->GetTouchRequired() && // Does the Application or derived actor type require a touch event?
            actor->IsHittable();         // Is actor sensitive, visible and on the scene?
   }
 
-  virtual bool DescendActorHierarchy( Actor* actor )
+  bool DescendActorHierarchy( Actor* actor ) override
   {
     return actor->IsVisible() && // Actor is visible, if not visible then none of its children are visible.
            actor->IsSensitive(); // Actor is sensitive, if insensitive none of its children should be hittable either.
   }
 
-  virtual bool DoesLayerConsumeHit( Layer* layer )
+  bool DoesLayerConsumeHit( Layer* layer ) override
   {
     return layer->IsTouchConsumed();
   }
diff --git a/dali/internal/event/events/hover-event-impl.h b/dali/internal/event/events/hover-event-impl.h
index 4d9c8f6..9564719 100755
--- a/dali/internal/event/events/hover-event-impl.h
+++ b/dali/internal/event/events/hover-event-impl.h
@@ -137,7 +137,7 @@ private:
    *
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~HoverEvent() = default;
+  ~HoverEvent() override = default;
 
   // Not copyable or movable
 
diff --git a/dali/internal/event/events/hover-event-processor.cpp b/dali/internal/event/events/hover-event-processor.cpp
index 64e969f..0eb1f0a 100644
--- a/dali/internal/event/events/hover-event-processor.cpp
+++ b/dali/internal/event/events/hover-event-processor.cpp
@@ -140,19 +140,19 @@ Dali::Actor EmitHoverSignals( Actor* actor, RenderTask& renderTask, const HoverE
  */
 struct ActorHoverableCheck : public HitTestAlgorithm::HitTestInterface
 {
-  bool IsActorHittable( Actor* actor )
+  bool IsActorHittable( Actor* actor ) override
   {
     return actor->GetHoverRequired() && // Does the Application or derived actor type require a hover event?
            actor->IsHittable();         // Is actor sensitive, visible and on the scene?
   }
 
-  bool DescendActorHierarchy( Actor* actor )
+  bool DescendActorHierarchy( Actor* actor ) override
   {
     return actor->IsVisible() && // Actor is visible, if not visible then none of its children are visible.
            actor->IsSensitive(); // Actor is sensitive, if insensitive none of its children should be hittable either.
   }
 
-  bool DoesLayerConsumeHit( Layer* layer )
+  bool DoesLayerConsumeHit( Layer* layer ) override
   {
     return layer->IsHoverConsumed();
   }
diff --git a/dali/internal/event/events/key-event-impl.h b/dali/internal/event/events/key-event-impl.h
index 863e244..95b417a 100755
--- a/dali/internal/event/events/key-event-impl.h
+++ b/dali/internal/event/events/key-event-impl.h
@@ -217,7 +217,7 @@ private:
    *
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~KeyEvent() = default;
+  ~KeyEvent() override = default;
 
   // Not copyable or movable
 
diff --git a/dali/internal/event/events/long-press-gesture/long-press-gesture-detector-impl.h b/dali/internal/event/events/long-press-gesture/long-press-gesture-detector-impl.h
index e297b25..1a9e12c 100644
--- a/dali/internal/event/events/long-press-gesture/long-press-gesture-detector-impl.h
+++ b/dali/internal/event/events/long-press-gesture/long-press-gesture-detector-impl.h
@@ -136,7 +136,7 @@ protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~LongPressGestureDetector();
+  ~LongPressGestureDetector() override;
 
 private:
 
@@ -149,17 +149,17 @@ private: // GestureDetector overrides
   /**
    * @copydoc Dali::Internal::GestureDetector::OnActorAttach(Actor&)
    */
-  virtual void OnActorAttach(Actor& actor);
+  void OnActorAttach(Actor& actor) override;
 
   /**
    * @copydoc Dali::Internal::GestureDetector::OnActorDetach(Actor&)
    */
-  virtual void OnActorDetach(Actor& actor);
+  void OnActorDetach(Actor& actor) override;
 
   /**
    * @copydoc Dali::Internal::GestureDetector::OnActorDestroyed(Object&)
    */
-  virtual void OnActorDestroyed(Object& object);
+  void OnActorDestroyed(Object& object) override;
 
 private:
 
diff --git a/dali/internal/event/events/long-press-gesture/long-press-gesture-event.h b/dali/internal/event/events/long-press-gesture/long-press-gesture-event.h
index 2c4e7a3..bbb6f13 100644
--- a/dali/internal/event/events/long-press-gesture/long-press-gesture-event.h
+++ b/dali/internal/event/events/long-press-gesture/long-press-gesture-event.h
@@ -52,7 +52,7 @@ struct LongPressGestureEvent : public GestureEvent
   /**
    * Virtual destructor
    */
-  virtual ~LongPressGestureEvent();
+  ~LongPressGestureEvent() override;
 
   // Data
 
diff --git a/dali/internal/event/events/long-press-gesture/long-press-gesture-impl.h b/dali/internal/event/events/long-press-gesture/long-press-gesture-impl.h
index c8c95ec..b9734d0 100644
--- a/dali/internal/event/events/long-press-gesture/long-press-gesture-impl.h
+++ b/dali/internal/event/events/long-press-gesture/long-press-gesture-impl.h
@@ -112,7 +112,7 @@ private:
    *
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~LongPressGesture() = default;
+  ~LongPressGesture() override = default;
 
 private:
   Vector2 mScreenPoint;
diff --git a/dali/internal/event/events/long-press-gesture/long-press-gesture-processor.h b/dali/internal/event/events/long-press-gesture/long-press-gesture-processor.h
index 8026167..e2a4585 100644
--- a/dali/internal/event/events/long-press-gesture/long-press-gesture-processor.h
+++ b/dali/internal/event/events/long-press-gesture/long-press-gesture-processor.h
@@ -54,7 +54,7 @@ public:
   /**
    * Non-virtual destructor; LongPressGestureProcessor is not a base class
    */
-  ~LongPressGestureProcessor();
+  ~LongPressGestureProcessor() override;
 
 public: // To be called by GestureEventProcessor
 
@@ -63,7 +63,7 @@ public: // To be called by GestureEventProcessor
    * @param[in] scene The scene the long press gesture event occurs in.
    * @param[in] longPressEvent The event that has occurred.
    */
-  void Process( Scene& scene, const LongPressGestureEvent& longPressEvent );
+  void Process( Scene& scene, const LongPressGestureEvent& longPressEvent ) override;
 
   /**
    * Adds a gesture detector to this gesture processor.
@@ -119,17 +119,17 @@ private:
   /**
    * @copydoc GestureProcessor::OnGesturedActorStageDisconnection()
    */
-  void OnGesturedActorStageDisconnection();
+  void OnGesturedActorStageDisconnection() override;
 
   /**
    * @copydoc GestureProcessor::CheckGestureDetector()
    */
-  bool CheckGestureDetector( GestureDetector* detector, Actor* actor );
+  bool CheckGestureDetector( GestureDetector* detector, Actor* actor ) override;
 
   /**
    * @copydoc GestureProcessor::EmitGestureSignal()
    */
-  void EmitGestureSignal( Actor* actor, const GestureDetectorContainer& gestureDetectors, Vector2 actorCoordinates );
+  void EmitGestureSignal( Actor* actor, const GestureDetectorContainer& gestureDetectors, Vector2 actorCoordinates ) override;
 
 private:
 
diff --git a/dali/internal/event/events/long-press-gesture/long-press-gesture-recognizer.h b/dali/internal/event/events/long-press-gesture/long-press-gesture-recognizer.h
index 5480ca6..f2c05e0 100644
--- a/dali/internal/event/events/long-press-gesture/long-press-gesture-recognizer.h
+++ b/dali/internal/event/events/long-press-gesture/long-press-gesture-recognizer.h
@@ -63,19 +63,19 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~LongPressGestureRecognizer();
+  ~LongPressGestureRecognizer() override;
 
 public:
 
   /**
    * @copydoc Dali::Internal::GestureDetector::SendEvent(const Integration::TouchEvent&)
    */
-  virtual void SendEvent(const Integration::TouchEvent& event);
+  void SendEvent(const Integration::TouchEvent& event) override;
 
   /**
    * @copydoc Dali::Internal::GestureDetector::Update(const Integration::GestureRequest&)
    */
-  virtual void Update(const GestureRequest& request);
+  void Update(const GestureRequest& request) override;
 
   /**
    * @brief This method sets the minimum holding time required to be recognized as a long press gesture
diff --git a/dali/internal/event/events/pan-gesture/pan-gesture-detector-impl.h b/dali/internal/event/events/pan-gesture/pan-gesture-detector-impl.h
index 4d42b12..a818fc2 100644
--- a/dali/internal/event/events/pan-gesture/pan-gesture-detector-impl.h
+++ b/dali/internal/event/events/pan-gesture/pan-gesture-detector-impl.h
@@ -178,7 +178,7 @@ protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~PanGestureDetector();
+  ~PanGestureDetector() override;
 
 private:
 
@@ -197,17 +197,17 @@ private:
   /**
    * @copydoc Dali::Internal::GestureDetector::OnActorAttach(Actor&)
    */
-  virtual void OnActorAttach(Actor& actor);
+  void OnActorAttach(Actor& actor) override;
 
   /**
    * @copydoc Dali::Internal::GestureDetector::OnActorDetach(Actor&)
    */
-  virtual void OnActorDetach(Actor& actor);
+  void OnActorDetach(Actor& actor) override;
 
   /**
    * @copydoc Dali::Internal::GestureDetector::OnActorDestroyed(Object&)
    */
-  virtual void OnActorDestroyed(Object& object);
+  void OnActorDestroyed(Object& object) override;
 
 
   // Default property extensions from Object
@@ -215,22 +215,22 @@ private:
   /**
    * @copydoc Dali::Internal::Object::SetDefaultProperty()
    */
-  virtual void SetDefaultProperty(Property::Index index, const Property::Value& propertyValue);
+  void SetDefaultProperty(Property::Index index, const Property::Value& propertyValue) override;
 
   /**
    * @copydoc Dali::Internal::Object::GetDefaultProperty()
    */
-  virtual Property::Value GetDefaultProperty( Property::Index index ) const;
+  Property::Value GetDefaultProperty( Property::Index index ) const override;
 
   /**
    * @copydoc Dali::Internal::Object::GetDefaultPropertyCurrentValue()
    */
-  virtual Property::Value GetDefaultPropertyCurrentValue( Property::Index index ) const;
+  Property::Value GetDefaultPropertyCurrentValue( Property::Index index ) const override;
 
   /**
    * @copydoc Dali::Internal::Object::GetSceneObjectInputProperty()
    */
-  virtual const PropertyInputImpl* GetSceneObjectInputProperty( Property::Index index ) const;
+  const PropertyInputImpl* GetSceneObjectInputProperty( Property::Index index ) const override;
 
 private:
 
diff --git a/dali/internal/event/events/pan-gesture/pan-gesture-event.h b/dali/internal/event/events/pan-gesture/pan-gesture-event.h
index 6f7695c..b6bee62 100644
--- a/dali/internal/event/events/pan-gesture/pan-gesture-event.h
+++ b/dali/internal/event/events/pan-gesture/pan-gesture-event.h
@@ -55,7 +55,7 @@ struct PanGestureEvent: public GestureEvent
   /**
    * Virtual destructor
    */
-  virtual ~PanGestureEvent();
+  ~PanGestureEvent() override;
 
   // Data
 
diff --git a/dali/internal/event/events/pan-gesture/pan-gesture-impl.h b/dali/internal/event/events/pan-gesture/pan-gesture-impl.h
index eb5b1f6..60ad977 100644
--- a/dali/internal/event/events/pan-gesture/pan-gesture-impl.h
+++ b/dali/internal/event/events/pan-gesture/pan-gesture-impl.h
@@ -213,7 +213,7 @@ private:
    *
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~PanGesture() = default;
+  ~PanGesture() override = default;
 
 private:
   Vector2 mVelocity;
diff --git a/dali/internal/event/events/pan-gesture/pan-gesture-processor.h b/dali/internal/event/events/pan-gesture/pan-gesture-processor.h
index 80439bf..2262b26 100644
--- a/dali/internal/event/events/pan-gesture/pan-gesture-processor.h
+++ b/dali/internal/event/events/pan-gesture/pan-gesture-processor.h
@@ -63,7 +63,7 @@ public:
   /**
    * Destructor
    */
-  virtual ~PanGestureProcessor();
+  ~PanGestureProcessor() override;
 
 public: // To be called by GestureEventProcessor
 
@@ -72,7 +72,7 @@ public: // To be called by GestureEventProcessor
    * @param[in] scene The scene the pan gesture event occurs in.
    * @param[in] panEvent The event that has occurred.
    */
-  void Process( Scene& scene, const PanGestureEvent& panEvent );
+  void Process( Scene& scene, const PanGestureEvent& panEvent ) override;
 
   /**
    * Adds a gesture detector to this gesture processor.
@@ -262,17 +262,17 @@ private:
   /**
    * @copydoc GestureProcessor::OnGesturedActorStageDisconnection()
    */
-  void OnGesturedActorStageDisconnection();
+  void OnGesturedActorStageDisconnection() override;
 
   /**
    * @copydoc GestureProcessor::CheckGestureDetector()
    */
-  bool CheckGestureDetector( GestureDetector* detector, Actor* actor );
+  bool CheckGestureDetector( GestureDetector* detector, Actor* actor ) override;
 
   /**
    * @copydoc GestureProcessor::EmitGestureSignal()
    */
-  void EmitGestureSignal( Actor* actor, const GestureDetectorContainer& gestureDetectors, Vector2 actorCoordinates );
+  void EmitGestureSignal( Actor* actor, const GestureDetectorContainer& gestureDetectors, Vector2 actorCoordinates ) override;
 
 private:
 
diff --git a/dali/internal/event/events/pan-gesture/pan-gesture-recognizer.h b/dali/internal/event/events/pan-gesture/pan-gesture-recognizer.h
index 17ad5e3..3babbc7 100644
--- a/dali/internal/event/events/pan-gesture/pan-gesture-recognizer.h
+++ b/dali/internal/event/events/pan-gesture/pan-gesture-recognizer.h
@@ -60,19 +60,19 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~PanGestureRecognizer();
+  ~PanGestureRecognizer() override;
 
 public:
 
   /**
    * @copydoc Dali::Internal::GestureDetector::SendEvent(const Integration::TouchEvent&)
    */
-  virtual void SendEvent(const Integration::TouchEvent& event);
+  void SendEvent(const Integration::TouchEvent& event) override;
 
   /**
    * @copydoc Dali::Internal::GestureDetector::Update(const Integration::GestureRequest&)
    */
-  virtual void Update(const GestureRequest& request);
+  void Update(const GestureRequest& request) override;
 
 private:
 
diff --git a/dali/internal/event/events/pinch-gesture/pinch-gesture-detector-impl.h b/dali/internal/event/events/pinch-gesture/pinch-gesture-detector-impl.h
index 3efc4d7..6dbdb2c 100644
--- a/dali/internal/event/events/pinch-gesture/pinch-gesture-detector-impl.h
+++ b/dali/internal/event/events/pinch-gesture/pinch-gesture-detector-impl.h
@@ -88,7 +88,7 @@ protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~PinchGestureDetector();
+  ~PinchGestureDetector() override;
 
 private:
 
@@ -101,17 +101,17 @@ private: // GestureDetector overrides
   /**
    * @copydoc Dali::Internal::GestureDetector::OnActorAttach(Actor&)
    */
-  virtual void OnActorAttach(Actor& actor);
+  void OnActorAttach(Actor& actor) override;
 
   /**
    * @copydoc Dali::Internal::GestureDetector::OnActorDetach(Actor&)
    */
-  virtual void OnActorDetach(Actor& actor);
+  void OnActorDetach(Actor& actor) override;
 
   /**
    * @copydoc Dali::Internal::GestureDetector::OnActorDestroyed(Object&)
    */
-  virtual void OnActorDestroyed(Object& object);
+  void OnActorDestroyed(Object& object) override;
 
 private:
 
diff --git a/dali/internal/event/events/pinch-gesture/pinch-gesture-event.h b/dali/internal/event/events/pinch-gesture/pinch-gesture-event.h
index 204f9ef..648659a 100644
--- a/dali/internal/event/events/pinch-gesture/pinch-gesture-event.h
+++ b/dali/internal/event/events/pinch-gesture/pinch-gesture-event.h
@@ -51,7 +51,7 @@ struct PinchGestureEvent : public GestureEvent
   /**
    * Virtual destructor
    */
-  virtual ~PinchGestureEvent();
+  ~PinchGestureEvent() override;
 
   // Data
 
diff --git a/dali/internal/event/events/pinch-gesture/pinch-gesture-impl.h b/dali/internal/event/events/pinch-gesture/pinch-gesture-impl.h
index eaf8f7e..1036a19 100644
--- a/dali/internal/event/events/pinch-gesture/pinch-gesture-impl.h
+++ b/dali/internal/event/events/pinch-gesture/pinch-gesture-impl.h
@@ -128,7 +128,7 @@ private:
    *
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~PinchGesture() = default;
+  ~PinchGesture() override = default;
 
 private:
   Vector2 mScreenCenterPoint;
diff --git a/dali/internal/event/events/pinch-gesture/pinch-gesture-processor.h b/dali/internal/event/events/pinch-gesture/pinch-gesture-processor.h
index 7f37f4a..22c77f5 100644
--- a/dali/internal/event/events/pinch-gesture/pinch-gesture-processor.h
+++ b/dali/internal/event/events/pinch-gesture/pinch-gesture-processor.h
@@ -56,7 +56,7 @@ public:
   /**
    * Non-virtual destructor; PinchGestureProcessor is not a base class
    */
-  ~PinchGestureProcessor();
+  ~PinchGestureProcessor() override;
 
 public: // To be called by GestureEventProcessor
 
@@ -83,7 +83,7 @@ public: // To be called by GestureEventProcessor
    * @param[in] scene The scene the pinch gesture event occurs in.
    * @param[in] pinchEvent The event that has occurred.
    */
-  void Process( Scene& scene, const PinchGestureEvent& pinchEvent );
+  void Process( Scene& scene, const PinchGestureEvent& pinchEvent ) override;
 
   /**
    * Adds a gesture detector to this gesture processor.
@@ -120,17 +120,17 @@ private:
   /**
    * @copydoc GestureProcessor::OnGesturedActorStageDisconnection()
    */
-  void OnGesturedActorStageDisconnection();
+  void OnGesturedActorStageDisconnection() override;
 
   /**
    * @copydoc GestureProcessor::CheckGestureDetector()
    */
-  bool CheckGestureDetector( GestureDetector* detector, Actor* actor );
+  bool CheckGestureDetector( GestureDetector* detector, Actor* actor ) override;
 
   /**
    * @copydoc GestureProcessor::EmitGestureSignal()
    */
-  void EmitGestureSignal( Actor* actor, const GestureDetectorContainer& gestureDetectors, Vector2 actorCoordinates );
+  void EmitGestureSignal( Actor* actor, const GestureDetectorContainer& gestureDetectors, Vector2 actorCoordinates ) override;
 
 private:
 
diff --git a/dali/internal/event/events/pinch-gesture/pinch-gesture-recognizer.h b/dali/internal/event/events/pinch-gesture/pinch-gesture-recognizer.h
index 235a38b..65a95f1 100644
--- a/dali/internal/event/events/pinch-gesture/pinch-gesture-recognizer.h
+++ b/dali/internal/event/events/pinch-gesture/pinch-gesture-recognizer.h
@@ -58,7 +58,7 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~PinchGestureRecognizer();
+  ~PinchGestureRecognizer() override;
 
 public:
 
@@ -79,12 +79,12 @@ public:
   /**
    * @copydoc Dali::Internal::GestureDetector::SendEvent(const Integration::TouchEvent&)
    */
-  virtual void SendEvent(const Integration::TouchEvent& event);
+  void SendEvent(const Integration::TouchEvent& event) override;
 
   /**
    * @copydoc Dali::Internal::GestureDetector::Update(const Integration::GestureRequest&)
    */
-  virtual void Update(const GestureRequest& request);
+  void Update(const GestureRequest& request) override;
 
 private:
 
diff --git a/dali/internal/event/events/rotation-gesture/rotation-gesture-detector-impl.h b/dali/internal/event/events/rotation-gesture/rotation-gesture-detector-impl.h
index ef1d708..f6821c4 100644
--- a/dali/internal/event/events/rotation-gesture/rotation-gesture-detector-impl.h
+++ b/dali/internal/event/events/rotation-gesture/rotation-gesture-detector-impl.h
@@ -93,24 +93,24 @@ protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~RotationGestureDetector() = default;
+  ~RotationGestureDetector() override = default;
 
 private: // GestureDetector overrides
 
   /**
    * @copydoc Dali::Internal::GestureDetector::OnActorAttach(Actor&)
    */
-  virtual void OnActorAttach( Actor& actor ) { /* Nothing to do */ }
+  void OnActorAttach( Actor& actor ) override { /* Nothing to do */ }
 
   /**
    * @copydoc Dali::Internal::GestureDetector::OnActorDetach(Actor&)
    */
-  virtual void OnActorDetach( Actor& actor ) { /* Nothing to do */ }
+  void OnActorDetach( Actor& actor ) override { /* Nothing to do */ }
 
   /**
    * @copydoc Dali::Internal::GestureDetector::OnActorDestroyed(Object&)
    */
-  virtual void OnActorDestroyed( Object& object ) { /* Nothing to do */ }
+  void OnActorDestroyed( Object& object ) override { /* Nothing to do */ }
 
 private:
 
diff --git a/dali/internal/event/events/rotation-gesture/rotation-gesture-event.h b/dali/internal/event/events/rotation-gesture/rotation-gesture-event.h
index 4a651ff..6fda1e4 100644
--- a/dali/internal/event/events/rotation-gesture/rotation-gesture-event.h
+++ b/dali/internal/event/events/rotation-gesture/rotation-gesture-event.h
@@ -54,7 +54,7 @@ struct RotationGestureEvent : public GestureEvent
   /**
    * Virtual destructor
    */
-  virtual ~RotationGestureEvent() = default;
+  ~RotationGestureEvent() override = default;
 
   // Data
 
diff --git a/dali/internal/event/events/rotation-gesture/rotation-gesture-impl.h b/dali/internal/event/events/rotation-gesture/rotation-gesture-impl.h
index 41c5a97..26c0960 100644
--- a/dali/internal/event/events/rotation-gesture/rotation-gesture-impl.h
+++ b/dali/internal/event/events/rotation-gesture/rotation-gesture-impl.h
@@ -111,7 +111,7 @@ private:
    *
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~RotationGesture() = default;
+  ~RotationGesture() override = default;
 
 private:
   Radian mRotation;
diff --git a/dali/internal/event/events/rotation-gesture/rotation-gesture-processor.h b/dali/internal/event/events/rotation-gesture/rotation-gesture-processor.h
index 3021fe4..1eb277c 100644
--- a/dali/internal/event/events/rotation-gesture/rotation-gesture-processor.h
+++ b/dali/internal/event/events/rotation-gesture/rotation-gesture-processor.h
@@ -56,7 +56,7 @@ public:
   /**
    * Non-virtual destructor; RotationGestureProcessor is not a base class
    */
-  ~RotationGestureProcessor() = default;
+  ~RotationGestureProcessor() override = default;
 
   RotationGestureProcessor( const RotationGestureProcessor& )                = delete; ///< Deleted copy constructor.
   RotationGestureProcessor& operator=( const RotationGestureProcessor& rhs ) = delete; ///< Deleted copy assignment operator.
@@ -68,7 +68,7 @@ public: // To be called by GestureEventProcessor
    * @param[in] scene The scene the rotation gesture event occurs in.
    * @param[in] rotationEvent The event that has occurred.
    */
-  void Process( Scene& scene, const RotationGestureEvent& rotationEvent );
+  void Process( Scene& scene, const RotationGestureEvent& rotationEvent ) override;
 
   /**
    * Adds a gesture detector to this gesture processor.
@@ -106,17 +106,17 @@ private:
   /**
    * @copydoc GestureProcessor::OnGesturedActorStageDisconnection()
    */
-  void OnGesturedActorStageDisconnection();
+  void OnGesturedActorStageDisconnection() override;
 
   /**
    * @copydoc GestureProcessor::CheckGestureDetector()
    */
-  bool CheckGestureDetector( GestureDetector* detector, Actor* actor );
+  bool CheckGestureDetector( GestureDetector* detector, Actor* actor ) override;
 
   /**
    * @copydoc GestureProcessor::EmitGestureSignal()
    */
-  void EmitGestureSignal( Actor* actor, const GestureDetectorContainer& gestureDetectors, Vector2 actorCoordinates );
+  void EmitGestureSignal( Actor* actor, const GestureDetectorContainer& gestureDetectors, Vector2 actorCoordinates ) override;
 
 private:
 
diff --git a/dali/internal/event/events/rotation-gesture/rotation-gesture-recognizer.h b/dali/internal/event/events/rotation-gesture/rotation-gesture-recognizer.h
index a96d980..8ddaaf1 100644
--- a/dali/internal/event/events/rotation-gesture/rotation-gesture-recognizer.h
+++ b/dali/internal/event/events/rotation-gesture/rotation-gesture-recognizer.h
@@ -56,19 +56,19 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~RotationGestureRecognizer() = default;
+  ~RotationGestureRecognizer() override = default;
 
 public:
 
   /**
    * @copydoc Dali::Internal::GestureDetector::SendEvent(const Integration::TouchEvent&)
    */
-  virtual void SendEvent( const Integration::TouchEvent& event );
+  void SendEvent( const Integration::TouchEvent& event ) override;
 
   /**
    * @copydoc Dali::Internal::GestureDetector::Update(const Integration::GestureRequest&)
    */
-  virtual void Update( const GestureRequest& request ) { /* Nothing to do */ }
+  void Update( const GestureRequest& request ) override { /* Nothing to do */ }
 
   /**
    * Sets the minimum touch events required before a rotation can be started
diff --git a/dali/internal/event/events/tap-gesture/tap-gesture-detector-impl.h b/dali/internal/event/events/tap-gesture/tap-gesture-detector-impl.h
index 5c8fe85..b6b5bc8 100644
--- a/dali/internal/event/events/tap-gesture/tap-gesture-detector-impl.h
+++ b/dali/internal/event/events/tap-gesture/tap-gesture-detector-impl.h
@@ -133,7 +133,7 @@ protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~TapGestureDetector();
+  ~TapGestureDetector() override;
 
 private:
 
@@ -146,17 +146,17 @@ private: // GestureDetector overrides
   /**
    * @copydoc Dali::Internal::GestureDetector::OnActorAttach(Actor&)
    */
-  virtual void OnActorAttach(Actor& actor);
+  void OnActorAttach(Actor& actor) override;
 
   /**
    * @copydoc Dali::Internal::GestureDetector::OnActorDetach(Actor&)
    */
-  virtual void OnActorDetach(Actor& actor);
+  void OnActorDetach(Actor& actor) override;
 
   /**
    * @copydoc Dali::Internal::GestureDetector::OnActorDestroyed(Object&)
    */
-  virtual void OnActorDestroyed(Object& object);
+  void OnActorDestroyed(Object& object) override;
 
 private:
 
diff --git a/dali/internal/event/events/tap-gesture/tap-gesture-event.h b/dali/internal/event/events/tap-gesture/tap-gesture-event.h
index 6576974..0b62b9f 100644
--- a/dali/internal/event/events/tap-gesture/tap-gesture-event.h
+++ b/dali/internal/event/events/tap-gesture/tap-gesture-event.h
@@ -55,7 +55,7 @@ struct TapGestureEvent : public GestureEvent
   /**
    * Virtual destructor
    */
-  virtual ~TapGestureEvent();
+  ~TapGestureEvent() override;
 
   // Data
 
diff --git a/dali/internal/event/events/tap-gesture/tap-gesture-impl.h b/dali/internal/event/events/tap-gesture/tap-gesture-impl.h
index 62d5214..ef0a8dd 100644
--- a/dali/internal/event/events/tap-gesture/tap-gesture-impl.h
+++ b/dali/internal/event/events/tap-gesture/tap-gesture-impl.h
@@ -128,7 +128,7 @@ private:
    *
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~TapGesture() = default;
+  ~TapGesture() override = default;
 
 private:
   Vector2 mScreenPoint;
diff --git a/dali/internal/event/events/tap-gesture/tap-gesture-processor.h b/dali/internal/event/events/tap-gesture/tap-gesture-processor.h
index a137ebd..b15e0fe 100644
--- a/dali/internal/event/events/tap-gesture/tap-gesture-processor.h
+++ b/dali/internal/event/events/tap-gesture/tap-gesture-processor.h
@@ -55,7 +55,7 @@ public:
   /**
    * Non-virtual destructor; TapGestureProcessor is not a base class
    */
-  ~TapGestureProcessor();
+  ~TapGestureProcessor() override;
 
 public: // To be called by GestureEventProcessor
 
@@ -64,7 +64,7 @@ public: // To be called by GestureEventProcessor
    * @param[in] scene The scene the tap gesture event occurs in.
    * @param[in] tapEvent The event that has occurred.
    */
-  void Process( Scene& scene, const TapGestureEvent& event);
+  void Process( Scene& scene, const TapGestureEvent& event) override;
 
   /**
    * Adds a gesture detector to this gesture processor.
@@ -107,17 +107,17 @@ private:
   /**
    * @copydoc GestureProcessor::OnGesturedActorStageDisconnection()
    */
-  void OnGesturedActorStageDisconnection() { /* Nothing to do */ }
+  void OnGesturedActorStageDisconnection() override { /* Nothing to do */ }
 
   /**
    * @copydoc GestureProcessor::CheckGestureDetector()
    */
-  bool CheckGestureDetector( GestureDetector* detector, Actor* actor );
+  bool CheckGestureDetector( GestureDetector* detector, Actor* actor ) override;
 
   /**
    * @copydoc GestureProcessor::EmitGestureSignal()
    */
-  void EmitGestureSignal( Actor* actor, const GestureDetectorContainer& gestureDetectors, Vector2 actorCoordinates );
+  void EmitGestureSignal( Actor* actor, const GestureDetectorContainer& gestureDetectors, Vector2 actorCoordinates ) override;
 
 private:
 
diff --git a/dali/internal/event/events/tap-gesture/tap-gesture-recognizer.h b/dali/internal/event/events/tap-gesture/tap-gesture-recognizer.h
index c277c6d..8d0f89d 100644
--- a/dali/internal/event/events/tap-gesture/tap-gesture-recognizer.h
+++ b/dali/internal/event/events/tap-gesture/tap-gesture-recognizer.h
@@ -60,19 +60,19 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~TapGestureRecognizer();
+  ~TapGestureRecognizer() override;
 
 public:
 
   /**
    * @copydoc Dali::Internal::GestureDetector::SendEvent(const Integration::TouchEvent&)
    */
-  virtual void SendEvent(const Integration::TouchEvent& event);
+  void SendEvent(const Integration::TouchEvent& event) override;
 
   /**
    * @copydoc Dali::Internal::GestureDetector::Update(const Integration::GestureRequest&)
    */
-  virtual void Update(const GestureRequest& request);
+  void Update(const GestureRequest& request) override;
 
 private:
 
diff --git a/dali/internal/event/events/touch-event-impl.h b/dali/internal/event/events/touch-event-impl.h
index cb4b688..17882ea 100644
--- a/dali/internal/event/events/touch-event-impl.h
+++ b/dali/internal/event/events/touch-event-impl.h
@@ -195,7 +195,7 @@ private:
    *
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~TouchEvent() = default;
+  ~TouchEvent() override = default;
 
 private:
 
diff --git a/dali/internal/event/events/wheel-event-impl.h b/dali/internal/event/events/wheel-event-impl.h
index 35f44ea..9fa4fa3 100755
--- a/dali/internal/event/events/wheel-event-impl.h
+++ b/dali/internal/event/events/wheel-event-impl.h
@@ -124,7 +124,7 @@ private:
    *
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~WheelEvent() = default;
+  ~WheelEvent() override = default;
 
   // Not copyable or movable
 
diff --git a/dali/internal/event/images/bitmap-compressed.h b/dali/internal/event/images/bitmap-compressed.h
index 68d3c52..c0c1ed7 100644
--- a/dali/internal/event/images/bitmap-compressed.h
+++ b/dali/internal/event/images/bitmap-compressed.h
@@ -46,8 +46,8 @@ public:
    */
   BitmapCompressed( ResourcePolicy::Discardable discardable = ResourcePolicy::OWNED_RETAIN );
 
-  virtual const Bitmap::CompressedProfile* GetCompressedProfile() const { return this; }
-  virtual Bitmap::CompressedProfile* GetCompressedProfile() { return this; }
+  const Bitmap::CompressedProfile* GetCompressedProfile() const override { return this; }
+  Bitmap::CompressedProfile* GetCompressedProfile() override { return this; }
 
 private:
   /**
@@ -74,16 +74,16 @@ public:
    * @param[in] bufferSize    Buffer size in bytes
    * @return pixel buffer pointer
    */
-  virtual Dali::Integration::PixelBuffer* ReserveBufferOfSize( Pixel::Format pixelFormat,
+  Dali::Integration::PixelBuffer* ReserveBufferOfSize( Pixel::Format pixelFormat,
                                      const uint32_t width,
                                      const uint32_t height,
-                                     const uint32_t numBytes );
+                                     const uint32_t numBytes ) override;
 
   /**
    * Get the pixel buffer size in bytes
    * @return The buffer size in bytes.
    */
-  virtual uint32_t GetBufferSize() const
+  uint32_t GetBufferSize() const override
   {
     return mBufferSize;
   }
@@ -91,14 +91,14 @@ public:
   /**
    * See Dali::Integration::Bitmap::GetReleaseFunction()
    */
-  ReleaseFunction GetReleaseFunction(){ return FREE; }
+  ReleaseFunction GetReleaseFunction() override{ return FREE; }
 
 protected:
 
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~BitmapCompressed();
+  ~BitmapCompressed() override;
 
 private:
 
diff --git a/dali/internal/event/images/bitmap-packed-pixel.h b/dali/internal/event/images/bitmap-packed-pixel.h
index 3eeebdd..2ed616c 100644
--- a/dali/internal/event/images/bitmap-packed-pixel.h
+++ b/dali/internal/event/images/bitmap-packed-pixel.h
@@ -49,8 +49,8 @@ public:
   BitmapPackedPixel( ResourcePolicy::Discardable discardable = ResourcePolicy::OWNED_RETAIN, Dali::Integration::PixelBuffer* pixBuf = 0 );
 
 public:
-  virtual const Bitmap::PackedPixelsProfile* GetPackedPixelsProfile() const { return this; }
-  virtual Bitmap::PackedPixelsProfile* GetPackedPixelsProfile() { return this; }
+  const Bitmap::PackedPixelsProfile* GetPackedPixelsProfile() const override { return this; }
+  Bitmap::PackedPixelsProfile* GetPackedPixelsProfile() override { return this; }
 
   /**
    * (Re-)Allocate pixel buffer for the Bitmap. Any previously allocated pixel buffer is deleted.
@@ -64,11 +64,11 @@ public:
    * @param[in] bufferHeight  Buffer height in pixels
    * @return pixel buffer pointer
    */
-  virtual Dali::Integration::PixelBuffer* ReserveBuffer(Pixel::Format pixelFormat,
+  Dali::Integration::PixelBuffer* ReserveBuffer(Pixel::Format pixelFormat,
                                      uint32_t width,
                                      uint32_t height,
                                      uint32_t bufferWidth = 0,
-                                     uint32_t bufferHeight = 0);
+                                     uint32_t bufferHeight = 0) override;
 
   /**
    * Assign a pixel buffer. Any previously allocated pixel buffer is deleted.
@@ -83,19 +83,19 @@ public:
    * @param[in] bufferWidth   Buffer width (stride) in pixels
    * @param[in] bufferHeight  Buffer height in pixels
    */
-  virtual void AssignBuffer(Pixel::Format pixelFormat,
+  void AssignBuffer(Pixel::Format pixelFormat,
                             Dali::Integration::PixelBuffer* buffer,
                             uint32_t bufferSize,
                             uint32_t width,
                             uint32_t height,
                             uint32_t bufferWidth = 0,
-                            uint32_t bufferHeight = 0);
+                            uint32_t bufferHeight = 0) override;
 
   /**
    * Get the width of the buffer (stride)
    * @return The width of the buffer in pixels
    */
-  virtual unsigned GetBufferWidth() const
+  unsigned GetBufferWidth() const override
   {
     return mBufferWidth;
   }
@@ -104,7 +104,7 @@ public:
    * Get the height of the buffer
    * @return The height of the buffer in pixels
    */
-  virtual unsigned GetBufferHeight() const
+  unsigned GetBufferHeight() const override
   {
     return mBufferHeight;
   }
@@ -113,7 +113,7 @@ public:
    * Get the pixel buffer size in bytes
    * @return The buffer size in bytes.
    */
-  virtual uint32_t GetBufferSize() const
+  uint32_t GetBufferSize() const override
   {
     return mBufferWidth * mBytesPerPixel * mBufferHeight;
   }
@@ -121,13 +121,13 @@ public:
   /**
    * See Dali::Integration::Bitmap::GetReleaseFunction()
    */
-  ReleaseFunction GetReleaseFunction(){ return FREE; }
+  ReleaseFunction GetReleaseFunction() override{ return FREE; }
 
   /**
    * Get the pixel buffer stride.
    * @return The buffer stride (in bytes).
    */
-  virtual uint32_t GetBufferStride() const;
+  uint32_t GetBufferStride() const override;
 
   /**
    * Get the pixel format
@@ -142,14 +142,14 @@ public:
    * Check the bitmap data and test whether it has any transparent pixels.
    * This property can then be tested for with IsFullyOpaque().
    */
-  virtual void TestForTransparency();
+  void TestForTransparency() override;
 
 protected:
 
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~BitmapPackedPixel();
+  ~BitmapPackedPixel() override;
 
 protected:
 
diff --git a/dali/internal/event/images/pixel-data-impl.h b/dali/internal/event/images/pixel-data-impl.h
index 6d8a7c9..8384036 100644
--- a/dali/internal/event/images/pixel-data-impl.h
+++ b/dali/internal/event/images/pixel-data-impl.h
@@ -77,7 +77,7 @@ protected:
    *
    * Release the pixel buffer if exists.
    */
-  ~PixelData();
+  ~PixelData() override;
 
 public:
 
diff --git a/dali/internal/event/render-tasks/render-task-impl.h b/dali/internal/event/render-tasks/render-task-impl.h
index 45186e3..235a795 100644
--- a/dali/internal/event/render-tasks/render-task-impl.h
+++ b/dali/internal/event/render-tasks/render-task-impl.h
@@ -258,32 +258,32 @@ public: // Implementation of Object
   /**
    * @copydoc Dali::Internal::Object::SetDefaultProperty()
    */
-  virtual void SetDefaultProperty(Property::Index index, const Property::Value& propertyValue);
+  void SetDefaultProperty(Property::Index index, const Property::Value& propertyValue) override;
 
   /**
    * @copydoc Dali::Internal::Object::GetDefaultProperty()
    */
-  virtual Property::Value GetDefaultProperty( Property::Index index ) const;
+  Property::Value GetDefaultProperty( Property::Index index ) const override;
 
   /**
    * @copydoc Dali::Internal::Object::GetDefaultPropertyCurrentValue()
    */
-  virtual Property::Value GetDefaultPropertyCurrentValue( Property::Index index ) const;
+  Property::Value GetDefaultPropertyCurrentValue( Property::Index index ) const override;
 
   /**
    * @copydoc Dali::Internal::Object::OnNotifyDefaultPropertyAnimation()
    */
-  virtual void OnNotifyDefaultPropertyAnimation( Animation& animation, Property::Index index, const Property::Value& value, Animation::Type animationType );
+  void OnNotifyDefaultPropertyAnimation( Animation& animation, Property::Index index, const Property::Value& value, Animation::Type animationType ) override;
 
   /**
    * @copydoc Dali::Internal::Object::GetSceneObjectAnimatableProperty()
    */
-  virtual const SceneGraph::PropertyBase* GetSceneObjectAnimatableProperty( Property::Index index ) const;
+  const SceneGraph::PropertyBase* GetSceneObjectAnimatableProperty( Property::Index index ) const override;
 
   /**
    * @copydoc Dali::Internal::Object::GetSceneObjectInputProperty()
    */
-  virtual const PropertyInputImpl* GetSceneObjectInputProperty( Property::Index index ) const;
+  const PropertyInputImpl* GetSceneObjectInputProperty( Property::Index index ) const override;
 
 public: //signals
 
@@ -330,7 +330,7 @@ protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~RenderTask();
+  ~RenderTask() override;
 
 private: // not copyable
 
diff --git a/dali/internal/event/render-tasks/render-task-list-impl.h b/dali/internal/event/render-tasks/render-task-list-impl.h
index 068a42f..9dc44c1 100644
--- a/dali/internal/event/render-tasks/render-task-list-impl.h
+++ b/dali/internal/event/render-tasks/render-task-list-impl.h
@@ -159,7 +159,7 @@ protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~RenderTaskList();
+  ~RenderTaskList() override;
 
   /**
    * 2nd-phase construction
@@ -171,7 +171,7 @@ private: // from CompleteNotificationInterface
   /**
    * @copydoc CompleteNotificationInterface::NotifyCompleted()
    */
-  virtual void NotifyCompleted();
+  void NotifyCompleted() override;
 
 private:
 
diff --git a/dali/internal/event/rendering/frame-buffer-impl.h b/dali/internal/event/rendering/frame-buffer-impl.h
index c0f72e2..1b59e74 100644
--- a/dali/internal/event/rendering/frame-buffer-impl.h
+++ b/dali/internal/event/rendering/frame-buffer-impl.h
@@ -60,7 +60,7 @@ public:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~FrameBuffer();
+  ~FrameBuffer() override;
 
   /**
    * @brief Get the FrameBuffer render object
diff --git a/dali/internal/event/rendering/geometry-impl.h b/dali/internal/event/rendering/geometry-impl.h
index 0daa354..c75909f 100644
--- a/dali/internal/event/rendering/geometry-impl.h
+++ b/dali/internal/event/rendering/geometry-impl.h
@@ -111,7 +111,7 @@ protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~Geometry();
+  ~Geometry() override;
 
 private: // unimplemented methods
   Geometry( const Geometry& );
diff --git a/dali/internal/event/rendering/renderer-impl.h b/dali/internal/event/rendering/renderer-impl.h
index a138bc0..2ec0e5c 100755
--- a/dali/internal/event/rendering/renderer-impl.h
+++ b/dali/internal/event/rendering/renderer-impl.h
@@ -173,32 +173,32 @@ public: // Default property extensions from Object
   /**
    * @copydoc Dali::Internal::Object::SetDefaultProperty()
    */
-  virtual void SetDefaultProperty(Property::Index index, const Property::Value& propertyValue);
+  void SetDefaultProperty(Property::Index index, const Property::Value& propertyValue) override;
 
   /**
    * @copydoc Dali::Internal::Object::GetDefaultProperty()
    */
-  virtual Property::Value GetDefaultProperty( Property::Index index ) const;
+  Property::Value GetDefaultProperty( Property::Index index ) const override;
 
   /**
    * @copydoc Dali::Internal::Object::GetDefaultPropertyCurrentValue()
    */
-  virtual Property::Value GetDefaultPropertyCurrentValue( Property::Index index ) const;
+  Property::Value GetDefaultPropertyCurrentValue( Property::Index index ) const override;
 
    /**
     * @copydoc Dali::Internal::Object::OnNotifyDefaultPropertyAnimation()
     */
-   virtual void OnNotifyDefaultPropertyAnimation( Animation& animation, Property::Index index, const Property::Value& value, Animation::Type animationType );
+   void OnNotifyDefaultPropertyAnimation( Animation& animation, Property::Index index, const Property::Value& value, Animation::Type animationType ) override;
 
   /**
    * @copydoc Dali::Internal::Object::GetSceneObjectAnimatableProperty()
    */
-  virtual const SceneGraph::PropertyBase* GetSceneObjectAnimatableProperty( Property::Index index ) const;
+  const SceneGraph::PropertyBase* GetSceneObjectAnimatableProperty( Property::Index index ) const override;
 
   /**
    * @copydoc Dali::Internal::Object::GetSceneObjectInputProperty()
    */
-  virtual const PropertyInputImpl* GetSceneObjectInputProperty( Property::Index index ) const;
+  const PropertyInputImpl* GetSceneObjectInputProperty( Property::Index index ) const override;
 
   /**
    * @brief Adds a draw command to the Renderer.
@@ -249,7 +249,7 @@ protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~Renderer();
+  ~Renderer() override;
 
 private: // unimplemented methods
   Renderer( const Renderer& );
diff --git a/dali/internal/event/rendering/sampler-impl.h b/dali/internal/event/rendering/sampler-impl.h
index 93fab94..7dce6e3 100644
--- a/dali/internal/event/rendering/sampler-impl.h
+++ b/dali/internal/event/rendering/sampler-impl.h
@@ -82,7 +82,7 @@ protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~Sampler();
+  ~Sampler() override;
 
 private: // data
   EventThreadServices& mEventThreadServices;    ///<Used to send messages to the render thread via the update thread
diff --git a/dali/internal/event/rendering/shader-impl.h b/dali/internal/event/rendering/shader-impl.h
index 05e916b..565e6e4 100644
--- a/dali/internal/event/rendering/shader-impl.h
+++ b/dali/internal/event/rendering/shader-impl.h
@@ -64,17 +64,17 @@ public: // Default property extensions from Object
   /**
    * @copydoc Dali::Internal::Object::SetDefaultProperty()
    */
-  virtual void SetDefaultProperty(Property::Index index, const Property::Value& propertyValue);
+  void SetDefaultProperty(Property::Index index, const Property::Value& propertyValue) override;
 
   /**
    * @copydoc Dali::Internal::Object::GetDefaultProperty()
    */
-  virtual Property::Value GetDefaultProperty( Property::Index index ) const;
+  Property::Value GetDefaultProperty( Property::Index index ) const override;
 
   /**
    * @copydoc Dali::Internal::Object::GetDefaultPropertyCurrentValue()
    */
-  virtual Property::Value GetDefaultPropertyCurrentValue( Property::Index index ) const;
+  Property::Value GetDefaultPropertyCurrentValue( Property::Index index ) const override;
 
 private: // implementation
 
@@ -94,7 +94,7 @@ protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~Shader();
+  ~Shader() override;
 
 private: // unimplemented methods
 
diff --git a/dali/internal/event/rendering/texture-impl.h b/dali/internal/event/rendering/texture-impl.h
index fb8f1c3..d7f6b4a 100644
--- a/dali/internal/event/rendering/texture-impl.h
+++ b/dali/internal/event/rendering/texture-impl.h
@@ -136,7 +136,7 @@ protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~Texture();
+  ~Texture() override;
 
 private: // unimplemented methods
   Texture( const Texture& );
diff --git a/dali/internal/event/rendering/texture-set-impl.h b/dali/internal/event/rendering/texture-set-impl.h
index a013a30..0e9a941 100644
--- a/dali/internal/event/rendering/texture-set-impl.h
+++ b/dali/internal/event/rendering/texture-set-impl.h
@@ -101,7 +101,7 @@ protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~TextureSet();
+  ~TextureSet() override;
 
 private: // unimplemented methods
   TextureSet( const TextureSet& );
diff --git a/dali/internal/event/rendering/vertex-buffer-impl.h b/dali/internal/event/rendering/vertex-buffer-impl.h
index 47de0dc..c8c8b8a 100644
--- a/dali/internal/event/rendering/vertex-buffer-impl.h
+++ b/dali/internal/event/rendering/vertex-buffer-impl.h
@@ -70,7 +70,7 @@ protected:
   /**
    * @brief Destructor
    */
-  ~VertexBuffer();
+  ~VertexBuffer() override;
 
 private: // implementation
   /**
diff --git a/dali/internal/event/size-negotiation/memory-pool-relayout-container.h b/dali/internal/event/size-negotiation/memory-pool-relayout-container.h
index 8cd3104..d8272c4 100644
--- a/dali/internal/event/size-negotiation/memory-pool-relayout-container.h
+++ b/dali/internal/event/size-negotiation/memory-pool-relayout-container.h
@@ -60,7 +60,7 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~MemoryPoolRelayoutContainer();
+  ~MemoryPoolRelayoutContainer() override;
 
   /**
    * @brief Add relayout information to the container if it does'nt already exist
@@ -68,7 +68,7 @@ public:
    * @param actor The actor to relayout
    * @param size The size to relayout
    */
-  virtual void Add( const Dali::Actor& actor, const Vector2& size );
+  void Add( const Dali::Actor& actor, const Vector2& size ) override;
 
   /**
    * @brief Remove information from the container
diff --git a/dali/internal/event/size-negotiation/relayout-controller-impl.h b/dali/internal/event/size-negotiation/relayout-controller-impl.h
index be5cd5d..5117371 100644
--- a/dali/internal/event/size-negotiation/relayout-controller-impl.h
+++ b/dali/internal/event/size-negotiation/relayout-controller-impl.h
@@ -58,7 +58,7 @@ public:
   /**
    * Destructor
    */
-  virtual ~RelayoutController();
+  ~RelayoutController() override;
 
   /**
    * @brief Get the singleton of RelayoutController object.
diff --git a/dali/internal/render/data-providers/node-data-provider.h b/dali/internal/render/data-providers/node-data-provider.h
index f792ad6..9603a77 100644
--- a/dali/internal/render/data-providers/node-data-provider.h
+++ b/dali/internal/render/data-providers/node-data-provider.h
@@ -57,18 +57,18 @@ public:
   /**
    * @copydoc Dali::Internal::SceneGraph::UniformMapDataProvider::GetUniformMapChanged()
    */
-  virtual bool GetUniformMapChanged( BufferIndex bufferIndex ) const = 0;
+  bool GetUniformMapChanged( BufferIndex bufferIndex ) const override = 0;
 
   /**
    * @copydoc Dali::Internal::SceneGraph::UniformMapDataProvider::GetUniformMap()
    */
-  virtual const CollectedUniformMap& GetUniformMap( BufferIndex bufferIndex ) const = 0;
+  const CollectedUniformMap& GetUniformMap( BufferIndex bufferIndex ) const override = 0;
 
 protected:
   /**
    * Virtual destructor, this is an interface, no deletion through this interface
    */
-  virtual ~NodeDataProvider() { }
+  ~NodeDataProvider() override { }
 };
 
 } // SceneGraph
diff --git a/dali/internal/render/renderers/render-renderer.h b/dali/internal/render/renderers/render-renderer.h
index 089fb4e..cd601b8 100755
--- a/dali/internal/render/renderers/render-renderer.h
+++ b/dali/internal/render/renderers/render-renderer.h
@@ -94,12 +94,12 @@ public:
   /**
    * @copydoc Dali::Internal::GlResourceOwner::GlContextDestroyed()
    */
-  void GlContextDestroyed();
+  void GlContextDestroyed() override;
 
   /**
    * @copydoc Dali::Internal::GlResourceOwner::GlCleanup()
    */
-  void GlCleanup();
+  void GlCleanup() override;
 
   /**
    * Create a new renderer instance
@@ -176,7 +176,7 @@ public:
   /**
    * Destructor
    */
-  ~Renderer();
+  ~Renderer() override;
 
   /**
    * Set the face-culling mode.
diff --git a/dali/internal/render/shaders/program-controller.h b/dali/internal/render/shaders/program-controller.h
index e076bc9..0ab4cc8 100644
--- a/dali/internal/render/shaders/program-controller.h
+++ b/dali/internal/render/shaders/program-controller.h
@@ -99,7 +99,7 @@ public:
   /**
    * Destructor, non virtual as not a base class
    */
-  ~ProgramController();
+  ~ProgramController() override;
 
 public: // API
 
@@ -134,42 +134,42 @@ private: // From ProgramCache
   /**
    * @copydoc ProgramCache::GetGlAbstraction
    */
-  virtual Integration::GlAbstraction& GetGlAbstraction();
+  Integration::GlAbstraction& GetGlAbstraction() override;
 
   /**
    * @copydoc ProgramCache::GetProgram
    */
-  virtual Program* GetProgram( size_t shaderHash );
+  Program* GetProgram( size_t shaderHash ) override;
 
   /**
    * @copydoc ProgramCache::AddProgram
    */
-  virtual void AddProgram( size_t shaderHash, Program* program );
+  void AddProgram( size_t shaderHash, Program* program ) override;
 
   /**
    * @copydoc ProgramCache::GetCurrentProgram
    */
-  virtual Program* GetCurrentProgram();
+  Program* GetCurrentProgram() override;
 
   /**
    * @copydoc ProgramCache::SetCurrentProgram
    */
-  virtual void SetCurrentProgram( Program* program );
+  void SetCurrentProgram( Program* program ) override;
 
   /**
    * @copydoc ProgramCache::IsBinarySupported
    */
-  virtual bool IsBinarySupported();
+  bool IsBinarySupported() override;
 
   /**
    * @copydoc ProgramCache::ProgramBinaryFormat
    */
-  virtual GLenum ProgramBinaryFormat();
+  GLenum ProgramBinaryFormat() override;
 
   /**
    * @copydoc ProgramCache::StoreBinary
    */
-  virtual void StoreBinary( Internal::ShaderDataPtr programData );
+  void StoreBinary( Internal::ShaderDataPtr programData ) override;
 
 private: // not implemented as non-copyable
 
diff --git a/dali/internal/render/shaders/scene-graph-shader.h b/dali/internal/render/shaders/scene-graph-shader.h
index d38e2fc..12d1dd3 100644
--- a/dali/internal/render/shaders/scene-graph-shader.h
+++ b/dali/internal/render/shaders/scene-graph-shader.h
@@ -53,7 +53,7 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~Shader();
+  ~Shader() override;
 
   ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
   // The following methods are called during Update
@@ -131,7 +131,7 @@ public: // UniformMap::Observer
   /**
    * @copydoc UniformMap::Observer::UniformMappingsChanged
    */
-  virtual void UniformMappingsChanged( const UniformMap& mappings );
+  void UniformMappingsChanged( const UniformMap& mappings ) override;
 
 private: // Data
 
diff --git a/dali/internal/update/animation/scene-graph-animator.h b/dali/internal/update/animation/scene-graph-animator.h
index 5e682da..1cc6ab6 100644
--- a/dali/internal/update/animation/scene-graph-animator.h
+++ b/dali/internal/update/animation/scene-graph-animator.h
@@ -158,7 +158,7 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~AnimatorBase()
+  ~AnimatorBase() override
   {
     delete mAnimatorFunction;
     if (mPropertyOwner && mConnectedToSceneGraph)
@@ -186,7 +186,7 @@ private: // From PropertyOwner::Observer
   /**
    * @copydoc PropertyOwner::Observer::PropertyOwnerConnected( PropertyOwner& owner )
    */
-  void PropertyOwnerConnected( PropertyOwner& owner ) override final
+  void PropertyOwnerConnected( PropertyOwner& owner ) final
   {
     mEnabled = true;
   }
@@ -194,7 +194,7 @@ private: // From PropertyOwner::Observer
   /**
    * @copydoc PropertyOwner::Observer::PropertyOwnerDisconnected( BufferIndex bufferIndex, PropertyOwner& owner )
    */
-  void PropertyOwnerDisconnected( BufferIndex bufferIndex, PropertyOwner& owner ) override final
+  void PropertyOwnerDisconnected( BufferIndex bufferIndex, PropertyOwner& owner ) final
   {
     // If we are active, then bake the value if required
     if ( mAnimationPlaying && mDisconnectAction != Dali::Animation::DISCARD )
@@ -209,7 +209,7 @@ private: // From PropertyOwner::Observer
   /**
    * @copydoc PropertyOwner::Observer::PropertyOwnerDestroyed( PropertyOwner& owner )
    */
-  void PropertyOwnerDestroyed( PropertyOwner& owner ) override final
+  void PropertyOwnerDestroyed( PropertyOwner& owner ) final
   {
     mPropertyOwner = nullptr;
   }
@@ -607,14 +607,14 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~Animator()
+  ~Animator() override
   {
   }
 
   /**
    * @copydoc AnimatorBase::DoUpdate( BufferIndex bufferIndex, bool bake, float alpha )
    */
-  virtual void DoUpdate( BufferIndex bufferIndex, bool bake, float alpha ) override final
+  void DoUpdate( BufferIndex bufferIndex, bool bake, float alpha ) final
   {
     const PropertyType& current = mPropertyAccessor.Get( bufferIndex );
 
@@ -696,14 +696,14 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~AnimatorTransformProperty()
+  ~AnimatorTransformProperty() override
   {
   }
 
   /**
    * @copydoc AnimatorBase::DoUpdate( BufferIndex bufferIndex, bool bake, float alpha )
    */
-  virtual void DoUpdate( BufferIndex bufferIndex, bool bake, float alpha ) override final
+  void DoUpdate( BufferIndex bufferIndex, bool bake, float alpha ) final
   {
     const PropertyType& current = mPropertyAccessor.Get( bufferIndex );
 
@@ -760,7 +760,7 @@ struct AnimateByInteger : public AnimatorFunctionBase
   }
 
   using AnimatorFunctionBase::operator();
-  float operator()(float alpha, const int32_t& property)
+  float operator()(float alpha, const int32_t& property) override
   {
     // integers need to be correctly rounded
     return roundf(static_cast<float>( property ) + static_cast<float>( mRelative ) * alpha );
@@ -777,7 +777,7 @@ struct AnimateToInteger : public AnimatorFunctionBase
   }
 
   using AnimatorFunctionBase::operator();
-  float operator()(float alpha, const int32_t& property)
+  float operator()(float alpha, const int32_t& property) override
   {
     // integers need to be correctly rounded
     return roundf(static_cast<float>( property ) + (static_cast<float>(mTarget - property) * alpha) );
@@ -794,7 +794,7 @@ struct AnimateByFloat : public AnimatorFunctionBase
   }
 
   using AnimatorFunctionBase::operator();
-  float operator()(float alpha, const float& property)
+  float operator()(float alpha, const float& property) override
   {
     return float(property + mRelative * alpha);
   }
@@ -810,7 +810,7 @@ struct AnimateToFloat : public AnimatorFunctionBase
   }
 
   using AnimatorFunctionBase::operator();
-  float operator()(float alpha, const float& property)
+  float operator()(float alpha, const float& property) override
   {
     return float(property + ((mTarget - property) * alpha));
   }
@@ -826,7 +826,7 @@ struct AnimateByVector2 : public AnimatorFunctionBase
   }
 
   using AnimatorFunctionBase::operator();
-  Vector2 operator()(float alpha, const Vector2& property)
+  Vector2 operator()(float alpha, const Vector2& property) override
   {
     return Vector2(property + mRelative * alpha);
   }
@@ -842,7 +842,7 @@ struct AnimateToVector2 : public AnimatorFunctionBase
   }
 
   using AnimatorFunctionBase::operator();
-  Vector2 operator()(float alpha, const Vector2& property)
+  Vector2 operator()(float alpha, const Vector2& property) override
   {
     return Vector2(property + ((mTarget - property) * alpha));
   }
@@ -858,7 +858,7 @@ struct AnimateByVector3 : public AnimatorFunctionBase
   }
 
   using AnimatorFunctionBase::operator();
-  Vector3 operator()(float alpha, const Vector3& property)
+  Vector3 operator()(float alpha, const Vector3& property) override
   {
     return Vector3(property + mRelative * alpha);
   }
@@ -874,7 +874,7 @@ struct AnimateToVector3 : public AnimatorFunctionBase
   }
 
   using AnimatorFunctionBase::operator();
-  Vector3 operator()(float alpha, const Vector3& property)
+  Vector3 operator()(float alpha, const Vector3& property) override
   {
     return Vector3(property + ((mTarget - property) * alpha));
   }
@@ -890,7 +890,7 @@ struct AnimateByVector4 : public AnimatorFunctionBase
   }
 
   using AnimatorFunctionBase::operator();
-  Vector4 operator()(float alpha, const Vector4& property)
+  Vector4 operator()(float alpha, const Vector4& property) override
   {
     return Vector4(property + mRelative * alpha);
   }
@@ -906,7 +906,7 @@ struct AnimateToVector4 : public AnimatorFunctionBase
   }
 
   using AnimatorFunctionBase::operator();
-  Vector4 operator()(float alpha, const Vector4& property)
+  Vector4 operator()(float alpha, const Vector4& property) override
   {
     return Vector4(property + ((mTarget - property) * alpha));
   }
@@ -922,7 +922,7 @@ struct AnimateByOpacity : public AnimatorFunctionBase
   }
 
   using AnimatorFunctionBase::operator();
-  Vector4 operator()(float alpha, const Vector4& property)
+  Vector4 operator()(float alpha, const Vector4& property) override
   {
     Vector4 result(property);
     result.a += mRelative * alpha;
@@ -941,7 +941,7 @@ struct AnimateToOpacity : public AnimatorFunctionBase
   }
 
   using AnimatorFunctionBase::operator();
-  Vector4 operator()(float alpha, const Vector4& property)
+  Vector4 operator()(float alpha, const Vector4& property) override
   {
     Vector4 result(property);
     result.a = property.a + ((mTarget - property.a) * alpha);
@@ -960,7 +960,7 @@ struct AnimateByBoolean : public AnimatorFunctionBase
   }
 
   using AnimatorFunctionBase::operator();
-  bool operator()(float alpha, const bool& property)
+  bool operator()(float alpha, const bool& property) override
   {
     // Alpha is not useful here, just keeping to the same template as other update functors
     return bool(alpha >= 1.0f ? (property || mRelative) : property);
@@ -977,7 +977,7 @@ struct AnimateToBoolean : public AnimatorFunctionBase
   }
 
   using AnimatorFunctionBase::operator();
-  bool operator()(float alpha, const bool& property)
+  bool operator()(float alpha, const bool& property) override
   {
     // Alpha is not useful here, just keeping to the same template as other update functors
     return bool(alpha >= 1.0f ? mTarget : property);
@@ -995,7 +995,7 @@ struct RotateByAngleAxis : public AnimatorFunctionBase
   }
 
   using AnimatorFunctionBase::operator();
-  Quaternion operator()(float alpha, const Quaternion& rotation)
+  Quaternion operator()(float alpha, const Quaternion& rotation) override
   {
     if (alpha > 0.0f)
     {
@@ -1017,7 +1017,7 @@ struct RotateToQuaternion : public AnimatorFunctionBase
   }
 
   using AnimatorFunctionBase::operator();
-  Quaternion operator()(float alpha, const Quaternion& rotation)
+  Quaternion operator()(float alpha, const Quaternion& rotation) override
   {
     return Quaternion::Slerp(rotation, mTarget, alpha);
   }
@@ -1034,7 +1034,7 @@ struct KeyFrameBooleanFunctor : public AnimatorFunctionBase
   }
 
   using AnimatorFunctionBase::operator();
-  bool operator()(float progress, const bool& property)
+  bool operator()(float progress, const bool& property) override
   {
     if(mKeyFrames->IsActive(progress))
     {
@@ -1054,7 +1054,7 @@ struct KeyFrameIntegerFunctor : public AnimatorFunctionBase
   }
 
   using AnimatorFunctionBase::operator();
-  float operator()(float progress, const int32_t& property)
+  float operator()(float progress, const int32_t& property) override
   {
     if(mKeyFrames->IsActive(progress))
     {
@@ -1075,7 +1075,7 @@ struct KeyFrameNumberFunctor : public AnimatorFunctionBase
   }
 
   using AnimatorFunctionBase::operator();
-  float operator()(float progress, const float& property)
+  float operator()(float progress, const float& property) override
   {
     if(mKeyFrames->IsActive(progress))
     {
@@ -1096,7 +1096,7 @@ struct KeyFrameVector2Functor : public AnimatorFunctionBase
   }
 
   using AnimatorFunctionBase::operator();
-  Vector2 operator()(float progress, const Vector2& property)
+  Vector2 operator()(float progress, const Vector2& property) override
   {
     if(mKeyFrames->IsActive(progress))
     {
@@ -1118,7 +1118,7 @@ struct KeyFrameVector3Functor : public AnimatorFunctionBase
   }
 
   using AnimatorFunctionBase::operator();
-  Vector3 operator()(float progress, const Vector3& property)
+  Vector3 operator()(float progress, const Vector3& property) override
   {
     if(mKeyFrames->IsActive(progress))
     {
@@ -1139,7 +1139,7 @@ struct KeyFrameVector4Functor : public AnimatorFunctionBase
   }
 
   using AnimatorFunctionBase::operator();
-  Vector4 operator()(float progress, const Vector4& property)
+  Vector4 operator()(float progress, const Vector4& property) override
   {
     if(mKeyFrames->IsActive(progress))
     {
@@ -1160,7 +1160,7 @@ struct KeyFrameQuaternionFunctor : public AnimatorFunctionBase
   }
 
   using AnimatorFunctionBase::operator();
-  Quaternion operator()(float progress, const Quaternion& property)
+  Quaternion operator()(float progress, const Quaternion& property) override
   {
     if(mKeyFrames->IsActive(progress))
     {
@@ -1180,7 +1180,7 @@ struct PathPositionFunctor : public AnimatorFunctionBase
   }
 
   using AnimatorFunctionBase::operator();
-  Vector3 operator()(float progress, const Vector3& property)
+  Vector3 operator()(float progress, const Vector3& property) override
   {
     Vector3 position(property);
     static_cast<void>( mPath->SamplePosition(progress, position) );
@@ -1200,7 +1200,7 @@ struct PathRotationFunctor : public AnimatorFunctionBase
   }
 
   using AnimatorFunctionBase::operator();
-  Quaternion operator()(float progress, const Quaternion& property)
+  Quaternion operator()(float progress, const Quaternion& property) override
   {
     Vector3 tangent;
     if( mPath->SampleTangent(progress, tangent) )
diff --git a/dali/internal/update/animation/scene-graph-constraint-base.h b/dali/internal/update/animation/scene-graph-constraint-base.h
index ba36871..622277f 100644
--- a/dali/internal/update/animation/scene-graph-constraint-base.h
+++ b/dali/internal/update/animation/scene-graph-constraint-base.h
@@ -81,7 +81,7 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~ConstraintBase();
+  ~ConstraintBase() override;
 
   /**
    * Property resetter observes the lifecycle of this object
@@ -175,14 +175,14 @@ private:
   /**
    * @copydoc PropertyOwner::Observer::PropertyOwnerConnected()
    */
-  virtual void PropertyOwnerConnected( PropertyOwner& owner )
+  void PropertyOwnerConnected( PropertyOwner& owner ) override
   {
   }
 
   /**
    * @copydoc PropertyOwner::Observer::PropertyOwnerDisconnected()
    */
-  virtual void PropertyOwnerDisconnected( BufferIndex bufferIndex, PropertyOwner& owner )
+  void PropertyOwnerDisconnected( BufferIndex bufferIndex, PropertyOwner& owner ) override
   {
     if ( !mDisconnected )
     {
@@ -199,7 +199,7 @@ private:
   /**
    * @copydoc PropertyOwner::Observer::PropertyOwnerDestroyed()
    */
-  virtual void PropertyOwnerDestroyed( PropertyOwner& owner )
+  void PropertyOwnerDestroyed( PropertyOwner& owner ) override
   {
     if ( !mDisconnected )
     {
diff --git a/dali/internal/update/animation/scene-graph-constraint.h b/dali/internal/update/animation/scene-graph-constraint.h
index ef12cb7..ef32672 100644
--- a/dali/internal/update/animation/scene-graph-constraint.h
+++ b/dali/internal/update/animation/scene-graph-constraint.h
@@ -72,14 +72,14 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~Constraint()
+  ~Constraint() override
   {
   }
 
   /**
    * @copydoc Dali::Internal::SceneGraph::ConstraintBase::Apply()
    */
-  virtual void Apply( BufferIndex updateBufferIndex )
+  void Apply( BufferIndex updateBufferIndex ) override
   {
     if ( !mDisconnected )
     {
@@ -130,7 +130,7 @@ private:
   /**
    * @copydoc Dali::Internal::SceneGraph::ConstraintBase::OnDisconnect()
    */
-  virtual void OnDisconnect()
+  void OnDisconnect() override
   {
     // Discard target object/property pointers
     mTargetProperty.Reset();
diff --git a/dali/internal/update/common/animatable-property.h b/dali/internal/update/common/animatable-property.h
index 8972bc9..a586a0d 100644
--- a/dali/internal/update/common/animatable-property.h
+++ b/dali/internal/update/common/animatable-property.h
@@ -77,7 +77,7 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~AnimatablePropertyBase()
+  ~AnimatablePropertyBase() override
   {}
 
 protected: // for derived classes
@@ -103,7 +103,7 @@ public: // From PropertyBase
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::IsClean()
    */
-  virtual bool IsClean() const
+  bool IsClean() const override
   {
     return ( CLEAN_FLAG == mDirtyFlags );
   }
@@ -111,7 +111,7 @@ public: // From PropertyBase
   /**
    * @copydoc Dali::Internal::PropertyInputImpl::InputInitialized()
    */
-  virtual bool InputInitialized() const
+  bool InputInitialized() const override
   {
     return true; // Animatable properties are always valid
   }
@@ -144,14 +144,14 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~AnimatableProperty()
+  ~AnimatableProperty() override
   {
   }
 
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
    */
-  virtual Dali::Property::Type GetType() const
+  Dali::Property::Type GetType() const override
   {
     return Dali::PropertyTypes::Get<bool>();
   }
@@ -159,7 +159,7 @@ public:
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::ResetToBaseValue()
    */
-  virtual void ResetToBaseValue(BufferIndex updateBufferIndex)
+  void ResetToBaseValue(BufferIndex updateBufferIndex) override
   {
     if (CLEAN_FLAG != mDirtyFlags)
     {
@@ -172,7 +172,7 @@ public:
   /**
    * @copydoc Dali::Internal::PropertyInputImpl::GetBoolean()
    */
-  virtual const bool& GetBoolean( BufferIndex bufferIndex ) const
+  const bool& GetBoolean( BufferIndex bufferIndex ) const override
   {
     return mValue[ bufferIndex ];
   }
@@ -317,14 +317,14 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~AnimatableProperty()
+  ~AnimatableProperty() override
   {
   }
 
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
    */
-  virtual Dali::Property::Type GetType() const
+  Dali::Property::Type GetType() const override
   {
     return Dali::PropertyTypes::Get<int>();
   }
@@ -332,7 +332,7 @@ public:
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::ResetToBaseValue()
    */
-  virtual void ResetToBaseValue(BufferIndex updateBufferIndex)
+  void ResetToBaseValue(BufferIndex updateBufferIndex) override
   {
     if (CLEAN_FLAG != mDirtyFlags)
     {
@@ -345,7 +345,7 @@ public:
   /**
    * @copydoc Dali::Internal::PropertyInputImpl::GetInteger()
    */
-  virtual const int& GetInteger( BufferIndex bufferIndex ) const
+  const int& GetInteger( BufferIndex bufferIndex ) const override
   {
     return mValue[ bufferIndex ];
   }
@@ -498,14 +498,14 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~AnimatableProperty()
+  ~AnimatableProperty() override
   {
   }
 
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
    */
-  virtual Dali::Property::Type GetType() const
+  Dali::Property::Type GetType() const override
   {
     return Dali::PropertyTypes::Get<float>();
   }
@@ -513,7 +513,7 @@ public:
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::ResetToBaseValue()
    */
-  virtual void ResetToBaseValue(BufferIndex updateBufferIndex)
+  void ResetToBaseValue(BufferIndex updateBufferIndex) override
   {
     if (CLEAN_FLAG != mDirtyFlags)
     {
@@ -526,7 +526,7 @@ public:
   /**
    * @copydoc Dali::Internal::PropertyInputImpl::GetFloat()
    */
-  virtual const float& GetFloat( BufferIndex bufferIndex ) const
+  const float& GetFloat( BufferIndex bufferIndex ) const override
   {
     return mValue[ bufferIndex ];
   }
@@ -680,14 +680,14 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~AnimatableProperty()
+  ~AnimatableProperty() override
   {
   }
 
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
    */
-  virtual Dali::Property::Type GetType() const
+  Dali::Property::Type GetType() const override
   {
     return Dali::PropertyTypes::Get<Vector2>();
   }
@@ -695,7 +695,7 @@ public:
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::ResetToBaseValue()
    */
-  virtual void ResetToBaseValue(BufferIndex updateBufferIndex)
+  void ResetToBaseValue(BufferIndex updateBufferIndex) override
   {
     if (CLEAN_FLAG != mDirtyFlags)
     {
@@ -708,7 +708,7 @@ public:
   /**
    * @copydoc Dali::PropertyInput::GetVector2()
    */
-  virtual const Vector2& GetVector2( BufferIndex bufferIndex ) const
+  const Vector2& GetVector2( BufferIndex bufferIndex ) const override
   {
     return mValue[ bufferIndex ];
   }
@@ -952,14 +952,14 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~AnimatableProperty()
+  ~AnimatableProperty() override
   {
   }
 
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
    */
-  virtual Dali::Property::Type GetType() const
+  Dali::Property::Type GetType() const override
   {
     return Dali::PropertyTypes::Get<Vector3>();
   }
@@ -967,7 +967,7 @@ public:
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::ResetToBaseValue()
    */
-  virtual void ResetToBaseValue(BufferIndex updateBufferIndex)
+  void ResetToBaseValue(BufferIndex updateBufferIndex) override
   {
     if (CLEAN_FLAG != mDirtyFlags)
     {
@@ -980,7 +980,7 @@ public:
   /**
    * @copydoc Dali::PropertyInput::GetVector3()
    */
-  virtual const Vector3& GetVector3( BufferIndex bufferIndex ) const
+  const Vector3& GetVector3( BufferIndex bufferIndex ) const override
   {
     return mValue[ bufferIndex ];
   }
@@ -1278,14 +1278,14 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~AnimatableProperty()
+  ~AnimatableProperty() override
   {
   }
 
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
    */
-  virtual Dali::Property::Type GetType() const
+  Dali::Property::Type GetType() const override
   {
     return Dali::PropertyTypes::Get<Vector4>();
   }
@@ -1293,7 +1293,7 @@ public:
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::ResetToBaseValue()
    */
-  virtual void ResetToBaseValue(BufferIndex updateBufferIndex)
+  void ResetToBaseValue(BufferIndex updateBufferIndex) override
   {
     if (CLEAN_FLAG != mDirtyFlags)
     {
@@ -1306,7 +1306,7 @@ public:
   /**
    * @copydoc Dali::PropertyInput::GetVector4()
    */
-  virtual const Vector4& GetVector4( BufferIndex bufferIndex ) const
+  const Vector4& GetVector4( BufferIndex bufferIndex ) const override
   {
     return mValue[ bufferIndex ];
   }
@@ -1663,14 +1663,14 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~AnimatableProperty()
+  ~AnimatableProperty() override
   {
   }
 
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
    */
-  virtual Dali::Property::Type GetType() const
+  Dali::Property::Type GetType() const override
   {
     return Dali::PropertyTypes::Get<Quaternion>();
   }
@@ -1678,7 +1678,7 @@ public:
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::ResetToBaseValue()
    */
-  virtual void ResetToBaseValue(BufferIndex updateBufferIndex)
+  void ResetToBaseValue(BufferIndex updateBufferIndex) override
   {
     if (CLEAN_FLAG != mDirtyFlags)
     {
@@ -1691,7 +1691,7 @@ public:
   /**
    * @copydoc Dali::PropertyInput::GetQuaternion()
    */
-  virtual const Quaternion& GetQuaternion( BufferIndex bufferIndex ) const
+  const Quaternion& GetQuaternion( BufferIndex bufferIndex ) const override
   {
     return mValue[ bufferIndex ];
   }
@@ -1822,14 +1822,14 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~AnimatableProperty()
+  ~AnimatableProperty() override
   {
   }
 
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
    */
-  virtual Dali::Property::Type GetType() const
+  Dali::Property::Type GetType() const override
   {
     return Dali::PropertyTypes::Get<Matrix>();
   }
@@ -1837,7 +1837,7 @@ public:
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::ResetToBaseValue()
    */
-  virtual void ResetToBaseValue(BufferIndex updateBufferIndex)
+  void ResetToBaseValue(BufferIndex updateBufferIndex) override
   {
     if (CLEAN_FLAG != mDirtyFlags)
     {
@@ -1850,7 +1850,7 @@ public:
   /**
    * @copydoc Dali::Internal::PropertyInputImpl::GetMatrix()
    */
-  virtual const Matrix& GetMatrix( BufferIndex bufferIndex ) const
+  const Matrix& GetMatrix( BufferIndex bufferIndex ) const override
   {
     return mValue[ bufferIndex ];
   }
@@ -1985,14 +1985,14 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~AnimatableProperty()
+  ~AnimatableProperty() override
   {
   }
 
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
    */
-  virtual Dali::Property::Type GetType() const
+  Dali::Property::Type GetType() const override
   {
     return Dali::PropertyTypes::Get<Matrix3>();
   }
@@ -2000,7 +2000,7 @@ public:
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::ResetToBaseValue()
    */
-  virtual void ResetToBaseValue(BufferIndex updateBufferIndex)
+  void ResetToBaseValue(BufferIndex updateBufferIndex) override
   {
     if (CLEAN_FLAG != mDirtyFlags)
     {
@@ -2013,7 +2013,7 @@ public:
   /**
    * @copydoc Dali::Internal::PropertyInputImpl::GetMatrix3()
    */
-  virtual const Matrix3& GetMatrix3( BufferIndex bufferIndex ) const
+  const Matrix3& GetMatrix3( BufferIndex bufferIndex ) const override
   {
     return mValue[ bufferIndex ];
   }
diff --git a/dali/internal/update/common/inherited-property.h b/dali/internal/update/common/inherited-property.h
index 47aaa9c..4cd573e 100644
--- a/dali/internal/update/common/inherited-property.h
+++ b/dali/internal/update/common/inherited-property.h
@@ -68,14 +68,14 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~InheritedVector3()
+  ~InheritedVector3() override
   {
   }
 
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
    */
-  virtual Dali::Property::Type GetType() const
+  Dali::Property::Type GetType() const override
   {
     return Dali::PropertyTypes::Get<Vector3>();
   }
@@ -105,7 +105,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 mInheritedFlag;
@@ -115,7 +115,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 !IsClean();
   }
@@ -123,7 +123,7 @@ public:
   /**
    * @copydoc Dali::PropertyInput::GetVector3()
    */
-  virtual const Vector3& GetVector3( BufferIndex bufferIndex ) const
+  const Vector3& GetVector3( BufferIndex bufferIndex ) const override
   {
     return mValue[ bufferIndex ];
   }
@@ -131,7 +131,7 @@ public:
   /**
    * @copydoc Dali::PropertyInput::GetConstraintInputVector3()
    */
-  virtual const Vector3& GetConstraintInputVector3( BufferIndex bufferIndex ) const
+  const Vector3& GetConstraintInputVector3( BufferIndex bufferIndex ) const override
   {
     // For inherited properties, constraints work with the value from the previous frame.
     // This is because constraints are applied to position etc, before world-position is calculated.
@@ -219,14 +219,14 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~InheritedColor()
+  ~InheritedColor() override
   {
   }
 
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
    */
-  virtual Dali::Property::Type GetType() const
+  Dali::Property::Type GetType() const override
   {
     return Dali::PropertyTypes::Get<Vector4>();
   }
@@ -256,7 +256,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 mInheritedFlag;
@@ -266,7 +266,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 !IsClean();
   }
@@ -274,7 +274,7 @@ public:
   /**
    * @copydoc Dali::PropertyInput::GetVector4()
    */
-  virtual const Vector4& GetVector4( BufferIndex bufferIndex ) const
+  const Vector4& GetVector4( BufferIndex bufferIndex ) const override
   {
     return mValue[ bufferIndex ];
   }
@@ -282,7 +282,7 @@ public:
   /**
    * @copydoc Dali::PropertyInput::GetConstraintInputVector4()
    */
-  virtual const Vector4& GetConstraintInputVector4( BufferIndex bufferIndex ) const
+  const Vector4& GetConstraintInputVector4( BufferIndex bufferIndex ) const override
   {
     // For inherited properties, constraints work with the value from the previous frame.
     // This is because constraints are applied to position etc, before world-position is calculated.
@@ -388,14 +388,14 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~InheritedQuaternion()
+  ~InheritedQuaternion() override
   {
   }
 
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
    */
-  virtual Dali::Property::Type GetType() const
+  Dali::Property::Type GetType() const override
   {
     return Dali::PropertyTypes::Get<Quaternion>();
   }
@@ -425,7 +425,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 mInheritedFlag;
@@ -435,7 +435,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 !IsClean();
   }
@@ -443,7 +443,7 @@ public:
   /**
    * @copydoc Dali::PropertyInput::GetQuaternion()
    */
-  virtual const Quaternion& GetQuaternion( BufferIndex bufferIndex ) const
+  const Quaternion& GetQuaternion( BufferIndex bufferIndex ) const override
   {
     return mValue[ bufferIndex ];
   }
@@ -451,7 +451,7 @@ public:
   /**
    * @copydoc Dali::PropertyInput::GetConstraintInputQuaternion()
    */
-  virtual const Quaternion& GetConstraintInputQuaternion( BufferIndex bufferIndex ) const
+  const Quaternion& GetConstraintInputQuaternion( BufferIndex bufferIndex ) const override
   {
     // For inherited properties, constraints work with the value from the previous frame.
     // This is because constraints are applied to position etc, before world-position is calculated.
@@ -538,14 +538,14 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~InheritedMatrix()
+  ~InheritedMatrix() override
   {
   }
 
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
    */
-  virtual Dali::Property::Type GetType() const
+  Dali::Property::Type GetType() const override
   {
     return Dali::PropertyTypes::Get<Matrix>();
   }
@@ -575,7 +575,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 mInheritedFlag;
@@ -585,7 +585,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 !IsClean();
   }
@@ -593,7 +593,7 @@ public:
   /**
    * @copydoc Dali::Internal::PropertyInputImpl::GetMatrix()
    */
-  virtual const Matrix& GetMatrix( BufferIndex bufferIndex ) const
+  const Matrix& GetMatrix( BufferIndex bufferIndex ) const override
   {
     return mValue[ bufferIndex ];
   }
@@ -601,7 +601,7 @@ public:
   /**
    * @copydoc Dali::Internal::PropertyInputImpl::GetConstraintInputMatrix()
    */
-  virtual const Matrix& GetConstraintInputMatrix( BufferIndex bufferIndex ) const
+  const Matrix& GetConstraintInputMatrix( BufferIndex bufferIndex ) const override
   {
     // For inherited properties, constraints work with the value from the previous frame.
     // This is because constraints are applied to position etc, before world-position is calculated.
diff --git a/dali/internal/update/common/property-base.h b/dali/internal/update/common/property-base.h
index 568216b..2948fc5 100644
--- a/dali/internal/update/common/property-base.h
+++ b/dali/internal/update/common/property-base.h
@@ -51,7 +51,7 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~PropertyBase();
+  ~PropertyBase() override;
 
   /**
    * Reset the property to a base value; only required if the property is animated.
@@ -62,7 +62,7 @@ public:
   /**
    * @copydoc Dali::Internal::PropertyInputImpl::InputChanged()
    */
-  virtual bool InputChanged() const
+  bool InputChanged() const override
   {
     return !IsClean();
   }
diff --git a/dali/internal/update/common/property-owner-messages.h b/dali/internal/update/common/property-owner-messages.h
index 52d96a7..8af4362 100644
--- a/dali/internal/update/common/property-owner-messages.h
+++ b/dali/internal/update/common/property-owner-messages.h
@@ -54,7 +54,7 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~PropertyOwnerMessageBase();
+  ~PropertyOwnerMessageBase() override;
 
 private:
 
@@ -98,14 +98,14 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~AnimatablePropertyMessage()
+  ~AnimatablePropertyMessage() override
   {
   }
 
   /**
    * @copydoc MessageBase::Process
    */
-  virtual void Process( BufferIndex updateBufferIndex )
+  void Process( BufferIndex updateBufferIndex ) override
   {
     (mProperty->*mMemberFunction)( updateBufferIndex, mParam );
   }
@@ -176,14 +176,14 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~AnimatablePropertyComponentMessage()
+  ~AnimatablePropertyComponentMessage() override
   {
   }
 
   /**
    * @copydoc MessageBase::Process
    */
-  virtual void Process( BufferIndex updateBufferIndex )
+  void Process( BufferIndex updateBufferIndex ) override
   {
     (mProperty->*mMemberFunction)( updateBufferIndex, mParam );
   }
diff --git a/dali/internal/update/common/property-resetter.h b/dali/internal/update/common/property-resetter.h
index 3c60b35..cc0b99e 100644
--- a/dali/internal/update/common/property-resetter.h
+++ b/dali/internal/update/common/property-resetter.h
@@ -45,7 +45,7 @@ public:
   /**
    * Virtual Destructor
    */
-  virtual ~PropertyResetterBase()
+  ~PropertyResetterBase() override
   {
     if( mPropertyOwner != nullptr )
     {
@@ -91,7 +91,7 @@ public:
    *
    * @param[in] owner The property owner
    */
-  virtual void PropertyOwnerConnected( PropertyOwner& owner ) override
+  void PropertyOwnerConnected( PropertyOwner& owner ) override
   {
     mDisconnected = false;
     mActive = ACTIVE;
@@ -102,7 +102,7 @@ public:
    * @param[in] bufferIndex the current buffer index
    * @param[in] owner The property owner
    */
-  virtual void PropertyOwnerDisconnected( BufferIndex bufferIndex, PropertyOwner& owner ) override
+  void PropertyOwnerDisconnected( BufferIndex bufferIndex, PropertyOwner& owner ) override
   {
     mDisconnected = true;
   }
@@ -111,7 +111,7 @@ public:
    * Called shortly before the propertyOwner is destroyed
    * @param[in] owner The property owner
    */
-  virtual void PropertyOwnerDestroyed( PropertyOwner& owner ) override
+  void PropertyOwnerDestroyed( PropertyOwner& owner ) override
   {
     mDisconnected = true;
     mPropertyOwner = nullptr;
@@ -200,7 +200,7 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~Resetter()
+  ~Resetter() override
   {
     // Disconnect from modifier object. Although this resetter should match the lifecycle of the modifier object,
     // there are situations where it is deleted first (e.g. if the property owner is destroyed)
@@ -230,7 +230,7 @@ private:
   /**
    * The Animator or Constraint is destroyed
    */
-  virtual void ObjectDestroyed() override
+  void ObjectDestroyed() override
   {
     // When the modifier is destroyed, reduce the running value to ensure we stay alive for
     // another frame to reset the other buffer.
diff --git a/dali/internal/update/controllers/scene-controller-impl.h b/dali/internal/update/controllers/scene-controller-impl.h
index 724c549..57b3fdb 100644
--- a/dali/internal/update/controllers/scene-controller-impl.h
+++ b/dali/internal/update/controllers/scene-controller-impl.h
@@ -51,24 +51,24 @@ public:
   /**
    * Destructor
    */
-  virtual ~SceneControllerImpl();
+  ~SceneControllerImpl() override;
 
 public:  // from SceneController
 
   /**
    * @copydoc SceneController::GetRenderMessageDispatcher()
    */
-  virtual RenderMessageDispatcher& GetRenderMessageDispatcher() { return mRenderMessageDispatcher; }
+  RenderMessageDispatcher& GetRenderMessageDispatcher() override { return mRenderMessageDispatcher; }
 
   /**
    * @copydoc SceneController::GetRenderQueue()
    */
-  virtual RenderQueue& GetRenderQueue() { return mRenderQueue; }
+  RenderQueue& GetRenderQueue() override { return mRenderQueue; }
 
   /**
    * @copydoc SceneController::GetDiscardQueue()
    */
-  virtual DiscardQueue& GetDiscardQueue() { return mDiscardQueue; }
+  DiscardQueue& GetDiscardQueue() override { return mDiscardQueue; }
 
 private:
 
diff --git a/dali/internal/update/gestures/gesture-properties.h b/dali/internal/update/gestures/gesture-properties.h
index 4657685..c1f73b3 100644
--- a/dali/internal/update/gestures/gesture-properties.h
+++ b/dali/internal/update/gestures/gesture-properties.h
@@ -62,14 +62,14 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~GestureProperty()
+  ~GestureProperty() override
   {
   }
 
   /**
    * @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 +85,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 +95,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 +151,14 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~GesturePropertyVector2()
+  ~GesturePropertyVector2() override
   {
   }
 
   /**
    * @copydoc Dali::PropertyInput::GetVector2()
    */
-  virtual const Vector2& GetVector2( BufferIndex bufferIndex ) const
+  const Vector2& GetVector2( BufferIndex bufferIndex ) const override
   {
     return mValue;
   }
@@ -174,14 +174,14 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~GesturePropertyBool()
+  ~GesturePropertyBool() override
   {
   }
 
   /**
    * @copydoc Dali::PropertyInput::GetBoolean()
    */
-  virtual const bool& GetBoolean( BufferIndex bufferIndex ) const
+  const bool& GetBoolean( BufferIndex bufferIndex ) const override
   {
     return mValue;
   }
diff --git a/dali/internal/update/gestures/scene-graph-pan-gesture.h b/dali/internal/update/gestures/scene-graph-pan-gesture.h
index 2f2de12..017a5de 100644
--- a/dali/internal/update/gestures/scene-graph-pan-gesture.h
+++ b/dali/internal/update/gestures/scene-graph-pan-gesture.h
@@ -197,7 +197,7 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~PanGesture();
+  ~PanGesture() override;
 
   /**
    * Adds a PanGesture to the internal circular-buffer waiting to be handled by UpdateProperties.
diff --git a/dali/internal/update/manager/scene-graph-frame-callback.h b/dali/internal/update/manager/scene-graph-frame-callback.h
index 2f876e2..2373782 100644
--- a/dali/internal/update/manager/scene-graph-frame-callback.h
+++ b/dali/internal/update/manager/scene-graph-frame-callback.h
@@ -58,7 +58,7 @@ public:
   /**
    * Non-virtual Destructor.
    */
-  ~FrameCallback();
+  ~FrameCallback() override;
 
   /**
    * Called from the update-thread when connecting to the scene-graph.
@@ -107,19 +107,19 @@ private:
   /**
    * @copydoc PropertyOwner::Observer::PropertyOwnerConnected()
    */
-  virtual void PropertyOwnerConnected( PropertyOwner& owner ) { /* Nothing to do */ }
+  void PropertyOwnerConnected( PropertyOwner& owner ) override { /* Nothing to do */ }
 
   /**
    * @copydoc PropertyOwner::Observer::PropertyOwnerDisconnected()
    */
-  virtual void PropertyOwnerDisconnected( BufferIndex updateBufferIndex, PropertyOwner& owner ) { /* Nothing to do */ }
+  void PropertyOwnerDisconnected( BufferIndex updateBufferIndex, PropertyOwner& owner ) override { /* Nothing to do */ }
 
   /**
    * @copydoc PropertyOwner::Observer::PropertyOwnerDisconnected()
    *
    * Will use this to disconnect the frame-callback if the accompanying node is destroyed
    */
-  virtual void PropertyOwnerDestroyed( PropertyOwner& owner );
+  void PropertyOwnerDestroyed( PropertyOwner& owner ) override;
 
   // Construction
 
diff --git a/dali/internal/update/manager/transform-manager-property.h b/dali/internal/update/manager/transform-manager-property.h
index 800a65a..be56774 100644
--- a/dali/internal/update/manager/transform-manager-property.h
+++ b/dali/internal/update/manager/transform-manager-property.h
@@ -42,7 +42,7 @@ struct TransformManagerPropertyHandler : public AnimatablePropertyBase
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
    */
-  virtual Dali::Property::Type GetType() const = 0;
+  Dali::Property::Type GetType() const override = 0;
 
   /**
    * @copydoc Dali::SceneGraph::AnimatableProperty::Get()
@@ -57,7 +57,7 @@ struct TransformManagerPropertyHandler : public AnimatablePropertyBase
   /**
    * @copydoc Dali::PropertyInput::GetVector3()
    */
-  virtual const Vector3& GetVector3( BufferIndex bufferIndex ) const{ return Vector3::ZERO; }
+  const Vector3& GetVector3( BufferIndex bufferIndex ) const override{ return Vector3::ZERO; }
 
   /**
    * Retrieve a component of property
@@ -120,12 +120,12 @@ struct TransformManagerPropertyHandler : public AnimatablePropertyBase
   /**
    * @copydoc Dali::AnimatableProperty::ResetToBaseValue()
    */
-  virtual void ResetToBaseValue(BufferIndex updateBufferIndex){}
+  void ResetToBaseValue(BufferIndex updateBufferIndex) override{}
 
   /**
    * @copydoc Dali::AnimatableProperty::IsClean()
    */
-  virtual bool IsClean() const{ return false; }
+  bool IsClean() const override{ return false; }
 
   /**
    * Initializes the property
@@ -141,7 +141,7 @@ struct TransformManagerPropertyHandler : public AnimatablePropertyBase
   /**
    * @copydoc Dali::Internal::PropertyInputImpl::IsTransformManagerProperty()
    */
-  virtual bool IsTransformManagerProperty() const
+  bool IsTransformManagerProperty() const override
   {
     return true;
   }
@@ -158,32 +158,32 @@ struct TransformManagerPropertyVector3 : public TransformManagerPropertyHandler<
    mProperty( property )
   {}
 
-  Dali::Property::Type GetType() const
+  Dali::Property::Type GetType() const override
   {
     return Dali::PropertyTypes::Get<Vector3>();
   }
 
-  Vector3& Get( BufferIndex bufferIndex )
+  Vector3& Get( BufferIndex bufferIndex ) override
   {
     return mTxManager->GetVector3PropertyValue( mId, mProperty );
   }
 
-  const Vector3& Get( BufferIndex bufferIndex ) const
+  const Vector3& Get( BufferIndex bufferIndex ) const override
   {
     return mTxManager->GetVector3PropertyValue( mId, mProperty );
   }
 
-  virtual const Vector3& GetVector3( BufferIndex bufferIndex ) const
+  const Vector3& GetVector3( BufferIndex bufferIndex ) const override
   {
     return Get(bufferIndex);
   }
 
-  const float& GetFloatComponent( uint32_t component )
+  const float& GetFloatComponent( uint32_t component ) override
   {
     return mTxManager->GetVector3PropertyComponentValue( mId, mProperty, component );
   }
 
-  void Set(BufferIndex bufferIndex, const Vector3& value)
+  void Set(BufferIndex bufferIndex, const Vector3& value) override
   {
     mTxManager->SetVector3PropertyValue( mId, mProperty, value );
   }
@@ -198,42 +198,42 @@ struct TransformManagerPropertyVector3 : public TransformManagerPropertyHandler<
     mTxManager->BakeVector3PropertyComponentValue( mId, mProperty, value, component);
   }
 
-  void Bake(BufferIndex bufferIndex, const Vector3& value)
+  void Bake(BufferIndex bufferIndex, const Vector3& value) override
   {
     mTxManager->BakeVector3PropertyValue(mId, mProperty, value );
   }
 
-  void BakeX(BufferIndex bufferIndex, float value)
+  void BakeX(BufferIndex bufferIndex, float value) override
   {
     mTxManager->BakeXVector3PropertyValue(mId, mProperty, value );
   }
 
-  void BakeY(BufferIndex bufferIndex, float value)
+  void BakeY(BufferIndex bufferIndex, float value) override
   {
     mTxManager->BakeYVector3PropertyValue(mId, mProperty, value );
   }
 
-  void BakeZ(BufferIndex bufferIndex, float value)
+  void BakeZ(BufferIndex bufferIndex, float value) override
   {
     mTxManager->BakeZVector3PropertyValue(mId, mProperty, value );
   }
 
-  void SetFloatComponent( float value, uint32_t component)
+  void SetFloatComponent( float value, uint32_t component) override
   {
     mTxManager->SetVector3PropertyComponentValue( mId, mProperty, value, component);
   }
 
-  void BakeFloatComponent( float value, uint32_t component )
+  void BakeFloatComponent( float value, uint32_t component ) override
   {
     mTxManager->BakeVector3PropertyComponentValue( mId, mProperty, value, component);
   }
 
-  void BakeRelative(BufferIndex bufferIndex, const Vector3& value)
+  void BakeRelative(BufferIndex bufferIndex, const Vector3& value) override
   {
     mTxManager->BakeRelativeVector3PropertyValue(mId, mProperty, value );
   }
 
-  void BakeRelativeMultiply(BufferIndex bufferIndex, const Vector3& value)
+  void BakeRelativeMultiply(BufferIndex bufferIndex, const Vector3& value) override
   {
     mTxManager->BakeMultiplyVector3PropertyValue(mId, mProperty, value );
   }
@@ -249,42 +249,42 @@ public:
   :TransformManagerPropertyHandler()
   {}
 
-  virtual Dali::Property::Type GetType() const
+  Dali::Property::Type GetType() const override
   {
     return Dali::PropertyTypes::Get<Quaternion>();
   }
 
-  Quaternion& Get( BufferIndex bufferIndex )
+  Quaternion& Get( BufferIndex bufferIndex ) override
   {
     return mTxManager->GetQuaternionPropertyValue( mId );
   }
 
-  const Quaternion& Get( BufferIndex bufferIndex ) const
+  const Quaternion& Get( BufferIndex bufferIndex ) const override
   {
     return mTxManager->GetQuaternionPropertyValue( mId );
   }
 
-  const float& GetFloatComponent( uint32_t component)
+  const float& GetFloatComponent( uint32_t component) override
   {
     return mTxManager->GetQuaternionPropertyValue( mId ).mVector[component];
   }
 
-  void Set(BufferIndex bufferIndex, const Quaternion& value)
+  void Set(BufferIndex bufferIndex, const Quaternion& value) override
   {
     return mTxManager->SetQuaternionPropertyValue( mId, value );
   }
 
-  void Bake(BufferIndex bufferIndex, const Quaternion& value)
+  void Bake(BufferIndex bufferIndex, const Quaternion& value) override
   {
     return mTxManager->BakeQuaternionPropertyValue( mId, value );
   }
 
-  void BakeRelative(BufferIndex bufferIndex, const Quaternion& value)
+  void BakeRelative(BufferIndex bufferIndex, const Quaternion& value) override
   {
     return mTxManager->BakeRelativeQuaternionPropertyValue( mId, value );
   }
 
-  virtual const Quaternion& GetQuaternion( BufferIndex bufferIndex ) const
+  const Quaternion& GetQuaternion( BufferIndex bufferIndex ) const override
   {
     return Get(bufferIndex);
   }
@@ -311,14 +311,14 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~TransformManagerVector3Input()
+  ~TransformManagerVector3Input() override
   {
   }
 
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
    */
-  virtual Dali::Property::Type GetType() const
+  Dali::Property::Type GetType() const override
   {
     return Dali::PropertyTypes::Get<Vector3>();
   }
@@ -334,7 +334,7 @@ public:
   /**
    * @copydoc Dali::Internal::PropertyInputImpl::InputInitialized()
    */
-  virtual bool InputInitialized() const
+  bool InputInitialized() const override
   {
     return true;
   }
@@ -343,7 +343,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 true;
   }
@@ -374,7 +374,7 @@ public:
   /**
    * @copydoc Dali::PropertyInput::GetVector3()
    */
-  virtual const Vector3& GetVector3( BufferIndex bufferIndex ) const
+  const Vector3& GetVector3( BufferIndex bufferIndex ) const override
   {
     ComputeTransformComponent();
     return mValue;
@@ -383,7 +383,7 @@ public:
   /**
    * @copydoc Dali::PropertyInput::GetConstraintInputVector3()
    */
-  virtual const Vector3& GetConstraintInputVector3( BufferIndex bufferIndex ) const
+  const Vector3& GetConstraintInputVector3( BufferIndex bufferIndex ) const override
   {
     ComputeTransformComponent();
     return mValue;
@@ -432,7 +432,7 @@ public:
   /**
    * @copydoc Dali::Internal::PropertyInputImpl::IsTransformManagerProperty()
    */
-  virtual bool IsTransformManagerProperty() const
+  bool IsTransformManagerProperty() const override
   {
     return true;
   }
@@ -473,14 +473,14 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~TransformManagerQuaternionInput()
+  ~TransformManagerQuaternionInput() override
   {
   }
 
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
    */
-  virtual Dali::Property::Type GetType() const
+  Dali::Property::Type GetType() const override
   {
     return Dali::PropertyTypes::Get<Quaternion>();
   }
@@ -496,7 +496,7 @@ public:
   /**
    * @copydoc Dali::Internal::PropertyInputImpl::InputInitialized()
    */
-  virtual bool InputInitialized() const
+  bool InputInitialized() const override
   {
     return true;
   }
@@ -505,7 +505,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 true;
   }
@@ -527,7 +527,7 @@ public:
   /**
    * @copydoc Dali::PropertyInput::GetQuaternion()
    */
-  virtual const Quaternion& GetQuaternion( BufferIndex bufferIndex ) const
+  const Quaternion& GetQuaternion( BufferIndex bufferIndex ) const override
   {
     ComputeTransformComponent();
     return mValue;
@@ -536,7 +536,7 @@ public:
   /**
    * @copydoc Dali::PropertyInput::GetConstraintInputQuaternion()
    */
-  virtual const Quaternion& GetConstraintInputQuaternion( BufferIndex bufferIndex ) const
+  const Quaternion& GetConstraintInputQuaternion( BufferIndex bufferIndex ) const override
   {
     ComputeTransformComponent();
     return mValue;
@@ -585,7 +585,7 @@ public:
   /**
    * @copydoc Dali::Internal::PropertyInputImpl::IsTransformManagerProperty()
    */
-  virtual bool IsTransformManagerProperty() const
+  bool IsTransformManagerProperty() const override
   {
     return true;
   }
@@ -624,14 +624,14 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~TransformManagerMatrixInput()
+  ~TransformManagerMatrixInput() override
   {
   }
 
   /**
    * @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
    */
-  virtual Dali::Property::Type GetType() const
+  Dali::Property::Type GetType() const override
   {
     return Dali::PropertyTypes::Get<Matrix>();
   }
@@ -647,7 +647,7 @@ public:
   /**
    * @copydoc Dali::Internal::PropertyInputImpl::InputInitialized()
    */
-  virtual bool InputInitialized() const
+  bool InputInitialized() const override
   {
     return true;
   }
@@ -656,7 +656,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 true;
   }
@@ -664,7 +664,7 @@ public:
   /**
    * @copydoc Dali::PropertyInput::GetMatrix()
    */
-  virtual const Matrix& GetMatrix( BufferIndex bufferIndex ) const
+  const Matrix& GetMatrix( BufferIndex bufferIndex ) const override
   {
     if( mTxManager )
     {
@@ -677,7 +677,7 @@ public:
   /**
    * @copydoc Dali::PropertyInput::GetConstraintInputMatrix()
    */
-  virtual const Matrix& GetConstraintInputMatrix( BufferIndex bufferIndex ) const
+  const Matrix& GetConstraintInputMatrix( BufferIndex bufferIndex ) const override
   {
     if( mTxManager )
     {
@@ -723,7 +723,7 @@ public:
   /**
    * @copydoc Dali::Internal::PropertyInputImpl::IsTransformManagerProperty()
    */
-  virtual bool IsTransformManagerProperty() const
+  bool IsTransformManagerProperty() const override
   {
     return true;
   }
diff --git a/dali/internal/update/manager/update-manager.h b/dali/internal/update/manager/update-manager.h
index 724f8bf..bf5d3e4 100644
--- a/dali/internal/update/manager/update-manager.h
+++ b/dali/internal/update/manager/update-manager.h
@@ -146,7 +146,7 @@ public:
   /**
    * Destructor.
    */
-  virtual ~UpdateManager();
+  ~UpdateManager() override;
 
   // Node connection methods
 
@@ -337,7 +337,7 @@ public:
    * @brief Accept compiled shaders passed back on render thread for saving.
    * @param[in] shaderData Source code, hash over source, and corresponding compiled binary to be saved.
    */
-  virtual void SaveBinary( Internal::ShaderDataPtr shaderData );
+  void SaveBinary( Internal::ShaderDataPtr shaderData ) override;
 
   /**
    * @brief Set the destination for compiled shader binaries to be passed on to.
@@ -1328,14 +1328,14 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~IndexBufferMessage()
+  ~IndexBufferMessage() override
   {
   }
 
   /**
    * @copydoc MessageBase::Process
    */
-  virtual void Process( BufferIndex /*bufferIndex*/ )
+  void Process( BufferIndex /*bufferIndex*/ ) override
   {
     DALI_ASSERT_DEBUG( mManager && "Message does not have an object" );
     mManager->SetIndexBuffer( mRenderGeometry, mIndices );
diff --git a/dali/internal/update/nodes/node-messages.h b/dali/internal/update/nodes/node-messages.h
index 03efec7..c7da093 100644
--- a/dali/internal/update/nodes/node-messages.h
+++ b/dali/internal/update/nodes/node-messages.h
@@ -47,7 +47,7 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~NodePropertyMessageBase();
+  ~NodePropertyMessageBase() override;
 
 private:
 
@@ -95,14 +95,14 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~NodePropertyMessage()
+  ~NodePropertyMessage() override
   {
   }
 
   /**
    * @copydoc MessageBase::Process
    */
-  virtual void Process( BufferIndex updateBufferIndex )
+  void Process( BufferIndex updateBufferIndex ) override
   {
     (mProperty->*mMemberFunction)( updateBufferIndex, mParam );
   }
@@ -175,14 +175,14 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~NodePropertyComponentMessage()
+  ~NodePropertyComponentMessage() override
   {
   }
 
   /**
    * @copydoc MessageBase::Process
    */
-  virtual void Process( BufferIndex updateBufferIndex )
+  void Process( BufferIndex updateBufferIndex ) override
   {
     (mProperty->*mMemberFunction)( updateBufferIndex, mParam );
   }
@@ -253,14 +253,14 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~NodeTransformPropertyMessage()
+  ~NodeTransformPropertyMessage() override
   {
   }
 
   /**
    * @copydoc MessageBase::Process
    */
-  virtual void Process( BufferIndex updateBufferIndex )
+  void Process( BufferIndex updateBufferIndex ) override
   {
     (mProperty->*mMemberFunction)( updateBufferIndex, mParam );
   }
@@ -331,14 +331,14 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~NodeTransformComponentMessage()
+  ~NodeTransformComponentMessage() override
   {
   }
 
   /**
    * @copydoc MessageBase::Process
    */
-  virtual void Process( BufferIndex updateBufferIndex )
+  void Process( BufferIndex updateBufferIndex ) override
   {
     (mProperty->*mMemberFunction)( updateBufferIndex, mParam );
   }
diff --git a/dali/internal/update/nodes/node.h b/dali/internal/update/nodes/node.h
index 037f6ed..3ea13e7 100644
--- a/dali/internal/update/nodes/node.h
+++ b/dali/internal/update/nodes/node.h
@@ -121,7 +121,7 @@ public:
    * @param[in] updated The updated flag
    * (used for partial rendering to mark an animating sub tree for example).
    */
-  virtual void SetUpdated(bool updated)
+  void SetUpdated(bool updated) override
   {
     mUpdated = updated;
 
@@ -798,12 +798,12 @@ public:
   /**
    * @copydoc UniformMap::Add
    */
-  void AddUniformMapping( OwnerPointer< UniformPropertyMapping >& map );
+  void AddUniformMapping( OwnerPointer< UniformPropertyMapping >& map ) override;
 
   /**
    * @copydoc UniformMap::Remove
    */
-  void RemoveUniformMapping( const std::string& uniformName );
+  void RemoveUniformMapping( const std::string& uniformName ) override;
 
   /**
    * Prepare the node for rendering.
@@ -844,14 +844,14 @@ protected:
    * Protected virtual destructor; See also Node::Delete( Node* )
    * Kept protected to allow destructor chaining from layer
    */
-  virtual ~Node();
+  ~Node() override;
 
 private: // from NodeDataProvider
 
   /**
    * @copydoc NodeDataProvider::GetModelMatrix
    */
-  virtual const Matrix& GetModelMatrix( BufferIndex bufferIndex ) const
+  const Matrix& GetModelMatrix( BufferIndex bufferIndex ) const override
   {
     return GetWorldMatrix( bufferIndex );
   }
@@ -859,7 +859,7 @@ private: // from NodeDataProvider
   /**
    * @copydoc NodeDataProvider::GetRenderColor
    */
-  virtual const Vector4& GetRenderColor( BufferIndex bufferIndex ) const
+  const Vector4& GetRenderColor( BufferIndex bufferIndex ) const override
   {
     return GetWorldColor( bufferIndex );
   }
@@ -868,7 +868,7 @@ public: // From UniformMapDataProvider
   /**
    * @copydoc UniformMapDataProvider::GetUniformMapChanged
    */
-  virtual bool GetUniformMapChanged( BufferIndex bufferIndex ) const
+  bool GetUniformMapChanged( BufferIndex bufferIndex ) const override
   {
     return mUniformMapChanged[bufferIndex];
   }
@@ -876,7 +876,7 @@ public: // From UniformMapDataProvider
   /**
    * @copydoc UniformMapDataProvider::GetUniformMap
    */
-  virtual const CollectedUniformMap& GetUniformMap( BufferIndex bufferIndex ) const
+  const CollectedUniformMap& GetUniformMap( BufferIndex bufferIndex ) const override
   {
     return mCollectedUniformMap[bufferIndex];
   }
diff --git a/dali/internal/update/nodes/scene-graph-layer.h b/dali/internal/update/nodes/scene-graph-layer.h
index 3a25f67..b9ac15a 100644
--- a/dali/internal/update/nodes/scene-graph-layer.h
+++ b/dali/internal/update/nodes/scene-graph-layer.h
@@ -83,13 +83,13 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~Layer();
+  ~Layer() override;
 
   /**
    * From Node, to convert a node to a layer.
    * @return The layer.
    */
-  virtual Layer* GetLayer()
+  Layer* GetLayer() override
   {
     return this;
   }
diff --git a/dali/internal/update/render-tasks/scene-graph-render-task.h b/dali/internal/update/render-tasks/scene-graph-render-task.h
index 1489618..3ebdaf2 100644
--- a/dali/internal/update/render-tasks/scene-graph-render-task.h
+++ b/dali/internal/update/render-tasks/scene-graph-render-task.h
@@ -70,7 +70,7 @@ public:
   /**
    * Virtual destructor
    */
-  virtual ~RenderTask();
+  ~RenderTask() override;
 
   /**
    * Initialize the render task. Called in update thread
@@ -342,17 +342,17 @@ private: // from PropertyOwner::Observer
   /**
    * @copydoc PropertyOwner::Observer::PropertyOwnerConnected( PropertyOwner& owner )
    */
-  void PropertyOwnerConnected( PropertyOwner& owner );
+  void PropertyOwnerConnected( PropertyOwner& owner ) override;
 
   /**
    * @copydoc PropertyOwner::Observer::PropertyOwnerDisconnected( BufferIndex updateBufferIndex, PropertyOwner& owner )
    */
-  void PropertyOwnerDisconnected( BufferIndex updateBufferIndex, PropertyOwner& owner );
+  void PropertyOwnerDisconnected( BufferIndex updateBufferIndex, PropertyOwner& owner ) override;
 
   /**
    * @copydoc PropertyOwner::Observer::PropertyOwnerDestroyed( PropertyOwner& owner )
    */
-  void PropertyOwnerDestroyed( PropertyOwner& owner );
+  void PropertyOwnerDestroyed( PropertyOwner& owner ) override;
 
 private:
 
diff --git a/dali/internal/update/rendering/scene-graph-renderer.h b/dali/internal/update/rendering/scene-graph-renderer.h
index dcc1bba..b3ab63e 100644
--- a/dali/internal/update/rendering/scene-graph-renderer.h
+++ b/dali/internal/update/rendering/scene-graph-renderer.h
@@ -76,7 +76,7 @@ public:
   /**
    * Destructor
    */
-  virtual ~Renderer();
+  ~Renderer() override;
 
   /**
    * Overriden delete operator
@@ -395,24 +395,24 @@ public: // UniformMap::Observer
   /**
    * @copydoc UniformMap::Observer::UniformMappingsChanged
    */
-  virtual void UniformMappingsChanged( const UniformMap& mappings );
+  void UniformMappingsChanged( const UniformMap& mappings ) override;
 
 public: // ConnectionChangePropagator::Observer
 
   /**
    * @copydoc ConnectionChangePropagator::ConnectionsChanged
    */
-  virtual void ConnectionsChanged( PropertyOwner& owner );
+  void ConnectionsChanged( PropertyOwner& owner ) override;
 
   /**
    * @copydoc ConnectionChangePropagator::ConnectedUniformMapChanged
    */
-  virtual void ConnectedUniformMapChanged( );
+  void ConnectedUniformMapChanged( ) override;
 
   /**
    * @copydoc ConnectionChangePropagator::ConnectedUniformMapChanged
    */
-  virtual void ObservedObjectDestroyed(PropertyOwner& owner);
+  void ObservedObjectDestroyed(PropertyOwner& owner) override;
 
 public: // PropertyOwner implementation
   /**
@@ -425,12 +425,12 @@ public: // From UniformMapDataProvider
   /**
    * @copydoc UniformMapDataProvider::GetUniformMapChanged
    */
-  virtual bool GetUniformMapChanged( BufferIndex bufferIndex ) const{ return mUniformMapChanged[bufferIndex];}
+  bool GetUniformMapChanged( BufferIndex bufferIndex ) const override{ return mUniformMapChanged[bufferIndex];}
 
   /**
    * @copydoc UniformMapDataProvider::GetUniformMap
    */
-  virtual const CollectedUniformMap& GetUniformMap( BufferIndex bufferIndex ) const;
+  const CollectedUniformMap& GetUniformMap( BufferIndex bufferIndex ) const override;
 
   void SetDrawCommands( Dali::DevelRenderer::DrawCommand* pDrawCommands, uint32_t size );
 
diff --git a/dali/public-api/actors/custom-actor-impl.h b/dali/public-api/actors/custom-actor-impl.h
index 9566e21..0b0d4e2 100644
--- a/dali/public-api/actors/custom-actor-impl.h
+++ b/dali/public-api/actors/custom-actor-impl.h
@@ -74,7 +74,7 @@ protected:
    * @brief Virtual destructor
    * @SINCE_1_0.0
    */
-  virtual ~CustomActorImpl();
+  ~CustomActorImpl() override;
 
 public:
   /**
diff --git a/dali/public-api/images/native-image-interface.h b/dali/public-api/images/native-image-interface.h
index 606864d..6d55fa7 100644
--- a/dali/public-api/images/native-image-interface.h
+++ b/dali/public-api/images/native-image-interface.h
@@ -165,7 +165,7 @@ protected:
    * The implementation should destroy the NativeImage resources.
    * @SINCE_1_0.0
    */
-  virtual ~NativeImageInterface()
+  ~NativeImageInterface() override
   {
   }
 
diff --git a/dali/public-api/object/base-object.h b/dali/public-api/object/base-object.h
index 5a42fc9..91ca518 100644
--- a/dali/public-api/object/base-object.h
+++ b/dali/public-api/object/base-object.h
@@ -100,7 +100,7 @@ protected:
    * @brief A reference counted object may only be deleted by calling Unreference().
    * @SINCE_1_0.0
    */
-  virtual ~BaseObject();
+  ~BaseObject() override;
 
   /**
    * @brief Registers the object as created with the Object registry.
diff --git a/dali/public-api/object/weak-handle.cpp b/dali/public-api/object/weak-handle.cpp
index 445eda8..bec255d 100644
--- a/dali/public-api/object/weak-handle.cpp
+++ b/dali/public-api/object/weak-handle.cpp
@@ -47,7 +47,7 @@ struct WeakHandleBase::Impl : public BaseObject::Impl::Observer
   }
 
   // Destruction
-  ~Impl()
+  ~Impl() override
   {
     Reset();
   }
@@ -64,7 +64,7 @@ struct WeakHandleBase::Impl : public BaseObject::Impl::Observer
   /**
    * From BaseObject::Impl::Observer
    */
-  virtual void ObjectDestroyed( BaseObject& object )
+  void ObjectDestroyed( BaseObject& object ) override
   {
     mObject = nullptr;
   }
diff --git a/dali/public-api/signals/base-signal.h b/dali/public-api/signals/base-signal.h
index a2e17ac..887403b 100755
--- a/dali/public-api/signals/base-signal.h
+++ b/dali/public-api/signals/base-signal.h
@@ -89,7 +89,7 @@ public:
    * @brief Virtual destructor.
    * @SINCE_1_0.0
    */
-  virtual ~BaseSignal();
+  ~BaseSignal() override;
 
   /**
    * @brief Queries whether there are any connected slots.
@@ -474,7 +474,7 @@ private: // SlotObserver interface, to be told when a slot disconnects
   /**
    * @copydoc SlotObserver::SlotDisconnected
    */
-  virtual void SlotDisconnected( CallbackBase* callback );
+  void SlotDisconnected( CallbackBase* callback ) override;
 
 private:
 
diff --git a/dali/public-api/signals/connection-tracker-interface.h b/dali/public-api/signals/connection-tracker-interface.h
index c9093f3..6e27eb4 100644
--- a/dali/public-api/signals/connection-tracker-interface.h
+++ b/dali/public-api/signals/connection-tracker-interface.h
@@ -65,7 +65,7 @@ public:
    * @brief Virtual destructor.
    * @SINCE_1_0.0
    */
-  virtual ~ConnectionTrackerInterface();
+  ~ConnectionTrackerInterface() override;
 
   /**
    * @brief Called when a signal is connected.
diff --git a/dali/public-api/signals/connection-tracker.h b/dali/public-api/signals/connection-tracker.h
index 7da099f..74a17f3 100644
--- a/dali/public-api/signals/connection-tracker.h
+++ b/dali/public-api/signals/connection-tracker.h
@@ -52,7 +52,7 @@ public:
    * @brief Virtual destructor.
    * @SINCE_1_0.0
    */
-  virtual ~ConnectionTracker();
+  ~ConnectionTracker() override;
 
   /**
    * @brief Disconnects all signals from this object.
@@ -63,12 +63,12 @@ public:
   /**
    * @copydoc ConnectionTrackerInterface::SignalConnected
    */
-  virtual void SignalConnected( SlotObserver* slotObserver, CallbackBase* callback );
+  void SignalConnected( SlotObserver* slotObserver, CallbackBase* callback ) override;
 
   /**
    * @copydoc ConnectionTrackerInterface::SignalDisconnected
    */
-  virtual void SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback );
+  void SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback ) override;
 
   /**
    * @brief Returns the connection count.