use modern construct 'override' in the derive class.

[platform/core/uifw/dali-core.git] / dali / internal / event / actors / layer-impl.h

diff --git a/dali/internal/event/actors/layer-impl.h b/dali/internal/event/actors/layer-impl.h
index 2a4e6b4..0ada991 100644 (file)
--- a/dali/internal/event/actors/layer-impl.h
+++ b/dali/internal/event/actors/layer-impl.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_LAYER_H
 
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ class UpdateManager;
 class Layer;
 }
 
-typedef Dali::ClippingBox ClippingBox;
+using ClippingBox = Dali::ClippingBox;
 
 class Layer : public Actor
 {
@@ -76,7 +76,7 @@ public:
   /**
    * @copydoc Dali::Internal::Actor::OnInitialize
    */
-  void OnInitialize();
+  void OnInitialize() override;
 
   /**
    * Query the current depth of the layer
@@ -199,10 +199,10 @@ public:
 
   /**
    * Helper function to get the scene object.
-   * This should only be called by Stage
+   *
    * @return the scene object for the layer.
    */
-  const SceneGraph::Layer& GetSceneLayerOnStage() const;
+  const SceneGraph::Layer& GetSceneGraphLayer() const;
 
   /**
    * @copydoc Dali::Internal::Actor::DoAction()
@@ -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,23 +238,23 @@ protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~Layer();
+  ~Layer() override;
 
 private: // From Actor
 
   /**
    * From Actor.
    */
-  virtual void OnStageConnectionInternal();
+  void OnSceneConnectionInternal() override;
 
   /**
    * From Actor.
    */
-  virtual void OnStageDisconnectionInternal();
+  void OnSceneDisconnectionInternal() override;
 
 private:
 
-  LayerList* mLayerList; ///< Only valid when layer is on-stage
+  LayerList* mLayerList; ///< Only valid when layer is on-scene
 
   // These properties not animatable; the actor side has the most up-to-date values
   ClippingBox mClippingBox;                     ///< The clipping box, in window coordinates