CanvasRenderer: Change name DrawableGroup::Clear() to RemoveAllDrawables()

Since the method name of the same concept in CanvasRenderer is used as
'RemoveAllDrawables', change it to maintain the concept.

Change-Id: I772f07ab437f96554696b4ac9be65a93195337fd

diff --git a/dali/devel-api/adaptor-framework/canvas-renderer-drawable-group.cpp b/dali/devel-api/adaptor-framework/canvas-renderer-drawable-group.cpp
index da7d450..f193277 100644 (file)
--- a/dali/devel-api/adaptor-framework/canvas-renderer-drawable-group.cpp
+++ b/dali/devel-api/adaptor-framework/canvas-renderer-drawable-group.cpp
@@ -48,9 +48,9 @@ bool CanvasRenderer::DrawableGroup::AddDrawable(Drawable& drawable)
   return GetImplementation(*this).AddDrawable(drawable);
 }
 
-bool CanvasRenderer::DrawableGroup::Clear()
+bool CanvasRenderer::DrawableGroup::RemoveAllDrawables()
 {
-  return GetImplementation(*this).Clear();
+  return GetImplementation(*this).RemoveAllDrawables();
 }
 
 } // namespace Dali

diff --git a/dali/devel-api/adaptor-framework/canvas-renderer-drawable-group.h b/dali/devel-api/adaptor-framework/canvas-renderer-drawable-group.h
index 3c6cccf..272da3b 100644 (file)
--- a/dali/devel-api/adaptor-framework/canvas-renderer-drawable-group.h
+++ b/dali/devel-api/adaptor-framework/canvas-renderer-drawable-group.h
@@ -81,10 +81,10 @@ public:
   bool AddDrawable(Drawable& drawable);
 
   /**
-   * @brief Clears the drawable object added to the DrawableGroup. This method does not free the memory of the added drawable object.
+   * @brief Remove all drawable objects added to the DrawableGroup.
    * @return Returns True when it's successful. False otherwise.
    */
-  bool Clear();
+  bool RemoveAllDrawables();
 
 public: // Not intended for application developers
   /// @cond internal

diff --git a/dali/internal/canvas-renderer/common/drawable-group-impl.cpp b/dali/internal/canvas-renderer/common/drawable-group-impl.cpp
index 53ec50e..e621e77 100644 (file)
--- a/dali/internal/canvas-renderer/common/drawable-group-impl.cpp
+++ b/dali/internal/canvas-renderer/common/drawable-group-impl.cpp
@@ -33,7 +33,7 @@ bool DrawableGroup::AddDrawable(Dali::CanvasRenderer::Drawable& drawable)
   return false;
 }
 
-bool DrawableGroup::Clear()
+bool DrawableGroup::RemoveAllDrawables()
 {
   return false;
 }

diff --git a/dali/internal/canvas-renderer/common/drawable-group-impl.h b/dali/internal/canvas-renderer/common/drawable-group-impl.h
index cfd62a2..ba8623d 100644 (file)
--- a/dali/internal/canvas-renderer/common/drawable-group-impl.h
+++ b/dali/internal/canvas-renderer/common/drawable-group-impl.h
@@ -59,9 +59,9 @@ public:
   virtual bool AddDrawable(Dali::CanvasRenderer::Drawable& drawable);
 
   /**
-   * @copydoc Dali::CanvasRenderer::DrawableGroup::Clear()
+   * @copydoc Dali::CanvasRenderer::DrawableGroup::RemoveAllDrawables()
    */
-  virtual bool Clear();
+  virtual bool RemoveAllDrawables();
 
   /**
    * @brief Get list of drawables that added this group.

diff --git a/dali/internal/canvas-renderer/generic/drawable-group-impl-generic.cpp b/dali/internal/canvas-renderer/generic/drawable-group-impl-generic.cpp
index a1de291..55ecb7d 100644 (file)
--- a/dali/internal/canvas-renderer/generic/drawable-group-impl-generic.cpp
+++ b/dali/internal/canvas-renderer/generic/drawable-group-impl-generic.cpp
@@ -57,7 +57,7 @@ bool DrawableGroupGeneric::AddDrawable(Dali::CanvasRenderer::Drawable& drawable)
   return false;
 }
 
-bool DrawableGroupGeneric::Clear()
+bool DrawableGroupGeneric::RemoveAllDrawables()
 {
   return false;
 }

diff --git a/dali/internal/canvas-renderer/generic/drawable-group-impl-generic.h b/dali/internal/canvas-renderer/generic/drawable-group-impl-generic.h
index 4d7bcd8..677b1d2 100644 (file)
--- a/dali/internal/canvas-renderer/generic/drawable-group-impl-generic.h
+++ b/dali/internal/canvas-renderer/generic/drawable-group-impl-generic.h
@@ -49,9 +49,9 @@ public:
   bool AddDrawable(Dali::CanvasRenderer::Drawable& drawable) override;
 
   /**
-   * @copydoc Dali::CanvasRenderer::DrawableGroup::Clear()
+   * @copydoc Dali::CanvasRenderer::DrawableGroup::RemoveAllDrawables()
    */
