summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-03-02 15:21:42 +0000
committerTom Hacohen <tom@stosb.com>2016-03-03 10:08:27 +0000
commit02e87e89af529cf4fb9146dda736f3c4995dd7a7 (patch)
treeedec8487efc725694830b102b9c896c9fb01e00d
parent7bd1d488408ae36d346ef274e6b93039dfa6de8b (diff)
Fix warnings following migration to Eo4.
Mostly unused variables.
-rw-r--r--src/lib/elc_ctxpopup.c1
-rw-r--r--src/lib/elc_hoversel.c1
-rw-r--r--src/lib/elc_multibuttonentry.c1
-rw-r--r--src/lib/elc_popup.c2
-rw-r--r--src/lib/elm_bg.c1
-rw-r--r--src/lib/elm_colorselector.c1
-rw-r--r--src/lib/elm_gengrid.c18
-rw-r--r--src/lib/elm_genlist.c20
-rw-r--r--src/lib/elm_interface_atspi_accessible.c6
-rw-r--r--src/lib/elm_layout.c1
-rw-r--r--src/lib/elm_list.c1
-rw-r--r--src/lib/elm_menu.c1
-rw-r--r--src/lib/elm_photo.c1
-rw-r--r--src/lib/elm_photocam.c2
-rw-r--r--src/lib/elm_prefs.c1
-rw-r--r--src/lib/elm_scroller.c4
-rw-r--r--src/lib/elm_toolbar.c7
-rw-r--r--src/lib/elm_video.c1
-rw-r--r--src/lib/elm_widget.h9
-rw-r--r--src/lib/elm_win.c2
20 files changed, 8 insertions, 73 deletions
diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index 27f24f48f..68f65d43c 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -918,7 +918,6 @@ EOLIAN static void
918_elm_ctxpopup_item_elm_widget_item_disable(Eo *eo_ctxpopup_it, 918_elm_ctxpopup_item_elm_widget_item_disable(Eo *eo_ctxpopup_it,
919 Elm_Ctxpopup_Item_Data *ctxpopup_it) 919 Elm_Ctxpopup_Item_Data *ctxpopup_it)
920{ 920{
921 Eina_Bool tmp;
922 elm_object_item_disabled_set 921 elm_object_item_disabled_set
923 (ctxpopup_it->list_item, elm_wdg_item_disabled_get(eo_ctxpopup_it)); 922 (ctxpopup_it->list_item, elm_wdg_item_disabled_get(eo_ctxpopup_it));
924} 923}
diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c
index 76816d006..7d9817f6b 100644
--- a/src/lib/elc_hoversel.c
+++ b/src/lib/elc_hoversel.c
@@ -460,7 +460,6 @@ EOLIAN static void
460_elm_hoversel_item_elm_widget_item_disable(Eo *eo_hoversel_it, 460_elm_hoversel_item_elm_widget_item_disable(Eo *eo_hoversel_it,
461 Elm_Hoversel_Item_Data *hoversel_it EINA_UNUSED) 461 Elm_Hoversel_Item_Data *hoversel_it EINA_UNUSED)
462{ 462{
463 Eina_Bool tmp;
464 elm_widget_disabled_set 463 elm_widget_disabled_set
465 (VIEW(hoversel_it), elm_wdg_item_disabled_get(eo_hoversel_it)); 464 (VIEW(hoversel_it), elm_wdg_item_disabled_get(eo_hoversel_it));
466} 465}
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index 3b6ab39b2..a154571b5 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -1905,7 +1905,6 @@ EOLIAN static void
1905_elm_multibuttonentry_item_elm_widget_item_disable(Eo *eo_it, Elm_Multibuttonentry_Item_Data *it) 1905_elm_multibuttonentry_item_elm_widget_item_disable(Eo *eo_it, Elm_Multibuttonentry_Item_Data *it)
1906{ 1906{
1907 const char* emission; 1907 const char* emission;
1908 Eina_Bool tmp;
1909 if (elm_wdg_item_disabled_get(eo_it)) 1908 if (elm_wdg_item_disabled_get(eo_it))
1910 emission = "elm,state,disabled"; 1909 emission = "elm,state,disabled";
1911 else 1910 else
diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c
index e2fd3cd1b..c69e16df9 100644
--- a/src/lib/elc_popup.c
+++ b/src/lib/elc_popup.c
@@ -832,7 +832,6 @@ _elm_popup_item_elm_widget_item_part_content_unset(Eo *eo_it EINA_UNUSED, Elm_Po
832EOLIAN static void 832EOLIAN static void
833_elm_popup_item_elm_widget_item_disable(Eo *eo_it, Elm_Popup_Item_Data *it) 833_elm_popup_item_elm_widget_item_disable(Eo *eo_it, Elm_Popup_Item_Data *it)
834{ 834{
835 Eina_Bool tmp;
836 ELM_POPUP_ITEM_CHECK_OR_RETURN(it); 835 ELM_POPUP_ITEM_CHECK_OR_RETURN(it);
837 836
838 if (elm_wdg_item_disabled_get(eo_it)) 837 if (elm_wdg_item_disabled_get(eo_it))
@@ -1201,7 +1200,6 @@ _action_button_set(Evas_Object *obj,
1201EOLIAN static Eina_Bool 1200EOLIAN static Eina_Bool
1202_elm_popup_elm_container_content_set(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content) 1201_elm_popup_elm_container_content_set(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
1203{ 1202{
1204 Eina_Bool tmp;
1205 unsigned int i; 1203 unsigned int i;
1206 Eina_Bool ret = EINA_TRUE; 1204 Eina_Bool ret = EINA_TRUE;
1207 1205
diff --git a/src/lib/elm_bg.c b/src/lib/elm_bg.c
index d711748b5..1c709b26b 100644
--- a/src/lib/elm_bg.c
+++ b/src/lib/elm_bg.c
@@ -275,7 +275,6 @@ _elm_bg_class_constructor(Eo_Class *klass)
275EAPI Eina_Bool 275EAPI Eina_Bool
276elm_bg_file_set(Eo *obj, const char *file, const char *group) 276elm_bg_file_set(Eo *obj, const char *file, const char *group)
277{ 277{
278 Eina_Bool ret;
279 return efl_file_set((Eo *) obj, file, group); 278 return efl_file_set((Eo *) obj, file, group);
280} 279}
281 280
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index 09c3f4e76..ca2ae727e 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -2480,7 +2480,6 @@ _elm_color_item_selected_set(Eo *eo_item,
2480EAPI Eina_Bool 2480EAPI Eina_Bool
2481elm_colorselector_palette_item_selected_get(const Elm_Object_Item *it) 2481elm_colorselector_palette_item_selected_get(const Elm_Object_Item *it)
2482{ 2482{
2483 Eina_Bool ret;
2484 return elm_obj_color_item_selected_get(it); 2483 return elm_obj_color_item_selected_get(it);
2485} 2484}
2486 2485
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index baec9c8a1..93d26449c 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -204,7 +204,6 @@ _item_cache_add(Elm_Gen_Item *it)
204 204
205 if (!it->group) 205 if (!it->group)
206 { 206 {
207 Eina_Bool tmp;
208 if (it->selected) 207 if (it->selected)
209 edje_object_signal_emit(itc->base_view, "elm,state,unselected", "elm"); 208 edje_object_signal_emit(itc->base_view, "elm,state,unselected", "elm");
210 if (elm_wdg_item_disabled_get(EO_OBJ(it))) 209 if (elm_wdg_item_disabled_get(EO_OBJ(it)))
@@ -673,7 +672,6 @@ _item_mouse_move_cb(void *data,
673static Eina_Bool 672static Eina_Bool
674_long_press_cb(void *data) 673_long_press_cb(void *data)
675{ 674{
676 Eina_Bool tmp;
677 Elm_Gen_Item *it = data; 675 Elm_Gen_Item *it = data;
678 ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd); 676 ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
679 677
@@ -833,7 +831,6 @@ _item_content_realize(Elm_Gen_Item *it,
833 const char *src, 831 const char *src,
834 const char *parts) 832 const char *parts)
835{ 833{
836 Eina_Bool tmp;
837 Evas_Object *content; 834 Evas_Object *content;
838 835
839 if (!parts) 836 if (!parts)
@@ -1028,7 +1025,6 @@ _item_mouse_up_cb(void *data,
1028 Evas_Object *obj EINA_UNUSED, 1025 Evas_Object *obj EINA_UNUSED,
1029 void *event_info) 1026 void *event_info)
1030{ 1027{
1031 Eina_Bool tmp;
1032 Evas_Event_Mouse_Up *ev = event_info; 1028 Evas_Event_Mouse_Up *ev = event_info;
1033 Eina_Bool dragged = EINA_FALSE; 1029 Eina_Bool dragged = EINA_FALSE;
1034 Elm_Gen_Item *it = data; 1030 Elm_Gen_Item *it = data;
@@ -1310,7 +1306,6 @@ _elm_gengrid_item_focus_update(Elm_Gen_Item *it)
1310static void 1306static void
1311_item_realize(Elm_Gen_Item *it) 1307_item_realize(Elm_Gen_Item *it)
1312{ 1308{
1313 Eina_Bool tmp;
1314 ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd); 1309 ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
1315 Elm_Object_Item *eo_it = EO_OBJ(it); 1310 Elm_Object_Item *eo_it = EO_OBJ(it);
1316 1311
@@ -1983,7 +1978,6 @@ _elm_gengrid_pan_class_constructor(Eo_Class *klass)
1983static void 1978static void
1984_elm_gengrid_item_focused(Elm_Object_Item *eo_it) 1979_elm_gengrid_item_focused(Elm_Object_Item *eo_it)
1985{ 1980{
1986 Eina_Bool tmp;
1987 ELM_GENGRID_ITEM_DATA_GET(eo_it, it); 1981 ELM_GENGRID_ITEM_DATA_GET(eo_it, it);
1988 Evas_Object *obj = WIDGET(it); 1982 Evas_Object *obj = WIDGET(it);
1989 ELM_GENGRID_DATA_GET(obj, sd); 1983 ELM_GENGRID_DATA_GET(obj, sd);
@@ -3952,7 +3946,6 @@ _elm_gengrid_item_compare(const void *data,
3952EOLIAN static void 3946EOLIAN static void
3953_elm_gengrid_item_elm_widget_item_disable(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) 3947_elm_gengrid_item_elm_widget_item_disable(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it)
3954{ 3948{
3955 Eina_Bool tmp;
3956 if (it->generation < GG_IT(it)->wsd->generation) return; 3949 if (it->generation < GG_IT(it)->wsd->generation) return;
3957 3950
3958 if (it->realized) 3951 if (it->realized)
@@ -4698,7 +4691,6 @@ EOLIAN static void
4698_elm_gengrid_item_selected_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, 4691_elm_gengrid_item_selected_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it,
4699 Eina_Bool selected) 4692 Eina_Bool selected)
4700{ 4693{
4701 Eina_Bool tmp;
4702 ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd); 4694 ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
4703 if ((it->generation < sd->generation) || elm_wdg_item_disabled_get(EO_OBJ(it))) 4695 if ((it->generation < sd->generation) || elm_wdg_item_disabled_get(EO_OBJ(it)))
4704 return; 4696 return;
@@ -4885,7 +4877,6 @@ _elm_gengrid_item_elm_widget_item_tooltip_style_set(Eo *eo_it, Elm_Gen_Item *it,
4885EAPI const char * 4877EAPI const char *
4886elm_gengrid_item_tooltip_style_get(const Elm_Object_Item *it) 4878elm_gengrid_item_tooltip_style_get(const Elm_Object_Item *it)
4887{ 4879{
4888 const char *ret;
4889 return elm_wdg_item_tooltip_style_get(it); 4880 return elm_wdg_item_tooltip_style_get(it);
4890} 4881}
4891 4882
@@ -4899,7 +4890,6 @@ EAPI Eina_Bool
4899elm_gengrid_item_tooltip_window_mode_set(Elm_Object_Item *it, 4890elm_gengrid_item_tooltip_window_mode_set(Elm_Object_Item *it,
4900 Eina_Bool disable) 4891 Eina_Bool disable)
4901{ 4892{
4902 Eina_Bool ret;
4903 return elm_wdg_item_tooltip_window_mode_set(it, disable); 4893 return elm_wdg_item_tooltip_window_mode_set(it, disable);
4904} 4894}
4905 4895
@@ -4921,7 +4911,6 @@ _elm_gengrid_item_elm_widget_item_tooltip_window_mode_set(Eo *eo_it, Elm_Gen_Ite
4921EAPI Eina_Bool 4911EAPI Eina_Bool
4922elm_gengrid_item_tooltip_window_mode_get(const Elm_Object_Item *it) 4912elm_gengrid_item_tooltip_window_mode_get(const Elm_Object_Item *it)
4923{ 4913{
4924 Eina_Bool ret;
4925 return elm_wdg_item_tooltip_window_mode_get(it); 4914 return elm_wdg_item_tooltip_window_mode_get(it);
4926} 4915}
4927 4916
@@ -4953,7 +4942,6 @@ _elm_gengrid_item_elm_widget_item_cursor_set(Eo *eo_it, Elm_Gen_Item *it,
4953EAPI const char * 4942EAPI const char *
4954elm_gengrid_item_cursor_get(const Elm_Object_Item *it) 4943elm_gengrid_item_cursor_get(const Elm_Object_Item *it)
4955{ 4944{
4956 const char *ret;
4957 return elm_wdg_item_cursor_get(it); 4945 return elm_wdg_item_cursor_get(it);
4958} 4946}
4959 4947
@@ -4985,7 +4973,6 @@ elm_gengrid_item_cursor_style_set(Elm_Object_Item *it,
4985EAPI const char * 4973EAPI const char *
4986elm_gengrid_item_cursor_style_get(const Elm_Object_Item *it) 4974elm_gengrid_item_cursor_style_get(const Elm_Object_Item *it)
4987{ 4975{
4988 const char *ret;
4989 return elm_wdg_item_cursor_style_get(it); 4976 return elm_wdg_item_cursor_style_get(it);
4990} 4977}
4991 4978
@@ -5003,7 +4990,6 @@ EAPI Eina_Bool
5003elm_gengrid_item_cursor_engine_only_get(const Elm_Object_Item *eo_it) 4990elm_gengrid_item_cursor_engine_only_get(const Elm_Object_Item *eo_it)
5004{ 4991{
5005 ELM_GENGRID_ITEM_DATA_GET(eo_it, it); 4992 ELM_GENGRID_ITEM_DATA_GET(eo_it, it);
5006 Eina_Bool ret;
5007 if (it->realized) 4993 if (it->realized)
5008 return elm_wdg_item_cursor_engine_only_get(eo_it); 4994 return elm_wdg_item_cursor_engine_only_get(eo_it);
5009 else return it->cursor_engine_only; 4995 else return it->cursor_engine_only;
@@ -5118,7 +5104,7 @@ elm_gengrid_page_show(const Evas_Object *obj,
5118 int v_pagenumber) 5104 int v_pagenumber)
5119{ 5105{
5120 ELM_GENGRID_CHECK(obj); 5106 ELM_GENGRID_CHECK(obj);
5121 elm_interface_scrollable_page_show(obj, h_pagenumber, v_pagenumber); 5107 elm_interface_scrollable_page_show((Eo *) obj, h_pagenumber, v_pagenumber);
5122} 5108}
5123 5109
5124EINA_DEPRECATED EAPI void 5110EINA_DEPRECATED EAPI void
@@ -5127,7 +5113,7 @@ elm_gengrid_page_bring_in(const Evas_Object *obj,
5127 int v_pagenumber) 5113 int v_pagenumber)
5128{ 5114{
5129 ELM_GENGRID_CHECK(obj); 5115 ELM_GENGRID_CHECK(obj);
5130 elm_interface_scrollable_page_bring_in(obj, h_pagenumber, v_pagenumber); 5116 elm_interface_scrollable_page_bring_in((Eo *) obj, h_pagenumber, v_pagenumber);
5131} 5117}
5132 5118
5133EAPI void 5119EAPI void
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index d57fecbf6..5447e72d4 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -356,7 +356,6 @@ _item_content_realize(Elm_Gen_Item *it,
356 const char *src, 356 const char *src,
357 const char *parts) 357 const char *parts)
358{ 358{
359 Eina_Bool tmp;
360 Evas_Object *content; 359 Evas_Object *content;
361 char buf[256]; 360 char buf[256];
362 361
@@ -1295,7 +1294,6 @@ _item_order_update(const Eina_Inlist *l,
1295static void 1294static void
1296_elm_genlist_item_state_update(Elm_Gen_Item *it) 1295_elm_genlist_item_state_update(Elm_Gen_Item *it)
1297{ 1296{
1298 Eina_Bool tmp;
1299 ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd); 1297 ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
1300 1298
1301 if (it->selected) 1299 if (it->selected)
@@ -1555,7 +1553,6 @@ _item_cache_add(Elm_Gen_Item *it, Eina_List *contents)
1555 Item_Cache *itc = NULL; 1553 Item_Cache *itc = NULL;
1556 ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd); 1554 ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
1557 Evas_Object *obj = sd->obj; 1555 Evas_Object *obj = sd->obj;
1558 Eina_Bool tmp;
1559 1556
1560 evas_event_freeze(evas_object_evas_get(obj)); 1557 evas_event_freeze(evas_object_evas_get(obj));
1561 1558
@@ -2705,7 +2702,6 @@ _elm_genlist_item_focused(Elm_Object_Item *eo_it)
2705 ELM_GENLIST_ITEM_DATA_GET(eo_it, it); 2702 ELM_GENLIST_ITEM_DATA_GET(eo_it, it);
2706 Evas_Object *obj = WIDGET(it); 2703 Evas_Object *obj = WIDGET(it);
2707 ELM_GENLIST_DATA_GET(obj, sd); 2704 ELM_GENLIST_DATA_GET(obj, sd);
2708 Eina_Bool tmp;
2709 2705
2710 if (_is_no_select(it) || 2706 if (_is_no_select(it) ||
2711 (eo_it == sd->focused_item) || 2707 (eo_it == sd->focused_item) ||
@@ -2771,7 +2767,6 @@ _item_focused_next(Evas_Object *obj, Elm_Focus_Direction dir)
2771 Elm_Object_Item *eo_next; 2767 Elm_Object_Item *eo_next;
2772 Elm_Object_Item *eo_first_item; 2768 Elm_Object_Item *eo_first_item;
2773 Elm_Object_Item *eo_last_item; 2769 Elm_Object_Item *eo_last_item;
2774 Eina_Bool tmp;
2775 2770
2776 if (!sd->focused_item) 2771 if (!sd->focused_item)
2777 { 2772 {
@@ -3449,7 +3444,6 @@ _show_region_hook(void *data EINA_UNUSED,
3449static void 3444static void
3450_item_highlight(Elm_Gen_Item *it) 3445_item_highlight(Elm_Gen_Item *it)
3451{ 3446{
3452 Eina_Bool tmp;
3453 const char *selectraise; 3447 const char *selectraise;
3454 ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd); 3448 ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
3455 3449
@@ -3965,7 +3959,6 @@ _item_mouse_move_cb(void *data,
3965static Eina_Bool 3959static Eina_Bool
3966_long_press_cb(void *data) 3960_long_press_cb(void *data)
3967{ 3961{
3968 Eina_Bool tmp;
3969 Elm_Gen_Item *it = data; 3962 Elm_Gen_Item *it = data;
3970 Elm_Object_Item *eo_it_tmp; 3963 Elm_Object_Item *eo_it_tmp;
3971 Eina_List *list; 3964 Eina_List *list;
@@ -4018,7 +4011,6 @@ static void
4018_swipe_do(Elm_Gen_Item *it) 4011_swipe_do(Elm_Gen_Item *it)
4019{ 4012{
4020 int i, sum = 0; 4013 int i, sum = 0;
4021 Eina_Bool tmp;
4022 ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd); 4014 ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
4023 4015
4024 if (_is_no_select(it) || 4016 if (_is_no_select(it) ||
@@ -4200,7 +4192,6 @@ _item_mouse_down_cb(void *data,
4200 Evas_Object *obj, 4192 Evas_Object *obj,
4201 void *event_info) 4193 void *event_info)
4202{ 4194{
4203 Eina_Bool tmp;
4204 Evas_Event_Mouse_Down *ev = event_info; 4195 Evas_Event_Mouse_Down *ev = event_info;
4205 Elm_Gen_Item *it = data; 4196 Elm_Gen_Item *it = data;
4206 Evas_Coord x, y; 4197 Evas_Coord x, y;
@@ -4833,7 +4824,6 @@ _item_mouse_up_cb(void *data,
4833 Evas_Object *obj EINA_UNUSED, 4824 Evas_Object *obj EINA_UNUSED,
4834 void *event_info) 4825 void *event_info)
4835{ 4826{
4836 Eina_Bool tmp;
4837 Evas_Event_Mouse_Up *ev = event_info; 4827 Evas_Event_Mouse_Up *ev = event_info;
4838 Eina_Bool dragged = EINA_FALSE; 4828 Eina_Bool dragged = EINA_FALSE;
4839 Elm_Gen_Item *it = data; 4829 Elm_Gen_Item *it = data;
@@ -5789,7 +5779,6 @@ _internal_elm_genlist_clear(Evas_Object *obj)
5789static Eina_Bool 5779static Eina_Bool
5790_item_select(Elm_Gen_Item *it) 5780_item_select(Elm_Gen_Item *it)
5791{ 5781{
5792 Eina_Bool tmp;
5793 Evas_Object *obj = WIDGET(it); 5782 Evas_Object *obj = WIDGET(it);
5794 ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd); 5783 ELM_GENLIST_DATA_GET_FROM_ITEM(it, sd);
5795 Elm_Object_Item *eo_it = EO_OBJ(it); 5784 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
5903EOLIAN static void 5892EOLIAN static void
5904_elm_genlist_item_elm_widget_item_disable(Eo *eo_it, Elm_Gen_Item *it) 5893_elm_genlist_item_elm_widget_item_disable(Eo *eo_it, Elm_Gen_Item *it)
5905{ 5894{
5906 Eina_Bool tmp;
5907 Eina_List *l; 5895 Eina_List *l;
5908 Evas_Object *obj; 5896 Evas_Object *obj;
5909 5897
@@ -6711,7 +6699,6 @@ EOLIAN static void
6711_elm_genlist_item_selected_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, 6699_elm_genlist_item_selected_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it,
6712 Eina_Bool selected) 6700 Eina_Bool selected)
6713{ 6701{
6714 Eina_Bool tmp;
6715 ELM_GENLIST_ITEM_CHECK_OR_RETURN(it); 6702 ELM_GENLIST_ITEM_CHECK_OR_RETURN(it);
6716 6703
6717 if (elm_wdg_item_disabled_get(EO_OBJ(it))) return; 6704 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,
7228EAPI const char * 7215EAPI const char *
7229elm_genlist_item_tooltip_style_get(const Elm_Object_Item *it) 7216elm_genlist_item_tooltip_style_get(const Elm_Object_Item *it)
7230{ 7217{
7231 const char *ret;
7232 return elm_wdg_item_tooltip_style_get(it); 7218 return elm_wdg_item_tooltip_style_get(it);
7233} 7219}
7234 7220
@@ -7242,7 +7228,6 @@ EAPI Eina_Bool
7242elm_genlist_item_tooltip_window_mode_set(Elm_Object_Item *item, 7228elm_genlist_item_tooltip_window_mode_set(Elm_Object_Item *item,
7243 Eina_Bool disable) 7229 Eina_Bool disable)
7244{ 7230{
7245 Eina_Bool ret;
7246 return elm_wdg_item_tooltip_window_mode_set(item, disable); 7231 return elm_wdg_item_tooltip_window_mode_set(item, disable);
7247} 7232}
7248 7233
@@ -7266,7 +7251,6 @@ _elm_genlist_item_elm_widget_item_tooltip_window_mode_set(Eo *eo_it, Elm_Gen_Ite
7266EAPI Eina_Bool 7251EAPI Eina_Bool
7267elm_genlist_item_tooltip_window_mode_get(const Elm_Object_Item *eo_it) 7252elm_genlist_item_tooltip_window_mode_get(const Elm_Object_Item *eo_it)
7268{ 7253{
7269 Eina_Bool ret;
7270 return elm_wdg_item_tooltip_window_mode_get(eo_it); 7254 return elm_wdg_item_tooltip_window_mode_get(eo_it);
7271} 7255}
7272 7256
@@ -7295,7 +7279,6 @@ _elm_genlist_item_elm_widget_item_cursor_set(Eo *eo_it, Elm_Gen_Item *it,
7295EAPI const char * 7279EAPI const char *
7296elm_genlist_item_cursor_get(const Elm_Object_Item *eo_it) 7280elm_genlist_item_cursor_get(const Elm_Object_Item *eo_it)
7297{ 7281{
7298 const char *ret;
7299 return elm_wdg_item_cursor_get(eo_it); 7282 return elm_wdg_item_cursor_get(eo_it);
7300} 7283}
7301 7284
@@ -7327,7 +7310,6 @@ elm_genlist_item_cursor_style_set(Elm_Object_Item *eo_it,
7327EAPI const char * 7310EAPI const char *
7328elm_genlist_item_cursor_style_get(const Elm_Object_Item *eo_it) 7311elm_genlist_item_cursor_style_get(const Elm_Object_Item *eo_it)
7329{ 7312{
7330 const char *ret;
7331 return elm_wdg_item_cursor_style_get(eo_it); 7313 return elm_wdg_item_cursor_style_get(eo_it);
7332} 7314}
7333 7315
@@ -7341,7 +7323,6 @@ elm_genlist_item_cursor_engine_only_set(Elm_Object_Item *eo_it,
7341EAPI Eina_Bool 7323EAPI Eina_Bool
7342elm_genlist_item_cursor_engine_only_get(const Elm_Object_Item *eo_it) 7324elm_genlist_item_cursor_engine_only_get(const Elm_Object_Item *eo_it)
7343{ 7325{
7344 Eina_Bool ret;
7345 return elm_wdg_item_cursor_engine_only_get(eo_it); 7326 return elm_wdg_item_cursor_engine_only_get(eo_it);
7346} 7327}
7347 7328
@@ -7747,7 +7728,6 @@ _elm_genlist_item_decorate_mode_set(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it,
7747 Elm_Genlist_Data *sd; 7728 Elm_Genlist_Data *sd;
7748 Eina_List *l; 7729 Eina_List *l;
7749 Elm_Object_Item *eo_it2 = NULL; 7730 Elm_Object_Item *eo_it2 = NULL;
7750 Eina_Bool tmp;
7751 7731
7752 ELM_GENLIST_ITEM_CHECK_OR_RETURN(it); 7732 ELM_GENLIST_ITEM_CHECK_OR_RETURN(it);
7753 sd = GL_IT(it)->wsd; 7733 sd = GL_IT(it)->wsd;
diff --git a/src/lib/elm_interface_atspi_accessible.c b/src/lib/elm_interface_atspi_accessible.c
index 700f18d4b..1e9d1a225 100644
--- a/src/lib/elm_interface_atspi_accessible.c
+++ b/src/lib/elm_interface_atspi_accessible.c
@@ -454,7 +454,7 @@ elm_atspi_relation_set_relation_append(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
454 if (!eina_list_data_find(rel->objects, rel_obj)) 454 if (!eina_list_data_find(rel->objects, rel_obj))
455 { 455 {
456 rel->objects = eina_list_append(rel->objects, rel_obj); 456 rel->objects = eina_list_append(rel->objects, rel_obj);
457 eo_event_callback_add(rel_obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set); 457 eo_event_callback_add((Eo *) rel_obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set);
458 } 458 }
459 return EINA_TRUE; 459 return EINA_TRUE;
460 } 460 }
@@ -467,7 +467,7 @@ elm_atspi_relation_set_relation_append(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
467 rel->objects = eina_list_append(rel->objects, rel_obj); 467 rel->objects = eina_list_append(rel->objects, rel_obj);
468 *set = eina_list_append(*set, rel); 468 *set = eina_list_append(*set, rel);
469 469
470 eo_event_callback_add(rel_obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set); 470 eo_event_callback_add((Eo *) rel_obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set);
471 return EINA_TRUE; 471 return EINA_TRUE;
472} 472}
473 473
@@ -483,7 +483,7 @@ elm_atspi_relation_set_relation_remove(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
483 { 483 {
484 if (eina_list_data_find(rel->objects, rel_obj)) 484 if (eina_list_data_find(rel->objects, rel_obj))
485 { 485 {
486 eo_event_callback_del(rel_obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set); 486 eo_event_callback_del((Eo *) rel_obj, EO_BASE_EVENT_DEL, _on_rel_obj_del, set);
487 rel->objects = eina_list_remove(rel->objects, rel_obj); 487 rel->objects = eina_list_remove(rel->objects, rel_obj);
488 } 488 }
489 if (!rel->objects) 489 if (!rel->objects)
diff --git a/src/lib/elm_layout.c b/src/lib/elm_layout.c
index a3d8bcb9f..8058b832e 100644
--- a/src/lib/elm_layout.c
+++ b/src/lib/elm_layout.c
@@ -1795,7 +1795,6 @@ EOLIAN static void _elm_layout_class_constructor(Eo_Class *klass)
1795EAPI Eina_Bool 1795EAPI Eina_Bool
1796elm_layout_file_set(Eo *obj, const char *file, const char *group) 1796elm_layout_file_set(Eo *obj, const char *file, const char *group)
1797{ 1797{
1798 Eina_Bool ret;
1799 return efl_file_set((Eo *) obj, file, group); 1798 return efl_file_set((Eo *) obj, file, group);
1800} 1799}
1801 1800
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 27180774b..78c6804c6 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -2024,7 +2024,6 @@ EOLIAN static const char *
2024_elm_list_item_elm_widget_item_part_text_get(Eo *eo_it, Elm_List_Item_Data *it, 2024_elm_list_item_elm_widget_item_part_text_get(Eo *eo_it, Elm_List_Item_Data *it,
2025 const char *part) 2025 const char *part)
2026{ 2026{
2027 const char *ret;
2028 if (part && strcmp(part, "default")) 2027 if (part && strcmp(part, "default"))
2029 return elm_wdg_item_part_text_custom_get(eo_it, part); 2028 return elm_wdg_item_part_text_custom_get(eo_it, part);
2030 return it->label; 2029 return it->label;
diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index 77f0b7b2c..ee31bcc2d 100644
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -528,7 +528,6 @@ _block_menu(void *_sd, const Eo_Event *event EINA_UNUSED)
528 Eina_List *items = sd->items; 528 Eina_List *items = sd->items;
529 EINA_LIST_FOREACH(items, l, eo_current) 529 EINA_LIST_FOREACH(items, l, eo_current)
530 { 530 {
531 Eina_Bool tmp;
532 ELM_MENU_ITEM_DATA_GET(eo_current, current); 531 ELM_MENU_ITEM_DATA_GET(eo_current, current);
533 if (!current->blocked) current->was_enabled = !elm_wdg_item_disabled_get(eo_current); 532 if (!current->blocked) current->was_enabled = !elm_wdg_item_disabled_get(eo_current);
534 current->blocked = EINA_TRUE; 533 current->blocked = EINA_TRUE;
diff --git a/src/lib/elm_photo.c b/src/lib/elm_photo.c
index 3223e1491..ada159057 100644
--- a/src/lib/elm_photo.c
+++ b/src/lib/elm_photo.c
@@ -401,7 +401,6 @@ _elm_photo_class_constructor(Eo_Class *klass)
401EAPI Eina_Bool 401EAPI Eina_Bool
402elm_photo_file_set(Eo *obj, const char *file) 402elm_photo_file_set(Eo *obj, const char *file)
403{ 403{
404 Eina_Bool ret;
405 return efl_file_set((Eo *) obj, file, NULL); 404 return efl_file_set((Eo *) obj, file, NULL);
406} 405}
407 406
diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c
index 1a8dda545..00bab4d6f 100644
--- a/src/lib/elm_photocam.c
+++ b/src/lib/elm_photocam.c
@@ -1716,8 +1716,6 @@ _elm_photocam_efl_file_file_set(Eo *obj, Elm_Photocam_Data *sd, const char *file
1716EAPI Evas_Load_Error 1716EAPI Evas_Load_Error
1717elm_photocam_file_set(Elm_Photocam *obj, const char *file) 1717elm_photocam_file_set(Elm_Photocam *obj, const char *file)
1718{ 1718{
1719 Eina_Bool ret;
1720
1721 ELM_PHOTOCAM_CHECK(obj) EVAS_LOAD_ERROR_NONE; 1719 ELM_PHOTOCAM_CHECK(obj) EVAS_LOAD_ERROR_NONE;
1722 EINA_SAFETY_ON_NULL_RETURN_VAL(file, EVAS_LOAD_ERROR_NONE); 1720 EINA_SAFETY_ON_NULL_RETURN_VAL(file, EVAS_LOAD_ERROR_NONE);
1723 if (efl_file_set(obj, file, NULL)) return EVAS_LOAD_ERROR_NONE; 1721 if (efl_file_set(obj, file, NULL)) return EVAS_LOAD_ERROR_NONE;
diff --git a/src/lib/elm_prefs.c b/src/lib/elm_prefs.c
index 508c7b8d3..87e12e073 100644
--- a/src/lib/elm_prefs.c
+++ b/src/lib/elm_prefs.c
@@ -1877,7 +1877,6 @@ _elm_prefs_class_constructor(Eo_Class *klass)
1877EAPI Eina_Bool 1877EAPI Eina_Bool
1878elm_prefs_file_set(Eo *obj, const char *file, const char *page) 1878elm_prefs_file_set(Eo *obj, const char *file, const char *page)
1879{ 1879{
1880 Eina_Bool ret;
1881 return efl_file_set((Eo *) obj, file, page); 1880 return efl_file_set((Eo *) obj, file, page);
1882} 1881}
1883 1882
diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index e2eb4bbbd..91fa2972c 100644
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -1181,7 +1181,7 @@ _elm_scroller_page_scroll_limit_set(const Eo *obj, Elm_Scroller_Data *_pd EINA_U
1181 page_limit_v = 9999; 1181 page_limit_v = 9999;
1182 1182
1183 elm_interface_scrollable_page_scroll_limit_set 1183 elm_interface_scrollable_page_scroll_limit_set
1184 (obj, page_limit_h, page_limit_v); 1184 ((Eo *) obj, page_limit_h, page_limit_v);
1185} 1185}
1186 1186
1187EOLIAN static void 1187EOLIAN static void
@@ -1373,8 +1373,6 @@ elm_scroller_wheel_disabled_get(const Evas_Object *obj)
1373{ 1373{
1374 ELM_SCROLLABLE_CHECK(obj, EINA_FALSE); 1374 ELM_SCROLLABLE_CHECK(obj, EINA_FALSE);
1375 1375
1376 Eina_Bool ret;
1377
1378 return elm_interface_scrollable_wheel_disabled_get((Eo *) obj); 1376 return elm_interface_scrollable_wheel_disabled_get((Eo *) obj);
1379} 1377}
1380 1378
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 1546a7530..1611969f7 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -420,7 +420,6 @@ _resize_job(void *data)
420 else 420 else
421 { 421 {
422 Elm_Object_Item *menu_it; 422 Elm_Object_Item *menu_it;
423 Eina_Bool tmp;
424 423
425 menu_it = elm_menu_item_add 424 menu_it = elm_menu_item_add
426 (menu, NULL, it->icon_str, it->label, 425 (menu, NULL, it->icon_str, it->label,
@@ -1001,7 +1000,6 @@ _resize_cb(void *data,
1001EOLIAN static void 1000EOLIAN static void
1002_elm_toolbar_item_elm_widget_item_disable(Eo *eo_toolbar, Elm_Toolbar_Item_Data *toolbar_it) 1001_elm_toolbar_item_elm_widget_item_disable(Eo *eo_toolbar, Elm_Toolbar_Item_Data *toolbar_it)
1003{ 1002{
1004 Eina_Bool tmp;
1005 const char* emission; 1003 const char* emission;
1006 1004
1007 if (elm_wdg_item_disabled_get(eo_toolbar)) 1005 if (elm_wdg_item_disabled_get(eo_toolbar))
@@ -1080,7 +1078,6 @@ _item_select(Elm_Toolbar_Item_Data *it)
1080{ 1078{
1081 Evas_Object *obj; 1079 Evas_Object *obj;
1082 Eina_Bool sel; 1080 Eina_Bool sel;
1083 Eina_Bool tmp;
1084 Eina_List *list; 1081 Eina_List *list;
1085 1082
1086 ELM_TOOLBAR_DATA_GET(WIDGET(it), sd); 1083 ELM_TOOLBAR_DATA_GET(WIDGET(it), sd);
@@ -1256,7 +1253,6 @@ _item_theme_hook(Evas_Object *obj,
1256 Evas_Coord mw = -1, mh = -1; 1253 Evas_Coord mw = -1, mh = -1;
1257 Evas_Object *view = VIEW(it); 1254 Evas_Object *view = VIEW(it);
1258 const char *style; 1255 const char *style;
1259 Eina_Bool tmp;
1260 1256
1261 ELM_TOOLBAR_DATA_GET(obj, sd); 1257 ELM_TOOLBAR_DATA_GET(obj, sd);
1262 1258
@@ -2277,7 +2273,6 @@ static char *
2277_access_state_cb(void *data, Evas_Object *obj EINA_UNUSED) 2273_access_state_cb(void *data, Evas_Object *obj EINA_UNUSED)
2278{ 2274{
2279 Elm_Toolbar_Item_Data *it = (Elm_Toolbar_Item_Data *)data; 2275 Elm_Toolbar_Item_Data *it = (Elm_Toolbar_Item_Data *)data;
2280 Eina_Bool tmp;
2281 2276
2282 if (it->separator) 2277 if (it->separator)
2283 return strdup(E_("Separator")); 2278 return strdup(E_("Separator"));
@@ -2330,7 +2325,6 @@ _access_activate_cb(void *data EINA_UNUSED,
2330{ 2325{
2331 ELM_TOOLBAR_ITEM_DATA_GET(item, it); 2326 ELM_TOOLBAR_ITEM_DATA_GET(item, it);
2332 ELM_TOOLBAR_DATA_GET(WIDGET(it), sd); 2327 ELM_TOOLBAR_DATA_GET(WIDGET(it), sd);
2333 Eina_Bool tmp;
2334 2328
2335 if (elm_wdg_item_disabled_get(item)) return; 2329 if (elm_wdg_item_disabled_get(item)) return;
2336 2330
@@ -3643,7 +3637,6 @@ _elm_toolbar_item_state_set(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item
3643 } 3637 }
3644 if (item->icon) 3638 if (item->icon)
3645 { 3639 {
3646 Eina_Bool tmp;
3647 if (elm_wdg_item_disabled_get(EO_OBJ(item))) 3640 if (elm_wdg_item_disabled_get(EO_OBJ(item)))
3648 elm_widget_signal_emit(item->icon, "elm,state,disabled", "elm"); 3641 elm_widget_signal_emit(item->icon, "elm,state,disabled", "elm");
3649 else 3642 else
diff --git a/src/lib/elm_video.c b/src/lib/elm_video.c
index 209ab06eb..65a5d6e53 100644
--- a/src/lib/elm_video.c
+++ b/src/lib/elm_video.c
@@ -471,7 +471,6 @@ _elm_video_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED
471EAPI Eina_Bool 471EAPI Eina_Bool
472elm_video_file_set(Eo *obj, const char *filename) 472elm_video_file_set(Eo *obj, const char *filename)
473{ 473{
474 Eina_Bool ret;
475 return efl_file_set((Eo *) obj, filename, NULL); 474 return efl_file_set((Eo *) obj, filename, NULL);
476} 475}
477 476
diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index 6d13e3ac3..f5b8626e5 100644
--- a/src/lib/elm_widget.h
+++ b/src/lib/elm_widget.h
@@ -569,15 +569,10 @@ struct _Elm_Widget_Item_Signal_Data
569}; 569};
570 570
571#define WIDGET_ITEM_DATA_GET(eo_obj) \ 571#define WIDGET_ITEM_DATA_GET(eo_obj) \
572 ({ \ 572 eo_key_data_get((Eo *) eo_obj, "__elm_widget_item_data")
573 void *_data; \
574 eo_key_data_get(eo_obj, "__elm_widget_item_data"); \
575 })
576 573
577#define WIDGET_ITEM_DATA_SET(eo_obj, data) \ 574#define WIDGET_ITEM_DATA_SET(eo_obj, data) \
578{ \ 575 eo_key_data_set((Eo *) eo_obj, "__elm_widget_item_data", data)
579 eo_key_data_set(eo_obj, "__elm_widget_item_data", data); \
580}
581 576
582struct _Elm_Widget_Item_Data 577struct _Elm_Widget_Item_Data
583{ 578{
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 5d76f59b3..900a0afe4 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -3967,7 +3967,6 @@ _elm_win_fake_canvas_set(Eo *obj EINA_UNUSED, Elm_Win_Data *pd, Ecore_Evas *oee)
3967EOLIAN static void 3967EOLIAN static void
3968_elm_win_type_set(Eo *obj, Elm_Win_Data *sd, Elm_Win_Type type) 3968_elm_win_type_set(Eo *obj, Elm_Win_Data *sd, Elm_Win_Type type)
3969{ 3969{
3970 Eina_Bool finalized;
3971 if (eo_finalized_get(obj)) 3970 if (eo_finalized_get(obj))
3972 { 3971 {
3973 ERR("This function is only allowed during construction."); 3972 ERR("This function is only allowed during construction.");
@@ -3985,7 +3984,6 @@ _elm_win_type_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
3985EOLIAN static void 3984EOLIAN static void
3986_elm_win_name_set(Eo *obj, Elm_Win_Data *sd, const char *name) 3985_elm_win_name_set(Eo *obj, Elm_Win_Data *sd, const char *name)
3987{ 3986{
3988 Eina_Bool finalized;
3989 if (eo_finalized_get(obj)) 3987 if (eo_finalized_get(obj))
3990 { 3988 {
3991 ERR("This function is only allowed during construction."); 3989 ERR("This function is only allowed during construction.");