On Thursday, October 21, 2010, Enlightenment SVN
<no-re...@enlightenment.org> wrote:
> Log:
> patch from: ?\234?\185?\128?\236?\167?\128?\237?\155?\136
> <jihoon48....@samsung.com>
> Subject: elementary patch
>
> In this elementary patch. type casting is used in elm_colorpicker.
???? Raster, did u see the patch? Cast from void*????
> In addition, Elementary.h.in is modified for indentation.
Don't mix these patches! Arghhhhh
>
>
> Author: raster
> Date: 2010-10-21 01:01:52 -0700 (Thu, 21 Oct 2010)
> New Revision: 53708
>
> Modified:
> trunk/TMP/st/elementary/src/lib/Elementary.h.in
> trunk/TMP/st/elementary/src/lib/elm_colorpicker.c
>
> Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
> ===================================================================
> --- trunk/TMP/st/elementary/src/lib/Elementary.h.in 2010-10-21 07:00:56
> UTC (rev 53707)
> +++ trunk/TMP/st/elementary/src/lib/Elementary.h.in 2010-10-21 08:01:52
> UTC (rev 53708)
> @@ -731,8 +731,8 @@
> };
>
> EAPI Evas_Object *elm_gengrid_add(Evas_Object *parent);
> - EAPI void elm_gengrid_item_size_set(Evas_Object *obj, Evas_Coord
> w, Evas_Coord h);
> - EAPI void elm_gengrid_item_size_get(const Evas_Object *obj,
> Evas_Coord *w, Evas_Coord *h);
> + EAPI void elm_gengrid_item_size_set(Evas_Object *obj, Evas_Coord
> w, Evas_Coord h);
> + EAPI void elm_gengrid_item_size_get(const Evas_Object *obj,
> Evas_Coord *w, Evas_Coord *h);
> EAPI void elm_gengrid_align_set(Evas_Object *obj, double align_x,
> double align_y);
> EAPI void elm_gengrid_align_get(const Evas_Object *obj, double
> *align_x, double *align_y);
>
> @@ -1485,8 +1485,8 @@
> EAPI void elm_genlist_item_bring_in(Elm_Genlist_Item *item);
> EAPI void elm_genlist_item_top_show(Elm_Genlist_Item *item);
> EAPI void elm_genlist_item_top_bring_in(Elm_Genlist_Item
> *item);
> - EAPI void elm_genlist_item_middle_show(Elm_Genlist_Item *it);
> - EAPI void elm_genlist_item_middle_bring_in(Elm_Genlist_Item
> *it);
> + EAPI void elm_genlist_item_middle_show(Elm_Genlist_Item *it);
> + EAPI void elm_genlist_item_middle_bring_in(Elm_Genlist_Item
> *it);
> EAPI void elm_genlist_item_del(Elm_Genlist_Item *item);
> EAPI void *elm_genlist_item_data_get(const Elm_Genlist_Item
> *item);
> EAPI void elm_genlist_item_data_set(Elm_Genlist_Item *it,
> const void *data);
> @@ -1631,21 +1631,21 @@
> */
>
> EAPI Evas_Object *elm_spinner_add(Evas_Object *parent);
> - EAPI void elm_spinner_label_format_set(Evas_Object *obj, const
> char *fmt);
> + EAPI void elm_spinner_label_format_set(Evas_Object *obj, const
> char *fmt);
> EAPI const char *elm_spinner_label_format_get(const Evas_Object *obj);
> EAPI void elm_spinner_min_max_set(Evas_Object *obj, double min,
> double max);
> EAPI void elm_spinner_min_max_get(const Evas_Object *obj, double
> *min, double *max);
> - EAPI void elm_spinner_step_set(Evas_Object *obj, double step);
> - EAPI double elm_spinner_step_get(const Evas_Object *obj);
> - EAPI void elm_spinner_value_set(Evas_Object *obj, double val);
> - EAPI double elm_spinner_value_get(const Evas_Object *obj);
> + EAPI void elm_spinner_step_set(Evas_Object *obj, double step);
> + EAPI double elm_spinner_step_get(const Evas_Object *obj);
> + EAPI void elm_spinner_value_set(Evas_Object *obj, double val);
> + EAPI double elm_spinner_value_get(const Evas_Object *obj);
> EAPI void elm_spinner_wrap_set(Evas_Object *obj, Eina_Bool wrap);
> EAPI Eina_Bool elm_spinner_wrap_get(const Evas_Object *obj);
> - EAPI void elm_spinner_editable_set(Evas_Object *obj, Eina_Bool
> editable);
> + EAPI void elm_spinner_editable_set(Evas_Object *obj, Eina_Bool
> editable);
> EAPI Eina_Bool elm_spinner_editable_get(const Evas_Object *obj);
> - EAPI void elm_spinner_special_value_add(Evas_Object *obj, double
> value, const char *label);
> - EAPI void elm_spinner_interval_set(Evas_Object *obj, double
> interval);
> - EAPI double elm_spinner_interval_get(const Evas_Object *obj);
> + EAPI void elm_spinner_special_value_add(Evas_Object *obj, double
> value, const char *label);
> + EAPI void elm_spinner_interval_set(Evas_Object *obj, double
> interval);
> + EAPI double elm_spinner_interval_get(const Evas_Object *obj);
> /* smart callbacks called:
> * "changed" - when the spinner value changes
> * "delay,changed" - when the spinner value changed, but a small time
> after a change (use this if you only want to respond to a change once the
> spinner is held still for a short while).
> @@ -1759,31 +1759,31 @@
> EAPI double elm_map_zoom_get(const Evas_Object *obj);
> EAPI void elm_map_zoom_mode_set(Evas_Object *obj,
> Elm_Map_Zoom_Mode mode);
> EAPI Elm_Map_Zoom_Mode elm_map_zoom_mode_get(const Evas_Object *obj);
> - EAPI void elm_map_geo_region_get(const Evas_Object *obj, double
> *lon, double *lat);
> + EAPI void elm_map_geo_region_get(const Evas_Object *obj, double
> *lon, double *lat);
> EAPI void elm_map_geo_region_bring_in(Evas_Object *obj, double
> lon, double lat);
> EAPI void elm_map_geo_region_show(Evas_Object *obj, double lon,
> double lat);
> EAPI void elm_map_paused_set(Evas_Object *obj, Eina_Bool paused);
> EAPI Eina_Bool elm_map_paused_get(const Evas_Object *obj);
> - EAPI void elm_map_paused_markers_set(Evas_Object *obj, Eina_Bool
> paused);
> + EAPI void elm_map_paused_markers_set(Evas_Object *obj, Eina_Bool
> paused);
> EAPI Eina_Bool elm_map_paused_markers_get(const Evas_Object *obj);
> - EAPI void elm_map_utils_convert_coord_into_geo(int x, int y, int
> size, double *lon, double *lat);
> + EAPI void elm_map_utils_convert_coord_into_geo(int x, int y, int
> size, double *lon, double *lat);
> EAPI void elm_map_utils_convert_geo_into_coord(double lon, double
> lat, int size, int *x, int *y);
> EAPI Elm_Map_Marker *elm_map_marker_add(Evas_Object *obj, double lon,
> double lat, Elm_Map_Marker_Class *clas, Elm_Map_Group_Class *clas_group, void
> *data);
> - EAPI void elm_map_max_marker_per_group_set(Evas_Object *obj, int
> max);
> - EAPI void elm_map_marker_remove(Elm_Map_Marker *marker);
> - EAPI void elm_map_marker_bring_in(Elm_Map_Marker *marker);
> - EAPI void elm_map_marker_show(Elm_Map_Marker *marker);
> - EAPI void elm_map_markers_list_show(Eina_List *markers);
> + EAPI void elm_map_max_marker_per_group_set(Evas_Object *obj, int
> max);
> + EAPI void elm_map_marker_remove(Elm_Map_Marker *marker);
> + EAPI void elm_map_marker_bring_in(Elm_Map_Marker *marker);
> + EAPI void elm_map_marker_show(Elm_Map_Marker *marker);
> + EAPI void elm_map_markers_list_show(Eina_List *markers);
> EAPI Evas_Object *elm_map_marker_object_get(Elm_Map_Marker *marker);
> - EAPI void elm_map_marker_update(Elm_Map_Marker *marker);
> - EAPI void elm_map_bubbles_close(Evas_Object *obj);
> + EAPI void elm_map_marker_update(Elm_Map_Marker *marker);
> + EAPI void elm_map_bubbles_close(Evas_Object *obj);
>
> EAPI Elm_Map_Group_Class * elm_map_group_class_new(Evas_Object *obj);
> EAPI void elm_map_group_class_style_set(Elm_Map_Group_Class
> *clas, const char *style);
> EAPI void elm_map_group_class_icon_cb_set(Elm_Map_Group_Class
> *clas, ElmMapGroupIconGetFunc icon_get);
> - EAPI void elm_map_group_class_data_set(Elm_Map_Group_Class *clas,
> void *data);
> + EAPI void elm_map_group_class_data_set(Elm_Map_Group_Class *clas,
> void *data);
> EAPI void
> elm_map_group_class_zoom_displayed_set(Elm_Map_Group_Class *clas, int zoom);
> - EAPI void elm_map_group_class_zoom_grouped_set(Elm_Map_Group_Class
> *clas, int zoom);
> + EAPI void
> elm_map_group_class_zoom_grouped_set(Elm_Map_Group_Class *clas, int zoom);
> EAPI void elm_map_group_class_hide_set(Evas_Object *obj,
> Elm_Map_Group_Class *clas, Eina_Bool hide);
>
> EAPI Elm_Map_Marker_Class * elm_map_marker_class_new(Evas_Object *obj);
> @@ -1797,8 +1797,8 @@
> EAPI void elm_map_source_custom_api_set(Elm_Map_Sources source,
> const char *label,
> int zoom_min, int zoom_max,
> ElmMapSourceURLFunc url_cb);
> EAPI int elm_map_source_zoom_min_get(Elm_Map_Sources source);
> - EAPI int elm_map_source_zoom_max_get(Elm_Map_Sources source);
> - EAPI const char * elm_map_source_name_get(Elm_Map_Sources source);
> + EAPI int elm_map_source_zoom_max_get(Elm_Map_Sources source);
> + EAPI const char *elm_map_source_name_get(Elm_Map_Sources source);
> /* smart callbacks called:
> * "clicked" - when image clicked
> * "press" - when mouse/finger held down initially on image
> @@ -1979,7 +1979,13 @@
> /* animator */
> typedef struct _Animator Elm_Animator;
>
> - typedef enum {ELM_ANIMATOR_CURVE_LINEAR, ELM_ANIMATOR_CURVE_IN_OUT,
> ELM_ANIMATOR_CURVE_IN, ELM_ANIMATOR_CURVE_OUT} Elm_Animator_Curve_Style;
> + typedef enum
> + {
> + ELM_ANIMATOR_CURVE_LINEAR,
> + ELM_ANIMATOR_CURVE_IN_OUT,
> + ELM_ANIMATOR_CURVE_IN,
> + ELM_ANIMATOR_CURVE_OUT
> + } Elm_Animator_Curve_Style;
>
> EAPI Elm_Animator* elm_animator_add(Evas_Object *parent);
> EAPI void elm_animator_del(Elm_Animator *animator);
> @@ -1996,7 +2002,14 @@
> EAPI unsigned int elm_animator_repeat_get(Elm_Animator *animator);
>
> /* calendar */
> - typedef enum {ELM_CALENDAR_UNIQUE, ELM_CALENDAR_DAILY,
> ELM_CALENDAR_WEEKLY, ELM_CALENDAR_MONTHLY, ELM_CALENDAR_ANNUALLY}
> Elm_Calendar_Mark_Repeat;
> + typedef enum
> + {
> + ELM_CALENDAR_UNIQUE,
> + ELM_CALENDAR_DAILY,
> + ELM_CALENDAR_WEEKLY,
> + ELM_CALENDAR_MONTHLY,
> + ELM_CALENDAR_ANNUALLY
> + } Elm_Calendar_Mark_Repeat;
> typedef struct _Elm_Calendar_Mark Elm_Calendar_Mark;
>
> EAPI Evas_Object *elm_calendar_add(Evas_Object *parent);
>
> Modified: trunk/TMP/st/elementary/src/lib/elm_colorpicker.c
> ===================================================================
> --- trunk/TMP/st/elementary/src/lib/elm_colorpicker.c 2010-10-21 07:00:56
> UTC (rev 53707)
> +++ trunk/TMP/st/elementary/src/lib/elm_colorpicker.c 2010-10-21 08:01:52
> UTC (rev 53708)
> @@ -154,7 +154,7 @@
> static void
> _rgb_to_hsl(void *data)
> {
> - Widget_Data *wd = data;
> + Widget_Data *wd = (Widget_Data *) data;
> double r, g, b;
> double v, m, vm;
> double r2, g2, b2;
> @@ -210,7 +210,7 @@
> static void
> _hsl_to_rgb(void *data)
> {
> - Widget_Data *wd = data;
> + Widget_Data *wd = (Widget_Data *)data;
> double r = 0, g = 0, b = 0;
> double _h, _s, _l;
> int i = 0;
> @@ -295,7 +295,7 @@
> static void
> _color_with_saturation(void *data)
> {
> - Widget_Data *wd = data;
> + Widget_Data *wd = (Widget_Data *) data;
>
> if (wd->er > 127)
> wd->sr = (int)((double)127 + ((double)wd->er - (double)127) * wd->s);
> @@ -344,7 +344,7 @@
> static void
> _draw_rects(void *data, double x)
> {
> - Colorpicker_Data *cp = data;
> + Colorpicker_Data *cp = (Colorpicker_Data *) data;
> Widget_Data *wd = elm_widget_data_get(cp->parent);
> double one_six = (double)1 / (double)6;
>
> @@ -435,7 +435,7 @@
> static void
> _arrow_cb(void *data, Evas_Object *obj, const char *emission __UNUSED__,
> const char *source __UNUSED__)
> {
> - Colorpicker_Data *cp = data;
> + Colorpicker_Data *cp = (Colorpicker_Data *) data;
> double x, y;
>
> edje_object_part_drag_value_get(obj, "elm.arrow", &x, &y);
> @@ -446,7 +446,7 @@
> static void
> _colorbar_cb(void *data, Evas *e, Evas_Object *obj __UNUSED__, void
> *event_info)
> {
> - Colorpicker_Data *cp = data;
> + Colorpicker_Data *cp = (Colorpicker_Data *) data;
> Evas_Event_Mouse_Down *ev = event_info;
> Evas_Coord x, y, w, h;
> double arrow_x, arrow_y;
> @@ -469,7 +469,7 @@
> static void
> _arrow_resize_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj
> __UNUSED__, void *event_info __UNUSED__)
> {
> - Colorpicker_Data *cp = data;
> + Colorpicker_Data *cp = (Colorpicker_Data *)data;
> Evas_Coord arrow_w, arrow_h;
>
> evas_object_geometry_get(cp->touch_area, NULL, NULL, NULL, &arrow_h);
> @@ -482,7 +482,7 @@
> static Eina_Bool
> _mv_timer(void *data)
> {
> - Colorpicker_Data *cp = data;
> + Colorpicker_Data *cp = (Colorpicker_Data *)data;
> Widget_Data *wd = elm_widget_data_get(cp->parent);
> double x, y;
>
> @@ -523,7 +523,7 @@
> static Eina_Bool
> _long_press_timer(void *data)
> {
> - Colorpicker_Data *cp = data;
> + Colorpicker_Data *cp = (Colorpicker_Data *) data;
> Widget_Data *wd = elm_widget_data_get(cp->parent);
>
> if (wd->lp_timer)
> @@ -540,7 +540,7 @@
> static void
> _left_button_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj
> __UNUSED__, void *event_info __UNUSED__)
> {
> - Colorpicker_Data *cp = data;
> + Colorpicker_Data *cp = (Colorpicker_Data *) data;
> Widget_Data *wd = elm_widget_data_get(cp->parent);
> double x, y;
>
> @@ -600,7 +600,7 @@
> static void
> _left_button_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj
> __UNUSED__, void *event_info __UNUSED__)
> {
> - Colorpicker_Data *cp = data;
> + Colorpicker_Data *cp = (Colorpicker_Data *) data;
> Widget_Data *wd = elm_widget_data_get(cp->parent);
>
> if (wd->lp_timer)
> @@ -621,7 +621,7 @@
> static void
> _right_button_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj
> __UNUSED__, void *event_info __UNUSED__)
> {
> - Colorpicker_Data *cp = data;
> + Colorpicker_Data *cp = (Colorpicker_Data *) data;
> Widget_Data *wd = elm_widget_data_get(cp->parent);
>
> if (wd->lp_timer)
>
>
> ------------------------------------------------------------------------------
> Nokia and AT&T present the 2010 Calling All Innovators-North America contest
> Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
> $10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
> Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
> http://p.sf.net/sfu/nokia-dev2dev
> _______________________________________________
> enlightenment-svn mailing list
> enlightenment-
--
Gustavo Sverzut Barbieri
http://profusion.mobi embedded systems
--------------------------------------
MSN: barbi...@gmail.com
Skype: gsbarbieri
Mobile: +55 (19) 9225-2202
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