-  bool Clear() override;
+  bool RemoveAllDrawables() override;
 
 private:
   DrawableGroupGeneric(const DrawableGroupGeneric&) = delete;

diff --git a/dali/internal/canvas-renderer/tizen/drawable-group-impl-tizen.cpp b/dali/internal/canvas-renderer/tizen/drawable-group-impl-tizen.cpp
index 5ec40c8..0ced4f1 100644 (file)
--- a/dali/internal/canvas-renderer/tizen/drawable-group-impl-tizen.cpp
+++ b/dali/internal/canvas-renderer/tizen/drawable-group-impl-tizen.cpp
@@ -101,7 +101,7 @@ bool DrawableGroupTizen::AddDrawable(Dali::CanvasRenderer::Drawable& drawable)
 #endif
 }
 
-bool DrawableGroupTizen::Clear()
+bool DrawableGroupTizen::RemoveAllDrawables()
 {
 #ifdef THORVG_SUPPORT
   if(!Drawable::GetObject() || !mTvgScene)
@@ -120,7 +120,7 @@ bool DrawableGroupTizen::Clear()
 
   if(static_cast<tvg::Scene*>(mTvgScene)->clear() != tvg::Result::Success)
   {
-    DALI_LOG_ERROR("Clear() fail.\n");
+    DALI_LOG_ERROR("RemoveAllDrawables() fail.\n");
     return false;
   }
 

diff --git a/dali/internal/canvas-renderer/tizen/drawable-group-impl-tizen.h b/dali/internal/canvas-renderer/tizen/drawable-group-impl-tizen.h
index b679642..a403cbc 100644 (file)
--- a/dali/internal/canvas-renderer/tizen/drawable-group-impl-tizen.h
+++ b/dali/internal/canvas-renderer/tizen/drawable-group-impl-tizen.h
@@ -53,9 +53,9 @@ public:
   bool AddDrawable(Dali::CanvasRenderer::Drawable& drawable) override;
 
   /**
-   * @copydoc Dali::CanvasRenderer::DrawableGroup::Clear()
+   * @copydoc Dali::CanvasRenderer::DrawableGroup::RemoveAllDrawables()
    */
-  bool Clear() override;
+  bool RemoveAllDrawables() override;
 
   /**
    * @copydoc Dali::CanvasRenderer::DrawableGroup::GetDrawables()

diff --git a/dali/internal/canvas-renderer/ubuntu/drawable-group-impl-ubuntu.cpp b/dali/internal/canvas-renderer/ubuntu/drawable-group-impl-ubuntu.cpp
index 5a80ff3..ccc590c 100644 (file)
--- a/dali/internal/canvas-renderer/ubuntu/drawable-group-impl-ubuntu.cpp
+++ b/dali/internal/canvas-renderer/ubuntu/drawable-group-impl-ubuntu.cpp
@@ -101,7 +101,7 @@ bool DrawableGroupUbuntu::AddDrawable(Dali::CanvasRenderer::Drawable& drawable)
 #endif
 }
 
-bool DrawableGroupUbuntu::Clear()
+bool DrawableGroupUbuntu::RemoveAllDrawables()
 {
 #ifdef THORVG_SUPPORT
   if(!Drawable::GetObject() || !mTvgScene)
@@ -120,7 +120,7 @@ bool DrawableGroupUbuntu::Clear()
 
   if(static_cast<tvg::Scene*>(mTvgScene)->clear() != tvg::Result::Success)
   {
-    DALI_LOG_ERROR("Clear() fail.\n");
+    DALI_LOG_ERROR("RemoveAllDrawables() fail.\n");
     return false;
   }
 

diff --git a/dali/internal/canvas-renderer/ubuntu/drawable-group-impl-ubuntu.h b/dali/internal/canvas-renderer/ubuntu/drawable-group-impl-ubuntu.h
index fb11240..52c9608 100644 (file)
--- a/dali/internal/canvas-renderer/ubuntu/drawable-group-impl-ubuntu.h
+++ b/dali/internal/canvas-renderer/ubuntu/drawable-group-impl-ubuntu.h
@@ -53,9 +53,9 @@ public:
   bool AddDrawable(Dali::CanvasRenderer::Drawable& drawable) override;
 
   /**
-   * @copydoc Dali::CanvasRenderer::DrawableGroup::Clear()
+   * @copydoc Dali::CanvasRenderer::DrawableGroup::RemoveAllDrawables()
    */
-  bool Clear() override;
+  bool RemoveAllDrawables() override;
 
   /**
    * @copydoc Dali::CanvasRenderer::DrawableGroup::GetDrawables()