From: Mike Blumenkrantz Date: Mon, 12 Feb 2018 18:45:07 +0000 (-0500) Subject: ector: rename ector_renderer "bounds_get" method to "boundary_get" X-Git-Tag: upstream/1.21.0~2025 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=40c9d89ec545d27b61c1aab6822c383beacd33ed;p=platform%2Fupstream%2Fefl.git ector: rename ector_renderer "bounds_get" method to "boundary_get" this conflicted with a method from Efl.Gfx.Path --- 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 eb46ee7..40783d1 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c +++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c @@ -113,7 +113,7 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_cairo_op_fill(Eo *obj, } static void -_ector_renderer_cairo_gradient_linear_ector_renderer_bounds_get(Eo *obj, +_ector_renderer_cairo_gradient_linear_ector_renderer_boundary_get(Eo *obj, Ector_Renderer_Cairo_Gradient_Linear_Data *pd EINA_UNUSED, Eina_Rect *r) { diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo index f8356c1..1d8d4d1 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo +++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo @@ -5,7 +5,7 @@ class Ector.Renderer.Cairo.Gradient.Linear (Ector.Renderer.Cairo, Ector.Renderer implements { Ector.Renderer.prepare; Ector.Renderer.draw; - Ector.Renderer.bounds_get; + Ector.Renderer.boundary_get; Ector.Renderer.crc { get; } Ector.Renderer.Cairo.op_fill; Efl.Object.finalize; 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 dabb843..555c553 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c +++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c @@ -136,7 +136,7 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_cairo_op_fill(Eo *obj, } static void -_ector_renderer_cairo_gradient_radial_ector_renderer_bounds_get(Eo *obj EINA_UNUSED, +_ector_renderer_cairo_gradient_radial_ector_renderer_boundary_get(Eo *obj EINA_UNUSED, Ector_Renderer_Cairo_Gradient_Radial_Data *pd EINA_UNUSED, Eina_Rect *r) { diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo index 97ba1d1..e95a14f 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo +++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo @@ -5,7 +5,7 @@ class Ector.Renderer.Cairo.Gradient.Radial (Ector.Renderer.Cairo, Ector.Renderer implements { Ector.Renderer.prepare; Ector.Renderer.draw; - Ector.Renderer.bounds_get; + Ector.Renderer.boundary_get; Ector.Renderer.crc { get; } Ector.Renderer.Cairo.op_fill; Efl.Object.destructor; diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.c b/src/lib/ector/cairo/ector_renderer_cairo_shape.c index 1b7df1e..dcd954d 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_shape.c +++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.c @@ -237,7 +237,7 @@ _ector_renderer_cairo_shape_ector_renderer_cairo_op_fill(Eo *obj EINA_UNUSED, } static void -_ector_renderer_cairo_shape_ector_renderer_bounds_get(Eo *obj, +_ector_renderer_cairo_shape_ector_renderer_boundary_get(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd EINA_UNUSED, Eina_Rect *r) { diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.eo b/src/lib/ector/cairo/ector_renderer_cairo_shape.eo index fe40d89..cbc980f 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_shape.eo +++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.eo @@ -5,7 +5,7 @@ class Ector.Renderer.Cairo.Shape (Ector.Renderer.Cairo, Ector.Renderer.Shape) implements { Ector.Renderer.prepare; Ector.Renderer.draw; - Ector.Renderer.bounds_get; + Ector.Renderer.boundary_get; Ector.Renderer.crc { get; } Ector.Renderer.Cairo.op_fill; Efl.Object.constructor; diff --git a/src/lib/ector/ector_renderer.eo b/src/lib/ector/ector_renderer.eo index 03b1d36..3ac2347 100644 --- a/src/lib/ector/ector_renderer.eo +++ b/src/lib/ector/ector_renderer.eo @@ -107,7 +107,7 @@ abstract Ector.Renderer (Efl.Object) return: uint; [[CRC value]] } } - bounds_get @pure_virtual { + boundary_get @pure_virtual { [[Retrieves the bounds of the renderer]] params { @out r: Eina.Rect; [[Bounds as @Eina.Rect]] diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c index 8856e7a..a84a341 100644 --- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c +++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c @@ -40,7 +40,7 @@ _ector_renderer_gl_gradient_linear_ector_renderer_draw(Eo *obj, Ector_Renderer_G } static void -_ector_renderer_gl_gradient_linear_ector_renderer_bounds_get(Eo *obj EINA_UNUSED, +_ector_renderer_gl_gradient_linear_ector_renderer_boundary_get(Eo *obj EINA_UNUSED, Ector_Renderer_GL_Gradient_Linear_Data *pd, Eina_Rect *r) { diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo index 053c8c1..0626ec5 100644 --- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo +++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo @@ -5,7 +5,7 @@ class Ector.Renderer.GL.Gradient.Linear (Ector.Renderer.GL, Ector.Renderer.Gradi implements { Ector.Renderer.prepare; Ector.Renderer.draw; - Ector.Renderer.bounds_get; + Ector.Renderer.boundary_get; Ector.Renderer.crc { get; } Ector.Renderer.GL.op_fill; Efl.Object.constructor; diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c index 8d00558..5b9339b 100644 --- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c +++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c @@ -54,7 +54,7 @@ _ector_renderer_gl_gradient_radial_ector_renderer_gl_op_fill(Eo *obj, Ector_Rend } static void -_ector_renderer_gl_gradient_radial_ector_renderer_bounds_get(Eo *obj EINA_UNUSED, +_ector_renderer_gl_gradient_radial_ector_renderer_boundary_get(Eo *obj EINA_UNUSED, Ector_Renderer_GL_Gradient_Radial_Data *pd, Eina_Rect *r) { diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo index 240d736..2c14450 100644 --- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo +++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo @@ -5,7 +5,7 @@ class Ector.Renderer.GL.Gradient.Radial (Ector.Renderer.GL, Ector.Renderer.Gradi implements { Ector.Renderer.prepare; Ector.Renderer.draw; - Ector.Renderer.bounds_get; + Ector.Renderer.boundary_get; Ector.Renderer.crc { get; } Ector.Renderer.GL.op_fill; Efl.Object.constructor; diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.c b/src/lib/ector/gl/ector_renderer_gl_shape.c index 7e59568..f472d9c 100644 --- a/src/lib/ector/gl/ector_renderer_gl_shape.c +++ b/src/lib/ector/gl/ector_renderer_gl_shape.c @@ -44,7 +44,7 @@ _ector_renderer_gl_shape_ector_renderer_prepare(Eo *obj, Ector_Renderer_GL_Shape r = ector_renderer_prepare(efl_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS)); - ector_renderer_bounds_get(obj, &bounding_box); + ector_renderer_boundary_get(obj, &bounding_box); pd->vertex = malloc(sizeof (GLshort) * 6 * 3); @@ -110,7 +110,7 @@ _ector_renderer_gl_shape_ector_renderer_gl_op_fill(Eo *obj EINA_UNUSED, } static void -_ector_renderer_gl_shape_ector_renderer_bounds_get(Eo *obj, Ector_Renderer_GL_Shape_Data *pd, Eina_Rect *r) +_ector_renderer_gl_shape_ector_renderer_boundary_get(Eo *obj, Ector_Renderer_GL_Shape_Data *pd, Eina_Rect *r) { efl_gfx_path_bounds_get(obj, r); diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.eo b/src/lib/ector/gl/ector_renderer_gl_shape.eo index 7b99724..83e2801 100644 --- a/src/lib/ector/gl/ector_renderer_gl_shape.eo +++ b/src/lib/ector/gl/ector_renderer_gl_shape.eo @@ -5,7 +5,7 @@ class Ector.Renderer.GL.Shape (Ector.Renderer.GL, Ector.Renderer.Shape) implements { Ector.Renderer.prepare; Ector.Renderer.draw; - Ector.Renderer.bounds_get; + Ector.Renderer.boundary_get; Ector.Renderer.crc { get; } Ector.Renderer.GL.op_fill; Efl.Object.constructor;