tizen_vector: updated after vg api name change. 85/91185/1
authorSubhransu Mohanty <sub.mohanty@samsung.com>
Thu, 6 Oct 2016 07:08:28 +0000 (16:08 +0900)
committerSubhransu Mohanty <sub.mohanty@samsung.com>
Thu, 6 Oct 2016 07:09:45 +0000 (16:09 +0900)
Change-Id: I9e8c14ee28969d2d6d8d157a1dbce6f3b97626e8

src/lib/tizen_vector.c

index a78fbd6c8a8ed3147feeb3047d16f84395123618..eafb1583d5f7c6bac770af8938e325b7df457acd 100644 (file)
@@ -59,14 +59,14 @@ _radio_bg_update(vg_radio *vd)
    Eina_Bool on_case = rd->state;
    Efl_VG * shape = vd->shape[0];
    evas_object_geometry_get(vd->vg[0], NULL, NULL, &w, &h);
-   evas_vg_shape_shape_reset(shape);
+   evas_vg_shape_reset(shape);
    double r = w/2;
    if (on_case)
      r -= 1; // 1 pixel margin
    else
      r -= 2; // 2 pixel margin
 
-   evas_vg_shape_shape_append_circle(shape, w/2, h/2, r);
+   evas_vg_shape_append_circle(shape, w/2, h/2, r);
 }
 
 static void
@@ -89,13 +89,13 @@ _radio_icon_update(vg_radio *vd, double progress)
 
    //Iconic Circle (Outline)
    evas_vg_shape_stroke_width_set(vd->shape[1], outline_stroke);
-   evas_vg_shape_shape_reset(vd->shape[1]);
-   evas_vg_shape_shape_append_circle(vd->shape[1], center_x, center_y, radius);
+   evas_vg_shape_reset(vd->shape[1]);
+   evas_vg_shape_append_circle(vd->shape[1], center_x, center_y, radius);
 
    //Iconic Circle (Center)
    radius = (radius - outline_stroke - ELM_VG_SCALE_SIZE(vd->obj, 4)) * progress;
-   evas_vg_shape_shape_reset(vd->shape[2]);
-   evas_vg_shape_shape_append_circle(vd->shape[2], center_x, center_y, radius);
+   evas_vg_shape_reset(vd->shape[2]);
+   evas_vg_shape_append_circle(vd->shape[2], center_x, center_y, radius);
 }
 
 static void
@@ -283,12 +283,12 @@ check_favorite_init(check_favorite *vd)
    evas_vg_node_origin_set(vd->shape[0], 14, 14);
    evas_vg_shape_stroke_color_set(vd->shape[0], 255, 255, 255, 255);
    evas_vg_shape_stroke_width_set(vd->shape[0], ELM_VG_SCALE_SIZE(vd->obj, 1.5));
-   evas_vg_shape_shape_append_svg_path(vd->shape[0], star_off);
+   evas_vg_shape_append_svg_path(vd->shape[0], star_off);
 
    //Inner Body Star
    vd->shape[1] = evas_vg_shape_add(evas_object_vg_root_node_get(vd->vg[1]));
    evas_vg_node_origin_set(vd->shape[1], 14, 14);
-   evas_vg_shape_shape_append_svg_path(vd->shape[1], star_on);
+   evas_vg_shape_append_svg_path(vd->shape[1], star_on);
    evas_vg_node_color_set(vd->shape[1], 255, 255, 255, 255);
 }
 
@@ -504,14 +504,14 @@ _check_onoff_circle(check_onoff *vd, double progress)
    double center_x = ((double)w / 2);
    double center_y = ((double)h / 2);
 
-   evas_vg_shape_shape_reset(vd->shape[3]);
+   evas_vg_shape_reset(vd->shape[3]);
 
    double radius = (center_x < center_y ? center_x : center_y) -
                    (ELM_VG_SCALE_SIZE(vd->obj, 3));
 
    if (elm_check_state_get(vd->obj)) progress = 1 - progress;
 
