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

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

rename method to op_fill

diff --git a/src/lib/ector/cairo/ector_renderer_cairo.eo b/src/lib/ector/cairo/ector_renderer_cairo.eo
index a0ee972..02431e0 100644 (file)
--- a/src/lib/ector/cairo/ector_renderer_cairo.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo.eo
@@ -2,7 +2,7 @@ abstract Ector.Renderer.Cairo (Ector.Renderer)
 {
    [[Ector cairo 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/cairo/ector_renderer_cairo_gradient_linear.c b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
index 95b4243..eb46ee7 100644 (file)
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
@@ -91,7 +91,7 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_draw(Eo *obj,
 }
 
 static Eina_Bool
-_ector_renderer_cairo_gradient_linear_ector_renderer_cairo_fill(Eo *obj,
+_ector_renderer_cairo_gradient_linear_ector_renderer_cairo_op_fill(Eo *obj,
                                                                      Ector_Renderer_Cairo_Gradient_Linear_Data *pd,
                                                                      unsigned int mul_col)
 {

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 670371c..f8356c1 100644 (file)
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
@@ -7,7 +7,7 @@ class Ector.Renderer.Cairo.Gradient.Linear (Ector.Renderer.Cairo, Ector.Renderer
       Ector.Renderer.draw;
       Ector.Renderer.bounds_get;
       Ector.Renderer.crc { get; }
-      Ector.Renderer.Cairo.fill;
+      Ector.Renderer.Cairo.op_fill;
       Efl.Object.finalize;
       Efl.Object.destructor;
       Efl.Gfx.Gradient.stop { set; }

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 30149e7..dabb843 100644 (file)
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
@@ -114,7 +114,7 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_draw(Eo *obj, Ector_Rendere
 
 // Clearly duplicated and should be in a common place...
 static Eina_Bool
-_ector_renderer_cairo_gradient_radial_ector_renderer_cairo_fill(Eo *obj,
+_ector_renderer_cairo_gradient_radial_ector_renderer_cairo_op_fill(Eo *obj,
                                                                      Ector_Renderer_Cairo_Gradient_Radial_Data *pd,
                                                                      unsigned int mul_col)
 {

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 adb1219..97ba1d1 100644 (file)
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
@@ -7,7 +7,7 @@ class Ector.Renderer.Cairo.Gradient.Radial (Ector.Renderer.Cairo, Ector.Renderer
       Ector.Renderer.draw;
       Ector.Renderer.bounds_get;
       Ector.Renderer.crc { get; }
-      Ector.Renderer.Cairo.fill;
+      Ector.Renderer.Cairo.op_fill;
       Efl.Object.destructor;
       Efl.Object.finalize;
       Efl.Gfx.Gradient.stop { set; }

diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.c b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
index 7012491..1b7df1e 100644 (file)
--- a/src/lib/ector/cairo/ector_renderer_cairo_shape.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
@@ -179,14 +179,14 @@ _ector_renderer_cairo_shape_ector_renderer_draw(Eo *obj, Ector_Renderer_Cairo_Sh
     cairo_set_fill_rule(pd->parent->cairo, CAIRO_FILL_RULE_WINDING);
 
    if (pd->shape->fill)
-     ector_renderer_cairo_fill(pd->shape->fill, mul_col);
+     ector_renderer_cairo_op_fill(pd->shape->fill, mul_col);
 
    if (pd->shape->stroke.fill || pd->public_shape->stroke.color.a > 0)
      {
         cairo_fill_preserve(pd->parent->cairo);
 
         if (pd->shape->stroke.fill)
-          ector_renderer_cairo_fill(pd->shape->stroke.fill, mul_col);
+          ector_renderer_cairo_op_fill(pd->shape->stroke.fill, mul_col);
        else
          {
             r = (((pd->public_shape->stroke.color.r * R_VAL(&mul_col)) + 0xff) >> 8);
@@ -226,7 +226,7 @@ _ector_renderer_cairo_shape_ector_renderer_draw(Eo *obj, Ector_Renderer_Cairo_Sh
 }
 
 static Eina_Bool
-_ector_renderer_cairo_shape_ector_renderer_cairo_fill(Eo *obj EINA_UNUSED,
+_ector_renderer_cairo_shape_ector_renderer_cairo_op_fill(Eo *obj EINA_UNUSED,
                                                            Ector_Renderer_Cairo_Shape_Data *pd EINA_UNUSED,
                                                            unsigned int mul_col EINA_UNUSED)
 {

diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.eo b/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
index dc65a40..fe40d89 100644 (file)
--- a/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
@@ -7,7 +7,7 @@ class Ector.Renderer.Cairo.Shape (Ector.Renderer.Cairo, Ector.Renderer.Shape)
       Ector.Renderer.draw;
       Ector.Renderer.bounds_get;
       Ector.Renderer.crc { get; }
-      Ector.Renderer.Cairo.fill;
+      Ector.Renderer.Cairo.op_fill;
       Efl.Object.constructor;
       Efl.Object.finalize;
       Efl.Object.destructor;

diff --git a/src/lib/ector/gl/ector_renderer_gl.eo b/src/lib/ector/gl/ector_renderer_gl.eo
index 18b305b..97941d2 100644 (file)
--- 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 87c5594..8856e7a 100644 (file)
--- 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 33b1389..053c8c1 100644 (file)
--- 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 827b120..8d00558 100644 (file)
--- 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 47bfb40..240d736 100644 (file)
--- 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 ecf78fa..7e59568 100644 (file)
--- 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 f3882e1..7b99724 100644 (file)
--- 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;
    }

diff --git a/src/lib/ector/software/ector_renderer_software.eo b/src/lib/ector/software/ector_renderer_software.eo
index 4d226fc..46251e3 100644 (file)
--- a/src/lib/ector/software/ector_renderer_software.eo
+++ b/src/lib/ector/software/ector_renderer_software.eo
@@ -3,7 +3,7 @@ class Ector.Renderer.Software (Ector.Renderer)
    [[Ector software renderer class]]
    data: null;
    methods {
-      fill @pure_virtual {
+      op_fill @pure_virtual {
           [[Renderer fill operation]]
          return: bool; [[$true on success, $false otherwise]]
       }

diff --git a/src/lib/ector/software/ector_renderer_software_gradient_linear.c b/src/lib/ector/software/ector_renderer_software_gradient_linear.c
index f024594..2291596 100644 (file)
--- a/src/lib/ector/software/ector_renderer_software_gradient_linear.c
+++ b/src/lib/ector/software/ector_renderer_software_gradient_linear.c
@@ -54,7 +54,7 @@ _ector_renderer_software_gradient_linear_ector_renderer_draw(Eo *obj EINA_UNUSED
 }
 
 static Eina_Bool
-_ector_renderer_software_gradient_linear_ector_renderer_software_fill(Eo *obj EINA_UNUSED,
+_ector_renderer_software_gradient_linear_ector_renderer_software_op_fill(Eo *obj EINA_UNUSED,
                                                                       Ector_Renderer_Software_Gradient_Data *pd)
 {
    ector_software_rasterizer_linear_gradient_set(pd->surface->rasterizer, pd);

diff --git a/src/lib/ector/software/ector_renderer_software_gradient_linear.eo b/src/lib/ector/software/ector_renderer_software_gradient_linear.eo
index 666ff7a..5cc4bdf 100644 (file)
--- a/src/lib/ector/software/ector_renderer_software_gradient_linear.eo
+++ b/src/lib/ector/software/ector_renderer_software_gradient_linear.eo
@@ -7,7 +7,7 @@ class Ector.Renderer.Software.Gradient.Linear (Ector.Renderer.Software, Ector.Re
       Ector.Renderer.prepare;
       Ector.Renderer.draw;
       Ector.Renderer.crc { get; }
-      Ector.Renderer.Software.fill;
+      Ector.Renderer.Software.op_fill;
       Efl.Object.constructor;
       Efl.Object.destructor;
       Efl.Gfx.Gradient.stop { set; }

diff --git a/src/lib/ector/software/ector_renderer_software_gradient_radial.c b/src/lib/ector/software/ector_renderer_software_gradient_radial.c
index d28ed0c..d64d903 100644 (file)
--- a/src/lib/ector/software/ector_renderer_software_gradient_radial.c
+++ b/src/lib/ector/software/ector_renderer_software_gradient_radial.c
@@ -66,7 +66,7 @@ _ector_renderer_software_gradient_radial_ector_renderer_draw(Eo *obj EINA_UNUSED
 
 // Clearly duplicated and should be in a common place...
 static Eina_Bool
-_ector_renderer_software_gradient_radial_ector_renderer_software_fill(Eo *obj EINA_UNUSED, Ector_Renderer_Software_Gradient_Data *pd)
+_ector_renderer_software_gradient_radial_ector_renderer_software_op_fill(Eo *obj EINA_UNUSED, Ector_Renderer_Software_Gradient_Data *pd)
 {
    ector_software_rasterizer_radial_gradient_set(pd->surface->rasterizer, pd);
    ector_software_gradient_color_update(pd);

diff --git a/src/lib/ector/software/ector_renderer_software_gradient_radial.eo b/src/lib/ector/software/ector_renderer_software_gradient_radial.eo
index 6de4786..f05ea41 100644 (file)
--- a/src/lib/ector/software/ector_renderer_software_gradient_radial.eo
+++ b/src/lib/ector/software/ector_renderer_software_gradient_radial.eo
@@ -7,7 +7,7 @@ class Ector.Renderer.Software.Gradient.Radial (Ector.Renderer.Software, Ector.Re
       Ector.Renderer.prepare;
       Ector.Renderer.draw;
       Ector.Renderer.crc { get; }
-      Ector.Renderer.Software.fill;
+      Ector.Renderer.Software.op_fill;
       Efl.Object.constructor;
       Efl.Object.destructor;
       Efl.Gfx.Gradient.stop { set; }

diff --git a/src/lib/ector/software/ector_renderer_software_shape.c b/src/lib/ector/software/ector_renderer_software_shape.c
index e60e1d6..e5be165 100644 (file)
--- a/src/lib/ector/software/ector_renderer_software_shape.c
+++ b/src/lib/ector/software/ector_renderer_software_shape.c
@@ -673,7 +673,7 @@ _ector_renderer_software_shape_ector_renderer_draw(Eo *obj,
 
    if (pd->shape->fill)
      {
-        ector_renderer_software_fill(pd->shape->fill);
+        ector_renderer_software_op_fill(pd->shape->fill);
         ector_software_rasterizer_draw_rle_data(pd->surface->rasterizer,
                                                 x, y, mul_col, op,
                                                 pd->shape_data);
@@ -695,7 +695,7 @@ _ector_renderer_software_shape_ector_renderer_draw(Eo *obj,
 
    if (pd->shape->stroke.fill)
      {
-        ector_renderer_software_fill(pd->shape->stroke.fill);
+        ector_renderer_software_op_fill(pd->shape->stroke.fill);
         ector_software_rasterizer_draw_rle_data(pd->surface->rasterizer,
                                                 x, y, mul_col, op,
                                                 pd->outline_data);
@@ -719,7 +719,7 @@ _ector_renderer_software_shape_ector_renderer_draw(Eo *obj,
 }
 
 static Eina_Bool
-_ector_renderer_software_shape_ector_renderer_software_fill(Eo *obj EINA_UNUSED,
+_ector_renderer_software_shape_ector_renderer_software_op_fill(Eo *obj EINA_UNUSED,
                                                                  Ector_Renderer_Software_Shape_Data *pd EINA_UNUSED)
 {
    // FIXME: let's find out how to fill a shape with a shape later.

diff --git a/src/lib/ector/software/ector_renderer_software_shape.eo b/src/lib/ector/software/ector_renderer_software_shape.eo
index 1382c6a..97b15ca 100644 (file)
--- a/src/lib/ector/software/ector_renderer_software_shape.eo
+++ b/src/lib/ector/software/ector_renderer_software_shape.eo
@@ -5,7 +5,7 @@ class Ector.Renderer.Software.Shape (Ector.Renderer.Software, Ector.Renderer.Sha
    implements {
       Ector.Renderer.prepare;
       Ector.Renderer.draw;
-      Ector.Renderer.Software.fill;
+      Ector.Renderer.Software.op_fill;
       Ector.Renderer.crc { get; }
       Efl.Gfx.Path.path { set; }
       Efl.Object.constructor;