Merge "Cleaning up RendererFactory API" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / controls / renderer-factory / renderer-factory.cpp

diff --git a/dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.cpp b/dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.cpp
index 084ddcb..cbcadc7 100644 (file)
--- a/dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.cpp
+++ b/dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.cpp
@@ -94,49 +94,19 @@ RendererFactory::RendererFactory(Internal::RendererFactory *impl)
 {
 }
 
-ControlRenderer RendererFactory::GetControlRenderer( const Property::Map& propertyMap )
+ControlRenderer RendererFactory::CreateControlRenderer( const Property::Map& propertyMap )
 {
-  return GetImplementation( *this ).GetControlRenderer( propertyMap );
+  return GetImplementation( *this ).CreateControlRenderer( propertyMap );
 }
 
-ControlRenderer RendererFactory::GetControlRenderer( const Vector4& color )
+ControlRenderer RendererFactory::CreateControlRenderer( const Image& image )
 {
-  return GetImplementation( *this ).GetControlRenderer( color );
+  return GetImplementation( *this ).CreateControlRenderer( image );
 }
 
-void RendererFactory::ResetRenderer( ControlRenderer& renderer, Actor& actor, const Vector4& color )
+ControlRenderer RendererFactory::CreateControlRenderer( const std::string& url, ImageDimensions size )
 {
-  GetImplementation( *this ).ResetRenderer( renderer, actor, color );
-}
-
-ControlRenderer RendererFactory::GetControlRenderer( float borderSize, const Vector4& borderColor )
-{
-  return GetImplementation( *this ).GetControlRenderer( borderSize, borderColor );
-}
-
-ControlRenderer RendererFactory::GetControlRenderer( const Image& image )
-{
-  return GetImplementation( *this ).GetControlRenderer( image );
-}
-
-void RendererFactory::ResetRenderer( ControlRenderer& renderer, Actor& actor, const Image& image )
-{
-  GetImplementation( *this ).ResetRenderer( renderer, actor, image );
-}
-
-ControlRenderer RendererFactory::GetControlRenderer( const std::string& url, ImageDimensions size )
-{
-  return GetImplementation( *this ).GetControlRenderer( url, size );
-}
-
-void RendererFactory::ResetRenderer( ControlRenderer& renderer, Actor& actor, const std::string& url, ImageDimensions size )
-{
-  GetImplementation( *this ).ResetRenderer( renderer, actor, url, size );
-}
-
-void RendererFactory::ResetRenderer( ControlRenderer& renderer, Actor& actor, const Property::Map& propertyMap )
-{
-  GetImplementation( *this ).ResetRenderer( renderer, actor, propertyMap );
+  return GetImplementation( *this ).CreateControlRenderer( url, size );
 }
 
 } // namespace Toolkit