ector: fix property/method name conflict for "fill"

Shape implements a property, sw/gl/cairo implements a method

rename method to op_fill

7 files changed, 8 insertions, 8 deletions

diff --git a/src/lib/ector/gl/ector_renderer_gl.eo b/src/lib/ector/gl/ector_renderer_gl.eo
index 18b305b8ab..97941d28c2 100644
--- a/src/lib/ector/gl/ector_renderer_gl.eo
+++ b/src/lib/ector/gl/ector_renderer_gl.eo
@@ -4,7 +4,7 @@ abstract Ector.Renderer.GL (Ector.Renderer)
 {
    [[Ector GL renderer abstract class]]
    methods {
-      fill @pure_virtual {
+      op_fill @pure_virtual {
           [[Fill operation]]
          return: bool; [[$true on success, $false otherwise]]
     params {
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 87c5594b88..8856e7a84d 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c
@@ -52,7 +52,7 @@ _ector_renderer_gl_gradient_linear_ector_renderer_bounds_get(Eo *obj EINA_UNUSED
 }
 
 static Eina_Bool
-_ector_renderer_gl_gradient_linear_ector_renderer_gl_fill(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd, uint64_t flags, GLshort *vertex, unsigned int vertex_count, unsigned int mul_col)
+_ector_renderer_gl_gradient_linear_ector_renderer_gl_op_fill(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd, uint64_t flags, GLshort *vertex, unsigned int vertex_count, unsigned int mul_col)
 {
    // FIXME: The idea here is to select the right shader and push the needed parameter for it
    // along with the other value
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 33b1389b40..053c8c1af9 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo
@@ -7,7 +7,7 @@ class Ector.Renderer.GL.Gradient.Linear (Ector.Renderer.GL, Ector.Renderer.Gradi
       Ector.Renderer.draw;
       Ector.Renderer.bounds_get;
       Ector.Renderer.crc { get; }
-      Ector.Renderer.GL.fill;
+      Ector.Renderer.GL.op_fill;
       Efl.Object.constructor;
       Efl.Object.destructor;
       Efl.Gfx.Gradient.stop { set; }
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 827b120600..8d00558e21 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c
@@ -39,7 +39,7 @@ _ector_renderer_gl_gradient_radial_ector_renderer_draw(Eo *obj, Ector_Renderer_G
 }
 
 static Eina_Bool
-_ector_renderer_gl_gradient_radial_ector_renderer_gl_fill(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd, uint64_t flags, GLshort *vertex, unsigned int vertex_count, unsigned int mul_col)
+_ector_renderer_gl_gradient_radial_ector_renderer_gl_op_fill(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd, uint64_t flags, GLshort *vertex, unsigned int vertex_count, unsigned int mul_col)
 {
    // FIXME: The idea here is to select the right shader and push the needed parameter for it
    // along with the other value
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 47bfb400eb..240d73628f 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo
@@ -7,7 +7,7 @@ class Ector.Renderer.GL.Gradient.Radial (Ector.Renderer.GL, Ector.Renderer.Gradi
       Ector.Renderer.draw;
       Ector.Renderer.bounds_get;
       Ector.Renderer.crc { get; }
-      Ector.Renderer.GL.fill;
+      Ector.Renderer.GL.op_fill;
       Efl.Object.constructor;
       Efl.Object.destructor;
       Efl.Gfx.Gradient.stop { set; }
diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.c b/src/lib/ector/gl/ector_renderer_gl_shape.c
index ecf78faec1..7e595687d5 100644
--- a/src/lib/ector/gl/ector_renderer_gl_shape.c
+++ b/src/lib/ector/gl/ector_renderer_gl_shape.c
@@ -85,7 +85,7 @@ _ector_renderer_gl_shape_ector_renderer_draw(Eo *obj, Ector_Renderer_GL_Shape_Da
 
    if (pd->shape->fill)
      {
-        ector_renderer_gl_fill(pd->shape->fill, flags, pd->vertex, 6, mul_col);
+        ector_renderer_gl_op_fill(pd->shape->fill, flags, pd->vertex, 6, mul_col);
      }
    else
      {
@@ -96,7 +96,7 @@ _ector_renderer_gl_shape_ector_renderer_draw(Eo *obj, Ector_Renderer_GL_Shape_Da
 }
 
 static Eina_Bool
-_ector_renderer_gl_shape_ector_renderer_gl_fill(Eo *obj EINA_UNUSED,
+_ector_renderer_gl_shape_ector_renderer_gl_op_fill(Eo *obj EINA_UNUSED,
                                                      Ector_Renderer_GL_Shape_Data *pd EINA_UNUSED,
                                                      uint64_t flags EINA_UNUSED,
                                                      GLshort *vertex EINA_UNUSED,
diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.eo b/src/lib/ector/gl/ector_renderer_gl_shape.eo
index f3882e1315..7b99724dcf 100644
--- a/src/lib/ector/gl/ector_renderer_gl_shape.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_shape.eo
@@ -7,7 +7,7 @@ class Ector.Renderer.GL.Shape (Ector.Renderer.GL, Ector.Renderer.Shape)
       Ector.Renderer.draw;
       Ector.Renderer.bounds_get;
       Ector.Renderer.crc { get; }
-      Ector.Renderer.GL.fill;
+      Ector.Renderer.GL.op_fill;
       Efl.Object.constructor;
       Efl.Object.destructor;
    }