Merge "CanvasRenderer: Revise for-loop using ranged-based" into devel/master

diff --git a/dali/internal/canvas-renderer/tizen/canvas-renderer-impl-tizen.cpp b/dali/internal/canvas-renderer/tizen/canvas-renderer-impl-tizen.cpp
index cc63db2..10629e7 100644 (file)
--- a/dali/internal/canvas-renderer/tizen/canvas-renderer-impl-tizen.cpp
+++ b/dali/internal/canvas-renderer/tizen/canvas-renderer-impl-tizen.cpp
@@ -66,12 +66,9 @@ CanvasRendererTizen::CanvasRendererTizen(const Vector2& viewBox)
 CanvasRendererTizen::~CanvasRendererTizen()
 {
 #ifdef THORVG_SUPPORT
-  for(DrawableVectorIterator it    = mDrawables.begin(),
-                             endIt = mDrawables.end();
-      it != endIt;
-      ++it)
+  for(auto& it : mDrawables)
   {
-    Dali::CanvasRenderer::Drawable drawable = (*it).GetHandle();
+    Dali::CanvasRenderer::Drawable drawable = it.GetHandle();
     if(DALI_UNLIKELY(!drawable))
     {
       continue;
@@ -112,12 +109,9 @@ bool CanvasRendererTizen::Commit()
 #ifdef THORVG_SUPPORT
   bool changed = false;
 
-  for(DrawableVectorIterator it    = mDrawables.begin(),
-                             endIt = mDrawables.end();
-      it != endIt;
-      ++it)
+  for(auto& it : mDrawables)
   {
-    Dali::CanvasRenderer::Drawable drawable = (*it).GetHandle();
+    Dali::CanvasRenderer::Drawable drawable = it.GetHandle();
     if(DALI_UNLIKELY(!drawable))
     {
       continue;
@@ -179,23 +173,14 @@ Devel::PixelBuffer CanvasRendererTizen::GetPixelBuffer()
 bool CanvasRendererTizen::AddDrawable(Dali::CanvasRenderer::Drawable& drawable)
 {
 #ifdef THORVG_SUPPORT
-  bool exist = false;
-  for(DrawableVectorIterator it    = mDrawables.begin(),
-                             endIt = mDrawables.end();
-      it != endIt;
-      ++it)
+  for(auto& it : mDrawables)
   {
-    if((*it) == drawable)
+    if(it.GetHandle() == drawable)
     {
-      exist = true;
-      break;
+      DALI_LOG_ERROR("Already added [%p]\n", this);
+      return false;
     }
   }
-  if(exist)
-  {
-    DALI_LOG_ERROR("Already added [%p]\n", this);
-    return false;
-  }
 
   Internal::Adaptor::Drawable& drawableImpl = GetImplementation(drawable);
   tvg::Paint*                  pDrawable    = static_cast<tvg::Paint*>(drawableImpl.GetObject());

diff --git a/dali/internal/canvas-renderer/ubuntu/canvas-renderer-impl-ubuntu.cpp b/dali/internal/canvas-renderer/ubuntu/canvas-renderer-impl-ubuntu.cpp
index 68c1132..ec1ffc3 100644 (file)
--- a/dali/internal/canvas-renderer/ubuntu/canvas-renderer-impl-ubuntu.cpp
+++ b/dali/internal/canvas-renderer/ubuntu/canvas-renderer-impl-ubuntu.cpp
@@ -66,12 +66,9 @@ CanvasRendererUbuntu::CanvasRendererUbuntu(const Vector2& viewBox)
 CanvasRendererUbuntu::~CanvasRendererUbuntu()
 {
 #ifdef THORVG_SUPPORT
-  for(DrawableVectorIterator it    = mDrawables.begin(),
-                             endIt = mDrawables.end();
-      it != endIt;
-      ++it)
+  for(auto& it : mDrawables)
   {
-    Dali::CanvasRenderer::Drawable drawable = (*it).GetHandle();
+    Dali::CanvasRenderer::Drawable drawable = it.GetHandle();
     if(DALI_UNLIKELY(!drawable))
     {
       continue;
@@ -112,12 +109,9 @@ bool CanvasRendererUbuntu::Commit()
 #ifdef THORVG_SUPPORT
   bool changed = false;
 
-  for(DrawableVectorIterator it    = mDrawables.begin(),
-                             endIt = mDrawables.end();
-      it != endIt;
-      ++it)
+  for(auto& it : mDrawables)
   {
-    Dali::CanvasRenderer::Drawable drawable = (*it).GetHandle();
+    Dali::CanvasRenderer::Drawable drawable = it.GetHandle();
     if(DALI_UNLIKELY(!drawable))
     {
       continue;
@@ -179,23 +173,14 @@ Devel::PixelBuffer CanvasRendererUbuntu::GetPixelBuffer()
 bool CanvasRendererUbuntu::AddDrawable(Dali::CanvasRenderer::Drawable& drawable)
 {
 #ifdef THORVG_SUPPORT
-  bool exist = false;
-  for(DrawableVectorIterator it    = mDrawables.begin(),
-                             endIt = mDrawables.end();
-      it != endIt;
-      ++it)
+  for(auto& it : mDrawables)
   {
-    if((*it) == drawable)
+    if(it.GetHandle() == drawable)
     {
-      exist = true;
-      break;
+      DALI_LOG_ERROR("Already added [%p]\n", this);
+      return false;
     }
   }
-  if(exist)
-  {
-    DALI_LOG_ERROR("Already added [%p]\n", this);
-    return false;
-  }
 
   Internal::Adaptor::Drawable& drawableImpl = GetImplementation(drawable);
   tvg::Paint*                  pDrawable    = static_cast<tvg::Paint*>(drawableImpl.GetObject());