evas/vg: renamed the legacy vg shape apis

Reviewers: Hermet, cedric, jpeg

Subscribers: cedric, jpeg

Differential Revision: https://phab.enlightenment.org/D4284

diff --git a/src/examples/evas/evas-vg-batman.c b/src/examples/evas/evas-vg-batman.c
index 9d7892e..c125b24 100644 (file)
--- a/src/examples/evas/evas-vg-batman.c
+++ b/src/examples/evas/evas-vg-batman.c
@@ -79,7 +79,7 @@ _animator(void *data EINA_UNUSED, double pos)
 {
    int next = (animation_position + 1) % (sizeof (batmans_path) / sizeof (batmans_path[0]));
 
-   evas_vg_shape_shape_interpolate(batman,   
+   evas_vg_shape_interpolate(batman,   
                                    batmans_vg[animation_position],
                                    batmans_vg[next],
                                    ecore_animator_pos_map(pos, ECORE_POS_MAP_SINUSOIDAL, 0.0, 0.0));
@@ -140,7 +140,7 @@ main(void)
           evas_vg_node_color_set(batmans_vg[i], 120, 120, 120, 255);
           evas_vg_shape_stroke_join_set(batmans_vg[i], EFL_GFX_JOIN_ROUND);
        }
-        evas_vg_shape_shape_append_svg_path(batmans_vg[i], batmans_path[i]);
+        evas_vg_shape_append_svg_path(batmans_vg[i], batmans_path[i]);
      }
 
    animation = ecore_animator_timeline_add(1, _animator, NULL);
@@ -154,7 +154,7 @@ main(void)
 
 
    circle = evas_vg_shape_add(root);
-   evas_vg_shape_shape_append_circle(circle, WIDTH / 2, HEIGHT / 2, 200);
+   evas_vg_shape_append_circle(circle, WIDTH / 2, HEIGHT / 2, 200);
    evas_vg_node_color_set(circle, 255, 255, 255, 255);
    evas_vg_shape_stroke_width_set(circle, 1);
    evas_vg_shape_stroke_color_set(circle, 255, 0, 0, 255);
@@ -162,8 +162,8 @@ main(void)
    batman = evas_vg_shape_add(root);
    evas_vg_node_color_set(batman, 0, 0, 0, 255);
    evas_vg_node_origin_set(batman, 100, 150);
-   evas_vg_shape_shape_append_move_to(batman, 256, 213);
-   evas_vg_shape_shape_dup(batman, batmans_vg[0]);
+   evas_vg_shape_append_move_to(batman, 256, 213);
+   evas_vg_shape_dup(batman, batmans_vg[0]);
 
    ecore_main_loop_begin();
 

diff --git a/src/examples/evas/evas-vg-simple.c b/src/examples/evas/evas-vg-simple.c
index 17bf3f0..9524e94 100644 (file)
--- a/src/examples/evas/evas-vg-simple.c
+++ b/src/examples/evas/evas-vg-simple.c
@@ -105,7 +105,7 @@ vector_set(int x, int y, int w, int h)
    //evas_vg_node_transformation_set(root, &matrix);
 
    Efl_VG *bg = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "bg"));
-   evas_vg_shape_shape_append_rect(bg, 0, 0 , vg_w, vg_h, 0, 0);
+   evas_vg_shape_append_rect(bg, 0, 0 , vg_w, vg_h, 0, 0);
    evas_vg_node_origin_set(bg, 0,0);
    evas_vg_shape_stroke_width_set(bg, 1.0);
    evas_vg_node_color_set(bg, 80, 80, 80, 80);
@@ -114,7 +114,7 @@ vector_set(int x, int y, int w, int h)
    Efl_VG *rgradient = efl_add(EFL_VG_GRADIENT_RADIAL_CLASS, NULL, efl_vg_name_set(efl_added, "rgradient"));
    Efl_VG *lgradient = efl_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL, efl_vg_name_set(efl_added, "lgradient"));
 
-   evas_vg_shape_shape_append_arc(shape, 0, 0, 100, 100, 25, 330);
+   evas_vg_shape_append_arc(shape, 0, 0, 100, 100, 25, 330);
 
    Efl_Gfx_Gradient_Stop stops[3];
    stops[0].r = 255;
