X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Factors%2Flayer-impl.cpp;h=dfb3011cc156b3737272159bb9b9059b2d7c9c6e;hb=7944cb8fe51a40dcecf48f08acf333f94be95414;hp=be09fd952aa21fd41a011af6c3f082c82fb19f80;hpb=5826321b721c2dc09abda23e9d845cb4cf8edc92;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/internal/event/actors/layer-impl.cpp b/dali/internal/event/actors/layer-impl.cpp
index be09fd9..dfb3011 100644
--- a/dali/internal/event/actors/layer-impl.cpp
+++ b/dali/internal/event/actors/layer-impl.cpp
@@ -126,7 +126,7 @@ LayerPtr Layer::NewRoot( LayerList& layerList )
 
 Layer::Layer( Actor::DerivedType type, const SceneGraph::Layer& layer )
 : Actor( type, layer ),
-  mLayerList( NULL ),
+  mLayerList( nullptr ),
   mClippingBox( 0, 0, 0, 0 ),
   mSortFunction( Layer::ZValue ),
   mBehavior( Dali::Layer::LAYER_UI ),
@@ -337,7 +337,7 @@ void Layer::OnSceneConnectionInternal()
     DALI_ASSERT_DEBUG( NULL == mLayerList );
 
     // Find the ordered layer-list
-    for ( Actor* parent = mParent; parent != NULL; parent = parent->GetParent() )
+    for ( Actor* parent = mParent; parent != nullptr; parent = parent->GetParent() )
     {
       if( parent->IsLayer() )
       {
@@ -356,7 +356,7 @@ void Layer::OnSceneDisconnectionInternal()
   mLayerList->UnregisterLayer(*this);
 
   // mLayerList is only valid when on-stage
-  mLayerList = NULL;
+  mLayerList = nullptr;
 }
 
 const SceneGraph::Layer& Layer::GetSceneGraphLayer() const