elm: formatting fix for consistency.

This commit is contained in:
Daniel Juyung Seo 2013-07-23 06:05:16 +09:00
parent 896f149e82
commit ecf6eff9a4
8 changed files with 15 additions and 14 deletions

View File

@ -252,7 +252,6 @@ static void
_elm_fileselector_entry_smart_text_set(Eo *obj, void *_pd, va_list *list)
{
Elm_Fileselector_Entry_Smart_Data *sd = _pd;
const char *part = va_arg(*list, const char *);
const char *label = va_arg(*list, const char *);
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
@ -260,13 +259,14 @@ _elm_fileselector_entry_smart_text_set(Eo *obj, void *_pd, va_list *list)
if (part && strcmp(part, "default"))
{
eo_do_super(obj, MY_CLASS, elm_obj_layout_text_set(part, label, &int_ret));
eo_do_super(obj, MY_CLASS,
elm_obj_layout_text_set(part, label, &int_ret));
goto end;
}
elm_object_text_set(sd->button, label);
int_ret = EINA_TRUE;
end:
if (ret) *ret = int_ret;
}

View File

@ -1464,7 +1464,8 @@ _elm_multibuttonentry_smart_text_set(Eo *obj, void *_pd EINA_UNUSED, va_list *li
if (label) _guide_text_set(obj, label);
int_ret = EINA_TRUE;
}
else eo_do_super(obj, MY_CLASS, elm_obj_layout_text_set(part, label, &int_ret));
else
eo_do_super(obj, MY_CLASS, elm_obj_layout_text_set(part, label, &int_ret));
if (ret) *ret = int_ret;
}

View File

@ -952,14 +952,15 @@ _elm_naviframe_smart_text_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
const char *part = va_arg(*list, const char *);
const char *label = va_arg(*list, const char *);
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
Eina_Bool int_ret = EINA_FALSE;
if (ret) *ret = EINA_FALSE;
it = elm_naviframe_top_item_get(obj);
if (!it) return;
elm_object_item_part_text_set(it, part, label);
int_ret = !strcmp(elm_object_item_part_text_get(it, part), label);
Eina_Bool int_ret = !strcmp(elm_object_item_part_text_get(it, part), label);
if (ret) *ret = int_ret;
}

View File

@ -972,6 +972,7 @@ _elm_popup_smart_text_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
int_ret = _title_text_set(obj, label);
else
eo_do_super(obj, MY_CLASS, elm_obj_layout_text_set(part, label, &int_ret));
if (ret) *ret = int_ret;
}

View File

@ -371,8 +371,8 @@ _elm_actionslider_smart_text_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
Eina_Bool int_ret = EINA_FALSE;
_mirrored_part_fix(obj, &part);
eo_do_super(obj, MY_CLASS, elm_obj_layout_text_set(part, text, &int_ret));
if (ret) *ret = int_ret;
}

View File

@ -137,8 +137,8 @@ _elm_bubble_smart_text_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
const char *label = va_arg(*list, const char *);
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
Eina_Bool int_ret = EINA_FALSE;
eo_do_super(obj, MY_CLASS, elm_obj_layout_text_set(part, label, &int_ret));
if (!int_ret) return;

View File

@ -2681,15 +2681,13 @@ _elm_entry_smart_content_unset(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
static void
_elm_entry_smart_text_set(Eo *obj, void *_pd, va_list *list)
{
Elm_Entry_Smart_Data *sd = _pd;
const char *part = va_arg(*list, const char *);
const char *entry = va_arg(*list, const char *);
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_TRUE;
int len = 0;
Elm_Entry_Smart_Data *sd = _pd;
if (!entry) entry = "";
if (part)
{

View File

@ -704,16 +704,16 @@ _elm_layout_part_aliasing_eval(const Evas_Object *obj EINA_UNUSED,
static void
_elm_layout_smart_text_set(Eo *obj, void *_pd, va_list *list)
{
Eina_List *l;
Elm_Layout_Sub_Object_Data *sub_d = NULL;
Elm_Layout_Smart_Data *sd = _pd;
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
const char *part = va_arg(*list, const char *);
const char *text = va_arg(*list, const char *);
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
Elm_Layout_Smart_Data *sd = _pd;
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
Eina_List *l;
Elm_Layout_Sub_Object_Data *sub_d = NULL;
if (!_elm_layout_part_aliasing_eval(obj, sd, &part, EINA_TRUE))
return;