@@ -154,7 +154,7 @@ vector_set(int x, int y, int w, int h)
    evas_vg_shape_stroke_color_set(shape, 0, 0, 255, 128);
 
    Efl_VG *rect = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "rect"));
-   evas_vg_shape_shape_append_rect(rect, 0, 0, 100, 100, 0, 0);
+   evas_vg_shape_append_rect(rect, 0, 0, 100, 100, 0, 0);
    evas_vg_node_origin_set(rect, 100, 100);
    evas_vg_shape_fill_set(rect, lgradient);
    evas_vg_shape_stroke_width_set(rect, 2.0);
@@ -162,7 +162,7 @@ vector_set(int x, int y, int w, int h)
    evas_vg_shape_stroke_color_set(rect, 255, 255, 255, 255);
 
    Efl_VG *rect1 = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "rect1"));
-   evas_vg_shape_shape_append_rect(rect1, 0, 0, 70, 70, 0, 0);
+   evas_vg_shape_append_rect(rect1, 0, 0, 70, 70, 0, 0);
    evas_vg_node_origin_set(rect1, 50, 70);
    evas_vg_shape_stroke_scale_set(rect1, 2);
    evas_vg_shape_stroke_width_set(rect1, 8.0);
@@ -170,7 +170,7 @@ vector_set(int x, int y, int w, int h)
    evas_vg_shape_stroke_color_set(rect1, 0, 100, 80, 100);
 
    Efl_VG *circle = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "circle"));
-   evas_vg_shape_shape_append_arc(circle, 0, 0, 250, 100, 30, 300);
+   evas_vg_shape_append_arc(circle, 0, 0, 250, 100, 30, 300);
    evas_vg_shape_fill_set(circle, lgradient);
    //evas_vg_node_transformation_set(&matrix),
    evas_vg_node_origin_set(circle, 50,50);
@@ -178,20 +178,20 @@ vector_set(int x, int y, int w, int h)
 
    // Foreground
    Efl_VG *fg = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "fg"));
-   evas_vg_shape_shape_append_rect(fg, 0, 0, vg_w, vg_h, 0, 0);
+   evas_vg_shape_append_rect(fg, 0, 0, vg_w, vg_h, 0, 0);
    evas_vg_node_origin_set(fg, 0, 0);
    evas_vg_shape_stroke_width_set(fg, 5.0);
    evas_vg_shape_stroke_join_set(fg, EFL_GFX_JOIN_ROUND);
    evas_vg_shape_stroke_color_set(fg, 70, 70, 0, 70);
 
    Efl_VG *tst = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "tst"));
-   evas_vg_shape_shape_append_rect(tst, 50, 25, 200, 200, 3, 5);
+   evas_vg_shape_append_rect(tst, 50, 25, 200, 200, 3, 5);
    evas_vg_node_color_set(tst, 0, 0, 200, 200);
    evas_vg_shape_stroke_width_set(tst, 2);
    evas_vg_shape_stroke_color_set(tst, 255, 0, 0, 255);
 
    Efl_VG *vc = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "vc"));
-   evas_vg_shape_shape_append_circle(vc, 100, 100, 23);
+   evas_vg_shape_append_circle(vc, 100, 100, 23);
    evas_vg_node_color_set(vc, 0, 200, 0, 255);
    evas_vg_shape_stroke_width_set(vc, 4);
    evas_vg_shape_stroke_color_set(vc, 255, 0, 0, 255);

diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index 4048a8d..9df4314 100644 (file)
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -2501,12 +2501,12 @@ _add_polyline(Efl_VG *vg, double *array, int size, Eina_Bool polygon)
 
    if (size < 2) return;
 
-   evas_vg_shape_shape_append_move_to(vg, array[0], array[1]);
+   evas_vg_shape_append_move_to(vg, array[0], array[1]);
    for (i=2; i < size; i+=2)
-     evas_vg_shape_shape_append_line_to(vg, array[i], array[i+1]);
+     evas_vg_shape_append_line_to(vg, array[i], array[i+1]);
 
    if (polygon)
-     evas_vg_shape_shape_append_close(vg);
+     evas_vg_shape_append_close(vg);
 }
 
 static void
@@ -2531,7 +2531,7 @@ _create_vg_node(Svg_Node *node, Efl_VG *parent)
            break;
         case SVG_NODE_PATH:
            vg = evas_vg_shape_add(parent);
