summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTaehyub Kim <taehyub.kim@samsung.com>2020-03-17 16:23:44 +0900
committerJunsuChoi <jsuya.choi@samsung.com>2020-03-17 16:23:45 +0900
commit2a54c0505f6269e6648e1119e40b6253f6f9aca0 (patch)
treef10272bd65ff268de6988c471d687f5945445396
parent4a74a9fc697446e0b8bba6c7f676059366f43931 (diff)
evas_vg: refined the evas vector APIs set
Reviewers: jsuya, Hermet Reviewed By: jsuya Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D11517
-rw-r--r--src/lib/evas/Evas_Legacy.h258
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_container.c4
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_container_eo.legacy.c6
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_container_eo.legacy.h18
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_gradient.c14
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_gradient_eo.legacy.h21
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_gradient_linear.c12
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_gradient_radial.c16
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_node.c20
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.c10
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.h24
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_object.c6
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.c12
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.h16
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_shape.c82
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_shape_eo.legacy.h27
-rw-r--r--src/lib/evas/canvas/meson.build1
17 files changed, 346 insertions, 201 deletions
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index 7970966230..5623205355 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -3690,6 +3690,130 @@ EAPI int evas_object_vg_animated_frame_get(const Evas_Object *obj) EINA_ARG_NONN
3690#include "canvas/efl_canvas_vg_node_eo.legacy.h" 3690#include "canvas/efl_canvas_vg_node_eo.legacy.h"
3691#include "canvas/efl_canvas_vg_object_eo.legacy.h" 3691#include "canvas/efl_canvas_vg_object_eo.legacy.h"
3692#include "canvas/efl_canvas_vg_container_eo.legacy.h" 3692#include "canvas/efl_canvas_vg_container_eo.legacy.h"
3693#include "canvas/efl_canvas_vg_shape_eo.legacy.h"
3694#include "canvas/efl_canvas_vg_gradient_eo.legacy.h"
3695
3696/**
3697 * @brief These values determine how the end of opened sub-paths are rendered in a
3698 * stroke. @ref evas_vg_shape_stroke_cap_set
3699 *
3700 * @since 1.24
3701 *
3702 * @ingroup Evas_Vg_Cap
3703 */
3704typedef enum Evas_Vg_Cap_Type
3705{
3706 EVAS_VG_CAP_BUTT = 0, /**< The end of lines is rendered as a full stop on the
3707 * last point itself */
3708 EVAS_VG_CAP_ROUND, /**< The end of lines is rendered as a half-circle
3709 * around */
3710 EVAS_VG_CAP_SQUARE, /**< The end of lines is rendered as a square around
3711 * the last point */
3712 EVAS_VG_CAP_LAST /**< Sentinel value to indicate last enum field during
3713 * iteration */
3714} Evas_Vg_Cap;
3715
3716
3717/**
3718 * @brief These values determine how two joining lines are rendered in a stroker.
3719 * @ref evas_vg_shape_stroke_join_set
3720 *
3721 * @since 1.24
3722 *
3723 * @ingroup Evas_Vg_Join
3724 */
3725typedef enum Evas_Vg_Join_Type
3726{
3727 EVAS_VG_JOIN_MITER = 0, /**< Used to render rounded line joins. Circular arcs
3728 * are used to join two lines smoothly */
3729 EVAS_VG_JOIN_ROUND, /**< Used to render beveled line joins. The outer corner
3730 * of the joined lines is filled by enclosing the
3731 * triangular region of the corner with a straight line
3732 * between the outer corners of each stroke */
3733 EVAS_VG_JOIN_BEVEL, /**< Used to render mitered line joins. The intersection
3734 * of the strokes is clipped at a line perpendicular to
3735 * the bisector of the angle between the strokes, at the
3736 * distance from the intersection of the segments equal
3737 * to the product of the miter limit value and the border
3738 * radius. This prevents long spikes being created */
3739 EVAS_VG_JOIN_LAST /**< Sentinel value to indicate last enum field during
3740 * teration */
3741} Evas_Vg_Join;
3742
3743/**
3744 * @brief These values determine how the points are interpreted in a stream of points.
3745 *
3746 * @since 1.24
3747 *
3748 * @ingroup Evas_Vg_Path_Command
3749 */
3750typedef enum Evas_Vg_Path_Command_Type
3751{
3752 EVAS_VG_PATH_COMMAND_END = 0, /**< The end of stream , no more points to process */
3753 EVAS_VG_PATH_COMMAND_MOVE_TO, /**< The next point is the start point of a sub path */
3754 EVAS_VG_PATH_COMMAND_LINE_TO, /**< The next point is used to draw a line from
3755 * current point */
3756 EVAS_VG_PATH_COMMAND_CUBIC_TO, /**< The next three point is used to draw
3757 * a cubic bezier curve from current point */
3758 EVAS_VG_PATH_COMMAND_CLOSE, /**< Close the current subpath by drawing a line
3759 * between current point and the first point of
3760 * current subpath */
3761 EVAS_VG_PATH_COMMAND_LAST /**< Sentinel value to indicate last enum field
3762 * during iteration */
3763} Evas_Vg_Path_Command;
3764
3765/**
3766 * @brief Type defining gradient stops. Describes the location and color of a
3767 * transition point in a gradient.
3768 *
3769 * @since 1.24
3770 *
3771 * @ingroup Evas_Vg_Gradient_Stop
3772 */
3773typedef struct _Evas_Vg_Gradient_Stop
3774{
3775 double offset; /**< The location of the gradient stop within the gradient
3776 * vector */
3777 int r; /**< The component R color of the gradient stop */
3778 int g; /**< The component G color of the gradient stop */
3779 int b; /**< The component B color of the gradient stop */
3780 int a; /**< The component A color of the gradient stop */
3781} Evas_Vg_Gradient_Stop;
3782
3783/**
3784 * @brief Specifies how the area outside the gradient area should be filled.
3785 * @ref evas_vg_gradient_spread_set
3786 *
3787 * @since 1.24
3788 *
3789 * @ingroup Evas_Vg_Gradient_Spread
3790 */
3791typedef enum Evas_Vg_Gradient_Spread_Type
3792{
3793 EVAS_VG_GRADIENT_SPREAD_PAD = 0, /**< The area is filled with the closest stop
3794 * color. This is the default */
3795 EVAS_VG_GRADIENT_SPREAD_REFLECT, /**< The gradient is reflected outside the
3796 * gradient area */
3797 EVAS_VG_GRADIENT_SPREAD_REPEAT, /**< The gradient is repeated outside the
3798 * gradient area */
3799 EVAS_VG_GRADIENT_SPREAD_LAST /**< Sentinel value to indicate last enum field
3800 * during iteration */
3801} Evas_Vg_Gradient_Spread;
3802
3803/**
3804 * @brief Type describing dash.
3805 * @ref evas_vg_shape_stroke_dash_set
3806 *
3807 * @since 1.24
3808 *
3809 * @ingroup Evas_Vg_Dash
3810 */
3811typedef struct _Evas_Vg_Dash
3812{
3813 double length; /**< Dash drawing length */
3814 double gap; /**< Distance between two dashes */
3815} Evas_Vg_Dash;
3816
3693/** 3817/**
3694 * Creates a new vector shape object. 3818 * Creates a new vector shape object.
3695 * 3819 *
@@ -3698,7 +3822,7 @@ EAPI int evas_object_vg_animated_frame_get(const Evas_Object *obj) EINA_ARG_NONN
3698 * 3822 *
3699 * @since 1.14 3823 * @since 1.14
3700 */ 3824 */
3701EAPI Efl_VG* evas_vg_shape_add(Efl_VG *parent); 3825EAPI Evas_Vg_Shape* evas_vg_shape_add(Evas_Vg_Container *parent);
3702 3826
3703/** 3827/**
3704 * Creates a new vector container object. 3828 * Creates a new vector container object.
@@ -3709,7 +3833,7 @@ EAPI Efl_VG* evas_vg_shape_add(Efl_VG *parent);
3709 * @since 1.14 3833 * @since 1.14
3710 */ 3834 */
3711 3835
3712EAPI Efl_VG* evas_vg_container_add(Efl_VG *parent); 3836EAPI Evas_Vg_Container* evas_vg_container_add(Evas_Object *parent);
3713 3837
3714/** 3838/**
3715 * 3839 *
@@ -3717,7 +3841,7 @@ EAPI Efl_VG* evas_vg_container_add(Efl_VG *parent);
3717 * 3841 *
3718 * 3842 *
3719 */ 3843 */
3720EAPI Eina_Bool evas_vg_node_visible_get(Eo *obj); 3844EAPI Eina_Bool evas_vg_node_visible_get(Evas_Vg_Node *obj);
3721 3845
3722/** 3846/**
3723 * 3847 *
@@ -3726,7 +3850,7 @@ EAPI Eina_Bool evas_vg_node_visible_get(Eo *obj);
3726 * @param[in] v @c EINA_TRUE if to make the object visible, @c EINA_FALSE otherwise 3850 * @param[in] v @c EINA_TRUE if to make the object visible, @c EINA_FALSE otherwise
3727 * 3851 *
3728 */ 3852 */
3729EAPI void evas_vg_node_visible_set(Eo *obj, Eina_Bool v); 3853EAPI void evas_vg_node_visible_set(Evas_Vg_Node *obj, Eina_Bool v);
3730 3854
3731/** 3855/**
3732 * 3856 *
@@ -3748,7 +3872,7 @@ EAPI void evas_vg_node_visible_set(Eo *obj, Eina_Bool v);
3748 * @param[out] a The alpha component of the given color. 3872 * @param[out] a The alpha component of the given color.
3749 * 3873 *
3750 */ 3874 */
3751EAPI void evas_vg_node_color_get(Eo *obj, int *r, int *g, int *b, int *a); 3875EAPI void evas_vg_node_color_get(Evas_Vg_Node *obj, int *r, int *g, int *b, int *a);
3752 3876
3753/** 3877/**
3754 * 3878 *
@@ -3766,7 +3890,7 @@ EAPI void evas_vg_node_color_get(Eo *obj, int *r, int *g, int *b, int *a);
3766 * @param[in] a The alpha component of the given color. 3890 * @param[in] a The alpha component of the given color.
3767 * 3891 *
3768 */ 3892 */
3769EAPI void evas_vg_node_color_set(Eo *obj, int r, int g, int b, int a); 3893EAPI void evas_vg_node_color_set(Evas_Vg_Node *obj, int r, int g, int b, int a);
3770 3894
3771/** 3895/**
3772 * 3896 *
@@ -3778,7 +3902,7 @@ EAPI void evas_vg_node_color_set(Eo *obj, int r, int g, int b, int a);
3778 * @param[out] h in 3902 * @param[out] h in
3779 * 3903 *
3780 */ 3904 */
3781EAPI void evas_vg_node_geometry_get(Eo *obj, int *x, int *y, int *w, int *h); 3905EAPI void evas_vg_node_geometry_get(Evas_Vg_Node *obj, int *x, int *y, int *w, int *h);
3782 3906
3783/** 3907/**
3784 * 3908 *
@@ -3790,7 +3914,7 @@ EAPI void evas_vg_node_geometry_get(Eo *obj, int *x, int *y, int *w, int *h);
3790 * @param[in] h in 3914 * @param[in] h in
3791 * 3915 *
3792 */ 3916 */
3793EAPI void evas_vg_node_geometry_set(Eo *obj, int x, int y, int w, int h); 3917EAPI void evas_vg_node_geometry_set(Evas_Vg_Node *obj, int x, int y, int w, int h);
3794 3918
3795/** 3919/**
3796 * 3920 *
@@ -3820,7 +3944,7 @@ EAPI void evas_vg_node_geometry_set(Eo *obj, int x, int y, int w, int h);
3820 * @param[in] below the object below which to stack 3944 * @param[in] below the object below which to stack
3821 * 3945 *
3822 */ 3946 */
3823EAPI void evas_vg_node_stack_below(Eo *obj, Eo *below); 3947EAPI void evas_vg_node_stack_below(Evas_Vg_Node *obj, Evas_Vg_Node *below);
3824 3948
3825/** 3949/**
3826 * 3950 *
@@ -3850,7 +3974,7 @@ EAPI void evas_vg_node_stack_below(Eo *obj, Eo *below);
3850 * @param[in] above the object above which to stack 3974 * @param[in] above the object above which to stack
3851 * 3975 *
3852 */ 3976 */
3853EAPI void evas_vg_node_stack_above(Eo *obj, Eo *above); 3977EAPI void evas_vg_node_stack_above(Evas_Vg_Node *obj, Evas_Vg_Node *above);
3854 3978
3855/** 3979/**
3856 * 3980 *
@@ -3864,7 +3988,7 @@ EAPI void evas_vg_node_stack_above(Eo *obj, Eo *above);
3864 * @see evas_object_lower() 3988 * @see evas_object_lower()
3865 * 3989 *
3866 */ 3990 */
3867EAPI void evas_vg_node_raise(Eo *obj); 3991EAPI void evas_vg_node_raise(Evas_Vg_Node *obj);
3868 3992
3869/** 3993/**
3870 * 3994 *
@@ -3880,7 +4004,7 @@ EAPI void evas_vg_node_raise(Eo *obj);
3880 * 4004 *
3881 * 4005 *
3882 */ 4006 */
3883EAPI void evas_vg_node_lower(Eo *obj); 4007EAPI void evas_vg_node_lower(Evas_Vg_Node *obj);
3884 4008
3885#include "canvas/efl_canvas_vg_node_eo.legacy.h" 4009#include "canvas/efl_canvas_vg_node_eo.legacy.h"
3886 4010
@@ -3891,7 +4015,7 @@ EAPI void evas_vg_node_lower(Eo *obj);
3891 * 4015 *
3892 * 4016 *
3893 */ 4017 */
3894EAPI double evas_vg_shape_stroke_scale_get(Eo *obj); 4018EAPI double evas_vg_shape_stroke_scale_get(Evas_Vg_Shape *obj);
3895 4019
3896/** 4020/**
3897 * 4021 *
@@ -3902,7 +4026,7 @@ EAPI double evas_vg_shape_stroke_scale_get(Eo *obj);
3902 * @param[in] s stroke scale value 4026 * @param[in] s stroke scale value
3903 * 4027 *
3904 */ 4028 */
3905EAPI void evas_vg_shape_stroke_scale_set(Eo *obj, double s); 4029EAPI void evas_vg_shape_stroke_scale_set(Evas_Vg_Shape *obj, double s);
3906 4030
3907/** 4031/**
3908 * 4032 *
@@ -3915,7 +4039,7 @@ EAPI void evas_vg_shape_stroke_scale_set(Eo *obj, double s);
3915 * @param[out] a The alpha component of the given color. 4039 * @param[out] a The alpha component of the given color.
3916 * 4040 *
3917 */ 4041 */
3918EAPI void evas_vg_shape_stroke_color_get(Eo *obj, int *r, int *g, int *b, int *a); 4042EAPI void evas_vg_shape_stroke_color_get(Evas_Vg_Shape *obj, int *r, int *g, int *b, int *a);
3919 4043
3920/** 4044/**
3921 * 4045 *
@@ -3928,7 +4052,7 @@ EAPI void evas_vg_shape_stroke_color_get(Eo *obj, int *r, int *g, int *b, int *a
3928 * @param[in] a The alpha component of the given color. 4052 * @param[in] a The alpha component of the given color.
3929 * 4053 *
3930 */ 4054 */
3931EAPI void evas_vg_shape_stroke_color_set(Eo *obj, int r, int g, int b, int a); 4055EAPI void evas_vg_shape_stroke_color_set(Evas_Vg_Shape *obj, int r, int g, int b, int a);
3932 4056
3933/** 4057/**
3934 * 4058 *
@@ -3937,7 +4061,7 @@ EAPI void evas_vg_shape_stroke_color_set(Eo *obj, int r, int g, int b, int a);
3937 * 4061 *
3938 * 4062 *
3939 */ 4063 */
3940EAPI double evas_vg_shape_stroke_width_get(Eo *obj); 4064EAPI double evas_vg_shape_stroke_width_get(Evas_Vg_Shape *obj);
3941 4065
3942/** 4066/**
3943 * 4067 *
@@ -3947,7 +4071,7 @@ EAPI double evas_vg_shape_stroke_width_get(Eo *obj);
3947 * @param[in] w stroke width to be used 4071 * @param[in] w stroke width to be used
3948 * 4072 *
3949 */ 4073 */
3950EAPI void evas_vg_shape_stroke_width_set(Eo *obj, double w); 4074EAPI void evas_vg_shape_stroke_width_set(Evas_Vg_Shape *obj, double w);
3951 4075
3952/** 4076/**
3953 * 4077 *
@@ -3955,7 +4079,7 @@ EAPI void evas_vg_shape_stroke_width_set(Eo *obj, double w);
3955 * 4079 *
3956 * 4080 *
3957 */ 4081 */
3958EAPI double evas_vg_shape_stroke_location_get(Eo *obj); 4082EAPI double evas_vg_shape_stroke_location_get(Evas_Vg_Shape *obj);
3959 4083
3960/** 4084/**
3961 * 4085 *
@@ -3964,7 +4088,7 @@ EAPI double evas_vg_shape_stroke_location_get(Eo *obj);
3964 * @param[in] centered 4088 * @param[in] centered
3965 * 4089 *
3966 */ 4090 */
3967EAPI void evas_vg_shape_stroke_location_set(Eo *obj, double centered); 4091EAPI void evas_vg_shape_stroke_location_set(Evas_Vg_Shape *obj, double centered);
3968 4092
3969/** 4093/**
3970 * 4094 *
@@ -3974,7 +4098,7 @@ EAPI void evas_vg_shape_stroke_location_set(Eo *obj, double centered);
3974 * @param[out] length 4098 * @param[out] length
3975 * 4099 *
3976 */ 4100 */
3977EAPI void evas_vg_shape_stroke_dash_get(Eo *obj, const Efl_Gfx_Dash **dash, unsigned int *length); 4101EAPI void evas_vg_shape_stroke_dash_get(Evas_Vg_Shape *obj, const Evas_Vg_Dash **dash, unsigned int *length);
3978 4102
3979/** 4103/**
3980 * 4104 *
@@ -3984,7 +4108,7 @@ EAPI void evas_vg_shape_stroke_dash_get(Eo *obj, const Efl_Gfx_Dash **dash, unsi
3984 * @param[in] length 4108 * @param[in] length
3985 * 4109 *
3986 */ 4110 */
3987EAPI void evas_vg_shape_stroke_dash_set(Eo *obj, const Efl_Gfx_Dash *dash, unsigned int length); 4111EAPI void evas_vg_shape_stroke_dash_set(Evas_Vg_Shape *obj, const Evas_Vg_Dash *dash, unsigned int length);
3988 4112
3989/** 4113/**
3990 * 4114 *
@@ -3993,7 +4117,7 @@ EAPI void evas_vg_shape_stroke_dash_set(Eo *obj, const Efl_Gfx_Dash *dash, unsig
3993 * 4117 *
3994 * 4118 *
3995 */ 4119 */
3996EAPI Efl_Gfx_Cap evas_vg_shape_stroke_cap_get(Eo *obj); 4120EAPI Evas_Vg_Cap evas_vg_shape_stroke_cap_get(Evas_Vg_Shape *obj);
3997 4121
3998/** 4122/**
3999 * 4123 *
@@ -4007,7 +4131,7 @@ EAPI Efl_Gfx_Cap evas_vg_shape_stroke_cap_get(Eo *obj);
4007 * @param[in] c cap style to use , default is EFL_GFX_CAP_BUTT 4131 * @param[in] c cap style to use , default is EFL_GFX_CAP_BUTT
4008 * 4132 *
4009 */ 4133 */
4010EAPI void evas_vg_shape_stroke_cap_set(Eo *obj, Efl_Gfx_Cap c); 4134EAPI void evas_vg_shape_stroke_cap_set(Evas_Vg_Shape *obj, Evas_Vg_Cap c);
4011 4135
4012/** 4136/**
4013 * 4137 *
@@ -4016,7 +4140,7 @@ EAPI void evas_vg_shape_stroke_cap_set(Eo *obj, Efl_Gfx_Cap c);
4016 * 4140 *
4017 * 4141 *
4018 */ 4142 */
4019EAPI Efl_Gfx_Join evas_vg_shape_stroke_join_get(Eo *obj); 4143EAPI Evas_Vg_Join evas_vg_shape_stroke_join_get(Evas_Vg_Shape *obj);
4020 4144
4021/** 4145/**
4022 * 4146 *
@@ -4031,7 +4155,7 @@ EAPI Efl_Gfx_Join evas_vg_shape_stroke_join_get(Eo *obj);
4031EFL_GFX_JOIN_MITER 4155EFL_GFX_JOIN_MITER
4032 * 4156 *
4033 */ 4157 */
4034EAPI void evas_vg_shape_stroke_join_set(Eo *obj, Efl_Gfx_Join j); 4158EAPI void evas_vg_shape_stroke_join_set(Evas_Vg_Shape *obj, Evas_Vg_Join j);
4035 4159
4036/** 4160/**
4037 * 4161 *
@@ -4046,7 +4170,7 @@ EAPI void evas_vg_shape_stroke_join_set(Eo *obj, Efl_Gfx_Join j);
4046 * @param[in] points point list 4170 * @param[in] points point list
4047 * 4171 *
4048 */ 4172 */
4049EAPI void evas_vg_shape_path_set(Eo *obj, const Efl_Gfx_Path_Command *op, const double *points); 4173EAPI void evas_vg_shape_path_set(Evas_Vg_Shape *obj, const Evas_Vg_Path_Command *op, const double *points);
4050 4174
4051/** 4175/**
4052 * 4176 *
@@ -4058,10 +4182,10 @@ EAPI void evas_vg_shape_path_set(Eo *obj, const Efl_Gfx_Path_Command *op, const
4058 * 4182 *
4059 */ 4183 */
4060 4184
4061EAPI void evas_vg_shape_path_get(Eo *obj, const Efl_Gfx_Path_Command **op, const double **points); 4185EAPI void evas_vg_shape_path_get(Evas_Vg_Shape *obj, const Evas_Vg_Path_Command **op, const double **points);
4062EAPI void evas_vg_shape_path_length_get(Eo *obj, unsigned int *commands, unsigned int *points); 4186EAPI void evas_vg_shape_path_length_get(Evas_Vg_Shape *obj, unsigned int *commands, unsigned int *points);
4063EAPI void evas_vg_shape_current_get(Eo *obj, double *x, double *y); 4187EAPI void evas_vg_shape_current_get(Evas_Vg_Shape *obj, double *x, double *y);
4064EAPI void evas_vg_shape_current_ctrl_get(Eo *obj, double *x, double *y); 4188EAPI void evas_vg_shape_current_ctrl_get(Evas_Vg_Shape *obj, double *x, double *y);
4065 4189
4066/** 4190/**
4067 * 4191 *
@@ -4073,7 +4197,7 @@ EAPI void evas_vg_shape_current_ctrl_get(Eo *obj, double *x, double *y);
4073 * @param[in] dup_from Shape object from where data will be copied. 4197 * @param[in] dup_from Shape object from where data will be copied.
4074 * 4198 *
4075 */ 4199 */
4076EAPI void evas_vg_shape_dup(Eo *obj, Eo *dup_from); 4200EAPI void evas_vg_shape_dup(Evas_Vg_Shape *obj, Evas_Vg_Shape *dup_from);
4077 4201
4078/** 4202/**
4079 * 4203 *
@@ -4084,7 +4208,7 @@ EAPI void evas_vg_shape_dup(Eo *obj, Eo *dup_from);
4084 * 4208 *
4085 * 4209 *
4086 */ 4210 */
4087EAPI void evas_vg_shape_reset(Eo *obj); 4211EAPI void evas_vg_shape_reset(Evas_Vg_Shape *obj);
4088 4212
4089/** 4213/**
4090 * 4214 *
@@ -4099,7 +4223,7 @@ EAPI void evas_vg_shape_reset(Eo *obj);
4099 * @param[in] y Y co-ordinate of the current point. 4223 * @param[in] y Y co-ordinate of the current point.
4100 * 4224 *
4101 */ 4225 */
4102EAPI void evas_vg_shape_append_move_to(Eo *obj, double x, double y); 4226EAPI void evas_vg_shape_append_move_to(Evas_Vg_Shape *obj, double x, double y);
4103 4227
4104/** 4228/**
4105 * 4229 *
@@ -4118,7 +4242,7 @@ EAPI void evas_vg_shape_append_move_to(Eo *obj, double x, double y);
4118 * @param[in] y Y co-ordinate of end point of the line. 4242 * @param[in] y Y co-ordinate of end point of the line.
4119 * 4243 *
4120 */ 4244 */
4121EAPI void evas_vg_shape_append_line_to(Eo *obj, double x, double y); 4245EAPI void evas_vg_shape_append_line_to(Evas_Vg_Shape *obj, double x, double y);
4122 4246
4123/** 4247/**
4124 * 4248 *
@@ -4136,7 +4260,7 @@ EAPI void evas_vg_shape_append_line_to(Eo *obj, double x, double y);
4136 * @param[in] ctrl_y Y co-ordinate of control point. 4260 * @param[in] ctrl_y Y co-ordinate of control point.
4137 * 4261 *
4138 */ 4262 */
4139EAPI void evas_vg_shape_append_quadratic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y); 4263EAPI void evas_vg_shape_append_quadratic_to(Evas_Vg_Shape *obj, double x, double y, double ctrl_x, double ctrl_y);
4140 4264
4141/** 4265/**
4142 * 4266 *
@@ -4151,7 +4275,7 @@ EAPI void evas_vg_shape_append_quadratic_to(Eo *obj, double x, double y, double
4151 * @param[in] y Y co-ordinate of end point of the line. 4275 * @param[in] y Y co-ordinate of end point of the line.
4152 * 4276 *
4153 */ 4277 */
4154EAPI void evas_vg_shape_append_squadratic_to(Eo *obj, double x, double y); 4278EAPI void evas_vg_shape_append_squadratic_to(Evas_Vg_Shape *obj, double x, double y);
4155 4279
4156/** 4280/**
4157 * 4281 *
@@ -4171,7 +4295,7 @@ EAPI void evas_vg_shape_append_squadratic_to(Eo *obj, double x, double y);
4171 * @param[in] ctrl_y1 Y co-ordinate of 2nd control point. 4295 * @param[in] ctrl_y1 Y co-ordinate of 2nd control point.
4172 * 4296 *
4173 */ 4297 */
4174EAPI 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); 4298EAPI void evas_vg_shape_append_cubic_to(Evas_Vg_Shape *obj, double x, double y, double ctrl_x0, double ctrl_y0, double ctrl_x1, double ctrl_y1);
4175 4299
4176/** 4300/**
4177 * 4301 *
@@ -4189,7 +4313,7 @@ EAPI void evas_vg_shape_append_cubic_to(Eo *obj, double x, double y, double ctrl
4189 * @param[in] ctrl_y Y co-ordinate of 2nd control point. 4313 * @param[in] ctrl_y Y co-ordinate of 2nd control point.
4190 * 4314 *
4191 */ 4315 */
4192EAPI void evas_vg_shape_append_scubic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y); 4316EAPI void evas_vg_shape_append_scubic_to(Evas_Vg_Shape *obj, double x, double y, double ctrl_x, double ctrl_y);
4193 4317
4194/** 4318/**
4195 * 4319 *
@@ -4213,7 +4337,7 @@ EAPI void evas_vg_shape_append_scubic_to(Eo *obj, double x, double y, double ctr
4213 * @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. 4337 * @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.
4214 * 4338 *
4215 */ 4339 */
4216EAPI 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); 4340EAPI void evas_vg_shape_append_arc_to(Evas_Vg_Shape *obj, double x, double y, double rx, double ry, double angle, Eina_Bool large_arc, Eina_Bool sweep);
4217 4341
4218/** 4342/**
4219 * @brief Append an arc that enclosed in the given rectangle (x, y, w, h). The 4343 * @brief Append an arc that enclosed in the given rectangle (x, y, w, h). The
@@ -4229,7 +4353,7 @@ EAPI void evas_vg_shape_append_arc_to(Eo *obj, double x, double y, double rx, do
4229 * 4353 *
4230 * @ingroup Efl_Gfx_Shape 4354 * @ingroup Efl_Gfx_Shape
4231 */ 4355 */
4232EAPI void evas_vg_shape_append_arc(Eo *obj, double x, double y, double w, double h, double start_angle, double sweep_length); 4356EAPI void evas_vg_shape_append_arc(Evas_Vg_Shape *obj, double x, double y, double w, double h, double start_angle, double sweep_length);
4233 4357
4234/** 4358/**
4235 * 4359 *
@@ -4244,7 +4368,7 @@ EAPI void evas_vg_shape_append_arc(Eo *obj, double x, double y, double w, double
4244 * 4368 *
4245 * 4369 *
4246 */ 4370 */
4247EAPI void evas_vg_shape_append_close(Eo *obj); 4371EAPI void evas_vg_shape_append_close(Evas_Vg_Shape *obj);
4248 4372
4249/** 4373/**
4250 * 4374 *
@@ -4259,7 +4383,7 @@ EAPI void evas_vg_shape_append_close(Eo *obj);
4259 * @param[in] radius radius of the circle. 4383 * @param[in] radius radius of the circle.
4260 * 4384 *
4261 */ 4385 */
4262EAPI void evas_vg_shape_append_circle(Eo *obj, double x, double y, double radius); 4386EAPI void evas_vg_shape_append_circle(Evas_Vg_Shape *obj, double x, double y, double radius);
4263 4387
4264/** 4388/**
4265 * 4389 *
@@ -4283,11 +4407,11 @@ EAPI void evas_vg_shape_append_circle(Eo *obj, double x, double y, double radius
4283 * @param[in] ry The y radius of the rounded corner and should be in range [ 0 to h/2 ] 4407 * @param[in] ry The y radius of the rounded corner and should be in range [ 0 to h/2 ]
4284 * 4408 *
4285 */ 4409 */
4286EAPI void evas_vg_shape_append_rect(Eo *obj, double x, double y, double w, double h, double rx, double ry); 4410EAPI void evas_vg_shape_append_rect(Evas_Vg_Shape *obj, double x, double y, double w, double h, double rx, double ry);
4287 4411
4288EAPI void evas_vg_shape_append_svg_path(Eo *obj, const char *svg_path_data); 4412EAPI void evas_vg_shape_append_svg_path(Evas_Vg_Shape *obj, const char *svg_path_data);
4289EAPI Eina_Bool evas_vg_shape_interpolate(Eo *obj, const Eo *from, const Eo *to, double pos_map); 4413EAPI Eina_Bool evas_vg_shape_interpolate(Evas_Vg_Shape *obj, const Evas_Vg_Shape *from, const Evas_Vg_Shape *to, double pos_map);
4290EAPI Eina_Bool evas_vg_shape_equal_commands(Eo *obj, const Eo *with); 4414EAPI Eina_Bool evas_vg_shape_equal_commands(Evas_Vg_Shape *obj, const Evas_Vg_Shape *with);
4291 4415
4292/** 4416/**
4293 * set a vg object as the fill property 4417 * set a vg object as the fill property
@@ -4296,7 +4420,7 @@ EAPI Eina_Bool evas_vg_shape_equal_commands(Eo *obj, const Eo *with);
4296 * @param f The object content will be used for filling. 4420 * @param f The object content will be used for filling.
4297 * 4421 *
4298 */ 4422 */
4299EAPI void evas_vg_shape_fill_set(Eo *obj, Efl_VG *f); 4423EAPI void evas_vg_shape_fill_set(Evas_Vg_Shape *obj, Evas_Vg_Node *f);
4300 4424
4301/** 4425/**
4302 * returns the object that is set for the fill property 4426 * returns the object that is set for the fill property
@@ -4305,7 +4429,7 @@ EAPI void evas_vg_shape_fill_set(Eo *obj, Efl_VG *f);
4305 * @return The object that is set as fill property. 4429 * @return The object that is set as fill property.
4306 * 4430 *
4307 */ 4431 */
4308EAPI Efl_VG* evas_vg_shape_fill_get(const Eo *obj); 4432EAPI Evas_Vg_Node* evas_vg_shape_fill_get(const Evas_Vg_Shape *obj);
4309 4433
4310/** 4434/**
4311 * set a vg object as the stroke fill property 4435 * set a vg object as the stroke fill property
@@ -4314,7 +4438,7 @@ EAPI Efl_VG* evas_vg_shape_fill_get(const Eo *obj);
4314 * @param f The object content will be used for stroke filling. 4438 * @param f The object content will be used for stroke filling.
4315 * 4439 *
4316 */ 4440 */
4317EAPI void evas_vg_shape_stroke_fill_set(Eo *obj, Efl_VG *f); 4441EAPI void evas_vg_shape_stroke_fill_set(Evas_Vg_Shape *obj, Evas_Vg_Node *f);
4318 4442
4319/** 4443/**
4320 * returns the object that is set for the stroke fill property 4444 * returns the object that is set for the stroke fill property
@@ -4323,7 +4447,7 @@ EAPI void evas_vg_shape_stroke_fill_set(Eo *obj, Efl_VG *f);
4323 * @return The object that is set as stroke fill property. 4447 * @return The object that is set as stroke fill property.
4324 * 4448 *
4325 */ 4449 */
4326EAPI Efl_VG* evas_vg_shape_stroke_fill_get(const Eo *obj); 4450EAPI Evas_Vg_Node* evas_vg_shape_stroke_fill_get(const Evas_Vg_Shape *obj);
4327 4451
4328#include "canvas/efl_canvas_vg_shape_eo.legacy.h" 4452#include "canvas/efl_canvas_vg_shape_eo.legacy.h"
4329 4453
@@ -4336,7 +4460,7 @@ EAPI Efl_VG* evas_vg_shape_stroke_fill_get(const Eo *obj);
4336 * @param[in] length length of the list 4460 * @param[in] length length of the list
4337 * 4461 *
4338 */ 4462 */
4339EAPI void evas_vg_gradient_stop_set(Eo *obj, const Efl_Gfx_Gradient_Stop *colors, unsigned int length); 4463EAPI void evas_vg_gradient_stop_set(Evas_Vg_Gradient *obj, const Evas_Vg_Gradient_Stop *colors, unsigned int length);
4340 4464
4341/** 4465/**
4342 * 4466 *
@@ -4347,7 +4471,7 @@ EAPI void evas_vg_gradient_stop_set(Eo *obj, const Efl_Gfx_Gradient_Stop *colors
4347 * @param[out] length length of the list 4471 * @param[out] length length of the list
4348 * 4472 *
4349 */ 4473 */
4350EAPI void evas_vg_gradient_stop_get(Eo *obj, const Efl_Gfx_Gradient_Stop **colors, unsigned int *length); 4474EAPI void evas_vg_gradient_stop_get(Evas_Vg_Gradient *obj, const Evas_Vg_Gradient_Stop **colors, unsigned int *length);
4351 4475
4352/** 4476/**
4353 * 4477 *
@@ -4357,7 +4481,7 @@ EAPI void evas_vg_gradient_stop_get(Eo *obj, const Efl_Gfx_Gradient_Stop **color
4357 * @param[in] s spread type to be used 4481 * @param[in] s spread type to be used
4358 * 4482 *
4359 */ 4483 */
4360EAPI void evas_vg_gradient_spread_set(Eo *obj, Efl_Gfx_Gradient_Spread s); 4484EAPI void evas_vg_gradient_spread_set(Evas_Vg_Gradient *obj, Evas_Vg_Gradient_Spread s);
4361 4485
4362/** 4486/**
4363 * 4487 *
@@ -4367,7 +4491,7 @@ EAPI void evas_vg_gradient_spread_set(Eo *obj, Efl_Gfx_Gradient_Spread s);
4367 * 4491 *
4368 * 4492 *
4369 */ 4493 */
4370EAPI Efl_Gfx_Gradient_Spread evas_vg_gradient_spread_get(Eo *obj); 4494EAPI Evas_Vg_Gradient_Spread evas_vg_gradient_spread_get(Evas_Vg_Gradient *obj);
4371 4495
4372/** 4496/**
4373 * Creates a new linear gradient object \. 4497 * Creates a new linear gradient object \.
@@ -4376,7 +4500,7 @@ EAPI Efl_Gfx_Gradient_Spread evas_vg_gradient_spread_get(Eo *obj);
4376 * @return The created linear gradient object handle. 4500 * @return The created linear gradient object handle.
4377 * 4501 *
4378 */ 4502 */
4379EAPI Efl_VG* evas_vg_gradient_linear_add(Efl_VG *parent); 4503EAPI Evas_Vg_Gradient_Linear* evas_vg_gradient_linear_add(Evas_Vg_Container *parent);
4380 4504
4381/** 4505/**
4382 * 4506 *
@@ -4386,7 +4510,7 @@ EAPI Efl_VG* evas_vg_gradient_linear_add(Efl_VG *parent);
4386 * @param[in] y y co-ordinate of start point 4510 * @param[in] y y co-ordinate of start point
4387 * 4511 *
4388 */ 4512 */
4389EAPI void evas_vg_gradient_linear_start_set(Eo *obj, double x, double y); 4513EAPI void evas_vg_gradient_linear_start_set(Evas_Vg_Gradient_Linear *obj, double x, double y);
4390 4514
4391/** 4515/**
4392 * 4516 *
@@ -4396,7 +4520,7 @@ EAPI void evas_vg_gradient_linear_start_set(Eo *obj, double x, double y);
4396 * @param[out] y y co-ordinate of start point 4520 * @param[out] y y co-ordinate of start point
4397 * 4521 *
4398 */ 4522 */
4399EAPI void evas_vg_gradient_linear_start_get(Eo *obj, double *x, double *y); 4523EAPI void evas_vg_gradient_linear_start_get(Evas_Vg_Gradient_Linear *obj, double *x, double *y);
4400 4524
4401/** 4525/**
4402 * 4526 *
@@ -4406,7 +4530,7 @@ EAPI void evas_vg_gradient_linear_start_get(Eo *obj, double *x, double *y);
4406 * @param[in] y y co-ordinate of end point 4530 * @param[in] y y co-ordinate of end point
4407 * 4531 *
4408 */ 4532 */
4409EAPI void evas_vg_gradient_linear_end_set(Eo *obj, double x, double y); 4533EAPI void evas_vg_gradient_linear_end_set(Evas_Vg_Gradient_Linear *obj, double x, double y);
4410 4534
4411/** 4535/**
4412 * 4536 *
@@ -4416,7 +4540,7 @@ EAPI void evas_vg_gradient_linear_end_set(Eo *obj, double x, double y);
4416 * @param[out] y y co-ordinate of end point 4540 * @param[out] y y co-ordinate of end point
4417 * 4541 *
4418 */ 4542 */
4419EAPI void evas_vg_gradient_linear_end_get(Eo *obj, double *x, double *y); 4543EAPI void evas_vg_gradient_linear_end_get(Evas_Vg_Gradient_Linear *obj, double *x, double *y);
4420 4544
4421/** 4545/**
4422 * Creates a new radial gradient object \. 4546 * Creates a new radial gradient object \.
@@ -4425,7 +4549,7 @@ EAPI void evas_vg_gradient_linear_end_get(Eo *obj, double *x, double *y);
4425 * @return The created radial gradient object handle. 4549 * @return The created radial gradient object handle.
4426 * 4550 *
4427 */ 4551 */
4428EAPI Efl_VG* evas_vg_gradient_radial_add(Efl_VG *parent); 4552EAPI Evas_Vg_Gradient_Radial* evas_vg_gradient_radial_add(Evas_Vg_Container *parent);
4429 4553
4430/** 4554/**
4431 * 4555 *
@@ -4435,7 +4559,7 @@ EAPI Efl_VG* evas_vg_gradient_radial_add(Efl_VG *parent);
4435 * @param[in] y y co-ordinate of center point 4559 * @param[in] y y co-ordinate of center point
4436 * 4560 *
4437 */ 4561 */
4438EAPI void evas_vg_gradient_radial_center_set(Eo *obj, double x, double y); 4562EAPI void evas_vg_gradient_radial_center_set(Evas_Vg_Gradient_Radial *obj, double x, double y);
4439 4563
4440/** 4564/**
4441 * 4565 *
@@ -4445,7 +4569,7 @@ EAPI void evas_vg_gradient_radial_center_set(Eo *obj, double x, double y);
4445 * @param[out] y y co-ordinate of center point 4569 * @param[out] y y co-ordinate of center point
4446 * 4570 *
4447 */ 4571 */
4448EAPI void evas_vg_gradient_radial_center_get(Eo *obj, double *x, double *y); 4572EAPI void evas_vg_gradient_radial_center_get(Evas_Vg_Gradient_Radial *obj, double *x, double *y);
4449 4573
4450/** 4574/**
4451 * 4575 *
@@ -4454,7 +4578,7 @@ EAPI void evas_vg_gradient_radial_center_get(Eo *obj, double *x, double *y);
4454 * @param[in] r center radius 4578 * @param[in] r center radius
4455 * 4579 *
4456 */ 4580 */
4457EAPI void evas_vg_gradient_radial_radius_set(Eo *obj, double r); 4581EAPI void evas_vg_gradient_radial_radius_set(Evas_Vg_Gradient_Radial *obj, double r);
4458 4582
4459/** 4583/**
4460 * 4584 *
@@ -4462,7 +4586,7 @@ EAPI void evas_vg_gradient_radial_radius_set(Eo *obj, double r);
4462 * 4586 *
4463 * 4587 *
4464 */ 4588 */
4465EAPI double evas_vg_gradient_radial_radius_get(Eo *obj); 4589EAPI double evas_vg_gradient_radial_radius_get(Evas_Vg_Gradient_Radial *obj);
4466 4590
4467/** 4591/**
4468 * 4592 *
@@ -4472,7 +4596,7 @@ EAPI double evas_vg_gradient_radial_radius_get(Eo *obj);
4472 * @param[in] y y co-ordinate of focal point 4596 * @param[in] y y co-ordinate of focal point
4473 * 4597 *
4474 */ 4598 */
4475EAPI void evas_vg_gradient_radial_focal_set(Eo *obj, double x, double y); 4599EAPI void evas_vg_gradient_radial_focal_set(Evas_Vg_Gradient_Radial *obj, double x, double y);
4476 4600
4477/** 4601/**
4478 * 4602 *
@@ -4482,7 +4606,7 @@ EAPI void evas_vg_gradient_radial_focal_set(Eo *obj, double x, double y);
4482 * @param[out] y y co-ordinate of focal point 4606 * @param[out] y y co-ordinate of focal point
4483 * 4607 *
4484 */ 4608 */
4485EAPI void evas_vg_gradient_radial_focal_get(Eo *obj, double *x, double *y); 4609EAPI void evas_vg_gradient_radial_focal_get(Evas_Vg_Gradient_Radial *obj, double *x, double *y);
4486 4610
4487/** 4611/**
4488 * @} 4612 * @}
diff --git a/src/lib/evas/canvas/efl_canvas_vg_container.c b/src/lib/evas/canvas/efl_canvas_vg_container.c
index dfa5b1ec74..f791f8160a 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_container.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_container.c
@@ -481,8 +481,8 @@ efl_canvas_vg_container_blend_buffer_clear(Efl_VG *obj EINA_UNUSED, Efl_Canvas_V
481 cd->blend.buffer = NULL; 481 cd->blend.buffer = NULL;
482} 482}
483 483
484EAPI Efl_VG* 484EAPI Evas_Vg_Container *
485evas_vg_container_add(Efl_VG *parent) 485evas_vg_container_add(Evas_Object *parent)
486{ 486{
487 /* Warn it because the usage has been changed. 487 /* Warn it because the usage has been changed.
488 We can remove this message after v1.21. */ 488 We can remove this message after v1.21. */
diff --git a/src/lib/evas/canvas/efl_canvas_vg_container_eo.legacy.c b/src/lib/evas/canvas/efl_canvas_vg_container_eo.legacy.c
index a31fc33d44..170a6668f0 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_container_eo.legacy.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_container_eo.legacy.c
@@ -1,12 +1,12 @@
1 1
2EAPI Efl_Canvas_Vg_Node * 2EAPI Evas_Vg_Node *
3evas_vg_container_child_get(Efl_Canvas_Vg_Container *obj, const char *name) 3evas_vg_container_child_get(Evas_Vg_Container *obj, const char *name)
4{ 4{
5 return efl_canvas_vg_container_child_get(obj, name); 5 return efl_canvas_vg_container_child_get(obj, name);
6} 6}
7 7
8EAPI Eina_Iterator * 8EAPI Eina_Iterator *
9evas_vg_container_children_get(Efl_Canvas_Vg_Container *obj) 9evas_vg_container_children_get(Evas_Vg_Container *obj)
10{ 10{
11 return efl_canvas_vg_container_children_get(obj); 11 return efl_canvas_vg_container_children_get(obj);
12} 12}
diff --git a/src/lib/evas/canvas/efl_canvas_vg_container_eo.legacy.h b/src/lib/evas/canvas/efl_canvas_vg_container_eo.legacy.h
index 691a93b3c4..3ce85d03fc 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_container_eo.legacy.h
+++ b/src/lib/evas/canvas/efl_canvas_vg_container_eo.legacy.h
@@ -1,15 +1,15 @@
1#ifndef _EFL_CANVAS_VG_CONTAINER_EO_LEGACY_H_ 1#ifndef _EVAS_VG_CONTAINER_EO_LEGACY_H_
2#define _EFL_CANVAS_VG_CONTAINER_EO_LEGACY_H_ 2#define _EVAS_VG_CONTAINER_EO_LEGACY_H_
3 3
4#ifndef _EFL_CANVAS_VG_CONTAINER_EO_CLASS_TYPE 4#ifndef _EVAS_VG_CONTAINER_EO_CLASS_TYPE
5#define _EFL_CANVAS_VG_CONTAINER_EO_CLASS_TYPE 5#define _EVAS_VG_CONTAINER_EO_CLASS_TYPE
6 6
7typedef Eo Efl_Canvas_Vg_Container; 7typedef Eo Evas_Vg_Container;
8 8
9#endif 9#endif
10 10
11#ifndef _EFL_CANVAS_VG_CONTAINER_EO_TYPES 11#ifndef _EVAS_VG_CONTAINER_EO_TYPES
12#define _EFL_CANVAS_VG_CONTAINER_EO_TYPES 12#define _EVAS_VG_CONTAINER_EO_TYPES
13 13
14 14
15#endif 15#endif
@@ -24,7 +24,7 @@ typedef Eo Efl_Canvas_Vg_Container;
24 * 24 *
25 * @ingroup Evas_Vg_Container_Group 25 * @ingroup Evas_Vg_Container_Group
26 */ 26 */
27EAPI Efl_Canvas_Vg_Node *evas_vg_container_child_get(Efl_Canvas_Vg_Container *obj, const char *name); 27EAPI Evas_Vg_Node *evas_vg_container_child_get(Evas_Vg_Container *obj, const char *name);
28 28
29/** 29/**
30 * @brief Get all children of container 30 * @brief Get all children of container
@@ -35,6 +35,6 @@ EAPI Efl_Canvas_Vg_Node *evas_vg_container_child_get(Efl_Canvas_Vg_Container *ob
35 * 35 *
36 * @ingroup Evas_Vg_Container_Group 36 * @ingroup Evas_Vg_Container_Group
37 */ 37 */
38EAPI Eina_Iterator *evas_vg_container_children_get(Efl_Canvas_Vg_Container *obj) EINA_WARN_UNUSED_RESULT; 38EAPI Eina_Iterator *evas_vg_container_children_get(Evas_Vg_Container *obj) EINA_WARN_UNUSED_RESULT;
39 39
40#endif 40#endif
diff --git a/src/lib/evas/canvas/efl_canvas_vg_gradient.c b/src/lib/evas/canvas/efl_canvas_vg_gradient.c
index 3bc4ec80a8..2f6f2eb604 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_gradient.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_gradient.c
@@ -118,25 +118,25 @@ _efl_canvas_vg_gradient_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_Vg_Gra
118} 118}
119 119
120EAPI void 120EAPI void
121evas_vg_gradient_stop_set(Eo *obj, const Efl_Gfx_Gradient_Stop *colors, unsigned int length) 121evas_vg_gradient_stop_set(Evas_Vg_Gradient *obj, const Evas_Vg_Gradient_Stop *colors, unsigned int length)
122{ 122{
123 efl_gfx_gradient_stop_set(obj, colors, length); 123 efl_gfx_gradient_stop_set(obj, (const Efl_Gfx_Gradient_Stop *)colors, length);
124} 124}
125 125
126EAPI void 126EAPI void
127evas_vg_gradient_stop_get(Eo *obj, const Efl_Gfx_Gradient_Stop **colors, unsigned int *length) 127evas_vg_gradient_stop_get(Evas_Vg_Gradient *obj, const Evas_Vg_Gradient_Stop **colors, unsigned int *length)
128{ 128{
129 efl_gfx_gradient_stop_get(obj, colors, length); 129 efl_gfx_gradient_stop_get(obj, (const Efl_Gfx_Gradient_Stop **)colors, length);
130} 130}
131 131
132EAPI void 132EAPI void
133evas_vg_gradient_spread_set(Eo *obj, Efl_Gfx_Gradient_Spread s) 133evas_vg_gradient_spread_set(Evas_Vg_Gradient *obj, Evas_Vg_Gradient_Spread s)
134{ 134{
135 efl_gfx_gradient_spread_set(obj, s); 135 efl_gfx_gradient_spread_set(obj, s);
136} 136}
137 137
138EAPI Efl_Gfx_Gradient_Spread 138EAPI Evas_Vg_Gradient_Spread
139evas_vg_gradient_spread_get(Eo *obj) 139evas_vg_gradient_spread_get(Evas_Vg_Gradient *obj)
140{ 140{
141 return efl_gfx_gradient_spread_get(obj); 141 return efl_gfx_gradient_spread_get(obj);
142} 142}
diff --git a/src/lib/evas/canvas/efl_canvas_vg_gradient_eo.legacy.h b/src/lib/evas/canvas/efl_canvas_vg_gradient_eo.legacy.h
new file mode 100644
index 0000000000..01ebdc32cb
--- /dev/null
+++ b/src/lib/evas/canvas/efl_canvas_vg_gradient_eo.legacy.h
@@ -0,0 +1,21 @@
1#ifndef _EVAS_VG_GRADIENT_EO_LEGACY_H_
2#define _EVAS_VG_GRADIENT_EO_LEGACY_H_
3
4typedef Eo Evas_Vg_Gradient;
5
6#endif
7
8#ifndef _EVAS_VG_GRADIENT_LINEAR_EO_LEGACY_H_
9#define _EVAS_VG_GRADIENT_LINEAR_EO_LEGACY_H_
10
11typedef Eo Evas_Vg_Gradient_Linear;
12
13#endif
14
15#ifndef _EVAS_VG_GRADIENT_RADIAL_EO_LEGACY_H_
16#define _EVAS_VG_GRADIENT_RADIAL_EO_LEGACY_H_
17
18typedef Eo Evas_Vg_Gradient_Radial;
19
20#endif
21
diff --git a/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.c b/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.c
index fd681eda38..bd8ccebf36 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.c
@@ -172,31 +172,31 @@ _efl_canvas_vg_gradient_linear_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas
172} 172}
173 173
174EAPI void 174EAPI void
175evas_vg_gradient_linear_start_set(Eo *obj, double x, double y) 175evas_vg_gradient_linear_start_set(Evas_Vg_Gradient_Linear *obj, double x, double y)
176{ 176{
177 efl_gfx_gradient_linear_start_set(obj, x, y); 177 efl_gfx_gradient_linear_start_set(obj, x, y);
178} 178}
179 179
180EAPI void 180EAPI void
181evas_vg_gradient_linear_start_get(Eo *obj, double *x, double *y) 181evas_vg_gradient_linear_start_get(Evas_Vg_Gradient_Linear *obj, double *x, double *y)
182{ 182{
183 efl_gfx_gradient_linear_start_get(obj, x, y); 183 efl_gfx_gradient_linear_start_get(obj, x, y);
184} 184}
185 185
186EAPI void 186EAPI void
187evas_vg_gradient_linear_end_set(Eo *obj, double x, double y) 187evas_vg_gradient_linear_end_set(Evas_Vg_Gradient_Linear *obj, double x, double y)
188{ 188{
189 efl_gfx_gradient_linear_end_set(obj, x, y); 189 efl_gfx_gradient_linear_end_set(obj, x, y);
190} 190}
191 191
192EAPI void 192EAPI void
193evas_vg_gradient_linear_end_get(Eo *obj, double *x, double *y) 193evas_vg_gradient_linear_end_get(Evas_Vg_Gradient_Linear *obj, double *x, double *y)
194{ 194{
195 efl_gfx_gradient_linear_end_get(obj, x, y); 195 efl_gfx_gradient_linear_end_get(obj, x, y);
196} 196}
197 197
198EAPI Efl_VG* 198EAPI Evas_Vg_Gradient_Linear *
199evas_vg_gradient_linear_add(Efl_VG *parent) 199evas_vg_gradient_linear_add(Evas_Vg_Container *parent)
200{ 200{
201 return efl_add(EFL_CANVAS_VG_GRADIENT_LINEAR_CLASS, parent); 201 return efl_add(EFL_CANVAS_VG_GRADIENT_LINEAR_CLASS, parent);
202} 202}
diff --git a/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.c b/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.c
index 8cbffa6e66..263428630b 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.c
@@ -194,43 +194,43 @@ _efl_canvas_vg_gradient_radial_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas
194} 194}
195 195
196EAPI void 196EAPI void
197evas_vg_gradient_radial_center_set(Eo *obj, double x, double y) 197evas_vg_gradient_radial_center_set(Evas_Vg_Gradient_Radial *obj, double x, double y)
198{ 198{
199 efl_gfx_gradient_radial_center_set(obj, x, y); 199 efl_gfx_gradient_radial_center_set(obj, x, y);
200} 200}
201 201
202EAPI void 202EAPI void
203evas_vg_gradient_radial_center_get(Eo *obj, double *x, double *y) 203evas_vg_gradient_radial_center_get(Evas_Vg_Gradient_Radial *obj, double *x, double *y)
204{ 204{
205 efl_gfx_gradient_radial_center_get(obj, x, y); 205 efl_gfx_gradient_radial_center_get(obj, x, y);
206} 206}
207 207
208EAPI void 208EAPI void
209evas_vg_gradient_radial_radius_set(Eo *obj, double r) 209evas_vg_gradient_radial_radius_set(Evas_Vg_Gradient_Radial *obj, double r)
210{ 210{
211 efl_gfx_gradient_radial_radius_set(obj, r); 211 efl_gfx_gradient_radial_radius_set(obj, r);
212} 212}
213 213
214EAPI double 214EAPI double
215evas_vg_gradient_radial_radius_get(Eo *obj) 215evas_vg_gradient_radial_radius_get(Evas_Vg_Gradient_Radial *obj)
216{ 216{
217 return efl_gfx_gradient_radial_radius_get(obj); 217 return efl_gfx_gradient_radial_radius_get(obj);
218} 218}
219 219
220EAPI void 220EAPI void
221evas_vg_gradient_radial_focal_set(Eo *obj, double x, double y) 221evas_vg_gradient_radial_focal_set(Evas_Vg_Gradient_Radial *obj, double x, double y)
222{ 222{
223 efl_gfx_gradient_radial_focal_set(obj, x, y); 223 efl_gfx_gradient_radial_focal_set(obj, x, y);
224} 224}
225 225
226EAPI void 226EAPI void
227evas_vg_gradient_radial_focal_get(Eo *obj, double *x, double *y) 227evas_vg_gradient_radial_focal_get(Evas_Vg_Gradient_Radial *obj, double *x, double *y)
228{ 228{
229 efl_gfx_gradient_radial_focal_get(obj, x, y); 229 efl_gfx_gradient_radial_focal_get(obj, x, y);
230} 230}
231 231
232EAPI Efl_VG* 232EAPI Evas_Vg_Gradient_Radial*
233evas_vg_gradient_radial_add(Efl_VG *parent) 233evas_vg_gradient_radial_add(Evas_Vg_Container *parent)
234{ 234{
235 return efl_add(EFL_CANVAS_VG_GRADIENT_RADIAL_CLASS, parent); 235 return efl_add(EFL_CANVAS_VG_GRADIENT_RADIAL_CLASS, parent);
236} 236}
diff --git a/src/lib/evas/canvas/efl_canvas_vg_node.c b/src/lib/evas/canvas/efl_canvas_vg_node.c
index 1f7975a937..865107639b 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_node.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_node.c
@@ -753,31 +753,31 @@ _efl_canvas_vg_node_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_Vg_Node_Da
753} 753}
754 754
755EAPI Eina_Bool 755EAPI Eina_Bool
756evas_vg_node_visible_get(Eo *obj) 756evas_vg_node_visible_get(Evas_Vg_Node *obj)
757{ 757{
758 return efl_gfx_entity_visible_get(obj); 758 return efl_gfx_entity_visible_get(obj);
759} 759}
760 760
761EAPI void 761EAPI void
762evas_vg_node_visible_set(Eo *obj, Eina_Bool v) 762evas_vg_node_visible_set(Evas_Vg_Node *obj, Eina_Bool v)
763{ 763{
764 efl_gfx_entity_visible_set(obj, v); 764 efl_gfx_entity_visible_set(obj, v);
765} 765}
766 766
767EAPI void 767EAPI void
768evas_vg_node_color_get(Eo *obj, int *r, int *g, int *b, int *a) 768evas_vg_node_color_get(Evas_Vg_Node *obj, int *r, int *g, int *b, int *a)
769{ 769{
770 efl_gfx_color_get(obj, r, g, b, a); 770 efl_gfx_color_get(obj, r, g, b, a);
771} 771}
772 772
773EAPI void 773EAPI void
774evas_vg_node_color_set(Eo *obj, int r, int g, int b, int a) 774evas_vg_node_color_set(Evas_Vg_Node *obj, int r, int g, int b, int a)
775{ 775{
776 efl_gfx_color_set(obj, r, g, b, a); 776 efl_gfx_color_set(obj, r, g, b, a);
777} 777}
778 778
779EAPI void 779EAPI void
780evas_vg_node_geometry_get(Eo *obj, int *x, int *y, int *w, int *h) 780evas_vg_node_geometry_get(Evas_Vg_Node *obj, int *x, int *y, int *w, int *h)
781{ 781{
782 Eina_Rect r; 782 Eina_Rect r;
783 r.pos = efl_gfx_entity_position_get(obj); 783 r.pos = efl_gfx_entity_position_get(obj);
@@ -789,32 +789,32 @@ evas_vg_node_geometry_get(Eo *obj, int *x, int *y, int *w, int *h)
789} 789}
790 790
791EAPI void 791EAPI void
792evas_vg_node_geometry_set(Eo *obj, int x, int y, int w, int h) 792evas_vg_node_geometry_set(Evas_Vg_Node *obj, int x, int y, int w, int h)
793{ 793{
794 efl_gfx_entity_position_set(obj, EINA_POSITION2D(x, y)); 794 efl_gfx_entity_position_set(obj, EINA_POSITION2D(x, y));
795 efl_gfx_entity_size_set(obj, EINA_SIZE2D(w, h)); 795 efl_gfx_entity_size_set(obj, EINA_SIZE2D(w, h));
796} 796}
797 797
798EAPI void 798EAPI void
799evas_vg_node_stack_below(Eo *obj, Eo *below) 799evas_vg_node_stack_below(Evas_Vg_Node *obj, Eo *below)
800{ 800{
801 efl_gfx_stack_below(obj, below); 801 efl_gfx_stack_below(obj, below);
802} 802}
803 803
804EAPI void 804EAPI void
805evas_vg_node_stack_above(Eo *obj, Eo *above) 805evas_vg_node_stack_above(Evas_Vg_Node *obj, Eo *above)
806{ 806{
807 efl_gfx_stack_above(obj, above); 807 efl_gfx_stack_above(obj, above);
808} 808}
809 809
810EAPI void 810EAPI void
811evas_vg_node_raise(Eo *obj) 811evas_vg_node_raise(Evas_Vg_Node *obj)
812{ 812{
813 efl_gfx_stack_raise_to_top(obj); 813 efl_gfx_stack_raise_to_top(obj);
814} 814}
815 815
816EAPI void 816EAPI void
817evas_vg_node_lower(Eo *obj) 817evas_vg_node_lower(Evas_Vg_Node *obj)
818{ 818{
819 efl_gfx_stack_lower_to_bottom(obj); 819 efl_gfx_stack_lower_to_bottom(obj);
820} 820}
diff --git a/src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.c b/src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.c
index 559434b294..e6d520ca44 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.c
@@ -1,30 +1,30 @@
1 1
2EAPI void 2EAPI void
3evas_vg_node_transformation_set(Efl_Canvas_Vg_Node *obj, const Eina_Matrix3 *m) 3evas_vg_node_transformation_set(Evas_Vg_Node *obj, const Eina_Matrix3 *m)
4{ 4{
5 efl_canvas_vg_node_transformation_set(obj, m); 5 efl_canvas_vg_node_transformation_set(obj, m);
6} 6}
7 7
8EAPI const Eina_Matrix3 * 8EAPI const Eina_Matrix3 *
9evas_vg_node_transformation_get(const Efl_Canvas_Vg_Node *obj) 9evas_vg_node_transformation_get(const Evas_Vg_Node *obj)
10{ 10{
11 return efl_canvas_vg_node_transformation_get(obj); 11 return efl_canvas_vg_node_transformation_get(obj);
12} 12}
13 13
14EAPI void 14EAPI void
15evas_vg_node_origin_set(Efl_Canvas_Vg_Node *obj, double x, double y) 15evas_vg_node_origin_set(Evas_Vg_Node *obj, double x, double y)
16{ 16{
17 efl_canvas_vg_node_origin_set(obj, x, y); 17 efl_canvas_vg_node_origin_set(obj, x, y);
18} 18}
19 19
20EAPI void 20EAPI void
21evas_vg_node_origin_get(const Efl_Canvas_Vg_Node *obj, double *x, double *y) 21evas_vg_node_origin_get(const Evas_Vg_Node *obj, double *x, double *y)
22{ 22{
23 efl_canvas_vg_node_origin_get(obj, x, y); 23 efl_canvas_vg_node_origin_get(obj, x, y);
24} 24}
25 25
26EAPI void 26EAPI void
27evas_vg_node_mask_set(Efl_Canvas_Vg_Node *obj, Efl_Canvas_Vg_Node *mask, int op EINA_UNUSED) 27evas_vg_node_mask_set(Evas_Vg_Node *obj, Evas_Vg_Node *mask, int op EINA_UNUSED)
28{ 28{
29 efl_canvas_vg_node_comp_method_set(obj, mask, 0); 29 efl_canvas_vg_node_comp_method_set(obj, mask, 0);
30} 30}
diff --git a/src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.h b/src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.h
index ee3b407331..ca85475ff5 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.h
+++ b/src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.h
@@ -1,15 +1,15 @@
1#ifndef _EFL_CANVAS_VG_NODE_EO_LEGACY_H_ 1#ifndef _EVAS_VG_NODE_EO_LEGACY_H_
2#define _EFL_CANVAS_VG_NODE_EO_LEGACY_H_ 2#define _EVAS_VG_NODE_EO_LEGACY_H_
3 3
4#ifndef _EFL_CANVAS_VG_NODE_EO_CLASS_TYPE 4#ifndef _EVAS_VG_NODE_EO_CLASS_TYPE
5#define _EFL_CANVAS_VG_NODE_EO_CLASS_TYPE 5#define _EVAS_VG_NODE_EO_CLASS_TYPE
6 6
7typedef Eo Efl_Canvas_Vg_Node; 7typedef Eo Evas_Vg_Node;
8 8
9#endif 9#endif
10 10
11#ifndef _EFL_CANVAS_VG_NODE_EO_TYPES 11#ifndef _EVAS_VG_NODE_EO_TYPES
12#define _EFL_CANVAS_VG_NODE_EO_TYPES 12#define _EVAS_VG_NODE_EO_TYPES
13 13
14 14
15#endif 15#endif
@@ -26,7 +26,7 @@ typedef Eo Efl_Canvas_Vg_Node;
26 * 26 *
27 * @ingroup Evas_Vg_Node_Group 27 * @ingroup Evas_Vg_Node_Group
28 */ 28 */
29EAPI void evas_vg_node_transformation_set(Efl_Canvas_Vg_Node *obj, const Eina_Matrix3 *m); 29EAPI void evas_vg_node_transformation_set(Evas_Vg_Node *obj, const Eina_Matrix3 *m);
30 30
31/** 31/**
32 * @brief Gets the transformation matrix used for this node object. 32 * @brief Gets the transformation matrix used for this node object.
@@ -39,7 +39,7 @@ EAPI void evas_vg_node_transformation_set(Efl_Canvas_Vg_Node *obj, const Eina_Ma
39 * 39 *
40 * @ingroup Evas_Vg_Node_Group 40 * @ingroup Evas_Vg_Node_Group
41 */ 41 */
42EAPI const Eina_Matrix3 *evas_vg_node_transformation_get(const Efl_Canvas_Vg_Node *obj); 42EAPI const Eina_Matrix3 *evas_vg_node_transformation_get(const Evas_Vg_Node *obj);
43 43
44/** 44/**
45 * @brief Sets the origin position of the node object. 45 * @brief Sets the origin position of the node object.
@@ -54,7 +54,7 @@ EAPI const Eina_Matrix3 *evas_vg_node_transformation_get(const Efl_Canvas_Vg_Nod
54 * 54 *
55 * @ingroup Evas_Vg_Node_Group 55 * @ingroup Evas_Vg_Node_Group
56 */ 56 */
57EAPI void evas_vg_node_origin_set(Efl_Canvas_Vg_Node *obj, double x, double y); 57EAPI void evas_vg_node_origin_set(Evas_Vg_Node *obj, double x, double y);
58 58
59/** 59/**
60 * @brief Gets the origin position of the node object. 60 * @brief Gets the origin position of the node object.
@@ -67,7 +67,7 @@ EAPI void evas_vg_node_origin_set(Efl_Canvas_Vg_Node *obj, double x, double y);
67 * 67 *
68 * @ingroup Evas_Vg_Node_Group 68 * @ingroup Evas_Vg_Node_Group
69 */ 69 */
70EAPI void evas_vg_node_origin_get(const Efl_Canvas_Vg_Node *obj, double *x, double *y); 70EAPI void evas_vg_node_origin_get(const Evas_Vg_Node *obj, double *x, double *y);
71 71
72/** 72/**
73 * @brief Set Mask Node to this renderer 73 * @brief Set Mask Node to this renderer
@@ -78,6 +78,6 @@ EAPI void evas_vg_node_origin_get(const Efl_Canvas_Vg_Node *obj, double *x, doub
78 * 78 *
79 * @ingroup Evas_Vg_Node_Group 79 * @ingroup Evas_Vg_Node_Group
80 */ 80 */
81EAPI void evas_vg_node_mask_set(Efl_Canvas_Vg_Node *obj, Efl_Canvas_Vg_Node *mask, int op); 81EAPI void evas_vg_node_mask_set(Evas_Vg_Node *obj, Evas_Vg_Node *mask, int op);
82 82
83#endif 83#endif
diff --git a/src/lib/evas/canvas/efl_canvas_vg_object.c b/src/lib/evas/canvas/efl_canvas_vg_object.c
index cccd9e2c6b..7963776889 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_object.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_object.c
@@ -1018,7 +1018,7 @@ _efl_canvas_vg_object_default_size_get(const Eo *eo_obj EINA_UNUSED,
1018} 1018}
1019 1019
1020/* the actual api call to add a vector graphic object */ 1020/* the actual api call to add a vector graphic object */
1021EAPI Evas_Object * 1021EAPI Eo *
1022evas_object_vg_add(Evas *e) 1022evas_object_vg_add(Evas *e)
1023{ 1023{
1024 e = evas_find(e); 1024 e = evas_find(e);
@@ -1090,13 +1090,13 @@ _efl_ui_canvas_object_vg_fill_mode_to_evas_object_vg_fill_mode(Efl_Canvas_Vg_Fil
1090} 1090}
1091 1091
1092EAPI void 1092EAPI void
1093evas_object_vg_fill_mode_set(Efl_VG *obj, Evas_Object_Vg_Fill_Mode fill_mode) 1093evas_object_vg_fill_mode_set(Evas_Object *obj, Evas_Object_Vg_Fill_Mode fill_mode)
1094{ 1094{
1095 efl_canvas_vg_object_fill_mode_set(obj, _evas_object_vg_fill_mode_to_efl_ui_canvas_object_vg_fill_mode(fill_mode)); 1095 efl_canvas_vg_object_fill_mode_set(obj, _evas_object_vg_fill_mode_to_efl_ui_canvas_object_vg_fill_mode(fill_mode));
1096} 1096}
1097 1097
1098EAPI Evas_Object_Vg_Fill_Mode 1098EAPI Evas_Object_Vg_Fill_Mode
1099evas_object_vg_fill_mode_get(const Efl_VG *obj) 1099evas_object_vg_fill_mode_get(const Evas_Object *obj)
1100{ 1100{
1101 return _efl_ui_canvas_object_vg_fill_mode_to_evas_object_vg_fill_mode(efl_canvas_vg_object_fill_mode_get(obj)); 1101 return _efl_ui_canvas_object_vg_fill_mode_to_evas_object_vg_fill_mode(efl_canvas_vg_object_fill_mode_get(obj));
1102} 1102}
diff --git a/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.c b/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.c
index 936ae0b512..14a9595c12 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.c
@@ -1,36 +1,36 @@
1 1
2EAPI void 2EAPI void
3evas_object_vg_viewbox_set(Efl_VG *obj, Eina_Rect viewbox) 3evas_object_vg_viewbox_set(Evas_Object *obj, Eina_Rect viewbox)
4{ 4{
5 efl_canvas_vg_object_viewbox_set(obj, viewbox); 5 efl_canvas_vg_object_viewbox_set(obj, viewbox);
6} 6}
7 7
8EAPI Eina_Rect 8EAPI Eina_Rect
9evas_object_vg_viewbox_get(const Efl_VG *obj) 9evas_object_vg_viewbox_get(const Evas_Object *obj)
10{ 10{
11 return efl_canvas_vg_object_viewbox_get(obj); 11 return efl_canvas_vg_object_viewbox_get(obj);
12} 12}
13 13
14EAPI void 14EAPI void
15evas_object_vg_viewbox_align_set(Efl_VG *obj, double align_x, double align_y) 15evas_object_vg_viewbox_align_set(Evas_Object *obj, double align_x, double align_y)
16{ 16{
17 efl_canvas_vg_object_viewbox_align_set(obj, align_x, align_y); 17 efl_canvas_vg_object_viewbox_align_set(obj, align_x, align_y);
18} 18}
19 19
20EAPI void 20EAPI void
21evas_object_vg_viewbox_align_get(const Efl_VG *obj, double *align_x, double *align_y) 21evas_object_vg_viewbox_align_get(const Evas_Object *obj, double *align_x, double *align_y)
22{ 22{
23 efl_canvas_vg_object_viewbox_align_get(obj, align_x, align_y); 23 efl_canvas_vg_object_viewbox_align_get(obj, align_x, align_y);
24} 24}
25 25
26EAPI void 26EAPI void
27evas_object_vg_root_node_set(Efl_VG *obj, Efl_Canvas_Vg_Node *root) 27evas_object_vg_root_node_set(Evas_Object *obj, Efl_Canvas_Vg_Node *root)
28{ 28{
29 efl_canvas_vg_object_root_node_set(obj, root); 29 efl_canvas_vg_object_root_node_set(obj, root);
30} 30}
31 31
32EAPI Efl_Canvas_Vg_Node * 32EAPI Efl_Canvas_Vg_Node *
33evas_object_vg_root_node_get(const Efl_VG *obj) 33evas_object_vg_root_node_get(const Evas_Object *obj)
34{ 34{
35 return efl_canvas_vg_object_root_node_get(obj); 35 return efl_canvas_vg_object_root_node_get(obj);
36} 36}
diff --git a/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.h b/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.h
index 319305f8c6..8877db086c 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.h
+++ b/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.h
@@ -40,7 +40,7 @@ typedef enum
40 * 40 *
41 * @ingroup Evas_Object_Vg_Group 41 * @ingroup Evas_Object_Vg_Group
42 */ 42 */
43EAPI void evas_object_vg_fill_mode_set(Efl_VG *obj, Evas_Object_Vg_Fill_Mode fill_mode); 43EAPI void evas_object_vg_fill_mode_set(Evas_Object *obj, Evas_Object_Vg_Fill_Mode fill_mode);
44 44
45/** 45/**
46 * @brief Control how the viewbox is mapped to the vg canvas's viewport. 46 * @brief Control how the viewbox is mapped to the vg canvas's viewport.
@@ -51,7 +51,7 @@ EAPI void evas_object_vg_fill_mode_set(Efl_VG *obj, Evas_Object_Vg_Fill_Mode fil
51 * 51 *
52 * @ingroup Evas_Object_Vg_Group 52 * @ingroup Evas_Object_Vg_Group
53 */ 53 */
54EAPI Evas_Object_Vg_Fill_Mode evas_object_vg_fill_mode_get(const Efl_VG *obj); 54EAPI Evas_Object_Vg_Fill_Mode evas_object_vg_fill_mode_get(const Evas_Object *obj);
55 55
56/** 56/**
57 * @brief Sets the viewbox for the evas vg canvas. viewbox if set should be 57 * @brief Sets the viewbox for the evas vg canvas. viewbox if set should be
@@ -62,7 +62,7 @@ EAPI Evas_Object_Vg_Fill_Mode evas_object_vg_fill_mode_get(const Efl_VG *obj);
62 * 62 *
63 * @ingroup Evas_Object_Vg_Group 63 * @ingroup Evas_Object_Vg_Group
64 */ 64 */
65EAPI void evas_object_vg_viewbox_set(Efl_VG *obj, Eina_Rect viewbox); 65EAPI void evas_object_vg_viewbox_set(Evas_Object *obj, Eina_Rect viewbox);
66 66
67/** 67/**
68 * @brief Get the current viewbox from the evas_object_vg 68 * @brief Get the current viewbox from the evas_object_vg
@@ -73,7 +73,7 @@ EAPI void evas_object_vg_viewbox_set(Efl_VG *obj, Eina_Rect viewbox);
73 * 73 *
74 * @ingroup Evas_Object_Vg_Group 74 * @ingroup Evas_Object_Vg_Group
75 */ 75 */
76EAPI Eina_Rect evas_object_vg_viewbox_get(const Efl_VG *obj); 76EAPI Eina_Rect evas_object_vg_viewbox_get(const Evas_Object *obj);
77 77
78/** 78/**
79 * @brief Control how the viewbox is positioned inside the viewport. 79 * @brief Control how the viewbox is positioned inside the viewport.
@@ -84,7 +84,7 @@ EAPI Eina_Rect evas_object_vg_viewbox_get(const Efl_VG *obj);
84 * 84 *
85 * @ingroup Evas_Object_Vg_Group 85 * @ingroup Evas_Object_Vg_Group
86 */ 86 */
87EAPI void evas_object_vg_viewbox_align_set(Efl_VG *obj, double align_x, double align_y); 87EAPI void evas_object_vg_viewbox_align_set(Evas_Object *obj, double align_x, double align_y);
88 88
89/** 89/**
90 * @brief Control how the viewbox is positioned inside the viewport. 90 * @brief Control how the viewbox is positioned inside the viewport.
@@ -95,7 +95,7 @@ EAPI void evas_object_vg_viewbox_align_set(Efl_VG *obj, double align_x, double a
95 * 95 *
96 * @ingroup Evas_Object_Vg_Group 96 * @ingroup Evas_Object_Vg_Group
97 */ 97 */
98EAPI void evas_object_vg_viewbox_align_get(const Efl_VG *obj, double *align_x, double *align_y); 98EAPI void evas_object_vg_viewbox_align_get(const Evas_Object *obj, double *align_x, double *align_y);
99 99
100/** 100/**
101 * @brief Set the root node of the evas_object_vg. 101 * @brief Set the root node of the evas_object_vg.
@@ -110,7 +110,7 @@ EAPI void evas_object_vg_viewbox_align_get(const Efl_VG *obj, double *align_x, d
110 * 110 *
111 * @ingroup Evas_Object_Vg_Group 111 * @ingroup Evas_Object_Vg_Group
112 */ 112 */
113EAPI void evas_object_vg_root_node_set(Efl_VG *obj, Efl_Canvas_Vg_Node *root); 113EAPI void evas_object_vg_root_node_set(Evas_Object *obj, Evas_Vg_Node *root);
114 114
115/** 115/**
116 * @brief Get the root node of the evas_object_vg. 116 * @brief Get the root node of the evas_object_vg.
@@ -123,6 +123,6 @@ EAPI void evas_object_vg_root_node_set(Efl_VG *obj, Efl_Canvas_Vg_Node *root);
123 * 123 *
124 * @ingroup Evas_Object_Vg_Group 124 * @ingroup Evas_Object_Vg_Group
125 */ 125 */
126EAPI Efl_Canvas_Vg_Node *evas_object_vg_root_node_get(const Efl_VG *obj); 126EAPI Evas_Vg_Node *evas_object_vg_root_node_get(const Evas_Object *obj);
127 127
128#endif 128#endif
diff --git a/src/lib/evas/canvas/efl_canvas_vg_shape.c b/src/lib/evas/canvas/efl_canvas_vg_shape.c
index cf220821d6..fb886d55df 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_shape.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_shape.c
@@ -236,227 +236,227 @@ _efl_canvas_vg_shape_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_Vg_Shape_
236} 236}
237 237
238EAPI double 238EAPI double
239evas_vg_shape_stroke_scale_get(Eo *obj) 239evas_vg_shape_stroke_scale_get(Evas_Vg_Shape *obj)
240{ 240{
241 return efl_gfx_shape_stroke_scale_get(obj); 241 return efl_gfx_shape_stroke_scale_get(obj);
242} 242}
243 243
244EAPI void 244EAPI void
245evas_vg_shape_stroke_scale_set(Eo *obj, double s) 245evas_vg_shape_stroke_scale_set(Evas_Vg_Shape *obj, double s)
246{ 246{
247 efl_gfx_shape_stroke_scale_set(obj, s); 247 efl_gfx_shape_stroke_scale_set(obj, s);
248 efl_canvas_vg_node_change(obj); 248 efl_canvas_vg_node_change(obj);
249} 249}
250 250
251EAPI void 251EAPI void
252evas_vg_shape_stroke_color_get(Eo *obj, int *r, int *g, int *b, int *a) 252evas_vg_shape_stroke_color_get(Evas_Vg_Shape *obj, int *r, int *g, int *b, int *a)
253{ 253{
254 efl_gfx_shape_stroke_color_get(obj, r, g, b, a); 254 efl_gfx_shape_stroke_color_get(obj, r, g, b, a);
255} 255}
256 256
257EAPI void 257EAPI void
258evas_vg_shape_stroke_color_set(Eo *obj, int r, int g, int b, int a) 258evas_vg_shape_stroke_color_set(Evas_Vg_Shape *obj, int r, int g, int b, int a)
259{ 259{
260 efl_gfx_shape_stroke_color_set(obj, r, g, b, a); 260 efl_gfx_shape_stroke_color_set(obj, r, g, b, a);
261 efl_canvas_vg_node_change(obj); 261 efl_canvas_vg_node_change(obj);
262} 262}
263 263
264EAPI double 264EAPI double
265evas_vg_shape_stroke_width_get(Eo *obj) 265evas_vg_shape_stroke_width_get(Evas_Vg_Shape *obj)
266{ 266{
267 return efl_gfx_shape_stroke_width_get(obj); 267 return efl_gfx_shape_stroke_width_get(obj);
268} 268}
269 269
270EAPI void 270EAPI void
271evas_vg_shape_stroke_width_set(Eo *obj, double w) 271evas_vg_shape_stroke_width_set(Evas_Vg_Shape *obj, double w)
272{ 272{
273 efl_gfx_shape_stroke_width_set(obj, w); 273 efl_gfx_shape_stroke_width_set(obj, w);
274 efl_canvas_vg_node_change(obj); 274 efl_canvas_vg_node_change(obj);
275} 275}
276 276
277EAPI double 277EAPI double
278evas_vg_shape_stroke_location_get(Eo *obj) 278evas_vg_shape_stroke_location_get(Evas_Vg_Shape *obj)
279{ 279{
280 return efl_gfx_shape_stroke_location_get(obj); 280 return efl_gfx_shape_stroke_location_get(obj);
281} 281}
282 282
283EAPI void 283EAPI void
284evas_vg_shape_stroke_location_set(Eo *obj, double centered) 284evas_vg_shape_stroke_location_set(Evas_Vg_Shape *obj, double centered)
285{ 285{
286 efl_gfx_shape_stroke_location_set(obj, centered); 286 efl_gfx_shape_stroke_location_set(obj, centered);
287 efl_canvas_vg_node_change(obj); 287 efl_canvas_vg_node_change(obj);
288} 288}
289 289
290EAPI void 290EAPI void
291evas_vg_shape_stroke_dash_get(Eo *obj, const Efl_Gfx_Dash **dash, unsigned int *length) 291evas_vg_shape_stroke_dash_get(Evas_Vg_Shape *obj, const Evas_Vg_Dash **dash, unsigned int *length)
292{ 292{
293 efl_gfx_shape_stroke_dash_get(obj, dash, length); 293 efl_gfx_shape_stroke_dash_get(obj, (const Efl_Gfx_Dash **)dash, length);
294} 294}
295 295
296EAPI void 296EAPI void
297evas_vg_shape_stroke_dash_set(Eo *obj, const Efl_Gfx_Dash *dash, unsigned int length) 297evas_vg_shape_stroke_dash_set(Evas_Vg_Shape *obj, const Evas_Vg_Dash *dash, unsigned int length)
298{ 298{
299 efl_gfx_shape_stroke_dash_set(obj, dash, length); 299 efl_gfx_shape_stroke_dash_set(obj, (const Efl_Gfx_Dash *)dash, length);
300 efl_canvas_vg_node_change(obj); 300 efl_canvas_vg_node_change(obj);
301} 301}
302 302
303EAPI Efl_Gfx_Cap 303EAPI Evas_Vg_Cap
304evas_vg_shape_stroke_cap_get(Eo *obj) 304evas_vg_shape_stroke_cap_get(Evas_Vg_Shape *obj)
305{ 305{
306 return efl_gfx_shape_stroke_cap_get(obj); 306 return efl_gfx_shape_stroke_cap_get(obj);
307} 307}
308 308
309EAPI void 309EAPI void
310evas_vg_shape_stroke_cap_set(Eo *obj, Efl_Gfx_Cap c) 310evas_vg_shape_stroke_cap_set(Evas_Vg_Shape *obj, Evas_Vg_Cap c)
311{ 311{
312 efl_gfx_shape_stroke_cap_set(obj, c); 312 efl_gfx_shape_stroke_cap_set(obj, c);
313 efl_canvas_vg_node_change(obj); 313 efl_canvas_vg_node_change(obj);
314} 314}
315 315
316EAPI Efl_Gfx_Join 316EAPI Evas_Vg_Join
317evas_vg_shape_stroke_join_get(Eo *obj) 317evas_vg_shape_stroke_join_get(Evas_Vg_Shape *obj)
318{ 318{
319 return efl_gfx_shape_stroke_join_get(obj); 319 return efl_gfx_shape_stroke_join_get(obj);
320} 320}
321 321
322EAPI void 322EAPI void
323evas_vg_shape_stroke_join_set(Eo *obj, Efl_Gfx_Join j) 323evas_vg_shape_stroke_join_set(Evas_Vg_Shape *obj, Evas_Vg_Join j)
324{ 324{
325 efl_gfx_shape_stroke_join_set(obj, j); 325 efl_gfx_shape_stroke_join_set(obj, j);
326 efl_canvas_vg_node_change(obj); 326 efl_canvas_vg_node_change(obj);
327} 327}
328 328
329EAPI void 329EAPI void
330evas_vg_shape_path_set(Eo *obj, const Efl_Gfx_Path_Command *op, const double *points) 330evas_vg_shape_path_set(Evas_Vg_Shape *obj, const Evas_Vg_Path_Command *op, const double *points)
331{ 331{
332 efl_gfx_path_set(obj, op, points); 332 efl_gfx_path_set(obj, (const Efl_Gfx_Path_Command *)op, points);
333 efl_canvas_vg_node_change(obj); 333 efl_canvas_vg_node_change(obj);
334} 334}
335 335
336EAPI void 336EAPI void
337evas_vg_shape_path_get(Eo *obj, const Efl_Gfx_Path_Command **op, const double **points) 337evas_vg_shape_path_get(Evas_Vg_Shape *obj, const Evas_Vg_Path_Command **op, const double **points)
338{ 338{
339 efl_gfx_path_get(obj, op, points); 339 efl_gfx_path_get(obj, (const Efl_Gfx_Path_Command **)op, points);
340} 340}
341 341
342EAPI void 342EAPI void
343evas_vg_shape_path_length_get(Eo *obj, unsigned int *commands, unsigned int *points) 343evas_vg_shape_path_length_get(Evas_Vg_Shape *obj, unsigned int *commands, unsigned int *points)
344{ 344{
345 efl_gfx_path_length_get(obj, commands, points); 345 efl_gfx_path_length_get(obj, commands, points);
346} 346}
347 347
348EAPI void 348EAPI void
349evas_vg_shape_current_get(Eo *obj, double *x, double *y) 349evas_vg_shape_current_get(Evas_Vg_Shape *obj, double *x, double *y)
350{ 350{
351 efl_gfx_path_current_get(obj, x, y); 351 efl_gfx_path_current_get(obj, x, y);
352} 352}
353 353
354EAPI void 354EAPI void
355evas_vg_shape_current_ctrl_get(Eo *obj, double *x, double *y) 355evas_vg_shape_current_ctrl_get(Evas_Vg_Shape *obj, double *x, double *y)
356{ 356{
357 efl_gfx_path_current_ctrl_get(obj, x, y); 357 efl_gfx_path_current_ctrl_get(obj, x, y);
358} 358}
359 359
360EAPI void 360EAPI void
361evas_vg_shape_dup(Eo *obj, Eo *dup_from) 361evas_vg_shape_dup(Evas_Vg_Shape *obj, Evas_Vg_Shape *dup_from)
362{ 362{
363 efl_gfx_path_copy_from(obj, dup_from); 363 efl_gfx_path_copy_from(obj, dup_from);
364 efl_canvas_vg_node_change(obj); 364 efl_canvas_vg_node_change(obj);
365} 365}
366 366
367EAPI void 367EAPI void
368evas_vg_shape_reset(Eo *obj) 368evas_vg_shape_reset(Evas_Vg_Shape *obj)
369{ 369{
370 efl_gfx_path_reset(obj); 370 efl_gfx_path_reset(obj);
371 efl_canvas_vg_node_change(obj); 371 efl_canvas_vg_node_change(obj);
372} 372}
373 373
374EAPI void 374EAPI void
375evas_vg_shape_append_move_to(Eo *obj, double x, double y) 375evas_vg_shape_append_move_to(Evas_Vg_Shape *obj, double x, double y)
376{ 376{
377 efl_gfx_path_append_move_to(obj, x, y); 377 efl_gfx_path_append_move_to(obj, x, y);
378 efl_canvas_vg_node_change(obj); 378 efl_canvas_vg_node_change(obj);
379} 379}
380 380
381EAPI void 381EAPI void
382evas_vg_shape_append_line_to(Eo *obj, double x, double y) 382evas_vg_shape_append_line_to(Evas_Vg_Shape *obj, double x, double y)
383{ 383{
384 efl_gfx_path_append_line_to(obj, x, y); 384 efl_gfx_path_append_line_to(obj, x, y);
385 efl_canvas_vg_node_change(obj); 385 efl_canvas_vg_node_change(obj);
386} 386}
387 387
388EAPI void 388EAPI void
389evas_vg_shape_append_quadratic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y) 389evas_vg_shape_append_quadratic_to(Evas_Vg_Shape *obj, double x, double y, double ctrl_x, double ctrl_y)
390{ 390{
391 efl_gfx_path_append_quadratic_to(obj, x, y, ctrl_x, ctrl_y); 391 efl_gfx_path_append_quadratic_to(obj, x, y, ctrl_x, ctrl_y);
392 efl_canvas_vg_node_change(obj); 392 efl_canvas_vg_node_change(obj);
393} 393}
394 394
395EAPI void 395EAPI void
396evas_vg_shape_append_squadratic_to(Eo *obj, double x, double y) 396evas_vg_shape_append_squadratic_to(Evas_Vg_Shape *obj, double x, double y)
397{ 397{
398 efl_gfx_path_append_squadratic_to(obj, x, y); 398 efl_gfx_path_append_squadratic_to(obj, x, y);
399 efl_canvas_vg_node_change(obj); 399 efl_canvas_vg_node_change(obj);
400} 400}
401 401
402EAPI void 402EAPI void
403evas_vg_shape_append_cubic_to(Eo *obj, double x, double y, double ctrl_x0, double ctrl_y0, double ctrl_x1, double ctrl_y1) 403evas_vg_shape_append_cubic_to(Evas_Vg_Shape *obj, double x, double y, double ctrl_x0, double ctrl_y0, double ctrl_x1, double ctrl_y1)
404{ 404{
405 efl_gfx_path_append_cubic_to(obj, ctrl_x0, ctrl_y0, ctrl_x1, ctrl_y1, x, y); 405 efl_gfx_path_append_cubic_to(obj, ctrl_x0, ctrl_y0, ctrl_x1, ctrl_y1, x, y);
406 efl_canvas_vg_node_change(obj); 406 efl_canvas_vg_node_change(obj);
407} 407}
408 408
409EAPI void 409EAPI void
410evas_vg_shape_append_scubic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y) 410evas_vg_shape_append_scubic_to(Evas_Vg_Shape *obj, double x, double y, double ctrl_x, double ctrl_y)
411{ 411{
412 efl_gfx_path_append_scubic_to(obj, x, y, ctrl_x, ctrl_y); 412 efl_gfx_path_append_scubic_to(obj, x, y, ctrl_x, ctrl_y);
413 efl_canvas_vg_node_change(obj); 413 efl_canvas_vg_node_change(obj);
414} 414}
415 415
416EAPI void 416EAPI void
417evas_vg_shape_append_arc_to(Eo *obj, double x, double y, double rx, double ry, double angle, Eina_Bool large_arc, Eina_Bool sweep) 417evas_vg_shape_append_arc_to(Evas_Vg_Shape *obj, double x, double y, double rx, double ry, double angle, Eina_Bool large_arc, Eina_Bool sweep)
418{ 418{
419 efl_gfx_path_append_arc_to(obj, x, y, rx, ry, angle, large_arc, sweep); 419 efl_gfx_path_append_arc_to(obj, x, y, rx, ry, angle, large_arc, sweep);
420 efl_canvas_vg_node_change(obj); 420 efl_canvas_vg_node_change(obj);
421} 421}
422 422
423EAPI void 423EAPI void
424evas_vg_shape_append_arc(Eo *obj, double x, double y, double w, double h, double start_angle, double sweep_length) 424evas_vg_shape_append_arc(Evas_Vg_Shape *obj, double x, double y, double w, double h, double start_angle, double sweep_length)
425{ 425{
426 efl_gfx_path_append_arc(obj, x, y, w, h, start_angle, sweep_length); 426 efl_gfx_path_append_arc(obj, x, y, w, h, start_angle, sweep_length);
427 efl_canvas_vg_node_change(obj); 427 efl_canvas_vg_node_change(obj);
428} 428}
429 429
430EAPI void 430EAPI void
431evas_vg_shape_append_close(Eo *obj) 431evas_vg_shape_append_close(Evas_Vg_Shape *obj)
432{ 432{
433 efl_gfx_path_append_close(obj); 433 efl_gfx_path_append_close(obj);
434 efl_canvas_vg_node_change(obj); 434 efl_canvas_vg_node_change(obj);
435} 435}
436 436
437EAPI void 437EAPI void
438evas_vg_shape_append_circle(Eo *obj, double x, double y, double radius) 438evas_vg_shape_append_circle(Evas_Vg_Shape *obj, double x, double y, double radius)
439{ 439{
440 efl_gfx_path_append_circle(obj, x, y, radius); 440 efl_gfx_path_append_circle(obj, x, y, radius);
441 efl_canvas_vg_node_change(obj); 441 efl_canvas_vg_node_change(obj);
442} 442}
443 443
444EAPI void 444EAPI void
445evas_vg_shape_append_rect(Eo *obj, double x, double y, double w, double h, double rx, double ry) 445evas_vg_shape_append_rect(Evas_Vg_Shape *obj, double x, double y, double w, double h, double rx, double ry)
446{ 446{
447 efl_gfx_path_append_rect(obj, x, y, w, h, rx, ry); 447 efl_gfx_path_append_rect(obj, x, y, w, h, rx, ry);
448 efl_canvas_vg_node_change(obj); 448 efl_canvas_vg_node_change(obj);
449} 449}
450 450
451EAPI void 451EAPI void
452evas_vg_shape_append_svg_path(Eo *obj, const char *svg_path_data) 452evas_vg_shape_append_svg_path(Evas_Vg_Shape *obj, const char *svg_path_data)
453{ 453{
454 efl_gfx_path_append_svg_path(obj, svg_path_data); 454 efl_gfx_path_append_svg_path(obj, svg_path_data);
455 efl_canvas_vg_node_change(obj); 455 efl_canvas_vg_node_change(obj);
456} 456}
457 457
458EAPI Eina_Bool 458EAPI Eina_Bool
459evas_vg_shape_interpolate(Eo *obj, const Eo *from, const Eo *to, double pos_map) 459evas_vg_shape_interpolate(Evas_Vg_Shape *obj, const Evas_Vg_Shape *from, const Evas_Vg_Shape *to, double pos_map)
460{ 460{
461 Eina_Bool ret = efl_gfx_path_interpolate(obj, from, to, pos_map); 461 Eina_Bool ret = efl_gfx_path_interpolate(obj, from, to, pos_map);
462 efl_canvas_vg_node_change(obj); 462 efl_canvas_vg_node_change(obj);
@@ -464,7 +464,7 @@ evas_vg_shape_interpolate(Eo *obj, const Eo *from, const Eo *to, double pos_map)
464} 464}
465 465
466EAPI Eina_Bool 466EAPI Eina_Bool
467evas_vg_shape_equal_commands(Eo *obj, const Eo *with) 467evas_vg_shape_equal_commands(Evas_Vg_Shape *obj, const Evas_Vg_Shape *with)
468{ 468{
469 return efl_gfx_path_equal_commands(obj, with); 469 return efl_gfx_path_equal_commands(obj, with);
470} 470}
diff --git a/src/lib/evas/canvas/efl_canvas_vg_shape_eo.legacy.h b/src/lib/evas/canvas/efl_canvas_vg_shape_eo.legacy.h
index 444acd2334..a721c95928 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_shape_eo.legacy.h
+++ b/src/lib/evas/canvas/efl_canvas_vg_shape_eo.legacy.h
@@ -1,16 +1,15 @@
1#ifndef _EFL_CANVAS_VG_SHAPE_EO_LEGACY_H_ 1#ifndef _EVAS_VG_SHAPE_EO_LEGACY_H_
2#define _EFL_CANVAS_VG_SHAPE_EO_LEGACY_H_ 2#define _EVAS_VG_SHAPE_EO_LEGACY_H_
3 3
4#ifndef _EFL_CANVAS_VG_SHAPE_EO_CLASS_TYPE 4#ifndef _EVAS_VG_SHAPE_EO_CLASS_TYPE
5#define _EFL_CANVAS_VG_SHAPE_EO_CLASS_TYPE 5#define _EVAS_VG_SHAPE_EO_CLASS_TYPE
6 6
7typedef Eo Efl_Canvas_Vg_Shape; 7typedef Eo Evas_Vg_Shape;
8 8
9#endif 9#endif
10 10
11#ifndef _EFL_CANVAS_VG_SHAPE_EO_TYPES 11#ifndef _EVAS_VG_SHAPE_EO_TYPES
12#define _EFL_CANVAS_VG_SHAPE_EO_TYPES 12#define _EVAS_VG_SHAPE_EO_TYPES
13
14 13
15#endif 14#endif
16 15
@@ -22,7 +21,7 @@ typedef Eo Efl_Canvas_Vg_Shape;
22 * 21 *
23 * @ingroup Evas_Vg_Shape_Group 22 * @ingroup Evas_Vg_Shape_Group
24 */ 23 */
25EAPI void evas_vg_shape_fill_set(Efl_Canvas_Vg_Shape *obj, Efl_Canvas_Vg_Node *f); 24EAPI void evas_vg_shape_fill_set(Evas_Vg_Shape *obj, Evas_Vg_Node *f);
26 25
27/** 26/**
28 * @brief Fill of the shape object 27 * @brief Fill of the shape object
@@ -33,7 +32,7 @@ EAPI void evas_vg_shape_fill_set(Efl_Canvas_Vg_Shape *obj, Efl_Canvas_Vg_Node *f
33 * 32 *
34 * @ingroup Evas_Vg_Shape_Group 33 * @ingroup Evas_Vg_Shape_Group
35 */ 34 */
36EAPI Efl_Canvas_Vg_Node *evas_vg_shape_fill_get(const Efl_Canvas_Vg_Shape *obj); 35EAPI Evas_Vg_Node *evas_vg_shape_fill_get(const Evas_Vg_Shape *obj);
37 36
38/** 37/**
39 * @brief Stroke fill of the shape object 38 * @brief Stroke fill of the shape object
@@ -43,7 +42,7 @@ EAPI Efl_Canvas_Vg_Node *evas_vg_shape_fill_get(const Efl_Canvas_Vg_Shape *obj);
43 * 42 *
44 * @ingroup Evas_Vg_Shape_Group 43 * @ingroup Evas_Vg_Shape_Group
45 */ 44 */
46EAPI void evas_vg_shape_stroke_fill_set(Efl_Canvas_Vg_Shape *obj, Efl_Canvas_Vg_Node *f); 45EAPI void evas_vg_shape_stroke_fill_set(Evas_Vg_Shape *obj, Evas_Vg_Node *f);
47 46
48/** 47/**
49 * @brief Stroke fill of the shape object 48 * @brief Stroke fill of the shape object
@@ -54,7 +53,7 @@ EAPI void evas_vg_shape_stroke_fill_set(Efl_Canvas_Vg_Shape *obj, Efl_Canvas_Vg_
54 * 53 *
55 * @ingroup Evas_Vg_Shape_Group 54 * @ingroup Evas_Vg_Shape_Group
56 */ 55 */
57EAPI Efl_Canvas_Vg_Node *evas_vg_shape_stroke_fill_get(const Efl_Canvas_Vg_Shape *obj); 56EAPI Evas_Vg_Node *evas_vg_shape_stroke_fill_get(const Evas_Vg_Shape *obj);
58 57
59/** 58/**
60 * @brief Stroke marker of the shape object 59 * @brief Stroke marker of the shape object
@@ -64,7 +63,7 @@ EAPI Efl_Canvas_Vg_Node *evas_vg_shape_stroke_fill_get(const Efl_Canvas_Vg_Shape
64 * 63 *
65 * @ingroup Evas_Vg_Shape_Group 64 * @ingroup Evas_Vg_Shape_Group
66 */ 65 */
67EAPI void evas_vg_shape_stroke_marker_set(Efl_Canvas_Vg_Shape *obj, Efl_Canvas_Vg_Node *m); 66EAPI void evas_vg_shape_stroke_marker_set(Evas_Vg_Shape *obj, Evas_Vg_Node *m);
68 67
69/** 68/**
70 * @brief Stroke marker of the shape object 69 * @brief Stroke marker of the shape object
@@ -75,6 +74,6 @@ EAPI void evas_vg_shape_stroke_marker_set(Efl_Canvas_Vg_Shape *obj, Efl_Canvas_V
75 * 74 *
76 * @ingroup Evas_Vg_Shape_Group 75 * @ingroup Evas_Vg_Shape_Group
77 */ 76 */
78EAPI Efl_Canvas_Vg_Node *evas_vg_shape_stroke_marker_get(const Efl_Canvas_Vg_Shape *obj); 77EAPI Evas_Vg_Node *evas_vg_shape_stroke_marker_get(const Evas_Vg_Shape *obj);
79 78
80#endif 79#endif
diff --git a/src/lib/evas/canvas/meson.build b/src/lib/evas/canvas/meson.build
index 35bdb46841..a7a6d06385 100644
--- a/src/lib/evas/canvas/meson.build
+++ b/src/lib/evas/canvas/meson.build
@@ -111,6 +111,7 @@ evas_legacy_h = files([
111 'efl_canvas_vg_node_eo.legacy.h', 111 'efl_canvas_vg_node_eo.legacy.h',
112 'efl_canvas_vg_object_eo.legacy.h', 112 'efl_canvas_vg_object_eo.legacy.h',
113 'efl_canvas_vg_shape_eo.legacy.h', 113 'efl_canvas_vg_shape_eo.legacy.h',
114 'efl_canvas_vg_gradient_eo.legacy.h',
114 'evas_box_eo.legacy.h', 115 'evas_box_eo.legacy.h',
115 'evas_canvas_eo.legacy.h', 116 'evas_canvas_eo.legacy.h',
116 'evas_grid_eo.legacy.h', 117 'evas_grid_eo.legacy.h',