use modern construct 'override' in the derive class.

[platform/core/uifw/dali-core.git] / dali / internal / event / animation / constraint-base.h

diff --git a/dali/internal/event/animation/constraint-base.h b/dali/internal/event/animation/constraint-base.h
index 8b9caa9..9f7c394 100644 (file)
--- a/dali/internal/event/animation/constraint-base.h
+++ b/dali/internal/event/animation/constraint-base.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ACTIVE_CONSTRAINT_BASE_H__
-#define __DALI_INTERNAL_ACTIVE_CONSTRAINT_BASE_H__
+#ifndef DALI_INTERNAL_ACTIVE_CONSTRAINT_BASE_H
+#define DALI_INTERNAL_ACTIVE_CONSTRAINT_BASE_H
 
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,8 +34,8 @@ namespace Internal
 
 class EventThreadServices;
 class Object;
-typedef Dali::Vector<Object*>     ObjectContainer;
-typedef ObjectContainer::Iterator ObjectIter;
+using ObjectContainer = Dali::Vector<Object*>;
+using ObjectIter      = ObjectContainer::Iterator;
 
 namespace SceneGraph
 {
@@ -51,8 +51,7 @@ class AnimatableProperty;
 class ConstraintBase : public BaseObject, public Object::Observer
 {
 public:
-
-  typedef Dali::Constraint::RemoveAction RemoveAction;
+  using RemoveAction = Dali::Constraint::RemoveAction;
 
   /**
    * Constructor.
@@ -73,7 +72,7 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~ConstraintBase();
+  ~ConstraintBase() override;
 
   /**
    * Adds a constraint source to the constraint
@@ -140,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:
 
@@ -253,4 +252,4 @@ inline const Internal::ConstraintBase& GetImplementation(const Dali::Constraint&
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_ACTIVE_CONSTRAINT_BASE_H__
+#endif // DALI_INTERNAL_ACTIVE_CONSTRAINT_BASE_H