use modern construct 'override' in the derive class.

[platform/core/uifw/dali-core.git] / dali / internal / update / nodes / scene-graph-layer.h

diff --git a/dali/internal/update/nodes/scene-graph-layer.h b/dali/internal/update/nodes/scene-graph-layer.h
old mode 100755 (executable)
new mode 100644 (file)
index 7109694..b9ac15a
--- a/dali/internal/update/nodes/scene-graph-layer.h
+++ b/dali/internal/update/nodes/scene-graph-layer.h
@@ -58,7 +58,7 @@ struct Renderable
   Renderer* mRenderer;
 };
 
-typedef Dali::Vector< Renderable > RenderableContainer;
+using RenderableContainer = Dali::Vector<Renderable>;
 
 /**
  * Layers have a "depth" relative to all other layers in the scene-graph.
@@ -70,28 +70,26 @@ typedef Dali::Vector< Renderable > RenderableContainer;
 class Layer : public Node
 {
 public:
-
-  typedef Dali::Layer::SortFunctionType SortFunctionType;
+  using SortFunctionType = Dali::Layer::SortFunctionType;
 
   // Creation methods
 
   /**
    * Construct a new Layer.
-   * @param[in] id The Unique ID of the actor creating the node
    * @return A smart-pointer to a newly allocated Node
    */
-  static SceneGraph::Layer* New( uint32_t id );
+  static SceneGraph::Layer* New();
 
   /**
    * 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;
   }
@@ -211,10 +209,9 @@ private:
 
   /**
    * Private constructor.
-   * @param[in] id The Unique ID of the actor creating the node
    * See also Layer::New()
    */
-  Layer( uint32_t id );
+  Layer();
 
   // Undefined
   Layer(const Layer&);
@@ -254,7 +251,7 @@ private:
  */
 inline void SetSortFunctionMessage( EventThreadServices& eventThreadServices, const Layer& layer, Dali::Layer::SortFunctionType function )
 {
-  typedef MessageValue1< Layer, Dali::Layer::SortFunctionType > LocalType;
+  using LocalType = MessageValue1<Layer, Dali::Layer::SortFunctionType>;
 
   // Reserve some memory inside the message queue
   uint32_t* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) );
@@ -270,7 +267,7 @@ inline void SetSortFunctionMessage( EventThreadServices& eventThreadServices, co
  */
 inline void SetClippingMessage( EventThreadServices& eventThreadServices, const Layer& layer, bool enabled )
 {
-  typedef MessageValue1< Layer, bool > LocalType;
+  using LocalType = MessageValue1<Layer, bool>;
 
   // Reserve some memory inside the message queue
   uint32_t* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) );
@@ -286,7 +283,7 @@ inline void SetClippingMessage( EventThreadServices& eventThreadServices, const
  */
 inline void SetClippingBoxMessage( EventThreadServices& eventThreadServices, const Layer& layer, const Dali::ClippingBox& clippingbox )
 {
-  typedef MessageValue1< Layer, Dali::ClippingBox > LocalType;
+  using LocalType = MessageValue1<Layer, Dali::ClippingBox>;
 
   // Reserve some memory inside the message queue
   uint32_t* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) );
@@ -304,7 +301,7 @@ inline void SetBehaviorMessage( EventThreadServices& eventThreadServices,
                                 const Layer& layer,
                                 Dali::Layer::Behavior behavior )
 {
-  typedef MessageValue1< Layer, Dali::Layer::Behavior > LocalType;
+  using LocalType = MessageValue1<Layer, Dali::Layer::Behavior>;
 
   // Reserve some memory inside the message queue
   uint32_t* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) );
@@ -323,7 +320,7 @@ inline void SetBehaviorMessage( EventThreadServices& eventThreadServices,
  */
 inline void SetDepthTestDisabledMessage( EventThreadServices& eventThreadServices, const Layer& layer, bool disable )
 {
-  typedef MessageValue1< Layer, bool > LocalType;
+  using LocalType = MessageValue1<Layer, bool>;
 
   // Reserve some memory inside the message queue
   uint32_t* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) );