-           evas_vg_shape_shape_append_svg_path(vg, node->node.path.path);
+           evas_vg_shape_append_svg_path(vg, node->node.path.path);
            break;
         case SVG_NODE_POLYGON:
            vg = evas_vg_shape_add(parent);
@@ -2543,18 +2543,18 @@ _create_vg_node(Svg_Node *node, Efl_VG *parent)
            break;
         case SVG_NODE_ELLIPSE:
            vg = evas_vg_shape_add(parent);
-           evas_vg_shape_shape_append_arc(vg, node->node.ellipse.cx - node->node.ellipse.rx,
+           evas_vg_shape_append_arc(vg, node->node.ellipse.cx - node->node.ellipse.rx,
                                           node->node.ellipse.cy - node->node.ellipse.ry,
                                           2*node->node.ellipse.rx, 2*node->node.ellipse.ry, 0, 360);
-           evas_vg_shape_shape_append_close(vg);
+           evas_vg_shape_append_close(vg);
            break;
         case SVG_NODE_CIRCLE:
            vg = evas_vg_shape_add(parent);
-           evas_vg_shape_shape_append_circle(vg, node->node.circle.cx, node->node.circle.cy, node->node.circle.r);
+           evas_vg_shape_append_circle(vg, node->node.circle.cx, node->node.circle.cy, node->node.circle.r);
            break;
         case SVG_NODE_RECT:
            vg = evas_vg_shape_add(parent);
-           evas_vg_shape_shape_append_rect(vg, node->node.rect.x, node->node.rect.y, node->node.rect.w, node->node.rect.h,
+           evas_vg_shape_append_rect(vg, node->node.rect.x, node->node.rect.y, node->node.rect.w, node->node.rect.h,
                                            node->node.rect.rx, node->node.rect.ry);
            break;
        default:

diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index d6d8115..ab2d3fb 100644 (file)
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -2770,7 +2770,7 @@ EAPI void evas_vg_shape_stroke_join_set(Eo *obj, Efl_Gfx_Join j);
  * @param[in] points point list
  *
  */
-EAPI void evas_vg_shape_shape_path_set(Eo *obj, const Efl_Gfx_Path_Command *op, const double *points);
+EAPI void evas_vg_shape_path_set(Eo *obj, const Efl_Gfx_Path_Command *op, const double *points);
 
 /**
  *
@@ -2782,10 +2782,10 @@ EAPI void evas_vg_shape_shape_path_set(Eo *obj, const Efl_Gfx_Path_Command *op,
  *
  */
 
-EAPI void evas_vg_shape_shape_path_get(Eo *obj, const Efl_Gfx_Path_Command **op, const double **points);
-EAPI void evas_vg_shape_shape_path_length_get(Eo *obj, unsigned int *commands, unsigned int *points);
-EAPI void evas_vg_shape_shape_current_get(Eo *obj, double *x, double *y);
-EAPI void evas_vg_shape_shape_current_ctrl_get(Eo *obj, double *x, double *y);
+EAPI void evas_vg_shape_path_get(Eo *obj, const Efl_Gfx_Path_Command **op, const double **points);
+EAPI void evas_vg_shape_path_length_get(Eo *obj, unsigned int *commands, unsigned int *points);
+EAPI void evas_vg_shape_current_get(Eo *obj, double *x, double *y);
+EAPI void evas_vg_shape_current_ctrl_get(Eo *obj, double *x, double *y);
 
 /**
  *
@@ -2797,7 +2797,7 @@ EAPI void evas_vg_shape_shape_current_ctrl_get(Eo *obj, double *x, double *y);
  * @param[in] dup_from Shape object from where data will be copied.
  *
  */
-EAPI void evas_vg_shape_shape_dup(Eo *obj, Eo *dup_from);
+EAPI void evas_vg_shape_dup(Eo *obj, Eo *dup_from);
 
 /**
  *
@@ -2808,7 +2808,7 @@ EAPI void evas_vg_shape_shape_dup(Eo *obj, Eo *dup_from);
  *
  *
  */
-EAPI void evas_vg_shape_shape_reset(Eo *obj);
+EAPI void evas_vg_shape_reset(Eo *obj);
 
 /**
  *
@@ -2823,7 +2823,7 @@ EAPI void evas_vg_shape_shape_reset(Eo *obj);
  * @param[in] y Y co-ordinate of the current point.
  *
  */
-EAPI void evas_vg_shape_shape_append_move_to(Eo *obj, double x, double y);
+EAPI void evas_vg_shape_append_move_to(Eo *obj, double x, double y);
 
 /**
  *
@@ -2842,7 +2842,7 @@ EAPI void evas_vg_shape_shape_append_move_to(Eo *obj, double x, double y);
  * @param[in] y Y co-ordinate of end point of the line.
  *
  */
-EAPI void evas_vg_shape_shape_append_line_to(Eo *obj, double x, double y);
+EAPI void evas_vg_shape_append_line_to(Eo *obj, double x, double y);
 
 /**
  *
@@ -2860,7 +2860,7 @@ EAPI void evas_vg_shape_shape_append_line_to(Eo *obj, double x, double y);
  * @param[in] ctrl_y Y co-ordinate of control point.
  *
  */
-EAPI void evas_vg_shape_shape_append_quadratic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y);
+EAPI void evas_vg_shape_append_quadratic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y);
 
 /**
  *
@@ -2875,7 +2875,7 @@ EAPI void evas_vg_shape_shape_append_quadratic_to(Eo *obj, double x, double y, d
  * @param[in] y Y co-ordinate of end point of the line.
  *
  */
