Use modern construct 'using' instead of typedef.

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

diff --git a/dali/internal/event/actors/layer-list.h b/dali/internal/event/actors/layer-list.h
index 22b5bfc..3972593 100644 (file)
--- a/dali/internal/event/actors/layer-list.h
+++ b/dali/internal/event/actors/layer-list.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_LAYER_LIST_H__
-#define __DALI_INTERNAL_LAYER_LIST_H__
+#ifndef DALI_INTERNAL_LAYER_LIST_H
+#define DALI_INTERNAL_LAYER_LIST_H
 
 /*
- * Copyright (c) 2014 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.
@@ -18,6 +18,9 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <cstdint> // uint32_t
+
 // INTERNAL INCLUDES
 #include <dali/public-api/common/vector-wrapper.h>
 
@@ -38,7 +41,6 @@ class Layer;
  * An ordered list of layers.
  * Layers are not owned by the LayerList; each layer is responsible for registering & unregistering.
  * This is used by the Stage, to keep track of layer depths.
- * A separate LayerList is maintained for actors added via the SystemOverlay::Add().
  */
 class LayerList
 {
@@ -47,9 +49,8 @@ public:
   /**
    * Create a new list of layers.
    * @param[in] updateManager A reference to the update manager.
-   * @param[in] systemLevel True if the layers are added via the SystemOverlay API.
    */
-  static LayerList* New( SceneGraph::UpdateManager& updateManager, bool systemLevel );
+  static LayerList* New( SceneGraph::UpdateManager& updateManager );
 
   /**
    * Non-virtual destructor; not suitable as a base class.
@@ -60,7 +61,7 @@ public:
    * Query the number of layers.
    * @return The number of layers.
    */
-  unsigned int GetLayerCount() const;
+  uint32_t GetLayerCount() const;
 
   /**
    * Retrieve the layer at a specified depth.
@@ -68,13 +69,13 @@ public:
    * @param[in] depth The depth.
    * @return The layer found at the given depth.
    */
-  Layer* GetLayer( unsigned int depth ) const;
+  Layer* GetLayer( uint32_t depth ) const;
 
   /**
    * Gets the depth of a given layer
    * @param layer which depth to check
    */
-  unsigned int GetDepth( const Layer* layer ) const;
+  uint32_t GetDepth( const Layer* layer ) const;
 
   /**
    * Register a layer with the stage.
@@ -131,14 +132,20 @@ public:
    */
   void MoveLayerBelow( const Layer& layer, const Layer& target );
 
+  /**
+   * Sets the root layer that this layer list belongs to
+   * @pre the root layer is created
+   * @param rootLayer The root layer
+   */
+  void SetRootLayer(Layer* rootLayer);
+
 private:
 
   /**
    * Protected constructor; see also LayerList::New().
    * @param[in] updateManager to send messages.
-   * @param[in] systemLevel True if the layers are added via the SystemOverlay API.
    */
-  LayerList( SceneGraph::UpdateManager& updateManager, bool systemLevel );
+  LayerList( SceneGraph::UpdateManager& updateManager );
 
   /**
    * A private helper method to set the depth for each layer.
@@ -151,9 +158,9 @@ private:
 
   SceneGraph::UpdateManager& mUpdateManager;
 
-  bool mIsSystemLevel; ///< True if the layers are added via the SystemOverlay API.
+  Layer* mRoot;        ///< The root layer that this ordered list of layers belong to
 
-  typedef std::vector<Layer*> LayerContainer;
+  using LayerContainer = std::vector<Layer*>;
 
   // Layers are not owned by the LayerList.
   // Each layer is responsible for registering & unregistering before the end of its life-time.
@@ -164,4 +171,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_LAYER_LIST_H__
+#endif // DALI_INTERNAL_LAYER_LIST_H