vtorri
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elm: long waited seasonal trailing whitespaces removal! 

This is a ceremony of elementary 1.8 release!
This commit is contained in:
Daniel Juyung Seo 2013-12-02 19:43:46 +09:00
parent 56ca1c1dd7
commit 8a0159df4f
10 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
legacy/elementary/src/bin/test_gengrid.c
View File

@ -1019,17 +1019,17 @@ _bring_in_clicked_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info _
static Item_Data ti[5000];
int i, n;
char buf[PATH_MAX];
if(!data) return;
show_data *s_data = data;
if (s_data->winmode == 0)
win = elm_win_util_standard_add("horz bring_in", "Horz Bring_in");
else
win = elm_win_util_standard_add("vertical bring_in", "Vertical Bring_in");
elm_win_autodel_set(win, EINA_TRUE);
grid = elm_gengrid_add(win);
elm_gengrid_item_size_set(grid, 150, 150);
elm_gengrid_group_item_size_set(grid, 31, 31);
@ -1039,14 +1039,14 @@ _bring_in_clicked_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info _
elm_gengrid_horizontal_set(grid, EINA_FALSE);
evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_gengrid_align_set(grid, 0.1, 0.1);
gic = elm_gengrid_item_class_new();
gic->item_style = "default";
gic->func.text_get = grid_text_get;
gic->func.content_get = grid_content_get;
gic->func.state_get = grid_state_get;
gic->func.del = NULL;
n = 0;
for (i = 0; i < 5000; i++)
{
@ -1058,7 +1058,7 @@ _bring_in_clicked_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info _
if (i == 1430)
elm_gengrid_item_selected_set(ti[i].item, EINA_TRUE);
}
elm_gengrid_item_class_free(gic);
elm_gengrid_item_bring_in(ti[1430].item, s_data->scrollto);
evas_object_show(grid);
@ -1077,17 +1077,17 @@ _show_clicked_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNU
static Item_Data ti[10000];
int i, n;
char buf[PATH_MAX];
if(!data) return;
show_data *s_data = data;
if (s_data->winmode == 0)
win = elm_win_util_standard_add("horz show", "Horz Show");
else
win = elm_win_util_standard_add("vertical show", "Vertical Show");
elm_win_autodel_set(win, EINA_TRUE);
grid = elm_gengrid_add(win);
elm_gengrid_item_size_set(grid, 150, 150);
elm_gengrid_group_item_size_set(grid, 31, 31);
@ -1097,14 +1097,14 @@ _show_clicked_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNU
elm_gengrid_horizontal_set(grid, EINA_FALSE);
evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_gengrid_align_set(grid, 0.1, 0.1);
gic = elm_gengrid_item_class_new();
gic->item_style = "default";
gic->func.text_get = grid_text_get;
gic->func.content_get = grid_content_get;
gic->func.state_get = grid_state_get;
gic->func.del = NULL;
n = 0;
for (i = 0; i < 10000; i++)
{
@ -1116,7 +1116,7 @@ _show_clicked_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNU
if (i == 2579)
elm_gengrid_item_selected_set(ti[i].item, EINA_TRUE);
}
elm_gengrid_item_class_free(gic);
evas_object_show(grid);
elm_gengrid_item_show(ti[2579].item, s_data->scrollto);
@ -1133,17 +1133,17 @@ _window_mode_frame_new(Evas_Object *win, Evas_Object **rdg, void *data)
{
Evas_Object *fr, *bx, *rd;
show_data *s_data = data;
fr = elm_frame_add(win);
evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_text_set(fr, "Window Mode Set");
evas_object_show(fr);
bx = elm_box_add(win);
elm_object_content_set(fr, bx);
evas_object_show(bx);
rd = elm_radio_add(win);
evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_radio_state_value_set(rd, 0);
@ -1152,7 +1152,7 @@ _window_mode_frame_new(Evas_Object *win, Evas_Object **rdg, void *data)
evas_object_show(rd);
elm_box_pack_end(bx, rd);
*rdg = rd;
rd = elm_radio_add(win);
evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_radio_state_value_set(rd, 1);
@ -1161,7 +1161,7 @@ _window_mode_frame_new(Evas_Object *win, Evas_Object **rdg, void *data)
evas_object_smart_callback_add(rd, "changed", _rd1_changed_cb, s_data);
evas_object_show(rd);
elm_box_pack_end(bx, rd);
return fr;
}
@ -1170,17 +1170,17 @@ _scrollto_mode_frame_new(Evas_Object *win, Evas_Object **rdg, void *data)
{
Evas_Object *fr, *bx, *rd;
show_data *s_data = data;
fr = elm_frame_add(win);
evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_text_set(fr, "Scrollto Mode Set");
evas_object_show(fr);
bx = elm_box_add(win);
elm_object_content_set(fr, bx);
evas_object_show(bx);
rd = elm_radio_add(win);
evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_radio_state_value_set(rd, 0);
@ -1189,7 +1189,7 @@ _scrollto_mode_frame_new(Evas_Object *win, Evas_Object **rdg, void *data)
evas_object_show(rd);
elm_box_pack_end(bx, rd);
*rdg = rd;
rd = elm_radio_add(win);
evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_radio_state_value_set(rd, 1);
@ -1198,7 +1198,7 @@ _scrollto_mode_frame_new(Evas_Object *win, Evas_Object **rdg, void *data)
evas_object_smart_callback_add(rd, "changed", _rd2_changed_cb, s_data);
evas_object_show(rd);
elm_box_pack_end(bx, rd);
rd = elm_radio_add(win);
evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_radio_state_value_set(rd, 2);
@ -1207,7 +1207,7 @@ _scrollto_mode_frame_new(Evas_Object *win, Evas_Object **rdg, void *data)
evas_object_smart_callback_add(rd, "changed", _rd2_changed_cb, s_data);
evas_object_show(rd);
elm_box_pack_end(bx, rd);
rd = elm_radio_add(win);
evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_radio_state_value_set(rd, 4);
@ -1216,7 +1216,7 @@ _scrollto_mode_frame_new(Evas_Object *win, Evas_Object **rdg, void *data)
evas_object_smart_callback_add(rd, "changed", _rd2_changed_cb, s_data);
evas_object_show(rd);
elm_box_pack_end(bx, rd);
return fr;
}

