forked from enlightenment/efl
efl: Cleanup some code (return values)
This removes some useless code in various places, where the switch from eo_do() to standard function call was not properly refactored. This changes: type ret = 0; ret = my_eo_function(); return ret; To: return my_eo_function();
This commit is contained in:
parent
26ee77ff67
commit
28c917836c
|
@ -101,9 +101,7 @@ _ecore_audio_in_tone_eo_base_key_data_get(Eo *eo_obj, Ecore_Audio_In_Tone_Data *
|
||||||
if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) {
|
if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) {
|
||||||
return (void *) (intptr_t) obj->freq;
|
return (void *) (intptr_t) obj->freq;
|
||||||
} else {
|
} else {
|
||||||
void *ret = NULL;
|
return eo_key_data_get(eo_super(eo_obj, MY_CLASS), key);
|
||||||
ret = eo_key_data_get(eo_super(eo_obj, MY_CLASS), key);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4,16 +4,12 @@
|
||||||
EAPI Eina_Bool
|
EAPI Eina_Bool
|
||||||
ecore_con_url_url_set(Ecore_Con_Url *obj, const char *url)
|
ecore_con_url_url_set(Ecore_Con_Url *obj, const char *url)
|
||||||
{
|
{
|
||||||
Eina_Bool ret;
|
return efl_network_url_set((Ecore_Con_Url *)obj, url);
|
||||||
ret = efl_network_url_set((Ecore_Con_Url *)obj, url);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI const char *
|
EAPI const char *
|
||||||
ecore_con_url_url_get(const Ecore_Con_Url *obj)
|
ecore_con_url_url_get(const Ecore_Con_Url *obj)
|
||||||
{
|
{
|
||||||
const char * ret;
|
return efl_network_url_get((Ecore_Con_Url *)obj);
|
||||||
ret = efl_network_url_get((Ecore_Con_Url *)obj);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -42,14 +42,4 @@ _ector_renderer_buffer_buffer_get(Eo *obj EINA_UNUSED, Ector_Renderer_Buffer_Dat
|
||||||
return pd->eo_buffer;
|
return pd->eo_buffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eo_Base *
|
|
||||||
_ector_renderer_buffer_eo_base_constructor(Eo *obj, Ector_Renderer_Buffer_Data *pd EINA_UNUSED)
|
|
||||||
{
|
|
||||||
Eo_Base *ret;
|
|
||||||
|
|
||||||
ret = eo_constructor(eo_super(obj, MY_CLASS));
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
#include "ector_renderer_buffer.eo.c"
|
#include "ector_renderer_buffer.eo.c"
|
||||||
|
|
|
@ -12,7 +12,6 @@ mixin Ector.Renderer.Buffer (Eo.Interface, Ector.Renderer, Efl.Gfx.Fill)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
implements {
|
implements {
|
||||||
Eo.Base.constructor;
|
|
||||||
Efl.Gfx.Fill.fill.get;
|
Efl.Gfx.Fill.fill.get;
|
||||||
Efl.Gfx.Fill.fill.set;
|
Efl.Gfx.Fill.fill.set;
|
||||||
}
|
}
|
||||||
|
|
|
@ -461,9 +461,7 @@ edje_object_mmap_set(Edje_Object *obj, const Eina_File *file, const char *group)
|
||||||
EAPI Eina_Bool
|
EAPI Eina_Bool
|
||||||
edje_object_file_set(Edje_Object *obj, const char *file, const char *group)
|
edje_object_file_set(Edje_Object *obj, const char *file, const char *group)
|
||||||
{
|
{
|
||||||
Eina_Bool ret = 0;
|
return efl_file_set(obj, file, group);
|
||||||
ret = efl_file_set(obj, file, group);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EAPI void
|
||||||
|
|
|
@ -1282,9 +1282,7 @@ _efl_ui_image_efl_ui_draggable_drag_target_get(Eo *obj EINA_UNUSED, Efl_Ui_Image
|
||||||
EAPI Eina_Bool
|
EAPI Eina_Bool
|
||||||
elm_image_animated_available_get(const Evas_Object *obj)
|
elm_image_animated_available_get(const Evas_Object *obj)
|
||||||
{
|
{
|
||||||
Eina_Bool ret;
|
return efl_player_playable_get(obj);
|
||||||
ret = efl_player_playable_get(obj);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
|
@ -1326,8 +1324,6 @@ _efl_ui_image_animated_set_internal(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Bool an
|
||||||
sd->cur_frame = -1;
|
sd->cur_frame = -1;
|
||||||
sd->frame_duration = -1;
|
sd->frame_duration = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
|
@ -1733,11 +1729,8 @@ elm_image_file_get(const Eo *obj, const char **file, const char **group)
|
||||||
EAPI Eina_Bool
|
EAPI Eina_Bool
|
||||||
elm_image_mmap_set(Evas_Object *obj, const Eina_File *file, const char *group)
|
elm_image_mmap_set(Evas_Object *obj, const Eina_File *file, const char *group)
|
||||||
{
|
{
|
||||||
Eina_Bool ret = EINA_FALSE;
|
|
||||||
|
|
||||||
EFL_UI_IMAGE_CHECK(obj) EINA_FALSE;
|
EFL_UI_IMAGE_CHECK(obj) EINA_FALSE;
|
||||||
ret = efl_file_mmap_set(obj, file, group);
|
return efl_file_mmap_set(obj, file, group);
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Eina_Bool
|
EAPI Eina_Bool
|
||||||
|
|
|
@ -6915,9 +6915,7 @@ elm_win_window_id_get(const Evas_Object *obj)
|
||||||
|
|
||||||
ELM_WIN_CHECK(obj) 0;
|
ELM_WIN_CHECK(obj) 0;
|
||||||
ELM_WIN_DATA_GET_OR_RETURN(obj, sd, 0);
|
ELM_WIN_DATA_GET_OR_RETURN(obj, sd, 0);
|
||||||
Ecore_Window ret = 0;
|
return _elm_win_window_id_get(sd);
|
||||||
ret = _elm_win_window_id_get(sd);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EAPI void
|
||||||
|
|
|
@ -2047,9 +2047,7 @@ EAPI Eina_Bool
|
||||||
elm_fileselector_is_save_get(const Evas_Object *obj)
|
elm_fileselector_is_save_get(const Evas_Object *obj)
|
||||||
{
|
{
|
||||||
ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
|
ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
|
||||||
Eina_Bool ret = EINA_FALSE;
|
return elm_interface_fileselector_is_save_get((Eo *) obj);
|
||||||
ret = elm_interface_fileselector_is_save_get((Eo *) obj);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
|
@ -2082,9 +2080,7 @@ EAPI Eina_Bool
|
||||||
elm_fileselector_folder_only_get(const Evas_Object *obj)
|
elm_fileselector_folder_only_get(const Evas_Object *obj)
|
||||||
{
|
{
|
||||||
ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
|
ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
|
||||||
Eina_Bool ret = EINA_FALSE;
|
return elm_interface_fileselector_folder_only_get((Eo *) obj);
|
||||||
ret = elm_interface_fileselector_folder_only_get((Eo *) obj);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
|
@ -2160,9 +2156,7 @@ EAPI Eina_Bool
|
||||||
elm_fileselector_expandable_get(const Evas_Object *obj)
|
elm_fileselector_expandable_get(const Evas_Object *obj)
|
||||||
{
|
{
|
||||||
ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
|
ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
|
||||||
Eina_Bool ret = EINA_FALSE;
|
return elm_interface_fileselector_expandable_get((Eo *) obj);
|
||||||
ret = elm_interface_fileselector_expandable_get((Eo *) obj);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
|
@ -2283,9 +2277,7 @@ EAPI Elm_Fileselector_Mode
|
||||||
elm_fileselector_mode_get(const Evas_Object *obj)
|
elm_fileselector_mode_get(const Evas_Object *obj)
|
||||||
{
|
{
|
||||||
ELM_FILESELECTOR_INTERFACE_CHECK(obj, ELM_FILESELECTOR_LAST);
|
ELM_FILESELECTOR_INTERFACE_CHECK(obj, ELM_FILESELECTOR_LAST);
|
||||||
Elm_Fileselector_Mode ret = ELM_FILESELECTOR_LAST;
|
return elm_interface_fileselector_mode_get((Eo *) obj);
|
||||||
ret = elm_interface_fileselector_mode_get((Eo *) obj);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Elm_Fileselector_Mode
|
EOLIAN static Elm_Fileselector_Mode
|
||||||
|
@ -2340,9 +2332,7 @@ EAPI Eina_Bool
|
||||||
elm_fileselector_multi_select_get(const Evas_Object *obj)
|
elm_fileselector_multi_select_get(const Evas_Object *obj)
|
||||||
{
|
{
|
||||||
ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
|
ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
|
||||||
Eina_Bool ret = EINA_FALSE;
|
return elm_interface_fileselector_multi_select_get((Eo *) obj);
|
||||||
ret = elm_interface_fileselector_multi_select_get((Eo *) obj);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
|
@ -2625,9 +2615,7 @@ EAPI Eina_Bool
|
||||||
elm_fileselector_mime_types_filter_append(Evas_Object *obj, const char *mime_type, const char *filter_name)
|
elm_fileselector_mime_types_filter_append(Evas_Object *obj, const char *mime_type, const char *filter_name)
|
||||||
{
|
{
|
||||||
ELM_FILESELECTOR_CHECK(obj) EINA_FALSE;
|
ELM_FILESELECTOR_CHECK(obj) EINA_FALSE;
|
||||||
Eina_Bool ret = EINA_FALSE;
|
return elm_interface_fileselector_mime_types_filter_append(obj, mime_type, filter_name);
|
||||||
ret = elm_interface_fileselector_mime_types_filter_append(obj, mime_type, filter_name);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
|
@ -2670,9 +2658,7 @@ EAPI Eina_Bool
|
||||||
elm_fileselector_custom_filter_append(Evas_Object *obj, Elm_Fileselector_Filter_Func func, void *data, const char *filter_name)
|
elm_fileselector_custom_filter_append(Evas_Object *obj, Elm_Fileselector_Filter_Func func, void *data, const char *filter_name)
|
||||||
{
|
{
|
||||||
ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
|
ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
|
||||||
Eina_Bool ret = EINA_FALSE;
|
return elm_interface_fileselector_custom_filter_append(obj, func, data, filter_name);
|
||||||
ret = elm_interface_fileselector_custom_filter_append(obj, func, data, filter_name);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
|
@ -2781,9 +2767,7 @@ EAPI Eina_Bool
|
||||||
elm_fileselector_hidden_visible_get(const Evas_Object *obj)
|
elm_fileselector_hidden_visible_get(const Evas_Object *obj)
|
||||||
{
|
{
|
||||||
ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
|
ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
|
||||||
Eina_Bool ret = EINA_FALSE;
|
return elm_interface_fileselector_hidden_visible_get((Eo *) obj);
|
||||||
ret = elm_interface_fileselector_hidden_visible_get((Eo *) obj);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
|
@ -2891,10 +2875,7 @@ EAPI Elm_Fileselector_Sort
|
||||||
elm_fileselector_sort_method_get(const Evas_Object *obj)
|
elm_fileselector_sort_method_get(const Evas_Object *obj)
|
||||||
{
|
{
|
||||||
ELM_FILESELECTOR_INTERFACE_CHECK(obj, ELM_FILESELECTOR_SORT_LAST);
|
ELM_FILESELECTOR_INTERFACE_CHECK(obj, ELM_FILESELECTOR_SORT_LAST);
|
||||||
Elm_Fileselector_Sort ret = ELM_FILESELECTOR_SORT_LAST;
|
return elm_interface_fileselector_sort_method_get((Eo *) obj);
|
||||||
ret = elm_interface_fileselector_sort_method_get((Eo *) obj);
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Elm_Fileselector_Sort
|
EOLIAN static Elm_Fileselector_Sort
|
||||||
|
|
|
@ -4951,11 +4951,7 @@ _elm_gengrid_item_elm_widget_item_tooltip_window_mode_set(Eo *eo_it, Elm_Gen_Ite
|
||||||
{
|
{
|
||||||
it->tooltip.free_size = disable;
|
it->tooltip.free_size = disable;
|
||||||
if (VIEW(it))
|
if (VIEW(it))
|
||||||
{
|
return elm_wdg_item_tooltip_window_mode_set(eo_super(eo_it, ELM_GENGRID_ITEM_CLASS), disable);
|
||||||
Eina_Bool ret;
|
|
||||||
ret = elm_wdg_item_tooltip_window_mode_set(eo_super(eo_it, ELM_GENGRID_ITEM_CLASS), disable);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -744,9 +744,7 @@ EAPI Evas_Object *
|
||||||
elm_hover_parent_get(const Evas_Object *obj)
|
elm_hover_parent_get(const Evas_Object *obj)
|
||||||
{
|
{
|
||||||
ELM_HOVER_CHECK(obj) NULL;
|
ELM_HOVER_CHECK(obj) NULL;
|
||||||
Evas_Object *ret = NULL;
|
return elm_obj_widget_parent_get((Eo *) obj);
|
||||||
ret = elm_obj_widget_parent_get((Eo *) obj);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Evas_Object*
|
EOLIAN static Evas_Object*
|
||||||
|
|
|
@ -638,7 +638,6 @@ elm_icon_memfile_set(Evas_Object *obj,
|
||||||
const char *format,
|
const char *format,
|
||||||
const char *key)
|
const char *key)
|
||||||
{
|
{
|
||||||
Eina_Bool int_ret = EINA_FALSE;
|
|
||||||
ELM_ICON_CHECK(obj) EINA_FALSE;
|
ELM_ICON_CHECK(obj) EINA_FALSE;
|
||||||
|
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(img, EINA_FALSE);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(img, EINA_FALSE);
|
||||||
|
@ -649,8 +648,7 @@ elm_icon_memfile_set(Evas_Object *obj,
|
||||||
|
|
||||||
_edje_signals_free(sd);
|
_edje_signals_free(sd);
|
||||||
|
|
||||||
int_ret = elm_image_memfile_set(eo_super(obj, MY_CLASS), img, size, format, key);
|
return elm_image_memfile_set(eo_super(obj, MY_CLASS), img, size, format, key);
|
||||||
return int_ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Eina_Bool
|
EAPI Eina_Bool
|
||||||
|
@ -661,9 +659,7 @@ elm_icon_file_set(Evas_Object *obj,
|
||||||
ELM_ICON_CHECK(obj) EINA_FALSE;
|
ELM_ICON_CHECK(obj) EINA_FALSE;
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(file, EINA_FALSE);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(file, EINA_FALSE);
|
||||||
|
|
||||||
Eina_Bool ret = EINA_FALSE;
|
return efl_file_set(obj, file, group);
|
||||||
ret = efl_file_set(obj, file, group);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EAPI void
|
||||||
|
|
|
@ -1106,9 +1106,7 @@ elm_layout_content_unset(Evas_Object *obj,
|
||||||
const char *swallow)
|
const char *swallow)
|
||||||
{
|
{
|
||||||
ELM_LAYOUT_CHECK(obj) NULL;
|
ELM_LAYOUT_CHECK(obj) NULL;
|
||||||
Evas_Object *ret = NULL;
|
return efl_content_unset(efl_part(obj, swallow));
|
||||||
ret = efl_content_unset(efl_part(obj, swallow));
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static Evas_Object*
|
static Evas_Object*
|
||||||
|
|
|
@ -872,9 +872,7 @@ EAPI Evas_Object *
|
||||||
elm_menu_parent_get(const Evas_Object *obj)
|
elm_menu_parent_get(const Evas_Object *obj)
|
||||||
{
|
{
|
||||||
ELM_MENU_CHECK(obj) NULL;
|
ELM_MENU_CHECK(obj) NULL;
|
||||||
Evas_Object *ret = NULL;
|
return elm_obj_widget_parent_get(obj);
|
||||||
ret = elm_obj_widget_parent_get(obj);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Evas_Object*
|
EOLIAN static Evas_Object*
|
||||||
|
|
|
@ -1057,9 +1057,7 @@ elm_scroller_single_direction_get(const Evas_Object *obj)
|
||||||
EOLIAN static Elm_Scroller_Single_Direction
|
EOLIAN static Elm_Scroller_Single_Direction
|
||||||
_elm_scroller_elm_interface_scrollable_single_direction_get(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED)
|
_elm_scroller_elm_interface_scrollable_single_direction_get(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Elm_Scroller_Single_Direction ret = ELM_SCROLLER_SINGLE_DIRECTION_NONE;
|
return elm_interface_scrollable_single_direction_get(eo_super(obj, MY_CLASS));
|
||||||
ret = elm_interface_scrollable_single_direction_get(eo_super(obj, MY_CLASS));
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EAPI void
|
||||||
|
|
|
@ -4017,10 +4017,7 @@ _elm_toolbar_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, El
|
||||||
EOLIAN static Elm_Atspi_State_Set
|
EOLIAN static Elm_Atspi_State_Set
|
||||||
_elm_toolbar_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Toolbar_Data *sd EINA_UNUSED)
|
_elm_toolbar_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Toolbar_Data *sd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Elm_Atspi_State_Set ret;
|
return elm_interface_atspi_accessible_state_set_get(eo_super(obj, ELM_TOOLBAR_CLASS));
|
||||||
ret = elm_interface_atspi_accessible_state_set_get(eo_super(obj, ELM_TOOLBAR_CLASS));
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN int
|
EOLIAN int
|
||||||
|
|
|
@ -1117,7 +1117,6 @@ _elm_widget_on_show_region_hook_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *
|
||||||
EAPI Eina_Bool
|
EAPI Eina_Bool
|
||||||
elm_widget_sub_object_parent_add(Evas_Object *sobj)
|
elm_widget_sub_object_parent_add(Evas_Object *sobj)
|
||||||
{
|
{
|
||||||
Eina_Bool ret = EINA_FALSE;
|
|
||||||
Eo *parent = NULL;
|
Eo *parent = NULL;
|
||||||
|
|
||||||
parent = eo_parent_get(sobj);
|
parent = eo_parent_get(sobj);
|
||||||
|
@ -1125,12 +1124,10 @@ elm_widget_sub_object_parent_add(Evas_Object *sobj)
|
||||||
{
|
{
|
||||||
ERR("You passed a wrong parent parameter (%p %s). "
|
ERR("You passed a wrong parent parameter (%p %s). "
|
||||||
"Elementary widget's parent should be an elementary widget.", parent, evas_object_type_get(parent));
|
"Elementary widget's parent should be an elementary widget.", parent, evas_object_type_get(parent));
|
||||||
return ret;
|
return EINA_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = elm_obj_widget_sub_object_add(parent, sobj);
|
return elm_obj_widget_sub_object_add(parent, sobj);
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -1937,9 +1937,7 @@ evas_object_box_option_property_set(Evas_Object *o, Evas_Object_Box_Option *opt,
|
||||||
EAPI Eina_Bool
|
EAPI Eina_Bool
|
||||||
evas_object_box_option_property_vset(Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args)
|
evas_object_box_option_property_vset(Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args)
|
||||||
{
|
{
|
||||||
Eina_Bool ret = EINA_FALSE;
|
return evas_obj_box_option_property_vset(o, opt, property, (va_list *) &args);
|
||||||
ret = evas_obj_box_option_property_vset(o, opt, property, (va_list *) &args);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
|
@ -1964,9 +1962,7 @@ evas_object_box_option_property_get(const Evas_Object *o, Evas_Object_Box_Option
|
||||||
EAPI Eina_Bool
|
EAPI Eina_Bool
|
||||||
evas_object_box_option_property_vget(const Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args)
|
evas_object_box_option_property_vget(const Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args)
|
||||||
{
|
{
|
||||||
Eina_Bool ret = EINA_FALSE;
|
return evas_obj_box_option_property_vget((Eo *)o, opt, property, (va_list *) &args);
|
||||||
ret = evas_obj_box_option_property_vget((Eo *)o, opt, property, (va_list *) &args);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
|
|
|
@ -1964,11 +1964,10 @@ _evas_canvas_object_top_at_xy_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Eva
|
||||||
EAPI Evas_Object *
|
EAPI Evas_Object *
|
||||||
evas_object_top_at_pointer_get(const Evas *eo_e)
|
evas_object_top_at_pointer_get(const Evas *eo_e)
|
||||||
{
|
{
|
||||||
Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
|
Evas_Public_Data *e = eo_isa(eo_e, EVAS_CANVAS_CLASS) ?
|
||||||
Evas_Object *ret = NULL;
|
eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS) : NULL;
|
||||||
if (!e) return NULL;
|
if (!e) return NULL;
|
||||||
ret = evas_canvas_object_top_at_xy_get((Eo *)eo_e, e->pointer.x, e->pointer.y, EINA_TRUE, EINA_TRUE);
|
return evas_canvas_object_top_at_xy_get((Eo *)eo_e, e->pointer.x, e->pointer.y, EINA_TRUE, EINA_TRUE);
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN Evas_Object*
|
EOLIAN Evas_Object*
|
||||||
|
|
|
@ -49,17 +49,13 @@ _efl_vg_shape_efl_gfx_color_part_set(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED,
|
||||||
const char * part,
|
const char * part,
|
||||||
int r, int g, int b, int a)
|
int r, int g, int b, int a)
|
||||||
{
|
{
|
||||||
Eina_Bool ret;
|
|
||||||
|
|
||||||
if (part && !strcmp(part, "stroke"))
|
if (part && !strcmp(part, "stroke"))
|
||||||
{
|
{
|
||||||
efl_gfx_shape_stroke_color_set(obj, r, g, b, a);
|
efl_gfx_shape_stroke_color_set(obj, r, g, b, a);
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = efl_gfx_color_part_set(eo_super(obj, EFL_VG_SHAPE_CLASS), part, r, g, b, a);
|
return efl_gfx_color_part_set(eo_super(obj, EFL_VG_SHAPE_CLASS), part, r, g, b, a);
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
|
@ -67,17 +63,13 @@ _efl_vg_shape_efl_gfx_color_part_get(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED,
|
||||||
const char * part,
|
const char * part,
|
||||||
int *r, int *g, int *b, int *a)
|
int *r, int *g, int *b, int *a)
|
||||||
{
|
{
|
||||||
Eina_Bool ret;
|
|
||||||
|
|
||||||
if (part && !strcmp(part, "stroke"))
|
if (part && !strcmp(part, "stroke"))
|
||||||
{
|
{
|
||||||
efl_gfx_shape_stroke_color_get(obj, r, g, b, a);
|
efl_gfx_shape_stroke_color_get(obj, r, g, b, a);
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = efl_gfx_color_part_get(eo_super(obj, EFL_VG_SHAPE_CLASS), part, r, g, b, a);
|
return efl_gfx_color_part_get(eo_super(obj, EFL_VG_SHAPE_CLASS), part, r, g, b, a);
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
Loading…
Reference in New Issue