use modern construct 'nullptr' instead of 'NULL' or '0'

[platform/core/uifw/dali-core.git] / dali / internal / event / rendering / texture-set-impl.cpp

diff --git a/dali/internal/event/rendering/texture-set-impl.cpp b/dali/internal/event/rendering/texture-set-impl.cpp
index b4d4793..373daaf 100644 (file)
--- a/dali/internal/event/rendering/texture-set-impl.cpp
+++ b/dali/internal/event/rendering/texture-set-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -20,7 +20,6 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/object/type-registry.h>
-#include <dali/internal/event/common/object-impl-helper.h> // Dali::Internal::ObjectHelper
 #include <dali/internal/update/manager/update-manager.h>
 #include <dali/internal/update/rendering/scene-graph-texture-set.h>
 
@@ -52,18 +51,18 @@ void TextureSet::SetTexture( uint32_t index, TexturePtr texture )
 
     for( uint32_t i(textureCount); i<=index; ++i )
     {
-      mTextures[i] = NULL;
+      mTextures[i] = nullptr;
 
       if( !samplerExist )
       {
-        mSamplers[i] = NULL;
+        mSamplers[i] = nullptr;
       }
     }
   }
 
   mTextures[index]= texture;
 
-  Render::Texture* renderTexture(0);
+  Render::Texture* renderTexture(nullptr);
   if( texture )
   {
     renderTexture = texture->GetRenderObject();
@@ -74,7 +73,7 @@ void TextureSet::SetTexture( uint32_t index, TexturePtr texture )
 
 Texture* TextureSet::GetTexture( uint32_t index ) const
 {
-  Texture* result(0);
+  Texture* result(nullptr);
   if( index < mTextures.size() )
   {
     result = mTextures[index].Get();
@@ -95,13 +94,13 @@ void TextureSet::SetSampler( uint32_t index, SamplerPtr sampler )
     mSamplers.resize( index + 1 );
     for( uint32_t i = samplerCount; i<=index; ++i )
     {
-      mSamplers[i] = NULL;
+      mSamplers[i] = nullptr;
     }
   }
 
   mSamplers[index] = sampler;
 
-  Render::Sampler* renderSampler(0);
+  Render::Sampler* renderSampler(nullptr);
   if( sampler )
   {
     renderSampler = sampler->GetSamplerRenderObject();
@@ -112,7 +111,7 @@ void TextureSet::SetSampler( uint32_t index, SamplerPtr sampler )
 
 Sampler* TextureSet::GetSampler( uint32_t index ) const
 {
-  Sampler* result(0);
+  Sampler* result(nullptr);
   if( index < mSamplers.size() )
   {
     result = mSamplers[index].Get();
@@ -136,8 +135,8 @@ const SceneGraph::TextureSet* TextureSet::GetTextureSetSceneObject() const
 }
 
 TextureSet::TextureSet()
-:mEventThreadServices( *Stage::GetCurrent() ),
- mSceneObject( NULL )
+:mEventThreadServices( EventThreadServices::Get() ),
+ mSceneObject( nullptr )
 {
 }