-   evas_vg_shape_shape_append_circle(vd->shape[3], center_x, center_y,
+   evas_vg_shape_append_circle(vd->shape[3], center_x, center_y,
                                      radius * progress);
 }
 
@@ -538,15 +538,15 @@ _check_onoff_line(check_onoff *vd, double progress)
    double center_x = ((double)w / 2);
    double center_y = ((double)h / 2);
 
-   evas_vg_shape_shape_reset(vd->shape[2]);
+   evas_vg_shape_reset(vd->shape[2]);
 
    if (!elm_check_state_get(vd->obj)) progress = 1 - progress;
 
    double diff = center_y - ELM_VG_SCALE_SIZE(vd->obj, 3) - 1;
 
-   evas_vg_shape_shape_append_move_to(vd->shape[2], center_x,
+   evas_vg_shape_append_move_to(vd->shape[2], center_x,
                                       (center_y - (diff * progress)));
-   evas_vg_shape_shape_append_line_to(vd->shape[2], center_x,
+   evas_vg_shape_append_line_to(vd->shape[2], center_x,
                                       (center_y + (diff * progress)));
 }
 
@@ -586,8 +586,8 @@ _check_onoff_sizing(check_onoff *vd, double progress)
    if (!elm_check_state_get(vd->obj)) progress = 1 - progress;
    progress *= 0.3;
 
-   evas_vg_shape_shape_reset(vd->shape[1]);
-   evas_vg_shape_shape_append_circle(vd->shape[1],
+   evas_vg_shape_reset(vd->shape[1]);
+   evas_vg_shape_append_circle(vd->shape[1],
                                      center_x, center_y,
                                      (0.7 + progress) * center_x);
 }
@@ -720,8 +720,8 @@ check_onoff_vg_resize_cb(void *data, Evas *e EINA_UNUSED,
    Evas_Coord center_x = (w / 2);
    Evas_Coord center_y = (h / 2);
 
-   evas_vg_shape_shape_reset(vd->shape[0]);
-   evas_vg_shape_shape_append_circle(vd->shape[0], center_x, center_y,
+   evas_vg_shape_reset(vd->shape[0]);
+   evas_vg_shape_append_circle(vd->shape[0], center_x, center_y,
                                      center_x);
 }
 
@@ -739,8 +739,8 @@ check_onoff_vg2_resize_cb(void *data, Evas *e EINA_UNUSED,
    double center_x = ((double)w / 2);
    double center_y = ((double)h / 2);
 
-   evas_vg_shape_shape_reset(vd->shape[1]);
-   evas_vg_shape_shape_append_circle(vd->shape[1],
+   evas_vg_shape_reset(vd->shape[1]);
+   evas_vg_shape_append_circle(vd->shape[1],
                                      center_x, center_y,
                                      center_x);
 }
@@ -759,23 +759,23 @@ check_onoff_vg3_resize_cb(void *data, Evas *e EINA_UNUSED,
    double center_x = ((double)w / 2);
    double center_y = ((double)h / 2);
 
-   evas_vg_shape_shape_reset(vd->shape[2]);
-   evas_vg_shape_shape_reset(vd->shape[3]);
+   evas_vg_shape_reset(vd->shape[2]);
+   evas_vg_shape_reset(vd->shape[3]);
 
    //Line
    if (elm_check_state_get(vd->obj))
      {
         double diff = ELM_VG_SCALE_SIZE(vd->obj, 3) - 1;
 
-        evas_vg_shape_shape_append_move_to(vd->shape[2], center_x, diff);
-        evas_vg_shape_shape_append_line_to(vd->shape[2], center_x, h - diff);
+        evas_vg_shape_append_move_to(vd->shape[2], center_x, diff);
+        evas_vg_shape_append_line_to(vd->shape[2], center_x, h - diff);
      }
    //Circle
    else
      {
         double radius = (center_x < center_y ? center_x : center_y) -
                         (ELM_VG_SCALE_SIZE(vd->obj, 3));
-        evas_vg_shape_shape_append_circle(vd->shape[3],
+        evas_vg_shape_append_circle(vd->shape[3],
                                           center_x, center_y, radius);
      }
 }
@@ -893,11 +893,11 @@ _update_default_check_shape(check_default *vd EINA_UNUSED, Efl_VG *shape, Eina_B
    double scale_y = h / 50.0;
    eina_matrix3_identity(&m);
    eina_matrix3_scale(&m, scale_x, scale_y);
-   evas_vg_shape_shape_reset(shape);
+   evas_vg_shape_reset(shape);
    if (outline)
      {
         // outline
-        evas_vg_shape_shape_append_svg_path(shape, check_default_outline);
+        evas_vg_shape_append_svg_path(shape, check_default_outline);
         if (eina_matrix3_type_get(&m) != EINA_MATRIX_TYPE_IDENTITY)
           evas_vg_node_transformation_set(shape, &m);
 
@@ -909,7 +909,7 @@ _update_default_check_shape(check_default *vd EINA_UNUSED, Efl_VG *shape, Eina_B
    else
      {
         // fill
-        evas_vg_shape_shape_append_svg_path(shape, check_default_fill);
+        evas_vg_shape_append_svg_path(shape, check_default_fill);
         if (eina_matrix3_type_get(&m) != EINA_MATRIX_TYPE_IDENTITY)
           evas_vg_node_transformation_set(shape, &m);
 
@@ -958,21 +958,21 @@ check_default_vg_resize_cb(void *data, Evas *e EINA_UNUSED,
    if (elm_check_state_get(vd->obj))
      {
         //Left
-        evas_vg_shape_shape_reset(vd->shape[2]);
-        evas_vg_shape_shape_append_move_to(vd->shape[2],
+        evas_vg_shape_reset(vd->shape[2]);
+        evas_vg_shape_append_move_to(vd->shape[2],
                                            center_x + vd->left_move_to[0],
                                            center_y + vd->left_move_to[1]);
-        evas_vg_shape_shape_append_line_to(vd->shape[2],
+        evas_vg_shape_append_line_to(vd->shape[2],
                                            (center_x + vd->left_move_to[0]) +
                                            (vd->left_line_to[0]),
                                            (center_y + vd->left_move_to[1]) +
                                            (vd->left_line_to[1]));
         //Right
-        evas_vg_shape_shape_reset(vd->shape[3]);
-        evas_vg_shape_shape_append_move_to(vd->shape[3],
+        evas_vg_shape_reset(vd->shape[3]);
+        evas_vg_shape_append_move_to(vd->shape[3],
                                            center_x + vd->right_move_to[0],
                                            center_y + vd->right_move_to[1]);
-        evas_vg_shape_shape_append_line_to(vd->shape[3],
+        evas_vg_shape_append_line_to(vd->shape[3],
                                            (center_x + vd->right_move_to[0]) +
                                            (vd->right_line_to[0]),
                                            (center_y + vd->right_move_to[1]) +
@@ -1073,22 +1073,22 @@ _check_default_line(check_default *vd, double progress)
    if (!elm_check_state_get(vd->obj)) progress = 1 - progress;
 
    //Left
-   evas_vg_shape_shape_reset(vd->shape[2]);
-   evas_vg_shape_shape_append_move_to(vd->shape[2],
+   evas_vg_shape_reset(vd->shape[2]);
+   evas_vg_shape_append_move_to(vd->shape[2],
                                       center_x + vd->left_move_to[0],
                                       center_y + vd->left_move_to[1]);
-   evas_vg_shape_shape_append_line_to(vd->shape[2],
+   evas_vg_shape_append_line_to(vd->shape[2],
                                       (center_x + vd->left_move_to[0]) +
                                       (vd->left_line_to[0] * progress),
                                       (center_y + vd->left_move_to[1]) +
                                       (vd->left_line_to[1] * progress));
 
    //Right
-   evas_vg_shape_shape_reset(vd->shape[3]);
-   evas_vg_shape_shape_append_move_to(vd->shape[3],
+   evas_vg_shape_reset(vd->shape[3]);
+   evas_vg_shape_append_move_to(vd->shape[3],
                                       center_x + vd->right_move_to[0],
                                       center_y + vd->right_move_to[1]);
-   evas_vg_shape_shape_append_line_to(vd->shape[3],
+   evas_vg_shape_append_line_to(vd->shape[3],
                                       (center_x + vd->right_move_to[0]) +
                                       (vd->right_line_to[0] * progress),
                                       (center_y + vd->right_move_to[1]) +
@@ -1313,12 +1313,12 @@ button_effect_no_bg_resize_cb(void *data, Evas *e EINA_UNUSED,
    //Update Effect Shape
    Evas_Coord x, y, w, h;
    evas_object_geometry_get(vd->vg[0], &x, &y, &w, &h);
-   evas_vg_shape_shape_reset(vd->shape[0]);
+   evas_vg_shape_reset(vd->shape[0]);
    if (vd->is_circle)
      {
         double radius_w = w / 2.0;
         double radius_h = h / 2.0;
-        evas_vg_shape_shape_append_circle(vd->shape[0], radius_w, radius_h, radius_w);
+        evas_vg_shape_append_circle(vd->shape[0], radius_w, radius_h, radius_w);
      }
    else
      {
@@ -1328,7 +1328,7 @@ button_effect_no_bg_resize_cb(void *data, Evas *e EINA_UNUSED,
         if (!edje_object_part_geometry_get(elm_layout_edje_get(vd->obj), "effect_spacer", NULL, NULL, &w2, &h2))
           evas_object_geometry_get(vd->obj, NULL, NULL, &w2, &h2);
         effect_ratio = (w2 < h2) ? (double)w / w2 : (double)h / h2;
-        evas_vg_shape_shape_append_rect(vd->shape[0], 0, 0, w, h, vd->corner * effect_ratio, vd->corner * effect_ratio);
+        evas_vg_shape_append_rect(vd->shape[0], 0, 0, w, h, vd->corner * effect_ratio, vd->corner * effect_ratio);
      }
 }
 
@@ -1417,12 +1417,12 @@ button_effect_resize_cb(void *data, Evas *e EINA_UNUSED,
    //Update Effect Shape
    Evas_Coord x, y, w, h;
    evas_object_geometry_get(vd->vg[1], &x, &y, &w, &h);
-   evas_vg_shape_shape_reset(vd->shape[1]);
+   evas_vg_shape_reset(vd->shape[1]);
    if (vd->is_circle)
      {
         double radius_w = w / 2.0;
         double radius_h = h / 2.0;
-        evas_vg_shape_shape_append_circle(vd->shape[1], radius_w, radius_h, radius_w);
+        evas_vg_shape_append_circle(vd->shape[1], radius_w, radius_h, radius_w);
      }
    else
      {
@@ -1432,7 +1432,7 @@ button_effect_resize_cb(void *data, Evas *e EINA_UNUSED,
         if (!edje_object_part_geometry_get(elm_layout_edje_get(vd->obj), "effect_spacer", NULL, NULL, &w2, &h2))
           evas_object_geometry_get(vd->vg[0], NULL, NULL, &w2, &h2);
         effect_ratio = (w2 < h2) ? (double)w / w2 : (double)h / h2;
-        evas_vg_shape_shape_append_rect(vd->shape[1], 0, 0, w, h, vd->corner * effect_ratio, vd->corner * effect_ratio);
+        evas_vg_shape_append_rect(vd->shape[1], 0, 0, w, h, vd->corner * effect_ratio, vd->corner * effect_ratio);
      }
 }
 
@@ -1448,15 +1448,15 @@ button_base_resize_cb(void *data, Evas *e EINA_UNUSED,
    //Update Base Shape
    Evas_Coord w, h;
    evas_object_geometry_get(vd->vg[0], NULL, NULL, &w, &h);
-   evas_vg_shape_shape_reset(vd->shape[0]);
+   evas_vg_shape_reset(vd->shape[0]);
    if (vd->is_circle)
      {
         double radius_w = w / 2.0;
         double radius_h = h / 2.0;
-        evas_vg_shape_shape_append_circle(vd->shape[0], radius_w, radius_h, radius_w);
+        evas_vg_shape_append_circle(vd->shape[0], radius_w, radius_h, radius_w);
      }
    else
-     evas_vg_shape_shape_append_rect(vd->shape[0], 0, 0, w, h, vd->corner, vd->corner);
+     evas_vg_shape_append_rect(vd->shape[0], 0, 0, w, h, vd->corner, vd->corner);
 }
 
 static void
@@ -1634,14 +1634,14 @@ transit_progressbar_normal_op1(Elm_Transit_Effect *effect, Elm_Transit *transit
    vg_progressbar *vd = effect;
 
    evas_vg_node_color_set(vd->shape[1], 255, 255, 255, 255);
-   evas_vg_shape_shape_reset(vd->shape[1]);
+   evas_vg_shape_reset(vd->shape[1]);
    Evas_Coord start_width = vd->x + vd->h;
-   evas_vg_shape_shape_append_rect(vd->shape[1], 0, 0, start_width + (vd->w - start_width)* progress, vd->h, vd->h/2, vd->h/2);
+   evas_vg_shape_append_rect(vd->shape[1], 0, 0, start_width + (vd->w - start_width)* progress, vd->h, vd->h/2, vd->h/2);
 
    evas_vg_node_color_set(vd->shape[2], 255, 255, 255, 255);
-   evas_vg_shape_shape_reset(vd->shape[2]);
+   evas_vg_shape_reset(vd->shape[2]);
    Evas_Coord delta_width = (vd->w - vd->x - vd->h) * progress;
-   evas_vg_shape_shape_append_rect(vd->shape[2], vd->x, 0, vd->h + delta_width, vd->h, vd->h/2, vd->h/2);
+   evas_vg_shape_append_rect(vd->shape[2], vd->x, 0, vd->h + delta_width, vd->h, vd->h/2, vd->h/2);
 
 }
 
@@ -1650,9 +1650,9 @@ transit_progressbar_normal_op2(Elm_Transit_Effect *effect, Elm_Transit *transit
 {
    vg_progressbar *vd = effect;
    evas_vg_node_color_set(vd->shape[2], 255, 255, 255, 255);
-   evas_vg_shape_shape_reset(vd->shape[2]);
+   evas_vg_shape_reset(vd->shape[2]);
    Evas_Coord delta_move =  (vd->w - vd->x - vd->h) * progress;
-   evas_vg_shape_shape_append_rect(vd->shape[2], vd->x + delta_move, 0, vd->w - vd->x - delta_move, vd->h, vd->h/2, vd->h/2);
+   evas_vg_shape_append_rect(vd->shape[2], vd->x + delta_move, 0, vd->w - vd->x - delta_move, vd->h, vd->h/2, vd->h/2);
 }
 
 static void
@@ -1683,8 +1683,8 @@ progressbar_normal_bg_resize_cb(void *data , Evas *e EINA_UNUSED,
    vg_progressbar *vd = data;
    evas_object_geometry_get(vd->vg[0], &x, &y, &w, &h);
    evas_vg_node_color_set(vd->shape[0], 255, 255, 255, 255);
-   evas_vg_shape_shape_reset(vd->shape[0]);
-   evas_vg_shape_shape_append_rect(vd->shape[0], 0, 0, w, h, h/2, h/2);
+   evas_vg_shape_reset(vd->shape[0]);
+   evas_vg_shape_append_rect(vd->shape[0], 0, 0, w, h, h/2, h/2);
 }
 
 static void
@@ -1777,9 +1777,9 @@ progressbar_process_resize_cb(void *data , Evas *e EINA_UNUSED,
    evas_object_geometry_get(vd->vg[0], &x, &y, &w, &h);
    for(i=0; i < 3; i++)
      {
-        evas_vg_shape_shape_reset(vd->shape[i]);
+        evas_vg_shape_reset(vd->shape[i]);
         evas_vg_shape_stroke_color_set(vd->shape[i], 255, 255, 255, 255);
-        evas_vg_shape_shape_append_arc(vd->shape[i], 0, 0, w - vd->shrink, h - vd->shrink, 90.5, -1);
+        evas_vg_shape_append_arc(vd->shape[i], 0, 0, w - vd->shrink, h - vd->shrink, 90.5, -1);
         evas_vg_shape_stroke_width_set(vd->shape[i], vd->stroke_width);
         evas_vg_node_origin_set(vd->shape[i], vd->shift, vd->shift);
      }
@@ -1794,8 +1794,8 @@ transit_progressbar_process_A_op1(Elm_Transit_Effect *effect, Elm_Transit *trans
    evas_object_geometry_get(vd->vg[0], &x, &y, &w, &h);
    double start_angle = s_a + (e_a - s_a) * progress;
    double sweep_length = s_l + (e_l - s_l) * progress;
-   evas_vg_shape_shape_reset(vd->shape[2]);
-   evas_vg_shape_shape_append_arc(vd->shape[2], 0, 0, w - vd->shrink, h - vd->shrink, start_angle, sweep_length);
+   evas_vg_shape_reset(vd->shape[2]);
+   evas_vg_shape_append_arc(vd->shape[2], 0, 0, w - vd->shrink, h - vd->shrink, start_angle, sweep_length);
 }
 
 static void
@@ -1807,8 +1807,8 @@ transit_progressbar_process_A_op2(Elm_Transit_Effect *effect, Elm_Transit *trans
    evas_object_geometry_get(vd->vg[0], &x, &y, &w, &h);
    double start_angle = s_a + (e_a - s_a) * progress;
    double sweep_length = s_l + (e_l - s_l) * progress;
-   evas_vg_shape_shape_reset(vd->shape[2]);
-   evas_vg_shape_shape_append_arc(vd->shape[2], 0, 0, w - vd->shrink, h - vd->shrink, start_angle, sweep_length);
+   evas_vg_shape_reset(vd->shape[2]);
+   evas_vg_shape_append_arc(vd->shape[2], 0, 0, w - vd->shrink, h - vd->shrink, start_angle, sweep_length);
 }
 
 static void
@@ -1820,8 +1820,8 @@ transit_progressbar_process_A_op3(Elm_Transit_Effect *effect, Elm_Transit *trans
    evas_object_geometry_get(vd->vg[0], &x, &y, &w, &h);
    double start_angle = s_a + (e_a - s_a) * progress;
    double sweep_length = s_l + (e_l - s_l) * progress;
-   evas_vg_shape_shape_reset(vd->shape[2]);
-   evas_vg_shape_shape_append_arc(vd->shape[2], 0, 0, w - vd->shrink, h - vd->shrink, start_angle, sweep_length);
+   evas_vg_shape_reset(vd->shape[2]);
+   evas_vg_shape_append_arc(vd->shape[2], 0, 0, w - vd->shrink, h - vd->shrink, start_angle, sweep_length);
 }
 
 static void
@@ -1833,8 +1833,8 @@ transit_progressbar_process_B_op1(Elm_Transit_Effect *effect, Elm_Transit *trans
    evas_object_geometry_get(vd->vg[0], &x, &y, &w, &h);
    double start_angle = s_a + (e_a - s_a) * progress;
    double sweep_length = s_l + (e_l - s_l) * progress;
-   evas_vg_shape_shape_reset(vd->shape[1]);
-   evas_vg_shape_shape_append_arc(vd->shape[1], 0, 0, w - vd->shrink, h - vd->shrink, start_angle, sweep_length);
+   evas_vg_shape_reset(vd->shape[1]);
+   evas_vg_shape_append_arc(vd->shape[1], 0, 0, w - vd->shrink, h - vd->shrink, start_angle, sweep_length);
 }
 
 static void
@@ -1846,8 +1846,8 @@ transit_progressbar_process_B_op2(Elm_Transit_Effect *effect, Elm_Transit *trans
    evas_object_geometry_get(vd->vg[0], &x, &y, &w, &h);
    double start_angle = s_a + (e_a - s_a) * progress;
    double sweep_length = s_l + (e_l - s_l) * progress;
-   evas_vg_shape_shape_reset(vd->shape[1]);
-   evas_vg_shape_shape_append_arc(vd->shape[1], 0, 0, w - vd->shrink, h - vd->shrink, start_angle, sweep_length);
+   evas_vg_shape_reset(vd->shape[1]);
+   evas_vg_shape_append_arc(vd->shape[1], 0, 0, w - vd->shrink, h - vd->shrink, start_angle, sweep_length);
 }
 
 static void
@@ -1859,8 +1859,8 @@ transit_progressbar_process_B_op3(Elm_Transit_Effect *effect, Elm_Transit *trans
    evas_object_geometry_get(vd->vg[0], &x, &y, &w, &h);
    double start_angle = s_a + (e_a - s_a) * progress;
    double sweep_length = s_l + (e_l - s_l) * progress;
-   evas_vg_shape_shape_reset(vd->shape[1]);
-   evas_vg_shape_shape_append_arc(vd->shape[1], 0, 0, w - vd->shrink, h - vd->shrink, start_angle, sweep_length);
+   evas_vg_shape_reset(vd->shape[1]);
+   evas_vg_shape_append_arc(vd->shape[1], 0, 0, w - vd->shrink, h - vd->shrink, start_angle, sweep_length);
 }
 
 static void
@@ -1877,8 +1877,8 @@ transit_progressbar_process_C_op2(Elm_Transit_Effect *effect, Elm_Transit *trans
    evas_object_geometry_get(vd->vg[0], &x, &y, &w, &h);
    double start_angle = s_a + (e_a - s_a) * progress;
    double sweep_length = s_l + (e_l - s_l) * progress;
-   evas_vg_shape_shape_reset(vd->shape[0]);
-   evas_vg_shape_shape_append_arc(vd->shape[0], 0, 0, w - vd->shrink, h - vd->shrink, start_angle, sweep_length);
+   evas_vg_shape_reset(vd->shape[0]);
+   evas_vg_shape_append_arc(vd->shape[0], 0, 0, w - vd->shrink, h - vd->shrink, start_angle, sweep_length);
 }
 
 static void _transit_progressbar_process_end(Elm_Transit_Effect *effect, Elm_Transit *transit);
@@ -2162,16 +2162,16 @@ slider_del_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
 static void
 _append_circle(Efl_VG *shape, double cx, double cy, double r)
 {
-   evas_vg_shape_shape_reset(shape);
-   evas_vg_shape_shape_append_circle(shape, cx, cy, r);
+   evas_vg_shape_reset(shape);
+   evas_vg_shape_append_circle(shape, cx, cy, r);
 }
 
 static void
 _append_round_rect(Efl_VG *shape, int w, int h)
 {
    double radius = w/2 > h/2 ? h/2 : w/2;
-   evas_vg_shape_shape_reset(shape);
-   evas_vg_shape_shape_append_rect(shape, 0, 0, w, h, radius, radius);
+   evas_vg_shape_reset(shape);
+   evas_vg_shape_append_rect(shape, 0, 0, w, h, radius, radius);
 }
 
 static void