use modern construct 'override' in the derive class.

[platform/core/uifw/dali-core.git] / dali / internal / event / animation / path-constrainer-impl.h

diff --git a/dali/internal/event/animation/path-constrainer-impl.h b/dali/internal/event/animation/path-constrainer-impl.h
index e988321..60c599e 100644 (file)
--- a/dali/internal/event/animation/path-constrainer-impl.h
+++ b/dali/internal/event/animation/path-constrainer-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_PATH_CONSTRAINER_H__
-#define __DALI_INTERNAL_PATH_CONSTRAINER_H__
+#ifndef DALI_INTERNAL_PATH_CONSTRAINER_H
+#define DALI_INTERNAL_PATH_CONSTRAINER_H
 
 /*
- * Copyright (c) 2015 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.
@@ -131,66 +131,31 @@ protected:
   /**
    * virtual destructor
    */
-  virtual ~PathConstrainer();
+  ~PathConstrainer() override;
 
 private:
 
   /**
-   * @copydoc Dali::Internal::Object::GetDefaultPropertyCount()
-   */
-  virtual unsigned int GetDefaultPropertyCount() const;
-
-  /**
-   * @copydoc Dali::Internal::Object::GetDefaultPropertyIndices()
-   */
-  virtual void GetDefaultPropertyIndices( Property::IndexContainer& indices ) const;
-
-  /**
-   * @copydoc Dali::Internal::Object::GetDefaultPropertyName()
-   */
-  virtual const char* GetDefaultPropertyName(Property::Index index) const;
-
-  /**
-   * @copydoc Dali::Internal::Object::GetDefaultPropertyIndex()
-   */
-  virtual Property::Index GetDefaultPropertyIndex(const std::string& name) const;
-
-  /**
-   * @copydoc Dali::Internal::Object::IsDefaultPropertyWritable()
-   */
-  virtual bool IsDefaultPropertyWritable(Property::Index index) const;
-
-  /**
-   * @copydoc Dali::Internal::Object::IsDefaultPropertyAnimatable()
-   */
-  virtual bool IsDefaultPropertyAnimatable(Property::Index index) const;
-
-  /**
-   * @copydoc Dali::Internal::Object::IsDefaultPropertyAConstraintInput()
-   */
-  virtual bool IsDefaultPropertyAConstraintInput( Property::Index index ) const;
-
-  /**
-   * @copydoc Dali::Internal::Object::GetDefaultPropertyType()
-   */
-  virtual Property::Type GetDefaultPropertyType(Property::Index index) const;
-
-  /**
    * @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()
+  */
+ 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:
 
@@ -226,4 +191,4 @@ inline const Internal::PathConstrainer& GetImplementation(const Dali::PathConstr
 
 } // Dali
 
-#endif //__DALI_INTERNAL_PATH_CONSTRAINER_H__
+#endif // DALI_INTERNAL_PATH_CONSTRAINER_H