-EAPI void evas_vg_shape_shape_append_squadratic_to(Eo *obj, double x, double y);
+EAPI void evas_vg_shape_append_squadratic_to(Eo *obj, double x, double y);
 
 /**
  *
@@ -2895,7 +2895,7 @@ EAPI void evas_vg_shape_shape_append_squadratic_to(Eo *obj, double x, double y);
  * @param[in] ctrl_y1 Y co-ordinate of 2nd control point.
  *
  */
-EAPI void evas_vg_shape_shape_append_cubic_to(Eo *obj, double x, double y, double ctrl_x0, double ctrl_y0, double ctrl_x1, double ctrl_y1);
+EAPI void evas_vg_shape_append_cubic_to(Eo *obj, double x, double y, double ctrl_x0, double ctrl_y0, double ctrl_x1, double ctrl_y1);
 
 /**
  *
@@ -2913,7 +2913,7 @@ EAPI void evas_vg_shape_shape_append_cubic_to(Eo *obj, double x, double y, doubl
  * @param[in] ctrl_y Y co-ordinate of 2nd control point.
  *
  */
-EAPI void evas_vg_shape_shape_append_scubic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y);
+EAPI void evas_vg_shape_append_scubic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y);
 
 /**
  *
@@ -2937,7 +2937,7 @@ EAPI void evas_vg_shape_shape_append_scubic_to(Eo *obj, double x, double y, doub
  * @param[in] sweep Defines whether the arc will be drawn counter-clockwise or clockwise from current point to the end point taking into account the large_arc property.
  *
  */
-EAPI void evas_vg_shape_shape_append_arc_to(Eo *obj, double x, double y, double rx, double ry, double angle, Eina_Bool large_arc, Eina_Bool sweep);
+EAPI void evas_vg_shape_append_arc_to(Eo *obj, double x, double y, double rx, double ry, double angle, Eina_Bool large_arc, Eina_Bool sweep);
 
 /**
  * @brief Append an arc that enclosed in the given rectangle (x, y, w, h). The
@@ -2953,7 +2953,7 @@ EAPI void evas_vg_shape_shape_append_arc_to(Eo *obj, double x, double y, double
  *
  * @ingroup Efl_Gfx_Shape
  */
-EAPI void evas_vg_shape_shape_append_arc(Eo *obj, double x, double y, double w, double h, double start_angle, double sweep_length);
+EAPI void evas_vg_shape_append_arc(Eo *obj, double x, double y, double w, double h, double start_angle, double sweep_length);
 
 /**
  *
@@ -2968,7 +2968,7 @@ EAPI void evas_vg_shape_shape_append_arc(Eo *obj, double x, double y, double w,
  *
  *
  */