12
legacy/elementary/src/lib/elc_popup.c
View File

@ -587,7 +587,7 @@ _button_remove(Evas_Object *obj,
else
{
char style[1024];
snprintf(style, sizeof(style), "popup/%s", elm_widget_style_get(obj));
snprintf(buf, sizeof(buf), "buttons%i", sd->last_button_number);
if (!elm_layout_theme_set(sd->action_area, "popup", buf, style))
@ -619,7 +619,7 @@ static void
_list_add(Evas_Object *obj)
{
char style[1024];
ELM_POPUP_DATA_GET(obj, sd);
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
@ -853,7 +853,7 @@ static void
_item_new(Elm_Popup_Item *it)
{
char style[1024];
elm_widget_item_text_set_hook_set(it, _item_text_set_hook);
elm_widget_item_text_get_hook_set(it, _item_text_get_hook);
elm_widget_item_content_set_hook_set(it, _item_content_set_hook);
@ -864,7 +864,7 @@ _item_new(Elm_Popup_Item *it)
elm_widget_item_signal_emit_hook_set(it, _item_signal_emit_hook);
VIEW(it) = elm_layout_add(WIDGET(it));
snprintf(style, sizeof(style), "popup/%s", elm_widget_style_get(WIDGET(it)));
if (!elm_layout_theme_set(VIEW(it), "popup", "item", style))
CRITICAL("Failed to set layout!");
@ -1497,7 +1497,7 @@ _elm_popup_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
Elm_Popup_Smart_Data *priv = _pd;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
char style[1024];
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
elm_widget_sub_object_parent_add(obj);
@ -1509,7 +1509,7 @@ _elm_popup_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
snprintf(style, sizeof(style), "%s", "default");
if (!elm_layout_theme_set(obj, "popup", "base", style))
CRITICAL("Failed to set layout!");
snprintf(style, sizeof(style), "popup/%s", "default");
priv->notify = elm_notify_add(obj);

30
legacy/elementary/src/lib/elm_cnp.c
View File

@ -2169,10 +2169,10 @@ struct _Wl_Cnp_Selection
static Eina_Bool _wl_elm_cnp_init(void);
static Wl_Cnp_Selection wl_cnp_selection =
static Wl_Cnp_Selection wl_cnp_selection =
{
0, 0, NULL, NULL,
NULL, 0, 0, NULL, NULL, NULL,
0, 0, NULL, NULL,
NULL, 0, 0, NULL, NULL, NULL,
0, NULL, 0, EINA_FALSE
};
@ -2242,7 +2242,7 @@ _wl_elm_cnp_selection_set(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Form
if (sel->loss_cb) sel->loss_cb(sel->loss_data, selection);
if (sel->widget)
evas_object_event_callback_del_full(sel->widget,
evas_object_event_callback_del_full(sel->widget,
EVAS_CALLBACK_DEL,
_wl_sel_obj_del, &wl_cnp_selection);
sel->widget = NULL;
@ -2257,7 +2257,7 @@ _wl_elm_cnp_selection_set(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Form
sel->loss_data = NULL;
evas_object_event_callback_add
(sel->widget, EVAS_CALLBACK_DEL, _wl_sel_obj_del,
(sel->widget, EVAS_CALLBACK_DEL, _wl_sel_obj_del,
&wl_cnp_selection);
if (selbuf)
@ -2280,7 +2280,7 @@ _wl_elm_cnp_selection_set(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Form
const char *types[10] = {0, };
int i = -1;
if ((format & ELM_SEL_FORMAT_MARKUP) ||
if ((format & ELM_SEL_FORMAT_MARKUP) ||
(format & ELM_SEL_FORMAT_TEXT))
{
types[++i] = "application/x-elementary-markup";
@ -2322,7 +2322,7 @@ _wl_elm_cnp_selection_get(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Form
win = elm_win_wl_window_get(obj);
if (sel->requestwidget)
evas_object_event_callback_del_full(sel->requestwidget,
evas_object_event_callback_del_full(sel->requestwidget,
EVAS_CALLBACK_DEL,
_wl_sel_obj_del2, &wl_cnp_selection);
sel->requestwidget = NULL;
@ -2334,18 +2334,18 @@ _wl_elm_cnp_selection_get(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Form
sel->datacb = datacb;
sel->udata = udata;
evas_object_event_callback_add(sel->requestwidget,
EVAS_CALLBACK_DEL, _wl_sel_obj_del2,
evas_object_event_callback_add(sel->requestwidget,
EVAS_CALLBACK_DEL, _wl_sel_obj_del2,
&wl_cnp_selection);
if ((selection == ELM_SEL_TYPE_CLIPBOARD) ||
(selection == ELM_SEL_TYPE_PRIMARY) ||
if ((selection == ELM_SEL_TYPE_CLIPBOARD) ||
(selection == ELM_SEL_TYPE_PRIMARY) ||
(selection == ELM_SEL_TYPE_SECONDARY))
{
const char *types[10] = {0, };
int i = -1;
if ((format & ELM_SEL_FORMAT_MARKUP) ||
if ((format & ELM_SEL_FORMAT_MARKUP) ||
(format & ELM_SEL_FORMAT_TEXT))
{
types[++i] = "application/x-elementary-markup";
@ -2389,11 +2389,11 @@ _wl_elm_cnp_selection_clear(Evas_Object *obj, Elm_Sel_Type selection __UNUSED__)
return EINA_TRUE;
if (sel->widget)
evas_object_event_callback_del_full(sel->widget,
evas_object_event_callback_del_full(sel->widget,
EVAS_CALLBACK_DEL,
_wl_sel_obj_del, &wl_cnp_selection);
if (sel->requestwidget)
evas_object_event_callback_del_full(sel->requestwidget,
evas_object_event_callback_del_full(sel->requestwidget,
EVAS_CALLBACK_DEL,
_wl_sel_obj_del2, &wl_cnp_selection);
@ -2509,7 +2509,7 @@ _wl_selection_receive(void *udata, int type __UNUSED__, void *event)
}
else
{
evas_object_event_callback_del_full(sel->requestwidget,
evas_object_event_callback_del_full(sel->requestwidget,
EVAS_CALLBACK_DEL,
_wl_sel_obj_del2, sel);
sel->requestwidget = NULL;

4
legacy/elementary/src/lib/elm_colorselector.c
View File

@ -2077,7 +2077,7 @@ _palette_color_add(Eo *obj, void *_pd, va_list *list)
if (sd->config_load)
{
_items_del(sd);
_items_del(sd);
sd->config_load = EINA_FALSE;
}
item = _item_new(obj);
@ -2142,7 +2142,7 @@ _palette_name_set(Eo *obj, void *_pd, va_list *list)
if (!strcmp(sd->palette_name, palette_name)) return;
_items_del(sd);
_items_del(sd);
eina_stringshare_replace(&sd->palette_name, palette_name);
_palette_colors_load(obj);
}

6
legacy/elementary/src/lib/elm_genlist.c
View File

@ -1753,9 +1753,9 @@ _item_realize(Elm_Gen_Item *it,
edje_object_message_signal_process(it->deco_all_view);
}
}
if (it->decorate_it_set) _decorate_item_set(it);
edje_object_message_signal_process(VIEW(it));
}
@ -4499,7 +4499,7 @@ _item_block_recalc(Item_Block *itb,
if (changed)
{
Eina_Bool doit = EINA_TRUE;
if (itb->sd->homogeneous)
{
if ((it->group) && (itb->sd->group_item_height == 0))

4
legacy/elementary/src/lib/elm_interface_scrollable.c
View File

@ -1607,7 +1607,7 @@ _elm_scroll_content_pos_set(Eo *obj, void *_pd, va_list *list)
(sid->edje_obj, "elm.dragable.vbar", 0.0, vy);
edje_object_part_drag_value_set
(sid->edje_obj, "elm.dragable.hbar", vx, 0.0);
if (!sid->down.bounce_x_animator)
{
if (((x < minx) && (0 <= sid->down.dx)) ||
@ -2892,7 +2892,7 @@ _elm_scroll_hold_enterer(void *data)
Evas_Coord ox = 0, oy = 0, fx = 0, fy = 0;
sid->down.hold_enterer = NULL;
fx = sid->down.hold_x;
fy = sid->down.hold_y;

2
legacy/elementary/src/lib/elm_list.c
View File

@ -1072,7 +1072,7 @@ _item_unselect(Elm_List_Item *it)
{
it->selected = EINA_FALSE;
sd->selected = eina_list_remove(sd->selected, it);
if (!(it->base.disabled ||
if (!(it->base.disabled ||
(sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE)))
evas_object_smart_callback_call(WIDGET(it), SIG_UNSELECTED, it);
}

2
legacy/elementary/src/lib/elm_table.c
View File

@ -381,7 +381,7 @@ _pack(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
{
WRN("row + rowspan getting rather large (>32767)");
}
elm_widget_sub_object_add(obj, subobj);
evas_object_table_pack(wd->resize_obj, subobj, col, row, colspan, rowspan);
}

6
legacy/elementary/src/lib/elm_theme.c
View File

@ -924,7 +924,7 @@ elm_theme_system_dir_get(void)
{
static char *path = NULL;
char buf[PATH_MAX];
if (path) return path;
if (!path)
{
@ -939,13 +939,13 @@ elm_theme_user_dir_get(void)
{
static char *path = NULL;
char buf[PATH_MAX];
if (path) return path;
if (!path)
{
char *home = getenv("HOME");
if (!home) home = "";
snprintf(buf, sizeof(buf), "%s/"ELEMENTARY_BASE_DIR"/themes", home);
path = strdup(buf);
}

2
legacy/elementary/src/lib/elm_win.c
View File

@ -1698,7 +1698,7 @@ _elm_ee_wlwin_get(const Ecore_Evas *ee)
Ecore_Wl_Window *win = NULL;
if (!ee) return NULL;
if ((EE_ENGINE_COMPARE(ee, ELM_WAYLAND_SHM)) ||
if ((EE_ENGINE_COMPARE(ee, ELM_WAYLAND_SHM)) ||
(EE_ENGINE_COMPARE(ee, ELM_WAYLAND_EGL)))
{
if (ee) win = ecore_evas_wayland_window_get(ee);