To improve the readability of the code,
for loop is changed to use ranged-based with auto keyword.
Change-Id: I9c2d7ea592b964a163d2e3bd2e6dbcfbf611ec1f
CanvasRendererTizen::~CanvasRendererTizen()
{
#ifdef THORVG_SUPPORT
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;
if(DALI_UNLIKELY(!drawable))
{
continue;
#ifdef THORVG_SUPPORT
bool changed = false;
#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;
if(DALI_UNLIKELY(!drawable))
{
continue;
bool CanvasRendererTizen::AddDrawable(Dali::CanvasRenderer::Drawable& drawable)
{
#ifdef THORVG_SUPPORT
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.GetHandle() == drawable)
+ 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());
Internal::Adaptor::Drawable& drawableImpl = GetImplementation(drawable);
tvg::Paint* pDrawable = static_cast<tvg::Paint*>(drawableImpl.GetObject());
CanvasRendererUbuntu::~CanvasRendererUbuntu()
{
#ifdef THORVG_SUPPORT
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;
if(DALI_UNLIKELY(!drawable))
{
continue;
#ifdef THORVG_SUPPORT
bool changed = false;
#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;
if(DALI_UNLIKELY(!drawable))
{
continue;
bool CanvasRendererUbuntu::AddDrawable(Dali::CanvasRenderer::Drawable& drawable)
{
#ifdef THORVG_SUPPORT
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.GetHandle() == drawable)
+ 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());
Internal::Adaptor::Drawable& drawableImpl = GetImplementation(drawable);
tvg::Paint* pDrawable = static_cast<tvg::Paint*>(drawableImpl.GetObject());