projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use modern construct 'nullptr' instead of 'NULL' or '0'
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
event
/
actors
/
layer-impl.cpp
diff --git
a/dali/internal/event/actors/layer-impl.cpp
b/dali/internal/event/actors/layer-impl.cpp
index
be09fd9
..
dfb3011
100644
(file)
--- 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 ),
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 ),
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
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() )
{
{
if( parent->IsLayer() )
{
@@
-356,7
+356,7
@@
void Layer::OnSceneDisconnectionInternal()
mLayerList->UnregisterLayer(*this);
// mLayerList is only valid when on-stage
mLayerList->UnregisterLayer(*this);
// mLayerList is only valid when on-stage
- mLayerList =
NULL
;
+ mLayerList =
nullptr
;
}
const SceneGraph::Layer& Layer::GetSceneGraphLayer() const
}
const SceneGraph::Layer& Layer::GetSceneGraphLayer() const