From c272b9bfa2025f7d723fb986a117ab6af0c36152 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Thu, 15 Jan 2015 17:33:39 +0100 Subject: [PATCH] ector: prepare doesn't need surface, as it should always be the parent. Change-Id: Ie0b4a329c0c44c922a1c30a97a0a02d641fcbe32 --- src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c | 3 +-- src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c | 2 +- src/lib/ector/cairo/ector_renderer_cairo_shape.c | 10 +++++----- src/lib/ector/ector_renderer_generic_base.eo | 1 - 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c index bdf5c36..4b47bb0 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c +++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c @@ -29,8 +29,7 @@ struct _Ector_Renderer_Cairo_Gradient_Linear_Data static Eina_Bool _ector_renderer_cairo_gradient_linear_ector_renderer_generic_base_prepare(Eo *obj, - Ector_Renderer_Cairo_Gradient_Linear_Data *pd, - Ector_Surface *s EINA_UNUSED) + Ector_Renderer_Cairo_Gradient_Linear_Data *pd) { Ector_Renderer_Generic_Gradient_Linear_Data *gld; Ector_Renderer_Generic_Gradient_Data *gd; diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c index d22f710..2659a46 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c +++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c @@ -33,7 +33,7 @@ struct _Ector_Renderer_Cairo_Gradient_Radial_Data }; static Eina_Bool -_ector_renderer_cairo_gradient_radial_ector_renderer_generic_base_prepare(Eo *obj, Ector_Renderer_Cairo_Gradient_Radial_Data *pd, Ector_Surface *s) +_ector_renderer_cairo_gradient_radial_ector_renderer_generic_base_prepare(Eo *obj, Ector_Renderer_Cairo_Gradient_Radial_Data *pd) { Ector_Renderer_Generic_Gradient_Radial_Data *grd; Ector_Renderer_Generic_Gradient_Data *gd; diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.c b/src/lib/ector/cairo/ector_renderer_cairo_shape.c index 499a01b..d063114 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_shape.c +++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.c @@ -205,16 +205,16 @@ _ector_arc_to(Eo *obj, cairo_t* ctx, } static Eina_Bool -_ector_renderer_cairo_shape_ector_renderer_generic_base_prepare(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd, Ector_Surface *s) +_ector_renderer_cairo_shape_ector_renderer_generic_base_prepare(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd) { // FIXME: shouldn't that be part of the shape generic implementation ? if (pd->shape->fill) - eo_do(pd->shape->fill, ector_renderer_prepare(s)); + eo_do(pd->shape->fill, ector_renderer_prepare()); if (pd->shape->stroke.fill) - eo_do(pd->shape->stroke.fill, ector_renderer_prepare(s)); + eo_do(pd->shape->stroke.fill, ector_renderer_prepare()); if (pd->shape->stroke.marker) - eo_do(pd->shape->stroke.marker, ector_renderer_prepare(s)); - eo_do_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS, ector_renderer_prepare(s)); + eo_do(pd->shape->stroke.marker, ector_renderer_prepare()); + eo_do_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS, ector_renderer_prepare()); // shouldn't that be moved to the cairo base object if (!pd->parent) diff --git a/src/lib/ector/ector_renderer_generic_base.eo b/src/lib/ector/ector_renderer_generic_base.eo index 6f6808d..af3bbee 100644 --- a/src/lib/ector/ector_renderer_generic_base.eo +++ b/src/lib/ector/ector_renderer_generic_base.eo @@ -103,7 +103,6 @@ abstract Ector.Renderer.Generic.Base (Eo.Base) prepare { return: bool @warn_unused; params { - @in Ector_Surface *s; } } done { -- 2.7.4