From 5c4c21eacca551f5fdcab0bdfc3e7691544d490b Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Wed, 28 Jan 2015 22:06:41 +0100 Subject: [PATCH] evas: those function should have been static. Change-Id: I5e643a920a7091ea049f4b9eb935c717323bbd3b --- src/lib/evas/canvas/evas_vg_container.c | 4 +-- src/lib/evas/canvas/evas_vg_gradient.c | 8 ++--- src/lib/evas/canvas/evas_vg_gradient_linear.c | 8 ++--- src/lib/evas/canvas/evas_vg_gradient_radial.c | 12 +++---- src/lib/evas/canvas/evas_vg_image.c | 12 +++---- src/lib/evas/canvas/evas_vg_private.h | 5 ++- src/lib/evas/canvas/evas_vg_shape.c | 48 +++++++++++++-------------- 7 files changed, 50 insertions(+), 47 deletions(-) diff --git a/src/lib/evas/canvas/evas_vg_container.c b/src/lib/evas/canvas/evas_vg_container.c index 3459f4a..c4b7f38 100644 --- a/src/lib/evas/canvas/evas_vg_container.c +++ b/src/lib/evas/canvas/evas_vg_container.c @@ -5,14 +5,14 @@ #define MY_CLASS EVAS_VG_CONTAINER_CLASS -void +static void _evas_vg_container_eo_base_constructor(Eo *obj, Evas_VG_Container_Data *pd EINA_UNUSED) { eo_do_super(obj, MY_CLASS, eo_constructor()); } -Eina_Bool +static Eina_Bool _evas_vg_container_evas_vg_node_bound_get(Eo *obj EINA_UNUSED, Evas_VG_Container_Data *pd, Eina_Rectangle *r) diff --git a/src/lib/evas/canvas/evas_vg_gradient.c b/src/lib/evas/canvas/evas_vg_gradient.c index 28ed579..acca97f 100644 --- a/src/lib/evas/canvas/evas_vg_gradient.c +++ b/src/lib/evas/canvas/evas_vg_gradient.c @@ -13,7 +13,7 @@ struct _Evas_VG_Gradient_Data Efl_Graphics_Gradient_Spread s; }; -void +static void _evas_vg_gradient_efl_graphics_gradient_stop_set(Eo *obj EINA_UNUSED, Evas_VG_Gradient_Data *pd, const Efl_Graphics_Gradient_Stop *colors, @@ -30,7 +30,7 @@ _evas_vg_gradient_efl_graphics_gradient_stop_set(Eo *obj EINA_UNUSED, pd->colors_count = length; } -void +static void _evas_vg_gradient_efl_graphics_gradient_stop_get(Eo *obj EINA_UNUSED, Evas_VG_Gradient_Data *pd, const Efl_Graphics_Gradient_Stop **colors, @@ -40,7 +40,7 @@ _evas_vg_gradient_efl_graphics_gradient_stop_get(Eo *obj EINA_UNUSED, if (length) *length = pd->colors_count; } -void +static void _evas_vg_gradient_efl_graphics_gradient_spread_set(Eo *obj EINA_UNUSED, Evas_VG_Gradient_Data *pd, Efl_Graphics_Gradient_Spread s) @@ -48,7 +48,7 @@ _evas_vg_gradient_efl_graphics_gradient_spread_set(Eo *obj EINA_UNUSED, pd->s = s; } -Efl_Graphics_Gradient_Spread +static Efl_Graphics_Gradient_Spread _evas_vg_gradient_efl_graphics_gradient_spread_get(Eo *obj EINA_UNUSED, Evas_VG_Gradient_Data *pd) { diff --git a/src/lib/evas/canvas/evas_vg_gradient_linear.c b/src/lib/evas/canvas/evas_vg_gradient_linear.c index f60dc3b..035f6b1 100644 --- a/src/lib/evas/canvas/evas_vg_gradient_linear.c +++ b/src/lib/evas/canvas/evas_vg_gradient_linear.c @@ -11,7 +11,7 @@ struct _Evas_VG_Gradient_Linear_Data } start, end; }; -void +static void _evas_vg_gradient_linear_efl_graphics_gradient_linear_start_set(Eo *obj EINA_UNUSED, Evas_VG_Gradient_Linear_Data *pd, double x, double y) @@ -20,7 +20,7 @@ _evas_vg_gradient_linear_efl_graphics_gradient_linear_start_set(Eo *obj EINA_UNU pd->start.y = y; } -void +static void _evas_vg_gradient_linear_efl_graphics_gradient_linear_start_get(Eo *obj EINA_UNUSED, Evas_VG_Gradient_Linear_Data *pd, double *x, double *y) @@ -29,7 +29,7 @@ _evas_vg_gradient_linear_efl_graphics_gradient_linear_start_get(Eo *obj EINA_UNU if (y) *y = pd->start.y; } -void +static void _evas_vg_gradient_linear_efl_graphics_gradient_linear_end_set(Eo *obj EINA_UNUSED, Evas_VG_Gradient_Linear_Data *pd, double x, double y) @@ -38,7 +38,7 @@ _evas_vg_gradient_linear_efl_graphics_gradient_linear_end_set(Eo *obj EINA_UNUSE pd->end.y = y; } -void +static void _evas_vg_gradient_linear_efl_graphics_gradient_linear_end_get(Eo *obj EINA_UNUSED, Evas_VG_Gradient_Linear_Data *pd, double *x, double *y) diff --git a/src/lib/evas/canvas/evas_vg_gradient_radial.c b/src/lib/evas/canvas/evas_vg_gradient_radial.c index fecec50..0e21565 100644 --- a/src/lib/evas/canvas/evas_vg_gradient_radial.c +++ b/src/lib/evas/canvas/evas_vg_gradient_radial.c @@ -10,7 +10,7 @@ struct _Evas_VG_Gradient_Radial_Data double radius; }; -void +static void _evas_vg_gradient_radial_efl_graphics_gradient_radial_center_set(Eo *obj EINA_UNUSED, Evas_VG_Gradient_Radial_Data *pd, double x, double y) @@ -19,7 +19,7 @@ _evas_vg_gradient_radial_efl_graphics_gradient_radial_center_set(Eo *obj EINA_UN pd->center.y = y; } -void +static void _evas_vg_gradient_radial_efl_graphics_gradient_radial_center_get(Eo *obj EINA_UNUSED, Evas_VG_Gradient_Radial_Data *pd, double *x, double *y) @@ -28,7 +28,7 @@ _evas_vg_gradient_radial_efl_graphics_gradient_radial_center_get(Eo *obj EINA_UN if (y) *y = pd->center.y; } -void +static void _evas_vg_gradient_radial_efl_graphics_gradient_radial_radius_set(Eo *obj EINA_UNUSED, Evas_VG_Gradient_Radial_Data *pd, double r) @@ -36,14 +36,14 @@ _evas_vg_gradient_radial_efl_graphics_gradient_radial_radius_set(Eo *obj EINA_UN pd->radius = r; } -double +static double _evas_vg_gradient_radial_efl_graphics_gradient_radial_radius_get(Eo *obj EINA_UNUSED, Evas_VG_Gradient_Radial_Data *pd) { return pd->radius; } -void +static void _evas_vg_gradient_radial_efl_graphics_gradient_radial_focal_set(Eo *obj EINA_UNUSED, Evas_VG_Gradient_Radial_Data *pd, double x, double y) @@ -52,7 +52,7 @@ _evas_vg_gradient_radial_efl_graphics_gradient_radial_focal_set(Eo *obj EINA_UNU pd->focal.y = y; } -void +static void _evas_vg_gradient_radial_efl_graphics_gradient_radial_focal_get(Eo *obj EINA_UNUSED, Evas_VG_Gradient_Radial_Data *pd, double *x, double *y) diff --git a/src/lib/evas/canvas/evas_vg_image.c b/src/lib/evas/canvas/evas_vg_image.c index b93fc13..21a7bbe 100644 --- a/src/lib/evas/canvas/evas_vg_image.c +++ b/src/lib/evas/canvas/evas_vg_image.c @@ -13,21 +13,21 @@ struct _Evas_VG_Image_Data unsigned int w, h; }; -void +static void _evas_vg_image_position_set(Eo *obj, Evas_VG_Image_Data *pd, int x, int y) { pd->x = x; pd->y = y; } -void +static void _evas_vg_image_position_get(Eo *obj, Evas_VG_Image_Data *pd, int *x, int *y) { if (x) *x = pd->x; if (y) *y = pd->y; } -void +static void _evas_vg_image_size_set(Eo *obj, Evas_VG_Image_Data *pd, unsigned int w, unsigned int h) { @@ -35,7 +35,7 @@ _evas_vg_image_size_set(Eo *obj, Evas_VG_Image_Data *pd, pd->h = h; } -void +static void _evas_vg_image_size_get(Eo *obj, Evas_VG_Image_Data *pd, unsigned int *w, unsigned int *h) { @@ -43,7 +43,7 @@ _evas_vg_image_size_get(Eo *obj, Evas_VG_Image_Data *pd, if (h) *h = pd->h; } -Eina_Bool +static Eina_Bool _evas_vg_image_efl_file_file_set(Eo *obj, Evas_VG_Image_Data *pd, const char *file, const char *key) { @@ -51,7 +51,7 @@ _evas_vg_image_efl_file_file_set(Eo *obj, Evas_VG_Image_Data *pd, eina_stringshare_replace(&pd->key, key); } -void +static void _evas_vg_image_efl_file_file_get(Eo *obj, Evas_VG_Image_Data *pd, const char **file, const char **key) { diff --git a/src/lib/evas/canvas/evas_vg_private.h b/src/lib/evas/canvas/evas_vg_private.h index 3358e50..6b83623 100644 --- a/src/lib/evas/canvas/evas_vg_private.h +++ b/src/lib/evas/canvas/evas_vg_private.h @@ -9,10 +9,13 @@ struct _Evas_VG_Node_Data void (*render_pre)(void); void (*render)(void); + void *data; double x, y; int r, g, b, a; - Eina_Bool visibility; + + Eina_Bool visibility : 1; + Eina_Bool changed : 1; }; typedef struct _Evas_VG_Container_Data Evas_VG_Container_Data; diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c index c062ccb..b39a9ef 100644 --- a/src/lib/evas/canvas/evas_vg_shape.c +++ b/src/lib/evas/canvas/evas_vg_shape.c @@ -34,7 +34,7 @@ struct _Evas_VG_Shape_Data unsigned int pts_counts; }; -Eina_Bool +static Eina_Bool _evas_vg_shape_efl_graphics_shape_path_set(Eo *obj EINA_UNUSED, Evas_VG_Shape_Data *pd, const Efl_Graphics_Path_Command *op, @@ -48,14 +48,14 @@ _evas_vg_shape_efl_graphics_shape_path_set(Eo *obj EINA_UNUSED, return efl_graphics_path_dup(&pd->op, &pd->points, op, points); } -Eina_Bool +static Eina_Bool _evas_vg_shape_bounds_get(Eo *obj, Evas_VG_Shape_Data *pd, Eina_Rectangle *r) { (void) obj; (void) pd; (void) r; return EINA_FALSE; } -void +static void _evas_vg_shape_eo_base_constructor(Eo *obj, Evas_VG_Shape_Data *pd EINA_UNUSED) { eo_do_super(obj, MY_CLASS, eo_constructor()); @@ -66,13 +66,13 @@ _evas_vg_shape_eo_base_constructor(Eo *obj, Evas_VG_Shape_Data *pd EINA_UNUSED) pd->stroke.centered = 0.5; } -void +static void _evas_vg_shape_eo_base_destructor(Eo *obj, Evas_VG_Shape_Data *pd EINA_UNUSED) { eo_do_super(obj, MY_CLASS, eo_destructor()); } -void +static void _evas_vg_shape_fill_set(Eo *obj EINA_UNUSED, Evas_VG_Shape_Data *pd, Evas_VG_Node *f) @@ -83,13 +83,13 @@ _evas_vg_shape_fill_set(Eo *obj EINA_UNUSED, eo_unref(tmp); } -Evas_VG_Node * +static Evas_VG_Node * _evas_vg_shape_fill_get(Eo *obj EINA_UNUSED, Evas_VG_Shape_Data *pd) { return pd->fill; } -void +static void _evas_vg_shape_efl_graphics_shape_stroke_scale_set(Eo *obj EINA_UNUSED, Evas_VG_Shape_Data *pd, double s) @@ -97,14 +97,14 @@ _evas_vg_shape_efl_graphics_shape_stroke_scale_set(Eo *obj EINA_UNUSED, pd->stroke.scale = s; } -double +static double _evas_vg_shape_efl_graphics_shape_stroke_scale_get(Eo *obj EINA_UNUSED, Evas_VG_Shape_Data *pd) { return pd->stroke.scale; } -void +static void _evas_vg_shape_efl_graphics_shape_stroke_color_set(Eo *obj EINA_UNUSED, Evas_VG_Shape_Data *pd, int r, int g, int b, int a) @@ -115,7 +115,7 @@ _evas_vg_shape_efl_graphics_shape_stroke_color_set(Eo *obj EINA_UNUSED, pd->stroke.a = a; } -void +static void _evas_vg_shape_efl_graphics_shape_stroke_color_get(Eo *obj EINA_UNUSED, Evas_VG_Shape_Data *pd, int *r, int *g, int *b, int *a) @@ -126,7 +126,7 @@ _evas_vg_shape_efl_graphics_shape_stroke_color_get(Eo *obj EINA_UNUSED, if (a) *a = pd->stroke.a; } -void +static void _evas_vg_shape_stroke_fill_set(Eo *obj EINA_UNUSED, Evas_VG_Shape_Data *pd, Evas_VG_Node *f) @@ -137,14 +137,14 @@ _evas_vg_shape_stroke_fill_set(Eo *obj EINA_UNUSED, eo_unref(tmp); } -Evas_VG_Node * +static Evas_VG_Node * _evas_vg_shape_stroke_fill_get(Eo *obj EINA_UNUSED, Evas_VG_Shape_Data *pd) { return pd->stroke.fill; } -void +static void _evas_vg_shape_efl_graphics_shape_stroke_width_set(Eo *obj EINA_UNUSED, Evas_VG_Shape_Data *pd, double w) @@ -152,14 +152,14 @@ _evas_vg_shape_efl_graphics_shape_stroke_width_set(Eo *obj EINA_UNUSED, pd->stroke.width = w; } -double +static double _evas_vg_shape_efl_graphics_shape_stroke_width_get(Eo *obj EINA_UNUSED, Evas_VG_Shape_Data *pd) { return pd->stroke.width; } -void +static void _evas_vg_shape_efl_graphics_shape_stroke_location_set(Eo *obj EINA_UNUSED, Evas_VG_Shape_Data *pd, double centered) @@ -167,14 +167,14 @@ _evas_vg_shape_efl_graphics_shape_stroke_location_set(Eo *obj EINA_UNUSED, pd->stroke.centered = centered; } -double +static double _evas_vg_shape_efl_graphics_shape_stroke_location_get(Eo *obj EINA_UNUSED, Evas_VG_Shape_Data *pd) { return pd->stroke.centered; } -void +static void _evas_vg_shape_efl_graphics_shape_stroke_dash_set(Eo *obj EINA_UNUSED, Evas_VG_Shape_Data *pd, const Efl_Graphics_Dash *dash, @@ -191,7 +191,7 @@ _evas_vg_shape_efl_graphics_shape_stroke_dash_set(Eo *obj EINA_UNUSED, pd->stroke.dash_count = length; } -void +static void _evas_vg_shape_efl_graphics_shape_stroke_dash_get(Eo *obj EINA_UNUSED, Evas_VG_Shape_Data *pd, const Efl_Graphics_Dash **dash, @@ -201,7 +201,7 @@ _evas_vg_shape_efl_graphics_shape_stroke_dash_get(Eo *obj EINA_UNUSED, if (length) *length = pd->stroke.dash_count; } -void +static void _evas_vg_shape_stroke_marker_set(Eo *obj EINA_UNUSED, Evas_VG_Shape_Data *pd, Evas_VG_Shape *m) @@ -212,14 +212,14 @@ _evas_vg_shape_stroke_marker_set(Eo *obj EINA_UNUSED, eo_unref(tmp); } -Evas_VG_Shape * +static Evas_VG_Shape * _evas_vg_shape_stroke_marker_get(Eo *obj EINA_UNUSED, Evas_VG_Shape_Data *pd) { return pd->stroke.marker; } -void +static void _evas_vg_shape_efl_graphics_shape_stroke_cap_set(Eo *obj EINA_UNUSED, Evas_VG_Shape_Data *pd, Efl_Graphics_Cap c) @@ -227,14 +227,14 @@ _evas_vg_shape_efl_graphics_shape_stroke_cap_set(Eo *obj EINA_UNUSED, pd->stroke.cap = c; } -Efl_Graphics_Cap +static Efl_Graphics_Cap _evas_vg_shape_efl_graphics_shape_stroke_cap_get(Eo *obj EINA_UNUSED, Evas_VG_Shape_Data *pd) { return pd->stroke.cap; } -void +static void _evas_vg_shape_efl_graphics_shape_stroke_join_set(Eo *obj EINA_UNUSED, Evas_VG_Shape_Data *pd, Efl_Graphics_Join j) @@ -242,7 +242,7 @@ _evas_vg_shape_efl_graphics_shape_stroke_join_set(Eo *obj EINA_UNUSED, pd->stroke.join = j; } -Efl_Graphics_Join +static Efl_Graphics_Join _evas_vg_shape_efl_graphics_shape_stroke_join_get(Eo *obj EINA_UNUSED, Evas_VG_Shape_Data *pd) { -- 2.7.4