-EAPI void evas_vg_shape_shape_append_close(Eo *obj);
+EAPI void evas_vg_shape_append_close(Eo *obj);
 
 /**
  *
@@ -2983,7 +2983,7 @@ EAPI void evas_vg_shape_shape_append_close(Eo *obj);
  * @param[in] radius radius of the circle.
  *
  */
-EAPI void evas_vg_shape_shape_append_circle(Eo *obj, double x, double y, double radius);
+EAPI void evas_vg_shape_append_circle(Eo *obj, double x, double y, double radius);
 
 /**
  *
@@ -3007,11 +3007,11 @@ EAPI void evas_vg_shape_shape_append_circle(Eo *obj, double x, double y, double
  * @param[in] ry The y radius of the rounded corner and should be in range [ 0 to h/2 ]
  *
  */
-EAPI void evas_vg_shape_shape_append_rect(Eo *obj, double x, double y, double w, double h, double rx, double ry);
+EAPI void evas_vg_shape_append_rect(Eo *obj, double x, double y, double w, double h, double rx, double ry);
 
-EAPI void evas_vg_shape_shape_append_svg_path(Eo *obj, const char *svg_path_data);
-EAPI Eina_Bool evas_vg_shape_shape_interpolate(Eo *obj, const Eo *from, const Eo *to, double pos_map);
-EAPI Eina_Bool evas_vg_shape_shape_equal_commands(Eo *obj, const Eo *with);
+EAPI void evas_vg_shape_append_svg_path(Eo *obj, const char *svg_path_data);
+EAPI Eina_Bool evas_vg_shape_interpolate(Eo *obj, const Eo *from, const Eo *to, double pos_map);
+EAPI Eina_Bool evas_vg_shape_equal_commands(Eo *obj, const Eo *with);
 
 #include "canvas/efl_vg_shape.eo.legacy.h"
 

diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c
index 9b48ab3..4f873f0 100644 (file)
--- a/src/lib/evas/canvas/evas_vg_shape.c
+++ b/src/lib/evas/canvas/evas_vg_shape.c
@@ -328,127 +328,127 @@ evas_vg_shape_stroke_join_set(Eo *obj, Efl_Gfx_Join j)
 }
 
 EAPI void
-evas_vg_shape_shape_path_set(Eo *obj, const Efl_Gfx_Path_Command *op, const double *points)
+evas_vg_shape_path_set(Eo *obj, const Efl_Gfx_Path_Command *op, const double *points)
 {
    efl_gfx_shape_path_set(obj, op, points);
 }
 
 EAPI void
-evas_vg_shape_shape_path_get(Eo *obj, const Efl_Gfx_Path_Command **op, const double **points)
+evas_vg_shape_path_get(Eo *obj, const Efl_Gfx_Path_Command **op, const double **points)
 {
    efl_gfx_shape_path_get(obj, op, points);
 }
 
 EAPI void
-evas_vg_shape_shape_path_length_get(Eo *obj, unsigned int *commands, unsigned int *points)
+evas_vg_shape_path_length_get(Eo *obj, unsigned int *commands, unsigned int *points)
 {
    efl_gfx_shape_path_length_get(obj, commands, points);
 }
 
 EAPI void
-evas_vg_shape_shape_current_get(Eo *obj, double *x, double *y)
+evas_vg_shape_current_get(Eo *obj, double *x, double *y)
 {
    efl_gfx_shape_current_get(obj, x, y);
 }
 
 EAPI void
-evas_vg_shape_shape_current_ctrl_get(Eo *obj, double *x, double *y)
+evas_vg_shape_current_ctrl_get(Eo *obj, double *x, double *y)
 {
    efl_gfx_shape_current_ctrl_get(obj, x, y);
 }
 
 EAPI void
-evas_vg_shape_shape_dup(Eo *obj, Eo *dup_from)
+evas_vg_shape_dup(Eo *obj, Eo *dup_from)
 {
    efl_gfx_shape_dup(obj, dup_from);
 }
 
 EAPI void
-evas_vg_shape_shape_reset(Eo *obj)
+evas_vg_shape_reset(Eo *obj)
 {
    efl_gfx_shape_reset(obj);
 }
 
 EAPI void
-evas_vg_shape_shape_append_move_to(Eo *obj, double x, double y)
+evas_vg_shape_append_move_to(Eo *obj, double x, double y)
 {
    efl_gfx_shape_append_move_to(obj, x, y);
 }
 
 EAPI void
