summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-02-12 13:45:07 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2018-02-12 13:47:15 -0500
commit884fc35160152712decdf7fd43082ef3912c0856 (patch)
tree1b75e9137e471bf16011257b2ae991e4dfbb9d71
parent11d5bac1d3d9cf9655eb0b7c086e80d77a487563 (diff)
ector: rename ector_renderer "bounds_get" method to "boundary_get"
this conflicted with a method from Efl.Gfx.Path
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c2
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo2
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c2
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo2
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_shape.c2
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_shape.eo2
-rw-r--r--src/lib/ector/ector_renderer.eo2
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_linear.c2
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo2
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_radial.c2
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo2
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_shape.c4
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_shape.eo2
13 files changed, 14 insertions, 14 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 eb46ee73a0..40783d1bfc 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,
113} 113}
114 114
115static void 115static void
116_ector_renderer_cairo_gradient_linear_ector_renderer_bounds_get(Eo *obj, 116_ector_renderer_cairo_gradient_linear_ector_renderer_boundary_get(Eo *obj,
117 Ector_Renderer_Cairo_Gradient_Linear_Data *pd EINA_UNUSED, 117 Ector_Renderer_Cairo_Gradient_Linear_Data *pd EINA_UNUSED,
118 Eina_Rect *r) 118 Eina_Rect *r)
119{ 119{
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 f8356c1be0..1d8d4d1d15 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
5 implements { 5 implements {
6 Ector.Renderer.prepare; 6 Ector.Renderer.prepare;
7 Ector.Renderer.draw; 7 Ector.Renderer.draw;
8 Ector.Renderer.bounds_get; 8 Ector.Renderer.boundary_get;
9 Ector.Renderer.crc { get; } 9 Ector.Renderer.crc { get; }
10 Ector.Renderer.Cairo.op_fill; 10 Ector.Renderer.Cairo.op_fill;
11 Efl.Object.finalize; 11 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 dabb8438ba..555c553dc0 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,
136} 136}
137 137
138static void 138static void
139_ector_renderer_cairo_gradient_radial_ector_renderer_bounds_get(Eo *obj EINA_UNUSED, 139_ector_renderer_cairo_gradient_radial_ector_renderer_boundary_get(Eo *obj EINA_UNUSED,
140 Ector_Renderer_Cairo_Gradient_Radial_Data *pd EINA_UNUSED, 140 Ector_Renderer_Cairo_Gradient_Radial_Data *pd EINA_UNUSED,
141 Eina_Rect *r) 141 Eina_Rect *r)
142{ 142{
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 97ba1d1783..e95a14fdd4 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
5 implements { 5 implements {
6 Ector.Renderer.prepare; 6 Ector.Renderer.prepare;
7 Ector.Renderer.draw; 7 Ector.Renderer.draw;
8 Ector.Renderer.bounds_get; 8 Ector.Renderer.boundary_get;
9 Ector.Renderer.crc { get; } 9 Ector.Renderer.crc { get; }
10 Ector.Renderer.Cairo.op_fill; 10 Ector.Renderer.Cairo.op_fill;
11 Efl.Object.destructor; 11 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 1b7df1e74a..dcd954d62f 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,
237} 237}
238 238
239static void 239static void
240_ector_renderer_cairo_shape_ector_renderer_bounds_get(Eo *obj, 240_ector_renderer_cairo_shape_ector_renderer_boundary_get(Eo *obj,
241 Ector_Renderer_Cairo_Shape_Data *pd EINA_UNUSED, 241 Ector_Renderer_Cairo_Shape_Data *pd EINA_UNUSED,
242 Eina_Rect *r) 242 Eina_Rect *r)
243{ 243{
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.eo b/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
index fe40d8954c..cbc980f430 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)
5 implements { 5 implements {
6 Ector.Renderer.prepare; 6 Ector.Renderer.prepare;
7 Ector.Renderer.draw; 7 Ector.Renderer.draw;
8 Ector.Renderer.bounds_get; 8 Ector.Renderer.boundary_get;
9 Ector.Renderer.crc { get; } 9 Ector.Renderer.crc { get; }
10 Ector.Renderer.Cairo.op_fill; 10 Ector.Renderer.Cairo.op_fill;
11 Efl.Object.constructor; 11 Efl.Object.constructor;
diff --git a/src/lib/ector/ector_renderer.eo b/src/lib/ector/ector_renderer.eo
index 03b1d36631..3ac2347888 100644
--- a/src/lib/ector/ector_renderer.eo
+++ b/src/lib/ector/ector_renderer.eo
@@ -107,7 +107,7 @@ abstract Ector.Renderer (Efl.Object)
107 return: uint; [[CRC value]] 107 return: uint; [[CRC value]]
108 } 108 }
109 } 109 }
110 bounds_get @pure_virtual { 110 boundary_get @pure_virtual {
111 [[Retrieves the bounds of the renderer]] 111 [[Retrieves the bounds of the renderer]]
112 params { 112 params {
113 @out r: Eina.Rect; [[Bounds as @Eina.Rect]] 113 @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 8856e7a84d..a84a341780 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
40} 40}
41 41
42static void 42static void
43_ector_renderer_gl_gradient_linear_ector_renderer_bounds_get(Eo *obj EINA_UNUSED, 43_ector_renderer_gl_gradient_linear_ector_renderer_boundary_get(Eo *obj EINA_UNUSED,
44 Ector_Renderer_GL_Gradient_Linear_Data *pd, 44 Ector_Renderer_GL_Gradient_Linear_Data *pd,
45 Eina_Rect *r) 45 Eina_Rect *r)
46{ 46{
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 053c8c1af9..0626ec5618 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
5 implements { 5 implements {
6 Ector.Renderer.prepare; 6 Ector.Renderer.prepare;
7 Ector.Renderer.draw; 7 Ector.Renderer.draw;
8 Ector.Renderer.bounds_get; 8 Ector.Renderer.boundary_get;
9 Ector.Renderer.crc { get; } 9 Ector.Renderer.crc { get; }
10 Ector.Renderer.GL.op_fill; 10 Ector.Renderer.GL.op_fill;
11 Efl.Object.constructor; 11 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 8d00558e21..5b9339b27d 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
54} 54}
55 55
56static void 56static void
57_ector_renderer_gl_gradient_radial_ector_renderer_bounds_get(Eo *obj EINA_UNUSED, 57_ector_renderer_gl_gradient_radial_ector_renderer_boundary_get(Eo *obj EINA_UNUSED,
58 Ector_Renderer_GL_Gradient_Radial_Data *pd, 58 Ector_Renderer_GL_Gradient_Radial_Data *pd,
59 Eina_Rect *r) 59 Eina_Rect *r)
60{ 60{
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 240d73628f..2c1445081b 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
5 implements { 5 implements {
6 Ector.Renderer.prepare; 6 Ector.Renderer.prepare;
7 Ector.Renderer.draw; 7 Ector.Renderer.draw;
8 Ector.Renderer.bounds_get; 8 Ector.Renderer.boundary_get;
9 Ector.Renderer.crc { get; } 9 Ector.Renderer.crc { get; }
10 Ector.Renderer.GL.op_fill; 10 Ector.Renderer.GL.op_fill;
11 Efl.Object.constructor; 11 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 7e595687d5..f472d9c28c 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
44 44
45 r = ector_renderer_prepare(efl_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS)); 45 r = ector_renderer_prepare(efl_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS));
46 46
47 ector_renderer_bounds_get(obj, &bounding_box); 47 ector_renderer_boundary_get(obj, &bounding_box);
48 48
49 pd->vertex = malloc(sizeof (GLshort) * 6 * 3); 49 pd->vertex = malloc(sizeof (GLshort) * 6 * 3);
50 50
@@ -110,7 +110,7 @@ _ector_renderer_gl_shape_ector_renderer_gl_op_fill(Eo *obj EINA_UNUSED,
110} 110}
111 111
112static void 112static void
113_ector_renderer_gl_shape_ector_renderer_bounds_get(Eo *obj, Ector_Renderer_GL_Shape_Data *pd, Eina_Rect *r) 113_ector_renderer_gl_shape_ector_renderer_boundary_get(Eo *obj, Ector_Renderer_GL_Shape_Data *pd, Eina_Rect *r)
114{ 114{
115 efl_gfx_path_bounds_get(obj, r); 115 efl_gfx_path_bounds_get(obj, r);
116 116
diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.eo b/src/lib/ector/gl/ector_renderer_gl_shape.eo
index 7b99724dcf..83e2801806 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)
5 implements { 5 implements {
6 Ector.Renderer.prepare; 6 Ector.Renderer.prepare;
7 Ector.Renderer.draw; 7 Ector.Renderer.draw;
8 Ector.Renderer.bounds_get; 8 Ector.Renderer.boundary_get;
9 Ector.Renderer.crc { get; } 9 Ector.Renderer.crc { get; }
10 Ector.Renderer.GL.op_fill; 10 Ector.Renderer.GL.op_fill;
11 Efl.Object.constructor; 11 Efl.Object.constructor;