Efl gfx gradient: Remove the no longer needed .Base hack.

diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index 58a00c5..8f40e93 100644 (file)
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -17,7 +17,7 @@ efl_eolian_files = \
       lib/efl/interfaces/efl_gfx_view.eo \
       lib/efl/interfaces/efl_gfx_buffer.eo \
       lib/efl/interfaces/efl_gfx_shape.eo \
-      lib/efl/interfaces/efl_gfx_gradient_base.eo \
+      lib/efl/interfaces/efl_gfx_gradient.eo \
       lib/efl/interfaces/efl_gfx_gradient_linear.eo \
       lib/efl/interfaces/efl_gfx_gradient_radial.eo \
       lib/efl/interfaces/efl_gfx_filter.eo \

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 1d9c72d..3d5b508 100644 (file)
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
@@ -165,7 +165,7 @@ _ector_renderer_cairo_gradient_linear_eo_base_destructor(Eo *obj,
 }
 
 static void
-_ector_renderer_cairo_gradient_linear_efl_gfx_gradient_base_stop_set(Eo *obj,
+_ector_renderer_cairo_gradient_linear_efl_gfx_gradient_stop_set(Eo *obj,
                                                                      Ector_Renderer_Cairo_Gradient_Linear_Data *pd EINA_UNUSED,
                                                                      const Efl_Gfx_Gradient_Stop *colors,
                                                                      unsigned int length)

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 b8d1414..31c968e 100644 (file)
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
@@ -10,6 +10,6 @@ class Ector.Renderer.Cairo.Gradient_Linear (Ector.Renderer.Cairo.Base, Ector.Ren
       Ector.Renderer.Cairo.Base.fill;
       Eo.Base.finalize;
       Eo.Base.destructor;
-      Efl.Gfx.Gradient.Base.stop.set;
+      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 b075f88..30cad94 100644 (file)
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
@@ -169,7 +169,7 @@ _ector_renderer_cairo_gradient_radial_eo_base_destructor(Eo *obj,
 }
 
 static void
-_ector_renderer_cairo_gradient_radial_efl_gfx_gradient_base_stop_set(Eo *obj,
+_ector_renderer_cairo_gradient_radial_efl_gfx_gradient_stop_set(Eo *obj,
                                                                      Ector_Renderer_Cairo_Gradient_Radial_Data *pd EINA_UNUSED,
                                                                      const Efl_Gfx_Gradient_Stop *colors,
                                                                      unsigned int length)

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 2057478..caa47c7 100644 (file)
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
@@ -10,6 +10,6 @@ class Ector.Renderer.Cairo.Gradient_Radial (Ector.Renderer.Cairo.Base, Ector.Ren
       Ector.Renderer.Cairo.Base.fill;
       Eo.Base.destructor;
       Eo.Base.finalize;
-      Efl.Gfx.Gradient.Base.stop.set;
+      Efl.Gfx.Gradient.stop.set;
    }
 }

diff --git a/src/lib/ector/ector_renderer_generic_gradient.c b/src/lib/ector/ector_renderer_generic_gradient.c
index 6cf676f..e6e277e 100644 (file)
--- a/src/lib/ector/ector_renderer_generic_gradient.c
+++ b/src/lib/ector/ector_renderer_generic_gradient.c
@@ -8,7 +8,7 @@
 #include "ector_private.h"
 
 static void
-_ector_renderer_generic_gradient_efl_gfx_gradient_base_stop_set(Eo *obj EINA_UNUSED,
+_ector_renderer_generic_gradient_efl_gfx_gradient_stop_set(Eo *obj EINA_UNUSED,
                                                                 Ector_Renderer_Generic_Gradient_Data *pd,
                                                                 const Efl_Gfx_Gradient_Stop *colors,
                                                                 unsigned int length)
@@ -25,7 +25,7 @@ _ector_renderer_generic_gradient_efl_gfx_gradient_base_stop_set(Eo *obj EINA_UNU
 }
 
 static void
-_ector_renderer_generic_gradient_efl_gfx_gradient_base_stop_get(Eo *obj EINA_UNUSED,
+_ector_renderer_generic_gradient_efl_gfx_gradient_stop_get(Eo *obj EINA_UNUSED,
                                                                 Ector_Renderer_Generic_Gradient_Data *pd,
                                                                 const Efl_Gfx_Gradient_Stop **colors,
                                                                 unsigned int *length)
@@ -35,7 +35,7 @@ _ector_renderer_generic_gradient_efl_gfx_gradient_base_stop_get(Eo *obj EINA_UNU
 }
 
 static void
-_ector_renderer_generic_gradient_efl_gfx_gradient_base_spread_set(Eo *obj EINA_UNUSED,
+_ector_renderer_generic_gradient_efl_gfx_gradient_spread_set(Eo *obj EINA_UNUSED,
                                                                   Ector_Renderer_Generic_Gradient_Data *pd,
                                                                   Efl_Gfx_Gradient_Spread s)
 {
@@ -43,7 +43,7 @@ _ector_renderer_generic_gradient_efl_gfx_gradient_base_spread_set(Eo *obj EINA_U
 }
 
 static Efl_Gfx_Gradient_Spread
-_ector_renderer_generic_gradient_efl_gfx_gradient_base_spread_get(Eo *obj EINA_UNUSED,
+_ector_renderer_generic_gradient_efl_gfx_gradient_spread_get(Eo *obj EINA_UNUSED,
                                                                   Ector_Renderer_Generic_Gradient_Data *pd)
 {
    return pd->s;

diff --git a/src/lib/ector/ector_renderer_generic_gradient.eo b/src/lib/ector/ector_renderer_generic_gradient.eo
index 2c0cc83..1ce3c8a 100644 (file)
--- a/src/lib/ector/ector_renderer_generic_gradient.eo
+++ b/src/lib/ector/ector_renderer_generic_gradient.eo
@@ -1,11 +1,11 @@
-mixin Ector.Renderer.Generic.Gradient (Efl.Gfx.Gradient.Base)
+mixin Ector.Renderer.Generic.Gradient (Efl.Gfx.Gradient)
 {
    eo_prefix: ector_renderer_gradient;
    legacy_prefix: null;
    implements {
-      Efl.Gfx.Gradient.Base.stop.set;
-      Efl.Gfx.Gradient.Base.stop.get;
-      Efl.Gfx.Gradient.Base.spread.set;
-      Efl.Gfx.Gradient.Base.spread.get;
+      Efl.Gfx.Gradient.stop.set;
+      Efl.Gfx.Gradient.stop.get;
+      Efl.Gfx.Gradient.spread.set;
+      Efl.Gfx.Gradient.spread.get;
    }
 }

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 5bff844..9cc6922 100644 (file)
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c
@@ -89,7 +89,7 @@ _ector_renderer_gl_gradient_linear_eo_base_destructor(Eo *obj, Ector_Renderer_GL
 }
 
 static void
-_ector_renderer_gl_gradient_linear_efl_gfx_gradient_base_stop_set(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd EINA_UNUSED, const Efl_Gfx_Gradient_Stop *colors, unsigned int length)
+_ector_renderer_gl_gradient_linear_efl_gfx_gradient_stop_set(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd EINA_UNUSED, const Efl_Gfx_Gradient_Stop *colors, unsigned int length)
 {
    efl_gfx_gradient_stop_set(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS), colors, length);
 }

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 4ba0d5b..dd8e364 100644 (file)
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo
@@ -10,6 +10,6 @@ class Ector.Renderer.GL.Gradient_Linear (Ector.Renderer.GL.Base, Ector.Renderer.
       Ector.Renderer.GL.Base.fill;
       Eo.Base.constructor;
       Eo.Base.destructor;
-      Efl.Gfx.Gradient.Base.stop.set;
+      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 9ba402f..31a9752 100644 (file)
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c
@@ -102,7 +102,7 @@ _ector_renderer_gl_gradient_radial_eo_base_destructor(Eo *obj, Ector_Renderer_GL
 }
 
 static void
-_ector_renderer_gl_gradient_radial_efl_gfx_gradient_base_stop_set(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd EINA_UNUSED, const Efl_Gfx_Gradient_Stop *colors, unsigned int length)
+_ector_renderer_gl_gradient_radial_efl_gfx_gradient_stop_set(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd EINA_UNUSED, const Efl_Gfx_Gradient_Stop *colors, unsigned int length)
 {
    efl_gfx_gradient_stop_set(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS), colors, length);
 }

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 c1c7a81..5ece084 100644 (file)
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo
@@ -10,6 +10,6 @@ class Ector.Renderer.GL.Gradient_Radial (Ector.Renderer.GL.Base, Ector.Renderer.
       Ector.Renderer.GL.Base.fill;
       Eo.Base.constructor;
       Eo.Base.destructor;
-      Efl.Gfx.Gradient.Base.stop.set;
+      Efl.Gfx.Gradient.stop.set;
    }
 }

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 46ec2e5..368c56d 100644 (file)
--- a/src/lib/ector/software/ector_renderer_software_gradient_linear.c
+++ b/src/lib/ector/software/ector_renderer_software_gradient_linear.c
@@ -93,7 +93,7 @@ _ector_renderer_software_gradient_linear_eo_base_destructor(Eo *obj,
 }
 
 void
-_ector_renderer_software_gradient_linear_efl_gfx_gradient_base_stop_set(Eo *obj, Ector_Renderer_Software_Gradient_Data *pd, const Efl_Gfx_Gradient_Stop *colors, unsigned int length)
+_ector_renderer_software_gradient_linear_efl_gfx_gradient_stop_set(Eo *obj, Ector_Renderer_Software_Gradient_Data *pd, const Efl_Gfx_Gradient_Stop *colors, unsigned int length)
 {
    efl_gfx_gradient_stop_set(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS), colors, length);
 

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 d028548..2f4063f 100644 (file)
--- a/src/lib/ector/software/ector_renderer_software_gradient_linear.eo
+++ b/src/lib/ector/software/ector_renderer_software_gradient_linear.eo
@@ -10,6 +10,6 @@ class Ector.Renderer.Software.Gradient_Linear (Ector.Renderer.Software.Base, Ect
       Ector.Renderer.Software.Base.fill;
       Eo.Base.constructor;
       Eo.Base.destructor;
-      Efl.Gfx.Gradient.Base.stop.set;
+      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 64d0a9d..ee72a5f 100644 (file)
--- a/src/lib/ector/software/ector_renderer_software_gradient_radial.c
+++ b/src/lib/ector/software/ector_renderer_software_gradient_radial.c
@@ -101,7 +101,7 @@ _ector_renderer_software_gradient_radial_eo_base_destructor(Eo *obj,
 }
 
 void
-_ector_renderer_software_gradient_radial_efl_gfx_gradient_base_stop_set(Eo *obj, Ector_Renderer_Software_Gradient_Data *pd, const Efl_Gfx_Gradient_Stop *colors, unsigned int length)
+_ector_renderer_software_gradient_radial_efl_gfx_gradient_stop_set(Eo *obj, Ector_Renderer_Software_Gradient_Data *pd, const Efl_Gfx_Gradient_Stop *colors, unsigned int length)
 {
    efl_gfx_gradient_stop_set(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS), colors, length);
 

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 c94bfe4..6a3cb64 100644 (file)
--- a/src/lib/ector/software/ector_renderer_software_gradient_radial.eo
+++ b/src/lib/ector/software/ector_renderer_software_gradient_radial.eo
@@ -10,6 +10,6 @@ class Ector.Renderer.Software.Gradient_Radial (Ector.Renderer.Software.Base, Ect
       Ector.Renderer.Software.Base.fill;
       Eo.Base.constructor;
       Eo.Base.destructor;
-      Efl.Gfx.Gradient.Base.stop.set;
+      Efl.Gfx.Gradient.stop.set;
    }
 }

diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 61b62d9..479f7ef 100644 (file)
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -99,7 +99,7 @@ EAPI extern const Eo_Event_Description _EFL_GFX_PATH_CHANGED;
 #include "interfaces/efl_gfx_fill.eo.h"
 #include "interfaces/efl_gfx_view.eo.h"
 #include "interfaces/efl_gfx_shape.eo.h"
-#include "interfaces/efl_gfx_gradient_base.eo.h"
+#include "interfaces/efl_gfx_gradient.eo.h"
 #include "interfaces/efl_gfx_gradient_linear.eo.h"
 #include "interfaces/efl_gfx_gradient_radial.eo.h"
 #include "interfaces/efl_gfx_filter.eo.h"

diff --git a/src/lib/efl/Makefile.am b/src/lib/efl/Makefile.am
index 17ce1d4..4735080 100644 (file)
--- a/src/lib/efl/Makefile.am
+++ b/src/lib/efl/Makefile.am
@@ -21,7 +21,7 @@ interfaces/efl_gfx_stack.eo \
 interfaces/efl_gfx_view.eo \
 interfaces/efl_gfx_buffer.eo \
 interfaces/efl_gfx_shape.eo \
-interfaces/efl_gfx_gradient_base.eo \
+interfaces/efl_gfx_gradient.eo \
 interfaces/efl_gfx_gradient_linear.eo \
 interfaces/efl_gfx_gradient_radial.eo \
 interfaces/efl_gfx_filter.eo \

diff --git a/src/lib/efl/interfaces/efl_gfx_gradient_base.eo b/src/lib/efl/interfaces/efl_gfx_gradient.eo
similarity index 96%
rename from src/lib/efl/interfaces/efl_gfx_gradient_base.eo
rename to src/lib/efl/interfaces/efl_gfx_gradient.eo
index 36df101..ce73641 100644 (file)
--- a/src/lib/efl/interfaces/efl_gfx_gradient_base.eo
+++ b/src/lib/efl/interfaces/efl_gfx_gradient.eo
@@ -1,6 +1,6 @@
 import efl_gfx_types;
 
-interface Efl.Gfx.Gradient.Base
+interface Efl.Gfx.Gradient
 {
    eo_prefix: efl_gfx_gradient;
    legacy_prefix: null;

diff --git a/src/lib/efl/interfaces/efl_gfx_gradient_linear.eo b/src/lib/efl/interfaces/efl_gfx_gradient_linear.eo
index c3f6bfd..59a17fa 100644 (file)
--- a/src/lib/efl/interfaces/efl_gfx_gradient_linear.eo
+++ b/src/lib/efl/interfaces/efl_gfx_gradient_linear.eo
@@ -1,4 +1,4 @@
-interface Efl.Gfx.Gradient.Linear (Efl.Gfx.Gradient.Base)
+interface Efl.Gfx.Gradient.Linear (Efl.Gfx.Gradient)
 {
    legacy_prefix: null;
    methods {

diff --git a/src/lib/efl/interfaces/efl_gfx_gradient_radial.eo b/src/lib/efl/interfaces/efl_gfx_gradient_radial.eo
index b322be4..5aaa214 100644 (file)
--- a/src/lib/efl/interfaces/efl_gfx_gradient_radial.eo
+++ b/src/lib/efl/interfaces/efl_gfx_gradient_radial.eo
@@ -1,4 +1,4 @@
-interface Efl.Gfx.Gradient.Radial (Efl.Gfx.Gradient.Base)
+interface Efl.Gfx.Gradient.Radial (Efl.Gfx.Gradient)
 {
    legacy_prefix: null;
    methods {

diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index b3ece1e..98d5096 100644 (file)
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -19,7 +19,7 @@
 #include "interfaces/efl_gfx_fill.eo.c"
 #include "interfaces/efl_gfx_view.eo.c"
 
-#include "interfaces/efl_gfx_gradient_base.eo.c"
+#include "interfaces/efl_gfx_gradient.eo.c"
 #include "interfaces/efl_gfx_gradient_linear.eo.c"
 #include "interfaces/efl_gfx_gradient_radial.eo.c"
 

diff --git a/src/lib/evas/canvas/efl_vg_gradient.eo b/src/lib/evas/canvas/efl_vg_gradient.eo
index 7f794cb..6b717fa 100644 (file)
--- a/src/lib/evas/canvas/efl_vg_gradient.eo
+++ b/src/lib/evas/canvas/efl_vg_gradient.eo
@@ -1,11 +1,11 @@
-abstract Efl.VG.Gradient (Efl.VG.Base, Efl.Gfx.Gradient.Base)
+abstract Efl.VG.Gradient (Efl.VG.Base, Efl.Gfx.Gradient)
 {
    legacy_prefix: evas_vg_gradient;
    implements {
-      Efl.Gfx.Gradient.Base.stop.set;
-      Efl.Gfx.Gradient.Base.stop.get;
-      Efl.Gfx.Gradient.Base.spread.set;
-      Efl.Gfx.Gradient.Base.spread.get;
+      Efl.Gfx.Gradient.stop.set;
+      Efl.Gfx.Gradient.stop.get;
+      Efl.Gfx.Gradient.spread.set;
+      Efl.Gfx.Gradient.spread.get;
       Efl.VG.Base.interpolate;
       Efl.VG.Base.dup;
    }

diff --git a/src/lib/evas/canvas/evas_vg_gradient.c b/src/lib/evas/canvas/evas_vg_gradient.c
index d4a64b7..db7eedb 100644 (file)
--- a/src/lib/evas/canvas/evas_vg_gradient.c
+++ b/src/lib/evas/canvas/evas_vg_gradient.c
@@ -6,7 +6,7 @@
 #include <strings.h>
 
 static void
-_efl_vg_gradient_efl_gfx_gradient_base_stop_set(Eo *obj EINA_UNUSED,
+_efl_vg_gradient_efl_gfx_gradient_stop_set(Eo *obj EINA_UNUSED,
                                                 Efl_VG_Gradient_Data *pd,
                                                 const Efl_Gfx_Gradient_Stop *colors,
                                                 unsigned int length)
@@ -25,7 +25,7 @@ _efl_vg_gradient_efl_gfx_gradient_base_stop_set(Eo *obj EINA_UNUSED,
 }
 
 static void
-_efl_vg_gradient_efl_gfx_gradient_base_stop_get(Eo *obj EINA_UNUSED,
+_efl_vg_gradient_efl_gfx_gradient_stop_get(Eo *obj EINA_UNUSED,
                                                 Efl_VG_Gradient_Data *pd,
                                                 const Efl_Gfx_Gradient_Stop **colors,
                                                 unsigned int *length)
@@ -35,7 +35,7 @@ _efl_vg_gradient_efl_gfx_gradient_base_stop_get(Eo *obj EINA_UNUSED,
 }
 
 static void
-_efl_vg_gradient_efl_gfx_gradient_base_spread_set(Eo *obj EINA_UNUSED,
+_efl_vg_gradient_efl_gfx_gradient_spread_set(Eo *obj EINA_UNUSED,
                                                   Efl_VG_Gradient_Data *pd,
                                                   Efl_Gfx_Gradient_Spread s)
 {
@@ -45,7 +45,7 @@ _efl_vg_gradient_efl_gfx_gradient_base_spread_set(Eo *obj EINA_UNUSED,
 }
 
 static Efl_Gfx_Gradient_Spread
-_efl_vg_gradient_efl_gfx_gradient_base_spread_get(Eo *obj EINA_UNUSED,
+_efl_vg_gradient_efl_gfx_gradient_spread_get(Eo *obj EINA_UNUSED,
                                                   Efl_VG_Gradient_Data *pd)
 {
    return pd->s;