-evas_vg_shape_shape_append_line_to(Eo *obj, double x, double y)
+evas_vg_shape_append_line_to(Eo *obj, double x, double y)
 {
    efl_gfx_shape_append_line_to(obj, x, y);
 }
 
 EAPI void
-evas_vg_shape_shape_append_quadratic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y)
+evas_vg_shape_append_quadratic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y)
 {
    efl_gfx_shape_append_quadratic_to(obj, x, y, ctrl_x, ctrl_y);
 }
 
 EAPI void
-evas_vg_shape_shape_append_squadratic_to(Eo *obj, double x, double y)
+evas_vg_shape_append_squadratic_to(Eo *obj, double x, double y)
 {
    efl_gfx_shape_append_squadratic_to(obj, x, y);
 }
 
 EAPI void
-evas_vg_shape_shape_append_cubic_to(Eo *obj, double x, double y, double ctrl_x0, double ctrl_y0, double ctrl_x1, double ctrl_y1)
+evas_vg_shape_append_cubic_to(Eo *obj, double x, double y, double ctrl_x0, double ctrl_y0, double ctrl_x1, double ctrl_y1)
 {
    efl_gfx_shape_append_cubic_to(obj, x, y, ctrl_x0, ctrl_y0, ctrl_x1, ctrl_y1);
 }
 
 EAPI void
-evas_vg_shape_shape_append_scubic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y)
+evas_vg_shape_append_scubic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y)
 {
    efl_gfx_shape_append_scubic_to(obj, x, y, ctrl_x, ctrl_y);
 }
 
 EAPI void
-evas_vg_shape_shape_append_arc_to(Eo *obj, double x, double y, double rx, double ry, double angle, Eina_Bool large_arc, Eina_Bool sweep)
+evas_vg_shape_append_arc_to(Eo *obj, double x, double y, double rx, double ry, double angle, Eina_Bool large_arc, Eina_Bool sweep)
 {
    efl_gfx_shape_append_arc_to(obj, x, y, rx, ry, angle, large_arc, sweep);
 }
 
 EAPI void
-evas_vg_shape_shape_append_arc(Eo *obj, double x, double y, double w, double h, double start_angle, double sweep_length)
+evas_vg_shape_append_arc(Eo *obj, double x, double y, double w, double h, double start_angle, double sweep_length)
 {
    efl_gfx_shape_append_arc(obj, x, y, w, h, start_angle, sweep_length);
 }
 
 EAPI void
-evas_vg_shape_shape_append_close(Eo *obj)
+evas_vg_shape_append_close(Eo *obj)
 {
    efl_gfx_shape_append_close(obj);
 }
 
 EAPI void
-evas_vg_shape_shape_append_circle(Eo *obj, double x, double y, double radius)
+evas_vg_shape_append_circle(Eo *obj, double x, double y, double radius)
 {
    efl_gfx_shape_append_circle(obj, x, y, radius);
 }
 
 EAPI void
-evas_vg_shape_shape_append_rect(Eo *obj, double x, double y, double w, double h, double rx, double ry)
+evas_vg_shape_append_rect(Eo *obj, double x, double y, double w, double h, double rx, double ry)
 {
    efl_gfx_shape_append_rect(obj, x, y, w, h, rx, ry);
 }
 
 EAPI void
-evas_vg_shape_shape_append_svg_path(Eo *obj, const char *svg_path_data)
+evas_vg_shape_append_svg_path(Eo *obj, const char *svg_path_data)
 {
    efl_gfx_shape_append_svg_path(obj, svg_path_data);
 }
 
 EAPI Eina_Bool
-evas_vg_shape_shape_interpolate(Eo *obj, const Eo *from, const Eo *to, double pos_map)
+evas_vg_shape_interpolate(Eo *obj, const Eo *from, const Eo *to, double pos_map)
 {
    return efl_gfx_shape_interpolate(obj, from, to, pos_map);
 }
 
 EAPI Eina_Bool
-evas_vg_shape_shape_equal_commands(Eo *obj, const Eo *with)
+evas_vg_shape_equal_commands(Eo *obj, const Eo *with)
 {
    return efl_gfx_shape_equal_commands(obj, with);
 }