Fix warnings following migration to Eo4.

Mostly unused variables.
This commit is contained in:
Tom Hacohen 2016-03-02 15:21:42 +00:00
parent 26ee9f0afb
commit 75569ec561
20 changed files with 8 additions and 73 deletions

View File

@ -918,7 +918,6 @@ EOLIAN static void
_elm_ctxpopup_item_elm_widget_item_disable(Eo *eo_ctxpopup_it,
Elm_Ctxpopup_Item_Data *ctxpopup_it)
{
Eina_Bool tmp;
elm_object_item_disabled_set
(ctxpopup_it->list_item, elm_wdg_item_disabled_get(eo_ctxpopup_it));
}

View File

@ -460,7 +460,6 @@ EOLIAN static void
_elm_hoversel_item_elm_widget_item_disable(Eo *eo_hoversel_it,
Elm_Hoversel_Item_Data *hoversel_it EINA_UNUSED)
{
Eina_Bool tmp;
elm_widget_disabled_set
(VIEW(hoversel_it), elm_wdg_item_disabled_get(eo_hoversel_it));
}

View File

@ -1905,7 +1905,6 @@ EOLIAN static void
_elm_multibuttonentry_item_elm_widget_item_disable(Eo *eo_it, Elm_Multibuttonentry_Item_Data *it)
{
const char* emission;
Eina_Bool tmp;
if (elm_wdg_item_disabled_get(eo_it))
emission = "elm,state,disabled";
else

View File

@ -832,7 +832,6 @@ _elm_popup_item_elm_widget_item_part_content_unset(Eo *eo_it EINA_UNUSED, Elm_Po
EOLIAN static void
_elm_popup_item_elm_widget_item_disable(Eo *eo_it, Elm_Popup_Item_Data *it)
{
Eina_Bool tmp;
ELM_POPUP_ITEM_CHECK_OR_RETURN(it);
if (elm_wdg_item_disabled_get(eo_it))
@ -1201,7 +1200,6 @@ _action_button_set(Evas_Object *obj,
EOLIAN static Eina_Bool
_elm_popup_elm_container_content_set(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
{
Eina_Bool tmp;
unsigned int i;
Eina_Bool ret = EINA_TRUE;

View File

@ -275,7 +275,6 @@ _elm_bg_class_constructor(Eo_Class *klass)
EAPI Eina_Bool
elm_bg_file_set(Eo *obj, const char *file, const char *group)
{
Eina_Bool ret;
return efl_file_set((Eo *) obj, file, group);
}

View File

@ -2480,7 +2480,6 @@ _elm_color_item_selected_set(Eo *eo_item,
EAPI Eina_Bool
elm_colorselector_palette_item_selected_get(const Elm_Object_Item *it)
{
Eina_Bool ret;
return elm_obj_color_item_selected_get(it);
}

View File

@ -204,7 +204,6 @@ _item_cache_add(Elm_Gen_Item *it)
if (!it->group)
{
Eina_Bool tmp;
if (it->selected)
edje_object_signal_emit(itc->base_view, "elm,state,unselected", "elm");
if (elm_wdg_item_disabled_get(EO_OBJ(it)))
@ -673,7 +672,6 @@ _item_mouse_move_cb(void *data,
static Eina_Bool
_long_press_cb(void *data)
{
Eina_Bool tmp;
Elm_Gen_Item *it = data;
ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
@ -833,7 +831,6 @@ _item_content_realize(Elm_Gen_Item *it,
const char *src,
const char *parts)
{
Eina_Bool tmp;
Evas_Object *content;
if (!parts)
@ -1028,7 +1025,6 @@ _item_mouse_up_cb(void *data,
Evas_Object *obj EINA_UNUSED,
void *event_info)
{
Eina_Bool tmp;
Evas_Event_Mouse_Up *ev = event_info;
Eina_Bool dragged = EINA_FALSE;
Elm_Gen_Item *it = data;
@ -1310,7 +1306,6 @@ _elm_gengrid_item_focus_update(Elm_Gen_Item *it)
static void
_item_realize(Elm_Gen_Item *it)
{
Eina_Bool tmp;
ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
Elm_Object_Item *eo_it = EO_OBJ(it);
@ -1983,7 +1978,6 @@ _elm_gengrid_pan_class_constructor(Eo_Class *klass)
static void
_elm_gengrid_item_focused(Elm_Object_Item *eo_it)
{
Eina_Bool tmp;
ELM_GENGRID_ITEM_DATA_GET(eo_it, it);
Evas_Object *obj = WIDGET(it);
ELM_GENGRID_DATA_GET(obj, sd);
@ -3952,7 +3946,6 @@ _elm_gengrid_item_compare(const void *data,
EOLIAN static void
_elm_gengrid_item_elm_widget_item_disable(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it)
{
Eina_Bool tmp;
if (it->generation < GG_IT(it)->wsd->generation) return;
if (it->realized)
@ -4698,7 +4691,6 @@ EOLIAN static void
_elm_gengrid_item_selected_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it,
Eina_Bool selected)
{
Eina_Bool tmp;
ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
if ((it->generation < sd->generation) || elm_wdg_item_disabled_get(EO_OBJ(it)))
return;
@ -4885,7 +4877,6 @@ _elm_gengrid_item_elm_widget_item_tooltip_style_set(Eo *eo_it, Elm_Gen_Item *it,
EAPI const char *
elm_gengrid_item_tooltip_style_get(const Elm_Object_Item *it)
{
const char *ret;
return elm_wdg_item_tooltip_style_get(it);
}
@ -4899,7 +4890,6 @@ EAPI Eina_Bool
elm_gengrid_item_tooltip_window_mode_set(Elm_Object_Item *it,
Eina_Bool disable)
{
Eina_Bool ret;
return elm_wdg_item_tooltip_window_mode_set(it, disable);
}
@ -4921,7 +4911,6 @@ _elm_gengrid_item_elm_widget_item_tooltip_window_mode_set(Eo *eo_it, Elm_Gen_Ite
EAPI Eina_Bool
elm_gengrid_item_tooltip_window_mode_get(const Elm_Object_Item *it)
{
Eina_Bool ret;
return elm_wdg_item_tooltip_window_mode_get(it);
}
@ -4953,7 +4942,6 @@ _elm_gengrid_item_elm_widget_item_cursor_set(Eo *eo_it, Elm_Gen_Item *it,
EAPI const char *
elm_gengrid_item_cursor_get(const Elm_Object_Item *it)
{
const char *ret;
return elm_wdg_item_cursor_get(it);
}
@ -4985,7 +4973,6 @@ elm_gengrid_item_cursor_style_set(Elm_Object_Item *it,
EAPI const char *
elm_gengrid_item_cursor_style_get(const Elm_Object_Item *it)
{
const char *ret;
return elm_wdg_item_cursor_style_get(it);
}
@ -5003,7 +4990,6 @@ EAPI Eina_Bool
elm_gengrid_item_cursor_engine_only_get(const Elm_Object_Item *eo_it)
{
ELM_GENGRID_ITEM_DATA_GET(eo_it, it);
Eina_Bool ret;
if (it->realized)
return elm_wdg_item_cursor_engine_only_get(eo_it);
else return it->cursor_engine_only;
@ -5118,7 +5104,7 @@ elm_gengrid_page_show(const Evas_Object *obj,
int v_pagenumber)
{
ELM_GENGRID_CHECK(obj);
elm_interface_scrollable_page_show(obj, h_pagenumber, v_pagenumber);
elm_interface_scrollable_page_show((Eo *) obj, h_pagenumber, v_pagenumber);
}
EINA_DEPRECATED EAPI void
@ -5127,7 +5113,7 @@ elm_gengrid_page_bring_in(const Evas_Object *obj,
int v_pagenumber)
{
ELM_GENGRID_CHECK(obj);
elm_interface_scrollable_page_bring_in(obj, h_pagenumber, v_pagenumber);
elm_interface_scrollable_page_bring_in((Eo *) obj, h_pagenumber, v_pagenumber);
}
EAPI void

View File

@ -356,7 +356,6 @@ _item_content_realize(Elm_Gen_Item *it,
const char *src,
const char *parts)
{
Eina_Bool tmp;
Evas_Object *content;
char buf[256];
@ -1295,7 +1294,6 @@ _item_order_update(const Eina_Inlist *l,
static void
_elm_genlist_item_state_update(Elm_Gen_Item *it)
{
Eina_Bool tmp;
ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
if (it->selected)
@ -1555,7 +1553,6 @@ _item_cache_add(Elm_Gen_Item *it, Eina_List *contents)
Item_Cache *itc = NULL;
ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
Evas_Object *obj = sd->obj;
Eina_Bool tmp;
evas_event_freeze(evas_object_evas_get(obj));
@ -2705,7 +2702,6 @@ _elm_genlist_item_focused(Elm_Object_Item *eo_it)
ELM_GENLIST_ITEM_DATA_GET(eo_it, it);
Evas_Object *obj = WIDGET(it);
ELM_GENLIST_DATA_GET(obj, sd);
Eina_Bool tmp;
if (_is_no_select(it) ||
(eo_it == sd->focused_item) ||
@ -2771,7 +2767,6 @@ _item_focused_next(Evas_Object *obj, Elm_Focus_Direction dir)
Elm_Object_Item *eo_next;
Elm_Object_Item *eo_first_item;
Elm_Object_Item *eo_last_item;
Eina_Bool tmp;
if (!sd->focused_item)
{
@ -3449,7 +3444,6 @@ _show_region_hook(void *data EINA_UNUSED,
static void
_item_highlight(Elm_Gen_Item *it)
{
Eina_Bool tmp;
const char *selectraise;
ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
@ -3965,7 +3959,6 @@ _item_mouse_move_cb(void *data,
static Eina_Bool
_long_press_cb(void *data)
{
Eina_Bool tmp;
Elm_Gen_Item *it = data;
Elm_Object_Item *eo_it_tmp;
Eina_List *list;
@ -4018,7 +4011,6 @@ static void
_swipe_do(Elm_Gen_Item *it)
{
int i, sum = 0;
Eina_Bool tmp;
ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
if (_is_no_select(it) ||
@ -4200,7 +4192,6 @@ _item_mouse_down_cb(void *data,
Evas_Object *obj,
void *event_info)
{
Eina_Bool tmp;
Evas_Event_Mouse_Down *ev = event_info;
Elm_Gen_Item *it = data;
Evas_Coord x, y;
@ -4833,7 +4824,6 @@ _item_mouse_up_cb(void *data,
Evas_Object *obj EINA_UNUSED,
void *event_info)
{
Eina_Bool tmp;
Evas_Event_Mouse_Up *ev = event_info;
Eina_Bool dragged = EINA_FALSE;
Elm_Gen_Item *it = data;
@ -5789,7 +5779,6 @@ _internal_elm_genlist_clear(Evas_Object *obj)
static Eina_Bool
_item_select(Elm_Gen_Item *it)
{
Eina_Bool tmp;
Evas_Object *obj = WIDGET(it);
ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
Elm_Object_Item *eo_it = EO_OBJ(it);
@ -5903,7 +5892,6 @@ _elm_genlist_item_elm_widget_item_part_text_get(Eo *eo_it EINA_UNUSED, Elm_Gen_I
EOLIAN static void
_elm_genlist_item_elm_widget_item_disable(Eo *eo_it, Elm_Gen_Item *it)
{
Eina_Bool tmp;
Eina_List *l;
Evas_Object *obj;
@ -6711,7 +6699,6 @@ EOLIAN static void
_elm_genlist_item_selected_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it,
Eina_Bool selected)
{
Eina_Bool tmp;
ELM_GENLIST_ITEM_CHECK_OR_RETURN(it);
if (elm_wdg_item_disabled_get(EO_OBJ(it))) return;
@ -7228,7 +7215,6 @@ _elm_genlist_item_elm_widget_item_tooltip_style_set(Eo *eo_it, Elm_Gen_Item *it,
EAPI const char *
elm_genlist_item_tooltip_style_get(const Elm_Object_Item *it)
{
const char *ret;
return elm_wdg_item_tooltip_style_get(it);
}
@ -7242,7 +7228,6 @@ EAPI Eina_Bool
elm_genlist_item_tooltip_window_mode_set(Elm_Object_Item *item,
Eina_Bool disable)
{
Eina_Bool ret;
return elm_wdg_item_tooltip_window_mode_set(item, disable);
}
@ -7266,7 +7251,6 @@ _elm_genlist_item_elm_widget_item_tooltip_window_mode_set(Eo *eo_it, Elm_Gen_Ite
EAPI Eina_Bool
elm_genlist_item_tooltip_window_mode_get(const Elm_Object_Item *eo_it)
{
Eina_Bool ret;
return elm_wdg_item_tooltip_window_mode_get(eo_it);
}
@ -7295,7 +7279,6 @@ _elm_genlist_item_elm_widget_item_cursor_set(Eo *eo_it, Elm_Gen_Item *it,
EAPI const char *
elm_genlist_item_cursor_get(const Elm_Object_Item *eo_it)
{
const char *ret;
return elm_wdg_item_cursor_get(eo_it);
}
@ -7327,7 +7310,6 @@ elm_genlist_item_cursor_style_set(Elm_Object_Item *eo_it,
EAPI const char *
elm_genlist_item_cursor_style_get(const Elm_Object_Item *eo_it)
{
const char *ret;
return elm_wdg_item_cursor_style_get(eo_it);
}
@ -7341,7 +7323,6 @@ elm_genlist_item_cursor_engine_only_set(Elm_Object_Item *eo_it,
EAPI Eina_Bool
elm_genlist_item_cursor_engine_only_get(const Elm_Object_Item *eo_it)
{
Eina_Bool ret;
return elm_wdg_item_cursor_engine_only_get(eo_it);
}
@ -7747,7 +7728,6 @@ _elm_genlist_item_decorate_mode_set(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it,
Elm_Genlist_Data *sd;
Eina_List *l;
Elm_Object_Item *eo_it2 = NULL;
Eina_Bool tmp;
ELM_GENLIST_ITEM_CHECK_OR_RETURN(it);
sd = GL_IT(it)->wsd;

View File

@ -454,7 +454,7 @@ elm_atspi_relation_set_relation_append(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
if (!eina_list_data_find(rel->objects, rel_obj))
{
rel->objects = eina_list_append(rel->objects, rel_obj);
eo_event_callback_add(rel_obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set);
eo_event_callback_add((Eo *) rel_obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set);
}
return EINA_TRUE;
}
@ -467,7 +467,7 @@ elm_atspi_relation_set_relation_append(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
rel->objects = eina_list_append(rel->objects, rel_obj);
*set = eina_list_append(*set, rel);
eo_event_callback_add(rel_obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set);
eo_event_callback_add((Eo *) rel_obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set);
return EINA_TRUE;
}
@ -483,7 +483,7 @@ elm_atspi_relation_set_relation_remove(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
{
if (eina_list_data_find(rel->objects, rel_obj))
{
eo_event_callback_del(rel_obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set);
eo_event_callback_del((Eo *) rel_obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set);
rel->objects = eina_list_remove(rel->objects, rel_obj);
}
if (!rel->objects)

View File

@ -1795,7 +1795,6 @@ EOLIAN static void _elm_layout_class_constructor(Eo_Class *klass)
EAPI Eina_Bool
elm_layout_file_set(Eo *obj, const char *file, const char *group)
{
Eina_Bool ret;
return efl_file_set((Eo *) obj, file, group);
}

View File

@ -2024,7 +2024,6 @@ EOLIAN static const char *
_elm_list_item_elm_widget_item_part_text_get(Eo *eo_it, Elm_List_Item_Data *it,
const char *part)
{
const char *ret;
if (part && strcmp(part, "default"))
return elm_wdg_item_part_text_custom_get(eo_it, part);
return it->label;

View File

@ -528,7 +528,6 @@ _block_menu(void *_sd, const Eo_Event *event EINA_UNUSED)
Eina_List *items = sd->items;
EINA_LIST_FOREACH(items, l, eo_current)
{
Eina_Bool tmp;
ELM_MENU_ITEM_DATA_GET(eo_current, current);
if (!current->blocked) current->was_enabled = !elm_wdg_item_disabled_get(eo_current);
current->blocked = EINA_TRUE;

View File

@ -401,7 +401,6 @@ _elm_photo_class_constructor(Eo_Class *klass)
EAPI Eina_Bool
elm_photo_file_set(Eo *obj, const char *file)
{
Eina_Bool ret;
return efl_file_set((Eo *) obj, file, NULL);
}

View File

@ -1716,8 +1716,6 @@ _elm_photocam_efl_file_file_set(Eo *obj, Elm_Photocam_Data *sd, const char *file
EAPI Evas_Load_Error
elm_photocam_file_set(Elm_Photocam *obj, const char *file)
{
Eina_Bool ret;
ELM_PHOTOCAM_CHECK(obj) EVAS_LOAD_ERROR_NONE;
EINA_SAFETY_ON_NULL_RETURN_VAL(file, EVAS_LOAD_ERROR_NONE);
if (efl_file_set(obj, file, NULL)) return EVAS_LOAD_ERROR_NONE;

View File

@ -1877,7 +1877,6 @@ _elm_prefs_class_constructor(Eo_Class *klass)
EAPI Eina_Bool
elm_prefs_file_set(Eo *obj, const char *file, const char *page)
{
Eina_Bool ret;
return efl_file_set((Eo *) obj, file, page);
}

View File

@ -1181,7 +1181,7 @@ _elm_scroller_page_scroll_limit_set(const Eo *obj, Elm_Scroller_Data *_pd EINA_U
page_limit_v = 9999;
elm_interface_scrollable_page_scroll_limit_set
(obj, page_limit_h, page_limit_v);
((Eo *) obj, page_limit_h, page_limit_v);
}
EOLIAN static void
@ -1373,8 +1373,6 @@ elm_scroller_wheel_disabled_get(const Evas_Object *obj)
{
ELM_SCROLLABLE_CHECK(obj, EINA_FALSE);
Eina_Bool ret;
return elm_interface_scrollable_wheel_disabled_get((Eo *) obj);
}

View File

@ -420,7 +420,6 @@ _resize_job(void *data)
else
{
Elm_Object_Item *menu_it;
Eina_Bool tmp;
menu_it = elm_menu_item_add
(menu, NULL, it->icon_str, it->label,
@ -1001,7 +1000,6 @@ _resize_cb(void *data,
EOLIAN static void
_elm_toolbar_item_elm_widget_item_disable(Eo *eo_toolbar, Elm_Toolbar_Item_Data *toolbar_it)
{
Eina_Bool tmp;
const char* emission;
if (elm_wdg_item_disabled_get(eo_toolbar))
@ -1080,7 +1078,6 @@ _item_select(Elm_Toolbar_Item_Data *it)
{
Evas_Object *obj;
Eina_Bool sel;
Eina_Bool tmp;
Eina_List *list;
ELM_TOOLBAR_DATA_GET(WIDGET(it), sd);
@ -1256,7 +1253,6 @@ _item_theme_hook(Evas_Object *obj,
Evas_Coord mw = -1, mh = -1;
Evas_Object *view = VIEW(it);
const char *style;
Eina_Bool tmp;
ELM_TOOLBAR_DATA_GET(obj, sd);
@ -2277,7 +2273,6 @@ static char *
_access_state_cb(void *data, Evas_Object *obj EINA_UNUSED)
{
Elm_Toolbar_Item_Data *it = (Elm_Toolbar_Item_Data *)data;
Eina_Bool tmp;
if (it->separator)
return strdup(E_("Separator"));
@ -2330,7 +2325,6 @@ _access_activate_cb(void *data EINA_UNUSED,
{
ELM_TOOLBAR_ITEM_DATA_GET(item, it);
ELM_TOOLBAR_DATA_GET(WIDGET(it), sd);
Eina_Bool tmp;
if (elm_wdg_item_disabled_get(item)) return;
@ -3643,7 +3637,6 @@ _elm_toolbar_item_state_set(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item
}
if (item->icon)
{
Eina_Bool tmp;
if (elm_wdg_item_disabled_get(EO_OBJ(item)))
elm_widget_signal_emit(item->icon, "elm,state,disabled", "elm");
else

View File

@ -471,7 +471,6 @@ _elm_video_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED
EAPI Eina_Bool
elm_video_file_set(Eo *obj, const char *filename)
{
Eina_Bool ret;
return efl_file_set((Eo *) obj, filename, NULL);
}

View File

@ -569,15 +569,10 @@ struct _Elm_Widget_Item_Signal_Data
};
#define WIDGET_ITEM_DATA_GET(eo_obj) \
({ \
void *_data; \
eo_key_data_get(eo_obj, "__elm_widget_item_data"); \
})
eo_key_data_get((Eo *) eo_obj, "__elm_widget_item_data")
#define WIDGET_ITEM_DATA_SET(eo_obj, data) \
{ \
eo_key_data_set(eo_obj, "__elm_widget_item_data", data); \
}
eo_key_data_set((Eo *) eo_obj, "__elm_widget_item_data", data)
struct _Elm_Widget_Item_Data
{

View File

@ -3967,7 +3967,6 @@ _elm_win_fake_canvas_set(Eo *obj EINA_UNUSED, Elm_Win_Data *pd, Ecore_Evas *oee)
EOLIAN static void
_elm_win_type_set(Eo *obj, Elm_Win_Data *sd, Elm_Win_Type type)
{
Eina_Bool finalized;
if (eo_finalized_get(obj))
{
ERR("This function is only allowed during construction.");
@ -3985,7 +3984,6 @@ _elm_win_type_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
EOLIAN static void
_elm_win_name_set(Eo *obj, Elm_Win_Data *sd, const char *name)
{
Eina_Bool finalized;
if (eo_finalized_get(obj))
{
ERR("This function is only allowed during construction.");