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
index f56bdd3..b9ac15a 100644 (file)
--- a/dali/internal/update/nodes/scene-graph-layer.h
+++ b/dali/internal/update/nodes/scene-graph-layer.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_SCENE_GRAPH_LAYER_H
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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.
@@ -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,8 +70,7 @@ typedef Dali::Vector< Renderable > RenderableContainer;
 class Layer : public Node
 {
 public:
-
-  typedef Dali::Layer::SortFunctionType SortFunctionType;
+  using SortFunctionType = Dali::Layer::SortFunctionType;
 
   // Creation methods
 
@@ -82,10 +81,15 @@ public:
   static SceneGraph::Layer* New();
 
   /**
+   * Virtual destructor
+   */
+  ~Layer() override;
+
+  /**
    * From Node, to convert a node to a layer.
    * @return The layer.
    */
-  virtual Layer* GetLayer()
+  Layer* GetLayer() override
   {
     return this;
   }
@@ -212,11 +216,6 @@ private:
   // Undefined
   Layer(const Layer&);
 
-  /**
-   * Virtual destructor
-   */
-  virtual ~Layer();
-
   // Undefined
   Layer& operator=(const Layer& rhs);
 
@@ -252,10 +251,10 @@ 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
-  unsigned int* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) );
+  uint32_t* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) );
 
   // Construct message in the message queue memory; note that delete should not be called on the return value
   new (slot) LocalType( &layer, &Layer::SetSortFunction, function );
@@ -268,10 +267,10 @@ 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
-  unsigned int* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) );
+  uint32_t* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) );
 
   // Construct message in the message queue memory; note that delete should not be called on the return value
   new (slot) LocalType( &layer, &Layer::SetClipping, enabled );
@@ -284,10 +283,10 @@ 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
-  unsigned int* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) );
+  uint32_t* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) );
 
   // Construct message in the message queue memory; note that delete should not be called on the return value
   new (slot) LocalType( &layer, &Layer::SetClippingBox, clippingbox );
@@ -302,10 +301,10 @@ 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
-  unsigned int* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) );
+  uint32_t* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) );
 
   // Construct message in the message queue memory; note that delete should not be called on the return value
   new (slot) LocalType( &layer, &Layer::SetBehavior, behavior );
@@ -321,10 +320,10 @@ 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
-  unsigned int* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) );
+  uint32_t* slot = eventThreadServices.ReserveMessageSlot( sizeof( LocalType ) );
 
   // Construct message in the message queue memory; note that delete should not be called on the return value
   new (slot) LocalType( &layer, &Layer::SetDepthTestDisabled, disable );
@@ -334,8 +333,14 @@ inline void SetDepthTestDisabledMessage( EventThreadServices& eventThreadService
 
 // Template specialisation for OwnerPointer<Layer>, because delete is protected
 template <>
-void OwnerPointer<Dali::Internal::SceneGraph::Layer>::Reset();
-
+inline void OwnerPointer<Dali::Internal::SceneGraph::Layer>::Reset()
+{
+  if (mObject != NULL)
+  {
+    Dali::Internal::SceneGraph::Node::Delete(mObject);
+    mObject = NULL;
+  }
+}
 } // namespace Internal
 
 } // namespace Dali