diff options
| author | Daniel Zaoui <daniel.zaoui@samsung.com> | 2014-08-19 14:49:30 +0300 |
|---|---|---|
| committer | Daniel Zaoui <daniel.zaoui@samsung.com> | 2014-11-12 12:03:58 +0200 |
| commit | fd0c5ff053cf5287d1d677ef23dc1d8e452b4075 (patch) | |
| tree | 2cd693fc51b80f2ac9caccb5bb4c94aac5859d13 | |
| parent | a9220cd9efad8e5544ac329324fcd3cb08d3a95e (diff) | |
| download | elementary-fd0c5ff053cf5287d1d677ef23dc1d8e452b4075.tar.gz | |
Object Items: remove legacy APIs.
They are now generated by Eolian.
82 files changed, 45 insertions, 2121 deletions
diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c index 7ff98b8a3..e3b714087 100644 --- a/src/lib/elc_ctxpopup.c +++ b/src/lib/elc_ctxpopup.c @@ -1366,12 +1366,6 @@ _elm_ctxpopup_item_prepend(Eo *obj, Elm_Ctxpopup_Data *sd, const char *label, Ev return eo_item; } -EAPI Elm_Object_Item * -elm_ctxpopup_item_prev_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_ctxpopup_item_prev_get()); -} - EOLIAN static Elm_Object_Item * _elm_ctxpopup_item_prev_get(Eo *eo_item EINA_UNUSED, Elm_Ctxpopup_Item_Data *item) { @@ -1387,12 +1381,6 @@ _elm_ctxpopup_item_prev_get(Eo *eo_item EINA_UNUSED, Elm_Ctxpopup_Item_Data *ite return NULL; } -EAPI Elm_Object_Item * -elm_ctxpopup_item_next_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_ctxpopup_item_next_get()); -} - EOLIAN static Elm_Object_Item * _elm_ctxpopup_item_next_get(Eo *eo_item EINA_UNUSED, Elm_Ctxpopup_Item_Data *item) { diff --git a/src/lib/elc_ctxpopup_common.h b/src/lib/elc_ctxpopup_common.h index df72a93b2..d4a26fbef 100644 --- a/src/lib/elc_ctxpopup_common.h +++ b/src/lib/elc_ctxpopup_common.h @@ -7,7 +7,3 @@ typedef enum ELM_CTXPOPUP_DIRECTION_UNKNOWN, /**< ctxpopup does not determine it's direction yet*/ } Elm_Ctxpopup_Direction; /**< Direction in which to show the popup */ -EAPI Elm_Object_Item *elm_ctxpopup_item_prev_get(const Elm_Object_Item *it); - -EAPI Elm_Object_Item *elm_ctxpopup_item_next_get(const Elm_Object_Item *it); - diff --git a/src/lib/elc_ctxpopup_eo.h b/src/lib/elc_ctxpopup_eo.h index d06c81d7c..e3ff124d0 100644 --- a/src/lib/elc_ctxpopup_eo.h +++ b/src/lib/elc_ctxpopup_eo.h @@ -1 +1,2 @@ -#include "elm_ctxpopup.eo.h"
\ No newline at end of file +#include "elm_ctxpopup_item.eo.h" +#include "elm_ctxpopup.eo.h" diff --git a/src/lib/elc_ctxpopup_legacy.h b/src/lib/elc_ctxpopup_legacy.h index 392772ec6..346589cc3 100644 --- a/src/lib/elc_ctxpopup_legacy.h +++ b/src/lib/elc_ctxpopup_legacy.h @@ -8,4 +8,5 @@ */ EAPI Evas_Object *elm_ctxpopup_add(Evas_Object *parent); +#include "elm_ctxpopup_item.eo.legacy.h" #include "elm_ctxpopup.eo.legacy.h" diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c index 8a32e1db2..d23c909f5 100644 --- a/src/lib/elc_hoversel.c +++ b/src/lib/elc_hoversel.c @@ -477,15 +477,6 @@ _elm_hoversel_item_add(Eo *obj, Elm_Hoversel_Data *sd, const char *label, const return eo_item; } -EAPI void -elm_hoversel_item_icon_set(Elm_Object_Item *it, - const char *icon_file, - const char *icon_group, - Elm_Icon_Type icon_type) -{ - eo_do(it, elm_obj_hoversel_item_icon_set(icon_file, icon_group, icon_type)); -} - EOLIAN static void _elm_hoversel_item_icon_set(Eo *eo_item EINA_UNUSED, Elm_Hoversel_Item_Data *item, @@ -499,15 +490,6 @@ _elm_hoversel_item_icon_set(Eo *eo_item EINA_UNUSED, item->icon_type = icon_type; } -EAPI void -elm_hoversel_item_icon_get(const Elm_Object_Item *it, - const char **icon_file, - const char **icon_group, - Elm_Icon_Type *icon_type) -{ - eo_do(it, elm_obj_hoversel_item_icon_get(icon_file, icon_group, icon_type)); -} - EOLIAN static void _elm_hoversel_item_icon_get(Eo *eo_item EINA_UNUSED, Elm_Hoversel_Item_Data *item, diff --git a/src/lib/elc_hoversel_eo.h b/src/lib/elc_hoversel_eo.h index d0e689635..9a07aa0d4 100644 --- a/src/lib/elc_hoversel_eo.h +++ b/src/lib/elc_hoversel_eo.h @@ -1 +1,2 @@ -#include "elm_hoversel.eo.h"
\ No newline at end of file +#include "elm_hoversel_item.eo.h" +#include "elm_hoversel.eo.h" diff --git a/src/lib/elc_hoversel_legacy.h b/src/lib/elc_hoversel_legacy.h index afe03266e..670117154 100644 --- a/src/lib/elc_hoversel_legacy.h +++ b/src/lib/elc_hoversel_legacy.h @@ -8,8 +8,5 @@ */ EAPI Evas_Object *elm_hoversel_add(Evas_Object *parent); -EAPI void elm_hoversel_item_icon_set(Elm_Object_Item *it, const char *icon_file, const char *icon_group, Elm_Icon_Type icon_type); - -EAPI void elm_hoversel_item_icon_get(const Elm_Object_Item *it, const char **icon_file, const char **icon_group, Elm_Icon_Type *icon_type); - +#include "elm_hoversel_item.eo.legacy.h" #include "elm_hoversel.eo.legacy.h" diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c index 78f581b69..64b31f45c 100644 --- a/src/lib/elc_multibuttonentry.c +++ b/src/lib/elc_multibuttonentry.c @@ -1745,13 +1745,6 @@ _elm_multibuttonentry_selected_item_get(Eo *obj EINA_UNUSED, Elm_Multibuttonentr return EO_OBJ(sd->selected_it); } -EAPI void -elm_multibuttonentry_item_selected_set(Elm_Object_Item *it, - Eina_Bool selected) -{ - eo_do(it, elm_obj_multibuttonentry_item_selected_set(selected)); -} - EOLIAN static void _elm_multibuttonentry_item_selected_set(Eo *eo_item EINA_UNUSED, Elm_Multibuttonentry_Item_Data *item, @@ -1761,12 +1754,6 @@ _elm_multibuttonentry_item_selected_set(Eo *eo_item EINA_UNUSED, else _button_select(WIDGET(item), NULL); } -EAPI Eina_Bool -elm_multibuttonentry_item_selected_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_multibuttonentry_item_selected_get()); -} - EOLIAN static Eina_Bool _elm_multibuttonentry_item_selected_get(Eo *eo_item, Elm_Multibuttonentry_Item_Data *item EINA_UNUSED) @@ -1797,12 +1784,6 @@ _elm_multibuttonentry_clear(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd) _view_update(sd); } -EAPI Elm_Object_Item * -elm_multibuttonentry_item_prev_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_multibuttonentry_item_prev_get()); -} - EOLIAN static Elm_Object_Item * _elm_multibuttonentry_item_prev_get(Eo *eo_it, Elm_Multibuttonentry_Item_Data *it) @@ -1824,12 +1805,6 @@ _elm_multibuttonentry_item_prev_get(Eo *eo_it, return NULL; } -EAPI Elm_Object_Item * -elm_multibuttonentry_item_next_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_multibuttonentry_item_next_get()); -} - EOLIAN static Elm_Object_Item * _elm_multibuttonentry_item_next_get(Eo *eo_it, Elm_Multibuttonentry_Item_Data *it) diff --git a/src/lib/elc_multibuttonentry_eo.h b/src/lib/elc_multibuttonentry_eo.h index ec1a8e7c5..4d958bd55 100644 --- a/src/lib/elc_multibuttonentry_eo.h +++ b/src/lib/elc_multibuttonentry_eo.h @@ -1 +1,2 @@ -#include "elm_multibuttonentry.eo.h"
\ No newline at end of file +#include "elm_multibuttonentry_item.eo.h" +#include "elm_multibuttonentry.eo.h" diff --git a/src/lib/elc_multibuttonentry_legacy.h b/src/lib/elc_multibuttonentry_legacy.h index ec936b701..84c66d118 100644 --- a/src/lib/elc_multibuttonentry_legacy.h +++ b/src/lib/elc_multibuttonentry_legacy.h @@ -9,12 +9,5 @@ */ EAPI Evas_Object *elm_multibuttonentry_add(Evas_Object *parent); -EAPI void elm_multibuttonentry_item_selected_set(Elm_Object_Item *it, Eina_Bool selected); - -EAPI Eina_Bool elm_multibuttonentry_item_selected_get(const Elm_Object_Item *it); - -EAPI Elm_Object_Item *elm_multibuttonentry_item_prev_get(const Elm_Object_Item *it); - -EAPI Elm_Object_Item *elm_multibuttonentry_item_next_get(const Elm_Object_Item *it); - +#include "elm_multibuttonentry_item.eo.legacy.h" #include "elm_multibuttonentry.eo.legacy.h" diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c index 78b1b9a41..2b4840bab 100644 --- a/src/lib/elc_naviframe.c +++ b/src/lib/elc_naviframe.c @@ -1721,12 +1721,6 @@ _elm_naviframe_item_pop(Eo *obj, Elm_Naviframe_Data *sd) return content; } -EAPI void -elm_naviframe_item_pop_to(Elm_Object_Item *it) -{ - eo_do(it, elm_obj_naviframe_item_pop_to()); -} - EOLIAN static void _elm_naviframe_item_pop_to(Eo *eo_it, Elm_Naviframe_Item_Data *it) { @@ -1757,12 +1751,6 @@ _elm_naviframe_item_pop_to(Eo *eo_it, Elm_Naviframe_Item_Data *it) elm_naviframe_item_pop(WIDGET(it)); } -EAPI void -elm_naviframe_item_promote(Elm_Object_Item *it) -{ - eo_do(it, elm_obj_naviframe_item_promote()); -} - EOLIAN static void _elm_naviframe_item_promote(Eo *eo_it, Elm_Naviframe_Item_Data *it) { @@ -1823,13 +1811,6 @@ _elm_naviframe_bottom_item_get(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd) return EO_OBJ(ret_it); } -EAPI void -elm_naviframe_item_style_set(Elm_Object_Item *it, - const char *item_style) -{ - eo_do(it, elm_obj_naviframe_item_style_set(item_style)); -} - EOLIAN static void _elm_naviframe_item_style_set(Eo *eo_item EINA_UNUSED, Elm_Naviframe_Item_Data *nit, @@ -1845,12 +1826,6 @@ _elm_naviframe_item_style_set(Eo *eo_item EINA_UNUSED, _item_title_enabled_update(nit, EINA_FALSE); } -EAPI const char * -elm_naviframe_item_style_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_naviframe_item_style_get()); -} - EOLIAN static const char * _elm_naviframe_item_style_get(Eo *eo_item EINA_UNUSED, Elm_Naviframe_Item_Data *nit) @@ -1871,14 +1846,6 @@ elm_naviframe_item_title_visible_get(const Elm_Object_Item *it) return elm_naviframe_item_title_enabled_get(it); } -EAPI void -elm_naviframe_item_title_enabled_set(Elm_Object_Item *it, - Eina_Bool enabled, - Eina_Bool transition) -{ - eo_do(it, elm_obj_naviframe_item_title_enabled_set(enabled, transition)); -} - EOLIAN static void _elm_naviframe_item_title_enabled_set(Eo *eo_item EINA_UNUSED, Elm_Naviframe_Item_Data *nit, @@ -1894,24 +1861,12 @@ _elm_naviframe_item_title_enabled_set(Eo *eo_item EINA_UNUSED, _item_title_enabled_update(nit, transition); } -EAPI Eina_Bool -elm_naviframe_item_title_enabled_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_naviframe_item_title_enabled_get()); -} - EOLIAN static Eina_Bool _elm_naviframe_item_title_enabled_get(Eo *eo_item EINA_UNUSED, Elm_Naviframe_Item_Data *nit) { return nit->title_enabled; } -EAPI void -elm_naviframe_item_pop_cb_set(Elm_Object_Item *it, Elm_Naviframe_Item_Pop_Cb func, void *data) -{ - eo_do(it, elm_obj_naviframe_item_pop_cb_set(func, data)); -} - EOLIAN static void _elm_naviframe_item_pop_cb_set(Eo *eo_item EINA_UNUSED, Elm_Naviframe_Item_Data *nit, diff --git a/src/lib/elc_naviframe_common.h b/src/lib/elc_naviframe_common.h index b14eae0b0..04cb926e6 100644 --- a/src/lib/elc_naviframe_common.h +++ b/src/lib/elc_naviframe_common.h @@ -21,20 +21,8 @@ typedef Eina_Bool (*Elm_Naviframe_Item_Pop_Cb)(void *data, Elm_Object_Item *it); */ EAPI Evas_Object *elm_naviframe_add(Evas_Object *parent); -EAPI void elm_naviframe_item_pop_to(Elm_Object_Item *it); - -EAPI void elm_naviframe_item_promote(Elm_Object_Item *it); - -EAPI void elm_naviframe_item_style_set(Elm_Object_Item *it, const char *item_style); - -EAPI const char *elm_naviframe_item_style_get(const Elm_Object_Item *it); - EAPI void elm_naviframe_item_title_enabled_set(Elm_Object_Item *it, Eina_Bool enabled, Eina_Bool transition); -EAPI Eina_Bool elm_naviframe_item_title_enabled_get(const Elm_Object_Item *it); - -EAPI void elm_naviframe_item_pop_cb_set(Elm_Object_Item *it, Elm_Naviframe_Item_Pop_Cb func, void *data); - Elm_Object_Item *elm_naviframe_item_push(Evas_Object *obj, const char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object *content, const char *item_style); /** * @brief Simple version of item_push. diff --git a/src/lib/elc_naviframe_eo.h b/src/lib/elc_naviframe_eo.h index 222556278..8d3cfe2e2 100644 --- a/src/lib/elc_naviframe_eo.h +++ b/src/lib/elc_naviframe_eo.h @@ -4,6 +4,7 @@ * @{ */ +#include "elm_naviframe_item.eo.h" #include "elm_naviframe.eo.h" /** diff --git a/src/lib/elc_naviframe_legacy.h b/src/lib/elc_naviframe_legacy.h index 2b200b1e1..a1b7d4630 100644 --- a/src/lib/elc_naviframe_legacy.h +++ b/src/lib/elc_naviframe_legacy.h @@ -1 +1,2 @@ -#include "elm_naviframe.eo.legacy.h"
\ No newline at end of file +#include "elm_naviframe_item.eo.legacy.h" +#include "elm_naviframe.eo.legacy.h" diff --git a/src/lib/elm_color_item.eo b/src/lib/elm_color_item.eo index 8739059f3..f3cce2d7b 100644 --- a/src/lib/elm_color_item.eo +++ b/src/lib/elm_color_item.eo @@ -1,6 +1,5 @@ class Elm_Color_Item(Elm_Widget_Item) { - legacy_prefix: null; eo_prefix: elm_obj_color_item; properties { color { diff --git a/src/lib/elm_ctxpopup_item.eo b/src/lib/elm_ctxpopup_item.eo index d51526402..957cbbcaf 100644 --- a/src/lib/elm_ctxpopup_item.eo +++ b/src/lib/elm_ctxpopup_item.eo @@ -1,6 +1,5 @@ class Elm_Ctxpopup_Item(Elm_Widget_Item) { - legacy_prefix: null; eo_prefix: elm_obj_ctxpopup_item; properties { prev { diff --git a/src/lib/elm_dayselector_item.eo b/src/lib/elm_dayselector_item.eo index a45f06d99..ebb4b5375 100644 --- a/src/lib/elm_dayselector_item.eo +++ b/src/lib/elm_dayselector_item.eo @@ -1,6 +1,5 @@ class Elm_Dayselector_Item(Elm_Widget_Item) { - legacy_prefix: null; eo_prefix: elm_dayselector_item; implements { Eo.Base.constructor; diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c index 681f64ae9..b51beb6d0 100644 --- a/src/lib/elm_diskselector.c +++ b/src/lib/elm_diskselector.c @@ -10,7 +10,6 @@ #include "elm_priv.h" #include "elm_widget_diskselector.h" #include "elm_interface_scrollable.h" -#include "elm_diskselector_item.eo.h" #define DISPLAY_ITEM_NUM_MIN 3 @@ -1689,13 +1688,6 @@ _elm_diskselector_selected_item_get(Eo *obj EINA_UNUSED, Elm_Diskselector_Data * return EO_OBJ(sd->selected_item); } -EAPI void -elm_diskselector_item_selected_set(Elm_Object_Item *item, - Eina_Bool selected) -{ - eo_do(item, elm_obj_diskselector_item_selected_set(selected)); -} - EOLIAN static void _elm_diskselector_item_selected_set(Eo *eo_it EINA_UNUSED, Elm_Diskselector_Item_Data *it, Eina_Bool selected) @@ -1718,12 +1710,6 @@ _elm_diskselector_item_selected_set(Eo *eo_it EINA_UNUSED, Elm_Diskselector_Item sd->scroller_move_idle_enterer = ecore_idle_enterer_before_add(_scroller_move, WIDGET(it)); } -EAPI Eina_Bool -elm_diskselector_item_selected_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_diskselector_item_selected_get()); -} - EOLIAN static Eina_Bool _elm_diskselector_item_selected_get(Eo *eo_it EINA_UNUSED, Elm_Diskselector_Item_Data *it) { @@ -1733,12 +1719,6 @@ _elm_diskselector_item_selected_get(Eo *eo_it EINA_UNUSED, Elm_Diskselector_Item return sd->selected_item == it; } -EAPI Elm_Object_Item * -elm_diskselector_item_prev_get(const Elm_Object_Item *item) -{ - return eo_do(item, elm_obj_diskselector_item_prev_get()); -} - EOLIAN static Elm_Object_Item * _elm_diskselector_item_prev_get(Eo *eo_it EINA_UNUSED, Elm_Diskselector_Item_Data *it) { @@ -1750,12 +1730,6 @@ _elm_diskselector_item_prev_get(Eo *eo_it EINA_UNUSED, Elm_Diskselector_Item_Dat else return NULL; } -EAPI Elm_Object_Item * -elm_diskselector_item_next_get(const Elm_Object_Item *item) -{ - return eo_do(item, elm_obj_diskselector_item_next_get()); -} - EOLIAN static Elm_Object_Item * _elm_diskselector_item_next_get(Eo *eo_it EINA_UNUSED, Elm_Diskselector_Item_Data *it) { diff --git a/src/lib/elm_diskselector_eo.h b/src/lib/elm_diskselector_eo.h index 0c9b043b8..3dbebc15c 100644 --- a/src/lib/elm_diskselector_eo.h +++ b/src/lib/elm_diskselector_eo.h @@ -1 +1,2 @@ -#include "elm_diskselector.eo.h"
\ No newline at end of file +#include "elm_diskselector_item.eo.h" +#include "elm_diskselector.eo.h" diff --git a/src/lib/elm_diskselector_item.eo b/src/lib/elm_diskselector_item.eo index 71173d3a0..3df81dabd 100644 --- a/src/lib/elm_diskselector_item.eo +++ b/src/lib/elm_diskselector_item.eo @@ -1,6 +1,5 @@ class Elm_Diskselector_Item(Elm_Widget_Item) { - legacy_prefix: null; eo_prefix: elm_obj_diskselector_item; properties { prev { diff --git a/src/lib/elm_diskselector_legacy.h b/src/lib/elm_diskselector_legacy.h index 3596c897e..5213ad545 100644 --- a/src/lib/elm_diskselector_legacy.h +++ b/src/lib/elm_diskselector_legacy.h @@ -11,4 +11,5 @@ */ EAPI Evas_Object *elm_diskselector_add(Evas_Object *parent); +#include "elm_diskselector_item.eo.legacy.h" #include "elm_diskselector.eo.legacy.h" diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c index c38f0124c..63a950cd0 100644 --- a/src/lib/elm_flipselector.c +++ b/src/lib/elm_flipselector.c @@ -747,13 +747,6 @@ _elm_flipselector_selected_item_get(Eo *obj EINA_UNUSED, Elm_Flipselector_Data * return DATA_GET(sd->current); } -EAPI void -elm_flipselector_item_selected_set(Elm_Object_Item *it, - Eina_Bool selected) -{ - eo_do(it, elm_obj_flipselector_item_selected_set(selected)); -} - EOLIAN static void _elm_flipselector_item_selected_set(Eo *eo_item, Elm_Flipselector_Item_Data *item, @@ -802,12 +795,6 @@ _elm_flipselector_item_selected_set(Eo *eo_item, _flipselector_unwalk(sd); } -EAPI Eina_Bool -elm_flipselector_item_selected_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_flipselector_item_selected_get()); -} - EOLIAN static Eina_Bool _elm_flipselector_item_selected_get(Eo *eo_item, Elm_Flipselector_Item_Data *item) @@ -817,12 +804,6 @@ _elm_flipselector_item_selected_get(Eo *eo_item, return eina_list_data_get(sd->current) == eo_item; } -EAPI Elm_Object_Item * -elm_flipselector_item_prev_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_flipselector_item_prev_get()); -} - EOLIAN static Elm_Object_Item * _elm_flipselector_item_prev_get(Eo *eo_item, Elm_Flipselector_Item_Data *item) @@ -839,12 +820,6 @@ _elm_flipselector_item_prev_get(Eo *eo_item, return NULL; } -EAPI Elm_Object_Item * -elm_flipselector_item_next_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_flipselector_item_next_get()); -} - EOLIAN static Elm_Object_Item * _elm_flipselector_item_next_get(Eo *eo_item, Elm_Flipselector_Item_Data *item) diff --git a/src/lib/elm_flipselector_eo.h b/src/lib/elm_flipselector_eo.h index 8a2bc0985..052fdabcb 100644 --- a/src/lib/elm_flipselector_eo.h +++ b/src/lib/elm_flipselector_eo.h @@ -1 +1,2 @@ +#include "elm_flipselector_item.eo.h" #include "elm_flipselector.eo.h" diff --git a/src/lib/elm_flipselector_item.eo b/src/lib/elm_flipselector_item.eo index 0cee16ab0..b9101b353 100644 --- a/src/lib/elm_flipselector_item.eo +++ b/src/lib/elm_flipselector_item.eo @@ -1,6 +1,5 @@ class Elm_Flipselector_Item(Elm_Widget_Item) { - legacy_prefix: null; eo_prefix: elm_obj_flipselector_item; properties { selected { diff --git a/src/lib/elm_flipselector_legacy.h b/src/lib/elm_flipselector_legacy.h index bbd46aa96..556272c17 100644 --- a/src/lib/elm_flipselector_legacy.h +++ b/src/lib/elm_flipselector_legacy.h @@ -11,4 +11,5 @@ */ EAPI Evas_Object *elm_flipselector_add(Evas_Object *parent); +#include "elm_flipselector_item.eo.legacy.h" #include "elm_flipselector.eo.legacy.h" diff --git a/src/lib/elm_focus.h b/src/lib/elm_focus.h index fbca8050a..3aad5e94c 100644 --- a/src/lib/elm_focus.h +++ b/src/lib/elm_focus.h @@ -335,30 +335,3 @@ EAPI const char *elm_object_focus_highlight_style_get(const Evas_Object *obj); * @since 1.10 */ EAPI Elm_Object_Item *elm_object_focused_item_get(const Evas_Object *obj); - -/** - * Set the object item focused - * - * @param it The object item - * @param focused The focused state - * - * @see elm_object_item_focus_get() - * - * @ingroup Focus - * @since 1.10 - */ -EAPI void elm_object_item_focus_set(Elm_Object_Item *it, Eina_Bool focused); - -/** - * Get whether the @p it is focused or not. - * - * @param it The object item - * @return @c EINA_TRUE means item is focused. @c EINA_FALSE indicates - * it's not. If @p obj is @c NULL, @c EINA_FALSE is returned. - * - * @see elm_object_item_focus_set() - * - * @ingroup Focus - * @since 1.10 - */ -EAPI Eina_Bool elm_object_item_focus_get(const Elm_Object_Item *it); diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c index 3847055f3..8e1315819 100644 --- a/src/lib/elm_gengrid.c +++ b/src/lib/elm_gengrid.c @@ -12,8 +12,6 @@ #include "elm_widget_gengrid.h" #include "elm_interface_scrollable.h" -#include "elm_gengrid_item.eo.h" - #define MY_PAN_CLASS ELM_GENGRID_PAN_CLASS #define MY_PAN_CLASS_NAME "Elm_Gengrid_Pan" @@ -3902,12 +3900,6 @@ elm_gengrid_item_object_get(const Elm_Object_Item *eo_it) return VIEW(it); } -EAPI void -elm_gengrid_item_update(Elm_Object_Item *item) -{ - eo_do(item, elm_obj_gengrid_item_update()); -} - EOLIAN static void _elm_gengrid_item_update(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it) { @@ -3921,12 +3913,6 @@ _elm_gengrid_item_update(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it) _item_place(it, it->x, it->y); } -EAPI const Elm_Gengrid_Item_Class * -elm_gengrid_item_item_class_get(const Elm_Object_Item *item) -{ - return eo_do(item, elm_obj_gengrid_item_class_get()); -} - EOLIAN static const Elm_Gengrid_Item_Class * _elm_gengrid_item_item_class_get(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *item) { @@ -3934,13 +3920,6 @@ _elm_gengrid_item_item_class_get(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *item) return item->itc; } -EAPI void -elm_gengrid_item_item_class_update(Elm_Object_Item *item, - const Elm_Gengrid_Item_Class *itc) -{ - eo_do(item, elm_obj_gengrid_item_class_update(itc)); -} - EOLIAN static void _elm_gengrid_item_item_class_update(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it, const Elm_Gengrid_Item_Class *itc) @@ -3952,14 +3931,6 @@ _elm_gengrid_item_item_class_update(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it, elm_gengrid_item_update(EO_OBJ(it)); } -EAPI void -elm_gengrid_item_pos_get(const Elm_Object_Item *it, - unsigned int *x, - unsigned int *y) -{ - return eo_do(it, elm_obj_gengrid_item_pos_get(x, y)); -} - EOLIAN static void _elm_gengrid_item_pos_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it, unsigned int *x, @@ -4010,13 +3981,6 @@ _elm_gengrid_selected_items_get(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *sd) return sd->selected; } -EAPI void -elm_gengrid_item_selected_set(Elm_Object_Item *item, - Eina_Bool selected) -{ - eo_do(item, elm_obj_gengrid_item_selected_set(selected)); -} - EOLIAN static void _elm_gengrid_item_selected_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, Eina_Bool selected) @@ -4047,12 +4011,6 @@ _elm_gengrid_item_selected_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, it->unsel_cb(it); } -EAPI Eina_Bool -elm_gengrid_item_selected_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_gengrid_item_selected_get()); -} - EOLIAN static Eina_Bool _elm_gengrid_item_selected_get(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it) { @@ -4600,12 +4558,6 @@ _elm_gengrid_last_item_get(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *sd) return EO_OBJ(it); } -EAPI Elm_Object_Item * -elm_gengrid_item_next_get(const Elm_Object_Item *item) -{ - return eo_do(item, elm_obj_gengrid_item_next_get()); -} - EOLIAN static Elm_Object_Item * _elm_gengrid_item_next_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) { @@ -4620,12 +4572,6 @@ _elm_gengrid_item_next_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) return EO_OBJ(it); } -EAPI Elm_Object_Item * -elm_gengrid_item_prev_get(const Elm_Object_Item *item) -{ - return eo_do(item, elm_obj_gengrid_item_prev_get()); -} - EOLIAN static Elm_Object_Item * _elm_gengrid_item_prev_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) { @@ -4640,13 +4586,6 @@ _elm_gengrid_item_prev_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) return EO_OBJ(it); } -EAPI void -elm_gengrid_item_show(Elm_Object_Item *item, - Elm_Gengrid_Item_Scrollto_Type type) -{ - eo_do(item, elm_obj_gengrid_item_show(type)); -} - EOLIAN static void _elm_gengrid_item_show(Eo *eo_it, Elm_Gen_Item *it, Elm_Gengrid_Item_Scrollto_Type type) { @@ -4661,13 +4600,6 @@ _elm_gengrid_item_show(Eo *eo_it, Elm_Gen_Item *it, Elm_Gengrid_Item_Scrollto_Ty _item_show_region(sd); } -EAPI void -elm_gengrid_item_bring_in(Elm_Object_Item *item, - Elm_Gengrid_Item_Scrollto_Type type) -{ - eo_do(item, elm_obj_gengrid_item_bring_in(type)); -} - EOLIAN static void _elm_gengrid_item_bring_in(Eo *eo_it, Elm_Gen_Item *it, Elm_Gengrid_Item_Scrollto_Type type) { @@ -4780,12 +4712,6 @@ _elm_gengrid_highlight_mode_get(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *sd) return sd->highlight; } -EAPI int -elm_gengrid_item_index_get(const Elm_Object_Item *item) -{ - return eo_do(item, elm_obj_gengrid_item_index_get()); -} - EOLIAN static int _elm_gengrid_item_index_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) { @@ -4794,13 +4720,6 @@ _elm_gengrid_item_index_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) return it->position; } -EAPI void -elm_gengrid_item_select_mode_set(Elm_Object_Item *item, - Elm_Object_Select_Mode mode) -{ - eo_do(item, elm_obj_gengrid_item_select_mode_set(mode)); -} - EOLIAN static void _elm_gengrid_item_select_mode_set(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it, Elm_Object_Select_Mode mode) @@ -4816,12 +4735,6 @@ _elm_gengrid_item_select_mode_set(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it, elm_gengrid_item_update(EO_OBJ(it)); } -EAPI Elm_Object_Select_Mode -elm_gengrid_item_select_mode_get(const Elm_Object_Item *item) -{ - return eo_do(item, elm_obj_gengrid_item_select_mode_get()); -} - EOLIAN static Elm_Object_Select_Mode _elm_gengrid_item_select_mode_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) { diff --git a/src/lib/elm_gengrid_common.h b/src/lib/elm_gengrid_common.h index 87083bf11..eba079104 100644 --- a/src/lib/elm_gengrid_common.h +++ b/src/lib/elm_gengrid_common.h @@ -41,156 +41,6 @@ typedef Elm_Gen_Item_State_Get_Cb Elm_Gengrid_Item_State_Get_Cb; typedef Elm_Gen_Item_Del_Cb Elm_Gengrid_Item_Del_Cb; /** - * Get the @b next item in a gengrid widget's internal list of items, - * given a handle to one of those items. - * - * @param it The gengrid item to fetch next from - * @return The item after @p item, or @c NULL if there's none (and - * on errors) - * - * This returns the item placed after the @p item, on the container - * gengrid. - * - * @see elm_gengrid_item_prev_get() - * - * @ingroup Gengrid - */ -EAPI Elm_Object_Item *elm_gengrid_item_next_get(const Elm_Object_Item *it); - -/** - * Get the @b previous item in a gengrid widget's internal list of items, - * given a handle to one of those items. - * - * @param it The gengrid item to fetch previous from - * @return The item before @p item, or @c NULL if there's none (and - * on errors) - * - * This returns the item placed before the @p item, on the container - * gengrid. - * - * @see elm_gengrid_item_next_get() - * - * @ingroup Gengrid - */ -EAPI Elm_Object_Item *elm_gengrid_item_prev_get(const Elm_Object_Item *it); - -/** - * Set whether a given gengrid item is selected or not - * - * @param it The gengrid item - * @param selected Use @c EINA_TRUE, to make it selected, @c - * EINA_FALSE to make it unselected - * - * This sets the selected state of an item. If multi-selection is - * not enabled on the containing gengrid and @p selected is @c - * EINA_TRUE, any other previously selected items will get - * unselected in favor of this new one. - * - * @see elm_gengrid_item_selected_get() - * - * @ingroup Gengrid - */ -EAPI void elm_gengrid_item_selected_set(Elm_Object_Item *it, Eina_Bool selected); - -/** - * Get whether a given gengrid item is selected or not - * - * @param it The gengrid item - * @return @c EINA_TRUE, if it's selected, @c EINA_FALSE otherwise - * - * This API returns @c EINA_TRUE for all the items selected in multi-select mode as well. - * - * @see elm_gengrid_item_selected_set() for more details - * - * @ingroup Gengrid - */ -EAPI Eina_Bool elm_gengrid_item_selected_get(const Elm_Object_Item *it); - -/** - * Show the portion of a gengrid's internal grid containing a given - * item, @b immediately. - * - * @param it The item to display - * @param type Where to position the item in the viewport. - * - * This causes gengrid to @b redraw its viewport's contents to the - * region containing the given @p item item, if it is not fully - * visible. - * - * @see elm_gengrid_item_bring_in() - * - * @ingroup Gengrid - */ -EAPI void elm_gengrid_item_show(Elm_Object_Item *it, Elm_Gengrid_Item_Scrollto_Type type); - -/** - * Animatedly bring in, to the visible area of a gengrid, a given - * item on it. - * - * @param it The gengrid item to display - * @param type Where to position the item in the viewport. - * - * This causes gengrid to jump to the given @p item and show - * it (by scrolling), if it is not fully visible. This will use - * animation to do so and take a period of time to complete. - * - * @see elm_gengrid_item_show() - * - * @ingroup Gengrid - */ -EAPI void elm_gengrid_item_bring_in(Elm_Object_Item *it, Elm_Gengrid_Item_Scrollto_Type type); - -/** - * Update the contents of a given gengrid item - * - * @param it The gengrid item - * - * This updates an item by calling all the item class functions - * again to get the contents, texts and states. Use this when the - * original item data has changed and you want the changes to be - * reflected. - * - * @ingroup Gengrid - */ -EAPI void elm_gengrid_item_update(Elm_Object_Item *it); - -/** - * Update the item class of a gengrid item. - * - * This sets another class of the item, changing the way that it is - * displayed. After changing the item class, elm_gengrid_item_update() is - * called on the item @p it. - * - * @param it The gengrid item - * @param gic The gengrid item class describing the function pointers and the item style. - * - * @ingroup Gengrid - */ -EAPI void elm_gengrid_item_item_class_update(Elm_Object_Item *it, const Elm_Gengrid_Item_Class *gic); - -/** - * Get the Gengrid Item class for the given Gengrid Item. - * - * @param it The gengrid item - * - * This returns the Gengrid_Item_Class for the given item. It can be used to examine - * the function pointers and item_style. - * - * @ingroup Gengrid - */ -EAPI const Elm_Gengrid_Item_Class *elm_gengrid_item_item_class_get(const Elm_Object_Item *it); - -/** - * Get the index of the item. It is only valid once displayed. - * - * @param it a gengrid item - * @return the position inside the list of item. - * - * @ingroup Gengrid - */ -EAPI int elm_gengrid_item_index_get(const Elm_Object_Item *it); - -/** * Add a new gengrid item class in a given gengrid widget. * * @return New allocated a gengrid item class. diff --git a/src/lib/elm_gengrid_eo.h b/src/lib/elm_gengrid_eo.h index 45f66a299..88a57bc14 100644 --- a/src/lib/elm_gengrid_eo.h +++ b/src/lib/elm_gengrid_eo.h @@ -4,6 +4,7 @@ * @{ */ +#include "elm_gengrid_item.eo.h" #include "elm_gengrid_pan.eo.h" #include "elm_gengrid.eo.h" diff --git a/src/lib/elm_gengrid_item.eo b/src/lib/elm_gengrid_item.eo index d8eb49f38..1cc738ee5 100644 --- a/src/lib/elm_gengrid_item.eo +++ b/src/lib/elm_gengrid_item.eo @@ -1,6 +1,5 @@ class Elm_Gengrid_Item(Elm_Widget_Item) { - legacy_prefix: null; eo_prefix: elm_obj_gengrid_item; data: Elm_Gen_Item; properties { diff --git a/src/lib/elm_gengrid_legacy.h b/src/lib/elm_gengrid_legacy.h index c6d1599ad..763292375 100644 --- a/src/lib/elm_gengrid_legacy.h +++ b/src/lib/elm_gengrid_legacy.h @@ -256,4 +256,5 @@ EAPI void elm_gengrid_reorder_mode_stop(Evas_Object *obj) */ EAPI void elm_gengrid_reorder_type_set(Evas_Object *obj, Elm_Gengrid_Reorder_Type type); +#include "elm_gengrid_item.eo.legacy.h" #include "elm_gengrid.eo.legacy.h" diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c index 563ac99d7..89034914c 100644 --- a/src/lib/elm_genlist.c +++ b/src/lib/elm_genlist.c @@ -15,8 +15,6 @@ #include "elm_widget_genlist.h" #include "elm_interface_scrollable.h" -#include "elm_genlist_item.eo.h" - #define MY_PAN_CLASS ELM_GENLIST_PAN_CLASS #define MY_PAN_CLASS_NAME "Elm_Genlist_Pan" @@ -6287,12 +6285,6 @@ _elm_genlist_last_item_get(Eo *obj EINA_UNUSED, Elm_Genlist_Data *sd) return EO_OBJ(it); } -EAPI Elm_Object_Item * -elm_genlist_item_next_get(const Elm_Object_Item *item) -{ - return eo_do(item, elm_obj_genlist_item_next_get()); -} - EOLIAN static Elm_Object_Item * _elm_genlist_item_next_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) { @@ -6306,12 +6298,6 @@ _elm_genlist_item_next_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) else return NULL; } -EAPI Elm_Object_Item * -elm_genlist_item_prev_get(const Elm_Object_Item *item) -{ - return eo_do(item, elm_obj_genlist_item_prev_get()); -} - EOLIAN static Elm_Object_Item * _elm_genlist_item_prev_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) { @@ -6325,12 +6311,6 @@ _elm_genlist_item_prev_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) else return NULL; } -EAPI Elm_Object_Item * -elm_genlist_item_parent_get(const Elm_Object_Item *item) -{ - return eo_do(item, elm_obj_genlist_item_parent_get()); -} - EOLIAN static Elm_Object_Item * _elm_genlist_item_parent_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) { @@ -6339,12 +6319,6 @@ _elm_genlist_item_parent_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) return EO_OBJ(it->parent); } -EAPI unsigned int -elm_genlist_item_subitems_count(const Elm_Object_Item *item) -{ - return eo_do(item, elm_obj_genlist_item_subitems_count()); -} - EOLIAN static unsigned int _elm_genlist_item_subitems_count(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *item) { @@ -6353,12 +6327,6 @@ _elm_genlist_item_subitems_count(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *item) return eina_list_count(item->item->items); } -EAPI const Eina_List * -elm_genlist_item_subitems_get(const Elm_Object_Item *item) -{ - return eo_do(item, elm_obj_genlist_item_subitems_get()); -} - EOLIAN static const Eina_List * _elm_genlist_item_subitems_get(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *item) { @@ -6367,12 +6335,6 @@ _elm_genlist_item_subitems_get(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *item) return item->item->items; } -EAPI void -elm_genlist_item_subitems_clear(Elm_Object_Item *item) -{ - eo_do(item, elm_obj_genlist_item_subitems_clear()); -} - EOLIAN static void _elm_genlist_item_subitems_clear(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it) { @@ -6398,13 +6360,6 @@ _elm_genlist_item_subitems_clear(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it) } } -EAPI void -elm_genlist_item_selected_set(Elm_Object_Item *item, - Eina_Bool selected) -{ - eo_do(item, elm_obj_genlist_item_selected_set(selected)); -} - EOLIAN static void _elm_genlist_item_selected_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, Eina_Bool selected) @@ -6439,12 +6394,6 @@ _elm_genlist_item_selected_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, it->unsel_cb(it); } -EAPI Eina_Bool -elm_genlist_item_selected_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_genlist_item_selected_get()); -} - EOLIAN static Eina_Bool _elm_genlist_item_selected_get(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it) { @@ -6542,13 +6491,6 @@ _event_block_rect_update(const Evas_Object *obj) evas_object_move(sd->event_block_rect, ox, oy); } -EAPI void -elm_genlist_item_expanded_set(Elm_Object_Item *item, - Eina_Bool expanded) -{ - eo_do(item, elm_obj_genlist_item_expanded_set(expanded)); -} - EOLIAN static void _elm_genlist_item_expanded_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, Eina_Bool expanded) { @@ -6583,12 +6525,6 @@ _elm_genlist_item_expanded_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, Eina_B } } -EAPI Eina_Bool -elm_genlist_item_expanded_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_genlist_item_expanded_get()); -} - EOLIAN static Eina_Bool _elm_genlist_item_expanded_get(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it) { @@ -6597,12 +6533,6 @@ _elm_genlist_item_expanded_get(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it) return it->item->expanded; } -EAPI int -elm_genlist_item_expanded_depth_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_genlist_item_expanded_depth_get()); -} - EOLIAN static int _elm_genlist_item_expanded_depth_get(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it) { @@ -6673,12 +6603,6 @@ _elm_genlist_item_coordinates_calc(Elm_Gen_Item *it, return EINA_TRUE; } -EAPI void -elm_genlist_item_promote(Elm_Object_Item *item) -{ - eo_do(item, elm_obj_genlist_item_promote()); -} - EOLIAN static void _elm_genlist_item_promote(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) { @@ -6690,12 +6614,6 @@ _elm_genlist_item_promote(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) _item_move_before(it, first_item); } -EAPI void -elm_genlist_item_demote(Elm_Object_Item *item) -{ - eo_do(item, elm_obj_genlist_item_demote()); -} - EOLIAN static void _elm_genlist_item_demote(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) { @@ -6706,13 +6624,6 @@ _elm_genlist_item_demote(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) _item_move_after(it, last_item); } -EAPI void -elm_genlist_item_show(Elm_Object_Item *item, - Elm_Genlist_Item_Scrollto_Type type) -{ - eo_do(item, elm_obj_genlist_item_show(type)); -} - EOLIAN static void _elm_genlist_item_show(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *item, Elm_Genlist_Item_Scrollto_Type type) { @@ -6726,13 +6637,6 @@ _elm_genlist_item_show(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *item, Elm_Genlist_ (x, y, w, h)); } -EAPI void -elm_genlist_item_bring_in(Elm_Object_Item *item, - Elm_Genlist_Item_Scrollto_Type type) -{ - eo_do(item, elm_obj_genlist_item_bring_in(type)); -} - EOLIAN static void _elm_genlist_item_bring_in(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *item, Elm_Genlist_Item_Scrollto_Type type) { @@ -6745,13 +6649,6 @@ _elm_genlist_item_bring_in(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *item, Elm_Genl eo_do(WIDGET(item), elm_interface_scrollable_region_bring_in(x, y, w, h)); } -EAPI void -elm_genlist_item_all_contents_unset(Elm_Object_Item *it, - Eina_List **l) -{ - eo_do(it, elm_obj_genlist_item_all_contents_unset(l)); -} - EOLIAN static void _elm_genlist_item_all_contents_unset(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, Eina_List **l) { @@ -6768,12 +6665,6 @@ _elm_genlist_item_all_contents_unset(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, } } -EAPI void -elm_genlist_item_update(Elm_Object_Item *item) -{ - eo_do(item, elm_obj_genlist_item_update()); -} - EOLIAN static void _elm_genlist_item_update(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it) { @@ -6789,14 +6680,6 @@ _elm_genlist_item_update(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it) sd->update_job = ecore_job_add(_update_job, sd->obj); } -EAPI void -elm_genlist_item_fields_update(Elm_Object_Item *item, - const char *parts, - Elm_Genlist_Item_Field_Type itf) -{ - eo_do(item, elm_obj_genlist_item_fields_update(parts, itf)); -} - EOLIAN static void _elm_genlist_item_fields_update(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, const char *parts, @@ -6872,13 +6755,6 @@ _elm_genlist_item_fields_update(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, elm_genlist_item_update(eo_item); } -EAPI void -elm_genlist_item_item_class_update(Elm_Object_Item *item, - const Elm_Genlist_Item_Class *itc) -{ - eo_do(item, elm_obj_genlist_item_class_update(itc)); -} - EOLIAN static void _elm_genlist_item_item_class_update(Eo *eo_it, Elm_Gen_Item *it, const Elm_Genlist_Item_Class *itc) @@ -6918,12 +6794,6 @@ _elm_genlist_item_item_class_update(Eo *eo_it, Elm_Gen_Item *it, elm_genlist_item_update(eo_it); } -EAPI const Elm_Genlist_Item_Class * -elm_genlist_item_item_class_get(const Elm_Object_Item *item) -{ - return eo_do(item, elm_obj_genlist_item_class_get()); -} - EOLIAN static const Elm_Genlist_Item_Class * _elm_genlist_item_item_class_get(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it) { @@ -7164,12 +7034,6 @@ elm_genlist_item_cursor_engine_only_get(const Elm_Object_Item *eo_it) return eo_do( eo_it, elm_wdg_item_cursor_engine_only_get()); } -EAPI int -elm_genlist_item_index_get(const Elm_Object_Item *item) -{ - return eo_do(item, elm_obj_genlist_item_index_get()); -} - EOLIAN static int _elm_genlist_item_index_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) { @@ -7320,14 +7184,6 @@ _elm_genlist_realized_items_update(Eo *obj, Elm_Genlist_Data *_pd EINA_UNUSED) elm_genlist_item_update(it); } -EAPI void -elm_genlist_item_decorate_mode_set(Elm_Object_Item *item, - const char *decorate_it_type, - Eina_Bool decorate_it_set) -{ - eo_do(item, elm_obj_genlist_item_decorate_mode_set(decorate_it_type, decorate_it_set)); -} - EOLIAN static void _elm_genlist_item_decorate_mode_set(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it, const char *decorate_it_type, @@ -7379,12 +7235,6 @@ _elm_genlist_item_decorate_mode_set(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it, if (decorate_it_set) _decorate_item_set(it); } -EAPI const char * -elm_genlist_item_decorate_mode_get(const Elm_Object_Item *item) -{ - return eo_do(item, elm_obj_genlist_item_decorate_mode_get()); -} - EOLIAN static const char * _elm_genlist_item_decorate_mode_get(Eo *eo_i EINA_UNUSED, Elm_Gen_Item *i) { @@ -7490,12 +7340,6 @@ _elm_genlist_reorder_mode_get(Eo *obj EINA_UNUSED, Elm_Genlist_Data *sd) return sd->reorder_mode; } -EAPI Elm_Genlist_Item_Type -elm_genlist_item_type_get(const Elm_Object_Item *item) -{ - return eo_do(item, elm_obj_genlist_item_type_get()); -} - EOLIAN static Elm_Genlist_Item_Type _elm_genlist_item_type_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) { @@ -7571,13 +7415,6 @@ _flip_job(void *data) sd->calc_job = ecore_job_add(_calc_job, sd->obj); } -EAPI void -elm_genlist_item_flip_set(Elm_Object_Item *item, - Eina_Bool flip) -{ - eo_do(item, elm_obj_genlist_item_flip_set(flip)); -} - EOLIAN static void _elm_genlist_item_flip_set(Eo *eo_it, Elm_Gen_Item *it, Eina_Bool flip) { @@ -7599,12 +7436,6 @@ _elm_genlist_item_flip_set(Eo *eo_it, Elm_Gen_Item *it, Eina_Bool flip) } } -EAPI Eina_Bool -elm_genlist_item_flip_get(const Elm_Object_Item *item) -{ - return eo_do(item, elm_obj_genlist_item_flip_get()); -} - EOLIAN static Eina_Bool _elm_genlist_item_flip_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) { @@ -7641,13 +7472,6 @@ _elm_genlist_highlight_mode_get(Eo *obj EINA_UNUSED, Elm_Genlist_Data *sd) return sd->highlight; } -EAPI void -elm_genlist_item_select_mode_set(Elm_Object_Item *item, - Elm_Object_Select_Mode mode) -{ - eo_do(item, elm_obj_genlist_item_select_mode_set(mode)); -} - EOLIAN static void _elm_genlist_item_select_mode_set(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it, Elm_Object_Select_Mode mode) @@ -7680,12 +7504,6 @@ _elm_genlist_item_select_mode_set(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it, } } -EAPI Elm_Object_Select_Mode -elm_genlist_item_select_mode_get(const Elm_Object_Item *item) -{ - return eo_do(item, elm_obj_genlist_item_select_mode_get()); -} - EOLIAN static Elm_Object_Select_Mode _elm_genlist_item_select_mode_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) { diff --git a/src/lib/elm_genlist_common.h b/src/lib/elm_genlist_common.h index 40cd95954..f8ad74ad3 100644 --- a/src/lib/elm_genlist_common.h +++ b/src/lib/elm_genlist_common.h @@ -69,26 +69,6 @@ typedef Elm_Gen_Item_State_Get_Cb Elm_Genlist_Item_State_Get_Cb; */ typedef Elm_Gen_Item_Del_Cb Elm_Genlist_Item_Del_Cb; -EAPI Elm_Object_Item *elm_genlist_item_next_get(const Elm_Object_Item *it); - -EAPI Elm_Object_Item *elm_genlist_item_prev_get(const Elm_Object_Item *it); - -EAPI void elm_genlist_item_selected_set(Elm_Object_Item *it, Eina_Bool selected); - -EAPI Eina_Bool elm_genlist_item_selected_get(const Elm_Object_Item *it); - -EAPI void elm_genlist_item_show(Elm_Object_Item *it, Elm_Genlist_Item_Scrollto_Type type); - -EAPI void elm_genlist_item_bring_in(Elm_Object_Item *it, Elm_Genlist_Item_Scrollto_Type type); - -EAPI void elm_genlist_item_update(Elm_Object_Item *it); - -EAPI void elm_genlist_item_item_class_update(Elm_Object_Item *it, const Elm_Genlist_Item_Class *itc); - -EAPI const Elm_Genlist_Item_Class *elm_genlist_item_item_class_get(const Elm_Object_Item *it); - -EAPI int elm_genlist_item_index_get(const Elm_Object_Item *it); - /** * Create a new genlist item class in a given genlist widget. * @@ -407,42 +387,3 @@ EAPI void elm_genlist_item_cursor_engine_only_set(Elm_O */ EAPI Eina_Bool elm_genlist_item_cursor_engine_only_get(const Elm_Object_Item *it); -EAPI Elm_Object_Item *elm_genlist_item_parent_get(const Elm_Object_Item *it); - -EAPI unsigned int elm_genlist_item_subitems_count(const Elm_Object_Item *it); - -EAPI const Eina_List *elm_genlist_item_subitems_get(const Elm_Object_Item *it); -EAPI void elm_genlist_item_subitems_clear(Elm_Object_Item *it); - -EAPI void elm_genlist_item_expanded_set(Elm_Object_Item *it, Eina_Bool expanded); - -EAPI Eina_Bool elm_genlist_item_expanded_get(const Elm_Object_Item *it); - -EAPI int elm_genlist_item_expanded_depth_get(const Elm_Object_Item *it); - -EAPI void elm_genlist_item_all_contents_unset(Elm_Object_Item *it, Eina_List **l); - -EAPI void elm_genlist_item_promote(Elm_Object_Item *it); - -EAPI void elm_genlist_item_demote(Elm_Object_Item *it); - -EAPI void elm_genlist_item_fields_update(Elm_Object_Item *it, const char *parts, Elm_Genlist_Item_Field_Type itf); - -EAPI void elm_genlist_item_decorate_mode_set(Elm_Object_Item *it, const char *decorate_it_type, Eina_Bool decorate_it_set); - -EAPI const char *elm_genlist_item_decorate_mode_get(const Elm_Object_Item *it); - -EAPI Elm_Genlist_Item_Type elm_genlist_item_type_get(const Elm_Object_Item *it); - -EAPI void elm_genlist_item_flip_set(Elm_Object_Item *it, Eina_Bool flip); - -EAPI Eina_Bool elm_genlist_item_flip_get(const Elm_Object_Item *it); - -EAPI void -elm_genlist_item_select_mode_set(Elm_Object_Item *it, - Elm_Object_Select_Mode mode); - -EAPI Elm_Object_Select_Mode -elm_genlist_item_select_mode_get(const Elm_Object_Item *it); - - diff --git a/src/lib/elm_genlist_eo.h b/src/lib/elm_genlist_eo.h index 39c32fd05..bd18b5b1e 100644 --- a/src/lib/elm_genlist_eo.h +++ b/src/lib/elm_genlist_eo.h @@ -4,6 +4,7 @@ * @{ */ +#include "elm_genlist_item.eo.h" #include "elm_genlist_pan.eo.h" #include "elm_genlist.eo.h" diff --git a/src/lib/elm_genlist_item.eo b/src/lib/elm_genlist_item.eo index 95177b447..13be0b9ac 100644 --- a/src/lib/elm_genlist_item.eo +++ b/src/lib/elm_genlist_item.eo @@ -1,6 +1,5 @@ class Elm_Genlist_Item(Elm_Widget_Item) { - legacy_prefix: null; eo_prefix: elm_obj_genlist_item; data: Elm_Gen_Item; properties { diff --git a/src/lib/elm_genlist_legacy.h b/src/lib/elm_genlist_legacy.h index c83667e0e..77866c074 100644 --- a/src/lib/elm_genlist_legacy.h +++ b/src/lib/elm_genlist_legacy.h @@ -31,4 +31,5 @@ EAPI Evas_Object *elm_genlist_add(Evas_Object *parent); EAPI Elm_Object_Item * elm_genlist_nth_item_get(const Evas_Object *obj, unsigned int nth); +#include "elm_genlist_item.eo.legacy.h" #include "elm_genlist.eo.legacy.h" diff --git a/src/lib/elm_hoversel_item.eo b/src/lib/elm_hoversel_item.eo index 091de18b3..729264b11 100644 --- a/src/lib/elm_hoversel_item.eo +++ b/src/lib/elm_hoversel_item.eo @@ -1,6 +1,5 @@ class Elm_Hoversel_Item(Elm_Widget_Item) { - legacy_prefix: null; eo_prefix: elm_obj_hoversel_item; properties { icon { diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c index b83c9cb01..a1846d555 100644 --- a/src/lib/elm_index.c +++ b/src/lib/elm_index.c @@ -1154,12 +1154,6 @@ _elm_index_item_level_get(Eo *obj EINA_UNUSED, Elm_Index_Data *sd) } //FIXME: Should update indicator based on the autohidden status & indicator visibility -EAPI void -elm_index_item_selected_set(Elm_Object_Item *it, Eina_Bool selected) -{ - eo_do(it, elm_obj_index_item_selected_set(selected)); -} - EOLIAN static void _elm_index_item_selected_set(Eo *eo_it, Elm_Index_Item_Data *it, @@ -1410,12 +1404,6 @@ _elm_index_indicator_disabled_get(Eo *obj EINA_UNUSED, Elm_Index_Data *sd) return sd->indicator_disabled; } -EAPI const char * -elm_index_item_letter_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_index_item_letter_get()); -} - EOLIAN static const char * _elm_index_item_letter_get(Eo *item EINA_UNUSED, Elm_Index_Item_Data *it) { diff --git a/src/lib/elm_index_common.h b/src/lib/elm_index_common.h index 7c87d35fd..e69de29bb 100644 --- a/src/lib/elm_index_common.h +++ b/src/lib/elm_index_common.h @@ -1,2 +0,0 @@ -EAPI void elm_index_item_selected_set(Elm_Object_Item *it, Eina_Bool selected); - diff --git a/src/lib/elm_index_eo.h b/src/lib/elm_index_eo.h index ec4857e09..c46708d6d 100644 --- a/src/lib/elm_index_eo.h +++ b/src/lib/elm_index_eo.h @@ -4,6 +4,7 @@ * @{ */ +#include "elm_index_item.eo.h" #include "elm_index.eo.h" /** diff --git a/src/lib/elm_index_item.eo b/src/lib/elm_index_item.eo index 57f57b659..a99a898d3 100644 --- a/src/lib/elm_index_item.eo +++ b/src/lib/elm_index_item.eo @@ -1,6 +1,5 @@ class Elm_Index_Item(Elm_Widget_Item) { - legacy_prefix: null; eo_prefix: elm_obj_index_item; properties { selected { diff --git a/src/lib/elm_index_legacy.h b/src/lib/elm_index_legacy.h index c78fcb829..7846f6442 100644 --- a/src/lib/elm_index_legacy.h +++ b/src/lib/elm_index_legacy.h @@ -11,6 +11,5 @@ */ EAPI Evas_Object *elm_index_add(Evas_Object *parent); -EAPI const char *elm_index_item_letter_get(const Elm_Object_Item *item); - +#include "elm_index_item.eo.legacy.h" #include "elm_index.eo.legacy.h" diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c index 18d7701ca..e30ca0337 100644 --- a/src/lib/elm_list.c +++ b/src/lib/elm_list.c @@ -12,8 +12,6 @@ #include "elm_widget_list.h" #include "elm_interface_scrollable.h" -#include "elm_list_item.eo.h" - #define MY_CLASS ELM_LIST_CLASS #define MY_CLASS_NAME "Elm_List" @@ -2743,13 +2741,6 @@ _elm_list_item_sorted_insert(Eo *obj, Elm_List_Data *sd, const char *label, Evas return EO_OBJ(it); } -EAPI void -elm_list_item_separator_set(Elm_Object_Item *it, - Eina_Bool setting) -{ - eo_do(it, elm_obj_list_item_separator_set(setting)); -} - EOLIAN static void _elm_list_item_separator_set(Eo *eo_item EINA_UNUSED, Elm_List_Item_Data *it, Eina_Bool setting) @@ -2759,12 +2750,6 @@ _elm_list_item_separator_set(Eo *eo_item EINA_UNUSED, Elm_List_Item_Data *it, it->is_separator = !!setting; } -EAPI Eina_Bool -elm_list_item_separator_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_list_item_separator_get()); -} - EOLIAN static Eina_Bool _elm_list_item_separator_get(Eo *eo_item EINA_UNUSED, Elm_List_Item_Data *it) { @@ -2773,13 +2758,6 @@ _elm_list_item_separator_get(Eo *eo_item EINA_UNUSED, Elm_List_Item_Data *it) return it->is_separator; } -EAPI void -elm_list_item_selected_set(Elm_Object_Item *it, - Eina_Bool selected) -{ - eo_do(it, elm_obj_list_item_selected_set(selected)); -} - EOLIAN static void _elm_list_item_selected_set(Eo *eo_item EINA_UNUSED, Elm_List_Item_Data *item, Eina_Bool selected) @@ -2822,12 +2800,6 @@ _elm_list_item_selected_set(Eo *eo_item EINA_UNUSED, Elm_List_Item_Data *item, evas_object_unref(obj); } -EAPI Eina_Bool -elm_list_item_selected_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_list_item_selected_get()); -} - EOLIAN static Eina_Bool _elm_list_item_selected_get(Eo *eo_item EINA_UNUSED, Elm_List_Item_Data *it) { @@ -2836,12 +2808,6 @@ _elm_list_item_selected_get(Eo *eo_item EINA_UNUSED, Elm_List_Item_Data *it) return it->selected; } -EAPI void -elm_list_item_show(Elm_Object_Item *it) -{ - eo_do(it, elm_obj_list_item_show()); -} - EOLIAN static void _elm_list_item_show(Eo *eo_it EINA_UNUSED, Elm_List_Item_Data *it) { @@ -2860,12 +2826,6 @@ _elm_list_item_show(Eo *eo_it EINA_UNUSED, Elm_List_Item_Data *it) eo_do(WIDGET(it), elm_interface_scrollable_content_region_show(x, y, w, h)); } -EAPI void -elm_list_item_bring_in(Elm_Object_Item *it) -{ - eo_do(it, elm_obj_list_item_bring_in()); -} - EOLIAN static void _elm_list_item_bring_in(Eo *eo_it EINA_UNUSED, Elm_List_Item_Data *it) { @@ -2884,12 +2844,6 @@ _elm_list_item_bring_in(Eo *eo_it EINA_UNUSED, Elm_List_Item_Data *it) eo_do(WIDGET(it), elm_interface_scrollable_region_bring_in(x, y, w, h)); } -EAPI Evas_Object * -elm_list_item_object_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_list_item_object_get()); -} - EOLIAN static Evas_Object * _elm_list_item_object_get(Eo *eo_it EINA_UNUSED, Elm_List_Item_Data *it) { @@ -2898,12 +2852,6 @@ _elm_list_item_object_get(Eo *eo_it EINA_UNUSED, Elm_List_Item_Data *it) return VIEW(it); } -EAPI Elm_Object_Item * -elm_list_item_prev(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_list_item_prev_get()); -} - EOLIAN static Elm_Object_Item * _elm_list_item_prev_get(Eo *eo_item EINA_UNUSED, Elm_List_Item_Data *item) { @@ -2912,12 +2860,6 @@ _elm_list_item_prev_get(Eo *eo_item EINA_UNUSED, Elm_List_Item_Data *item) return NULL; } -EAPI Elm_Object_Item * -elm_list_item_next(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_list_item_next_get()); -} - EOLIAN static Elm_Object_Item * _elm_list_item_next_get(Eo *eo_item EINA_UNUSED, Elm_List_Item_Data *item) { diff --git a/src/lib/elm_list_common.h b/src/lib/elm_list_common.h index ce9ac2a84..8a0bf19c6 100644 --- a/src/lib/elm_list_common.h +++ b/src/lib/elm_list_common.h @@ -21,21 +21,3 @@ typedef enum ELM_LIST_LAST /**< Indicates error if returned by elm_list_mode_get() */ } Elm_List_Mode; -EAPI void elm_list_item_selected_set(Elm_Object_Item *it, Eina_Bool selected); - -EAPI Eina_Bool elm_list_item_selected_get(const Elm_Object_Item *it); - -EAPI void elm_list_item_separator_set(Elm_Object_Item *it, Eina_Bool setting); - -EAPI Eina_Bool elm_list_item_separator_get(const Elm_Object_Item *it); - -EAPI void elm_list_item_show(Elm_Object_Item *it); - -EAPI void elm_list_item_bring_in(Elm_Object_Item *it); - -EAPI Evas_Object *elm_list_item_object_get(const Elm_Object_Item *it); - -EAPI Elm_Object_Item *elm_list_item_prev(const Elm_Object_Item *it); - -EAPI Elm_Object_Item *elm_list_item_next(const Elm_Object_Item *it); - diff --git a/src/lib/elm_list_eo.h b/src/lib/elm_list_eo.h index 7d91a30a6..f3bf3bcfa 100644 --- a/src/lib/elm_list_eo.h +++ b/src/lib/elm_list_eo.h @@ -4,6 +4,7 @@ * @{ */ +#include "elm_list_item.eo.h" #include "elm_list.eo.h" /** diff --git a/src/lib/elm_list_item.eo b/src/lib/elm_list_item.eo index 94628d358..597be6494 100644 --- a/src/lib/elm_list_item.eo +++ b/src/lib/elm_list_item.eo @@ -1,6 +1,5 @@ class Elm_List_Item(Elm_Widget_Item) { - legacy_prefix: null; eo_prefix: elm_obj_list_item; properties { separator { @@ -95,7 +94,7 @@ class Elm_List_Item(Elm_Widget_Item) @ingroup List */ - /*legacy: elm_list_item_prev;*/ + legacy: elm_list_item_prev; } values { Elm_Object_Item *item; /*@ The item before @p it, or @c NULL if none or on failure. */ @@ -113,7 +112,7 @@ class Elm_List_Item(Elm_Widget_Item) @ingroup List */ - /*legacy: elm_list_item_next;*/ + legacy: elm_list_item_next; } values { Elm_Object_Item *item; /*@ The item after @p it, or @c NULL if none or on failure. */ diff --git a/src/lib/elm_list_legacy.h b/src/lib/elm_list_legacy.h index 484cc8c7d..190a4c634 100644 --- a/src/lib/elm_list_legacy.h +++ b/src/lib/elm_list_legacy.h @@ -11,4 +11,5 @@ */ EAPI Evas_Object *elm_list_add(Evas_Object *parent); -#include "elm_list.eo.legacy.h"
\ No newline at end of file +#include "elm_list_item.eo.legacy.h" +#include "elm_list.eo.legacy.h" diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c index e5e331278..0f2e42943 100644 --- a/src/lib/elm_main.c +++ b/src/lib/elm_main.c @@ -1670,65 +1670,6 @@ elm_coords_finger_size_adjust(int times_w, return ret; \ } -EAPI Evas_Object * -elm_object_item_widget_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_wdg_item_widget_get()); -} - -EAPI void -elm_object_item_part_content_set(Elm_Object_Item *it, - const char *part, - Evas_Object *content) -{ - eo_do(it, elm_wdg_item_part_content_set(part, content)); -} - -EAPI Evas_Object * -elm_object_item_part_content_get(const Elm_Object_Item *it, - const char *part) -{ - return eo_do(it, elm_wdg_item_part_content_get(part)); -} - -EAPI Evas_Object * -elm_object_item_part_content_unset(Elm_Object_Item *it, const char *part) -{ - return eo_do(it, elm_wdg_item_part_content_unset(part)); -} - -EAPI void -elm_object_item_part_text_set(Elm_Object_Item *it, - const char *part, - const char *label) -{ - eo_do(it, elm_wdg_item_part_text_set(part, label)); -} - -EAPI const char * -elm_object_item_part_text_get(const Elm_Object_Item *it, const char *part) -{ - return eo_do(it, elm_wdg_item_part_text_get(part)); -} - -EAPI void -elm_object_item_domain_translatable_part_text_set(Elm_Object_Item *it, const char *part, const char *domain, const char *text) -{ - eo_do(it, elm_wdg_item_domain_translatable_part_text_set(part, domain, text)); -} - -EAPI const char * -elm_object_item_translatable_part_text_get(const Elm_Object_Item *it, const char *part) -{ - return eo_do(it, elm_wdg_item_translatable_part_text_get(part)); -} - -EAPI void -elm_object_item_domain_part_text_translatable_set(Elm_Object_Item *it, const char *part, const char *domain, Eina_Bool translatable) -{ - eo_do(it, elm_wdg_item_domain_part_text_translatable_set(part, domain, translatable)); -} - EAPI void elm_object_access_info_set(Evas_Object *obj, const char *txt) { @@ -1760,220 +1701,3 @@ elm_object_focused_item_get(const Evas_Object *obj) return elm_widget_focused_item_get(obj); } -EAPI void -elm_object_item_access_info_set(Elm_Object_Item *it, const char *txt) -{ - eo_do(it, elm_wdg_item_access_info_set(txt)); -} - -EAPI Evas_Object * -elm_object_item_access_register(Elm_Object_Item *item) -{ - return eo_do(item, elm_wdg_item_access_register()); -} - -EAPI void -elm_object_item_access_unregister(Elm_Object_Item *item) -{ - eo_do(item, elm_wdg_item_access_unregister()); -} - -EAPI Evas_Object * -elm_object_item_access_object_get(const Elm_Object_Item *item) -{ - return eo_do(item, elm_wdg_item_access_object_get()); -} - -EAPI void -elm_object_item_access_order_set(Elm_Object_Item *item, Eina_List *objs) -{ - eo_do(item, elm_wdg_item_access_order_set(objs)); -} - -EAPI const Eina_List * -elm_object_item_access_order_get(const Elm_Object_Item *item) -{ - return eo_do(item, elm_wdg_item_access_order_get()); -} - -EAPI void -elm_object_item_access_order_unset(Elm_Object_Item *item) -{ - eo_do(item, elm_wdg_item_access_order_unset()); -} - -EAPI void * -elm_object_item_data_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_wdg_item_data_get()); -} - -EAPI void -elm_object_item_data_set(Elm_Object_Item *it, void *data) -{ - eo_do(it, elm_wdg_item_data_set(data)); -} - -EAPI void -elm_object_item_signal_emit(Elm_Object_Item *it, const char *emission, const char *source) -{ - eo_do(it, elm_wdg_item_signal_emit(emission, source)); -} - -EAPI void -elm_object_item_signal_callback_add(Elm_Object_Item *it, const char *emission, const char *source, Elm_Object_Item_Signal_Cb func, void *data) -{ - eo_do(it, elm_wdg_item_signal_callback_add(emission, source, func, data)); -} - -EAPI void * -elm_object_item_signal_callback_del(Elm_Object_Item *it, const char *emission, const char *source, Elm_Object_Item_Signal_Cb func) -{ - return eo_do(it, elm_wdg_item_signal_callback_del(emission, source, func)); -} - -EAPI void -elm_object_item_style_set(Elm_Object_Item *it, const char *style) -{ - eo_do(it, elm_wdg_item_style_set(style)); -} - -EAPI const char * -elm_object_item_style_get(Elm_Object_Item *it) -{ - return eo_do(it, elm_wdg_item_style_get()); -} - -EAPI void elm_object_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled) -{ - eo_do(it, elm_wdg_item_disabled_set(disabled)); -} - -EAPI Eina_Bool elm_object_item_disabled_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_wdg_item_disabled_get()); -} - -EAPI void elm_object_item_del_cb_set(Elm_Object_Item *it, Evas_Smart_Cb del_cb) -{ - eo_do(it, elm_wdg_item_del_cb_set(del_cb)); -} - -EAPI void elm_object_item_del(Elm_Object_Item *it) -{ - eo_do(it, elm_wdg_item_del()); -} - -EAPI void -elm_object_item_tooltip_text_set(Elm_Object_Item *it, const char *text) -{ - eo_do(it, elm_wdg_item_tooltip_text_set(text)); -} - -EAPI void -elm_object_item_tooltip_content_cb_set(Elm_Object_Item *it, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb) -{ - eo_do(it, elm_wdg_item_tooltip_content_cb_set(func, data, del_cb)); -} - -EAPI void -elm_object_item_tooltip_unset(Elm_Object_Item *it) -{ - eo_do(it, elm_wdg_item_tooltip_unset()); -} - -EAPI Eina_Bool -elm_object_item_tooltip_window_mode_set(Elm_Object_Item *it, Eina_Bool disable) -{ - return eo_do(it, elm_wdg_item_tooltip_window_mode_set(disable)); -} - -EAPI Eina_Bool -elm_object_item_tooltip_window_mode_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_wdg_item_tooltip_window_mode_get()); -} - -EAPI void -elm_object_item_tooltip_style_set(Elm_Object_Item *it, const char *style) -{ - eo_do(it, elm_wdg_item_tooltip_style_set(style)); -} - -EAPI const char * -elm_object_item_tooltip_style_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_wdg_item_tooltip_style_get()); -} - -EAPI void -elm_object_item_cursor_set(Elm_Object_Item *it, const char *cursor) -{ - eo_do(it, elm_wdg_item_cursor_set(cursor)); -} - -EAPI const char * -elm_object_item_cursor_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_wdg_item_cursor_get()); -} - -EAPI void -elm_object_item_cursor_unset(Elm_Object_Item *it) -{ - eo_do(it, elm_wdg_item_cursor_unset()); -} - -EAPI void -elm_object_item_cursor_style_set(Elm_Object_Item *it, const char *style) -{ - eo_do(it, elm_wdg_item_cursor_style_set(style)); -} - -EAPI const char * -elm_object_item_cursor_style_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_wdg_item_cursor_style_get()); -} - -EAPI void -elm_object_item_cursor_engine_only_set(Elm_Object_Item *it, Eina_Bool engine_only) -{ - eo_do(it, elm_wdg_item_cursor_engine_only_set(engine_only)); -} - -EAPI Eina_Bool -elm_object_item_cursor_engine_only_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_wdg_item_cursor_engine_only_get()); -} - -EAPI Evas_Object * -elm_object_item_track(Elm_Object_Item *it) -{ - return eo_do(it, elm_wdg_item_track()); -} - -void -elm_object_item_untrack(Elm_Object_Item *it) -{ - eo_do(it, elm_wdg_item_untrack()); -} - -int -elm_object_item_track_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_wdg_item_track_get()); -} - -EAPI void -elm_object_item_focus_set(Elm_Object_Item *item, Eina_Bool focused) -{ - eo_do(item, elm_wdg_item_focus_set(focused)); -} - -EAPI Eina_Bool -elm_object_item_focus_get(const Elm_Object_Item *item) -{ - return eo_do(item, elm_wdg_item_focus_get()); -} diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c index a33e738c0..010f033ac 100644 --- a/src/lib/elm_menu.c +++ b/src/lib/elm_menu.c @@ -887,12 +887,6 @@ _elm_menu_close(Eo *obj, Elm_Menu_Data *sd) _menu_hide(obj, sd->hv, NULL); } -EAPI Evas_Object * -elm_menu_item_object_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_menu_item_object_get()); -} - EOLIAN static Evas_Object * _elm_menu_item_object_get(Eo *eo_it EINA_UNUSED, Elm_Menu_Item_Data *it) { @@ -1038,25 +1032,12 @@ _elm_menu_item_add(Eo *obj, Elm_Menu_Data *sd, Elm_Object_Item *parent, const ch return eo_item; } -EAPI unsigned int -elm_menu_item_index_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_menu_item_index_get()); -} - EOLIAN static unsigned int _elm_menu_item_index_get(Eo *eo_it EINA_UNUSED, Elm_Menu_Item_Data *it) { return it->idx; } -EAPI void -elm_menu_item_icon_name_set(Elm_Object_Item *it, - const char *icon) -{ - eo_do(it, elm_obj_menu_item_icon_name_set(icon)); -} - EOLIAN static void _elm_menu_item_icon_name_set(Eo *eo_item EINA_UNUSED, Elm_Menu_Item_Data *item, @@ -1129,48 +1110,24 @@ _elm_menu_item_separator_add(Eo *obj, Elm_Menu_Data *sd, Elm_Object_Item *eo_p_i return eo_subitem; } -EAPI const char * -elm_menu_item_icon_name_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_menu_item_icon_name_get()); -} - EOLIAN static const char * _elm_menu_item_icon_name_get(Eo *eo_item EINA_UNUSED, Elm_Menu_Item_Data *item) { return item->icon_str; } -EAPI Eina_Bool -elm_menu_item_is_separator(Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_menu_item_is_separator()); -} - EOLIAN static Eina_Bool _elm_menu_item_is_separator(Eo *eo_item EINA_UNUSED, Elm_Menu_Item_Data *item) { return item->separator; } -EAPI const Eina_List * -elm_menu_item_subitems_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_menu_item_subitems_get()); -} - EOLIAN static const Eina_List * _elm_menu_item_subitems_get(Eo *eo_item EINA_UNUSED, Elm_Menu_Item_Data *item) { return item->submenu.items; } -EAPI void -elm_menu_item_subitems_clear(Elm_Object_Item *it) -{ - eo_do(it, elm_obj_menu_item_subitems_clear()); -} - EOLIAN static void _elm_menu_item_subitems_clear(Eo *eo_item EINA_UNUSED, Elm_Menu_Item_Data *it) { @@ -1188,13 +1145,6 @@ _elm_menu_items_get(Eo *obj EINA_UNUSED, Elm_Menu_Data *sd) return sd->items; } -EAPI void -elm_menu_item_selected_set(Elm_Object_Item *it, - Eina_Bool selected) -{ - eo_do(it, elm_obj_menu_item_selected_set(selected)); -} - EOLIAN static void _elm_menu_item_selected_set(Eo *eo_item EINA_UNUSED, Elm_Menu_Item_Data *item, @@ -1215,24 +1165,12 @@ _elm_menu_item_selected_set(Eo *eo_item EINA_UNUSED, edje_object_message_signal_process(elm_layout_edje_get(VIEW(item))); } -EAPI Eina_Bool -elm_menu_item_selected_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_menu_item_selected_get()); -} - EOLIAN static Eina_Bool _elm_menu_item_selected_get(Eo *eo_item EINA_UNUSED, Elm_Menu_Item_Data *item) { return item->selected; } -EAPI Elm_Object_Item * -elm_menu_item_prev_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_menu_item_prev_get()); -} - EOLIAN static Elm_Object_Item * _elm_menu_item_prev_get(Eo *eo_item, Elm_Menu_Item_Data *item) { @@ -1257,12 +1195,6 @@ _elm_menu_item_prev_get(Eo *eo_item, Elm_Menu_Item_Data *item) return NULL; } -EAPI Elm_Object_Item * -elm_menu_item_next_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_menu_item_next_get()); -} - EOLIAN static Elm_Object_Item * _elm_menu_item_next_get(Eo *eo_item, Elm_Menu_Item_Data *item) { diff --git a/src/lib/elm_menu_common.h b/src/lib/elm_menu_common.h index 053fdd550..e69de29bb 100644 --- a/src/lib/elm_menu_common.h +++ b/src/lib/elm_menu_common.h @@ -1,22 +0,0 @@ -EAPI Evas_Object *elm_menu_item_object_get(const Elm_Object_Item *it); - -EAPI void elm_menu_item_icon_name_set(Elm_Object_Item *it, const char *icon); - -EAPI const char *elm_menu_item_icon_name_get(const Elm_Object_Item *it); - -EAPI void elm_menu_item_selected_set(Elm_Object_Item *it, Eina_Bool selected); - -EAPI Eina_Bool elm_menu_item_selected_get(const Elm_Object_Item *it); - -EAPI Eina_Bool elm_menu_item_is_separator(Elm_Object_Item *it); - -EAPI const Eina_List *elm_menu_item_subitems_get(const Elm_Object_Item *it); - -EAPI void elm_menu_item_subitems_clear(Elm_Object_Item *it); - -EAPI unsigned int elm_menu_item_index_get(const Elm_Object_Item *it); - -EAPI Elm_Object_Item *elm_menu_item_next_get(const Elm_Object_Item *it); - -EAPI Elm_Object_Item *elm_menu_item_prev_get(const Elm_Object_Item *it); - diff --git a/src/lib/elm_menu_eo.h b/src/lib/elm_menu_eo.h index 091a3a1a1..72aebb339 100644 --- a/src/lib/elm_menu_eo.h +++ b/src/lib/elm_menu_eo.h @@ -1 +1,2 @@ -#include "elm_menu.eo.h"
\ No newline at end of file +#include "elm_menu_item.eo.h" +#include "elm_menu.eo.h" diff --git a/src/lib/elm_menu_item.eo b/src/lib/elm_menu_item.eo index 6ead94185..92eda7543 100644 --- a/src/lib/elm_menu_item.eo +++ b/src/lib/elm_menu_item.eo @@ -1,6 +1,5 @@ class Elm_Menu_Item(Elm_Widget_Item) { - legacy_prefix: null; eo_prefix: elm_obj_menu_item; properties { icon_name { diff --git a/src/lib/elm_menu_legacy.h b/src/lib/elm_menu_legacy.h index ada62850d..a575de8fe 100644 --- a/src/lib/elm_menu_legacy.h +++ b/src/lib/elm_menu_legacy.h @@ -30,4 +30,5 @@ EAPI void elm_menu_parent_set(Evas_Object *obj, Evas_Obj */ EAPI Evas_Object *elm_menu_parent_get(const Evas_Object *obj); -#include "elm_menu.eo.legacy.h"
\ No newline at end of file +#include "elm_menu_item.eo.legacy.h" +#include "elm_menu.eo.legacy.h" diff --git a/src/lib/elm_multibuttonentry_item.eo b/src/lib/elm_multibuttonentry_item.eo index a4e2df1e0..2e42fc8f0 100644 --- a/src/lib/elm_multibuttonentry_item.eo +++ b/src/lib/elm_multibuttonentry_item.eo @@ -1,6 +1,5 @@ class Elm_Multibuttonentry_Item(Elm_Widget_Item) { - legacy_prefix: null; eo_prefix: elm_obj_multibuttonentry_item; properties { selected { diff --git a/src/lib/elm_naviframe_item.eo b/src/lib/elm_naviframe_item.eo index eede071af..e84b5b941 100644 --- a/src/lib/elm_naviframe_item.eo +++ b/src/lib/elm_naviframe_item.eo @@ -1,6 +1,5 @@ class Elm_Naviframe_Item(Elm_Widget_Item) { - legacy_prefix: null; eo_prefix: elm_obj_naviframe_item; properties { style { diff --git a/src/lib/elm_object_item.h b/src/lib/elm_object_item.h index 3e6aadc4b..5846130b6 100644 --- a/src/lib/elm_object_item.h +++ b/src/lib/elm_object_item.h @@ -21,80 +21,16 @@ typedef Eo Elm_Object_Item; */ typedef void (*Elm_Object_Item_Signal_Cb)(void *data, Elm_Object_Item *it, const char *emission, const char *source); -/** - * Get the widget object's handle which contains a given item - * - * @param it The Elementary object item - * @return The widget object - * - * @note This returns the widget object itself that an item belongs to. - * @note Every elm_object_item supports this API - * @ingroup General - */ -EAPI Evas_Object *elm_object_item_widget_get(const Elm_Object_Item *it); - -/** - * Set a content of an object item - * - * @param it The Elementary object item - * @param part The content part name to set (NULL for the default content) - * @param content The new content of the object item - * - * This sets a new object to an item as a content object. If any object was - * already set as a content object in the same part, previous object will be - * deleted automatically. - * - * @note Elementary object items may have many contents - * - * @ingroup General - */ -EAPI void elm_object_item_part_content_set(Elm_Object_Item *it, const char *part, Evas_Object *content); +#include "elm_widget_item.eo.h" +#include "elm_widget_item.eo.legacy.h" #define elm_object_item_content_set(it, content) elm_object_item_part_content_set((it), NULL, (content)) -/** - * Get a content of an object item - * - * @param it The Elementary object item - * @param part The content part name to unset (NULL for the default content) - * @return content of the object item or NULL for any error - * - * @note Elementary object items may have many contents - * - * @ingroup General - */ -EAPI Evas_Object *elm_object_item_part_content_get(const Elm_Object_Item *it, const char *part); - #define elm_object_item_content_get(it) elm_object_item_part_content_get((it), NULL) -/** - * Unset a content of an object item - * - * @param it The Elementary object item - * @param part The content part name to unset (NULL for the default content) - * - * @note Elementary object items may have many contents - * - * @ingroup General - */ -EAPI Evas_Object *elm_object_item_part_content_unset(Elm_Object_Item *it, const char *part); - #define elm_object_item_content_unset(it) elm_object_item_part_content_unset((it), NULL) /** - * Set a label of an object item - * - * @param it The Elementary object item - * @param part The text part name to set (NULL for the default label) - * @param label The new text of the label - * - * @note Elementary object items may have many labels - * - * @ingroup General - */ -EAPI void elm_object_item_part_text_set(Elm_Object_Item *it, const char *part, const char *label); - -/** * Macro to set a label of an object item. * * @param it The Elementary object item. @@ -106,647 +42,18 @@ EAPI void elm_object_item_part_text_set(Elm_Object_Item */ #define elm_object_item_text_set(it, label) elm_object_item_part_text_set((it), NULL, (label)) -/** - * Get a label of an object item - * - * @param it The Elementary object item - * @param part The text part name to get (NULL for the default label) - * @return text of the label or NULL for any error - * - * @note Elementary object items may have many labels - * - * @ingroup General - */ -EAPI const char *elm_object_item_part_text_get(const Elm_Object_Item *it, const char *part); - #define elm_object_item_text_get(it) elm_object_item_part_text_get((it), NULL) -/** - * Set the text for an object item's part, marking it as translatable. - * - * The string to set as @p text must be the original one. Do not pass the - * return of @c gettext() here. Elementary will translate the string - * internally and set it on the object item using - * elm_object_item_part_text_set(), also storing the original string so that it - * can be automatically translated when the language is changed with - * elm_language_set(). The @p domain will be stored along to find the - * translation in the correct catalog. It can be NULL, in which case it will use - * whatever domain was set by the application with @c textdomain(). This is - * useful in case you are building a library on top of Elementary that will have - * its own translatable strings, that should not be mixed with those of programs - * using the library. - * - * @param it The object item containing the text part - * @param part The name of the part to set - * @param domain The translation domain to use - * @param text The original, non-translated text to set - * - * @ingroup General - * @since 1.8 - */ -EAPI void elm_object_item_domain_translatable_part_text_set(Elm_Object_Item *it, const char *part, const char *domain, const char *text); - #define elm_object_item_domain_translatable_text_set(it, domain, text) elm_object_item_domain_translatable_part_text_set((it), NULL, (domain), (text)) #define elm_object_item_translatable_text_set(it, text) elm_object_item_domain_translatable_part_text_set((it), NULL, NULL, (text)) #define elm_object_item_translatable_part_text_set(it, part, text) elm_object_item_domain_translatable_part_text_set((it), (part), NULL, (text)) -/** - * Get the original string set as translatable for an object item. - * - * When setting translated strings, the function elm_object_item_part_text_get() - * will return the translation returned by @c gettext(). To get the original - * string use this function. - * - * @param it The object item. - * @param part The name of the part that was set - * - * @return The original, untranslated string - * - * @ingroup General - * @since 1.8 - */ -EAPI const char *elm_object_item_translatable_part_text_get(const Elm_Object_Item *it, const char *part); - #define elm_object_item_translatable_text_get(it) elm_object_item_translatable_part_text_get((it), NULL) -/** - * Mark the part text to be translatable or not. - * - * Once you mark the part text to be translatable, the text will be translated - * internally regardless of elm_object_item_part_text_set() and - * elm_object_item_domain_translatable_part_text_set(). In other case, if you - * set the Elementary policy that all text will be translatable in default, you - * can set the part text to not be translated by calling this API. - * - * @param it The object item containing the text part - * @param part The part name of the translatable text - * @param domain The translation domain to use - * @param translatable @c EINA_TRUE, the part text will be translated - * internally. @c EINA_FALSE, otherwise. - * - * @see elm_object_item_domain_translatable_part_text_set() - * @see elm_object_item_part_text_set() - * @see elm_policy() - * - * @since 1.8 - * - * @ingroup General - */ -EAPI void elm_object_item_domain_part_text_translatable_set(Elm_Object_Item *it, const char *part, const char *domain, Eina_Bool translatable); - #define elm_object_item_part_text_translatable_set(it, part, translatable) elm_object_item_domain_part_text_translatable_set((it), (part), NULL, (translatable)) #define elm_object_item_domain_text_translatable_set(it, domain, translatable) elm_object_item_domain_part_text_translatable_set((it), NULL, (domain), (translatable)) #define elm_object_item_text_translatable_set(it, translatable) elm_object_item_domain_part_text_translatable_set((it), NULL, NULL, (translatable)) - -/** - * Set the text to read out when in accessibility mode - * - * @param it The object item which is to be described - * @param txt The text that describes the widget to people with poor or no vision - * - * @ingroup General - */ -EAPI void elm_object_item_access_info_set(Elm_Object_Item *it, const char *txt); - -/** - * @brief Register object item as an accessible object. - * @since 1.8 - * - * @param item The elementary object item - * @return Accessible object of the object item or NULL for any error - * - * @ingroup General - */ -EAPI Evas_Object *elm_object_item_access_register(Elm_Object_Item *item); - -/** - * @brief Unregister accessible object of the object item. - * @since 1.8 - * - * @param item The elementary object item - * - * @ingroup General - */ -EAPI void elm_object_item_access_unregister(Elm_Object_Item *item); - -/** - * @brief Get an accessible object of the object item. - * @since 1.8 - * - * @param item The elementary object item - * @return Accessible object of the object item or NULL for any error - * - * @ingroup General - */ -EAPI Evas_Object *elm_object_item_access_object_get(const Elm_Object_Item *item); - -/** - * @brief Set highlight order - * @since 1.8 - * - * @param item The container object item - * @param objs Order of objects to pass highlight - * - * @ingroup General - */ -EAPI void elm_object_item_access_order_set(Elm_Object_Item *item, Eina_List *objs); - -/** - * @brief Get highlight order - * @since 1.8 - * - * @param item The container object item - * @return Order of objects to pass highlight - * - * @ingroup General - */ -EAPI const Eina_List *elm_object_item_access_order_get(const Elm_Object_Item *item); - -/** - * @brief Unset highlight order - * @since 1.8 - * - * @param item The container object item - * - * @ingroup General - */ -EAPI void elm_object_item_access_order_unset(Elm_Object_Item *item); - -/** - * Get the data associated with an object item - * @param it The Elementary object item - * @return The data associated with @p it - * - * @note Every elm_object_item supports this API - * @ingroup General - */ -EAPI void *elm_object_item_data_get(const Elm_Object_Item *it); - -/** - * Set the data associated with an object item - * @param it The Elementary object item - * @param data The data to be associated with @p it - * - * @note Every elm_object_item supports this API - * @ingroup General - */ -EAPI void elm_object_item_data_set(Elm_Object_Item *it, void *data); - -/** - * Send a signal to the edje object of the widget item. - * - * This function sends a signal to the edje object of the obj item. An - * edje program can respond to a signal by specifying matching - * 'signal' and 'source' fields. - * - * @param it The Elementary object item - * @param emission The signal's name. - * @param source The signal's source. - * @ingroup General - */ -EAPI void elm_object_item_signal_emit(Elm_Object_Item *it, const char *emission, const char *source); - -/** - * Add a callback for a signal emitted by object item edje. - * - * This function connects a callback function to a signal emitted by the - * edje object of the object item. - * Globs can occur in either the emission or source name. - * - * @param it The elementary object item - * @param emission The signal's name. - * @param source The signal's source. - * @param func The callback function to be executed when the signal is - * emitted. - * @param data A pointer to data to pass to the callback function. - * @since 1.8 - * - * @ingroup General - */ -EAPI void elm_object_item_signal_callback_add(Elm_Object_Item *it, const char *emission, const char *source, Elm_Object_Item_Signal_Cb func, void *data); - -/** - * Remove a signal-triggered callback from a object item edje object. - * - * @param it The elementary object item - * @param emission The signal's name. - * @param source The signal's source. - * @param func The callback function to be executed when the signal is - * emitted. - * @return The data pointer of the signal callback or @c NULL, on - * errors. - * - * This function removes the @b last callback, previously attached to - * a signal emitted by an underlying Edje object of @a it, whose - * parameters @a emission, @a source and @c func match exactly with - * those passed to a previous call to - * elm_object_item_signal_callback_add(). The data pointer that was passed - * to this call will be returned. - * - * @see elm_object_item_signal_callback_add() - * @since 1.8 - * - * @ingroup General - */ -EAPI void *elm_object_item_signal_callback_del(Elm_Object_Item *it, const char *emission, const char *source, Elm_Object_Item_Signal_Cb func); - -/** - * Set the disabled state of an widget item. - * - * @param it The Elementary object item - * @param disabled The state to put in in: @c EINA_TRUE for - * disabled, @c EINA_FALSE for enabled - * - * Elementary object item can be @b disabled, in which state they won't - * receive input and, in general, will be themed differently from - * their normal state, usually greyed out. Useful for contexts - * where you don't want your users to interact with some of the - * parts of you interface. - * - * This sets the state for the widget item, either disabling it or - * enabling it back. - * - * @ingroup Styles - */ -EAPI void elm_object_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled); - -/** - * Get the disabled state of an widget item. - * - * @param it The Elementary object item - * @return @c EINA_TRUE, if the widget item is disabled, @c EINA_FALSE - * if it's enabled (or on errors) - * - * This gets the state of the widget, which might be enabled or disabled. - * - * @ingroup Styles - */ -EAPI Eina_Bool elm_object_item_disabled_get(const Elm_Object_Item *it); - -/** - * @brief Set the function to be called when an item from the widget is - * freed. - * - * @param it The item to set the callback on - * @param del_cb The function called - * - * That function will receive these parameters: - * @li void * item data - * @li Evas_Object * widget object - * @li Elm_Object_Item * widget item - * - * @note Every elm_object_item supports this API - * - * @see elm_object_item_del() - * @ingroup General - */ -EAPI void elm_object_item_del_cb_set(Elm_Object_Item *it, Evas_Smart_Cb del_cb); - -/** - * Delete the given item. - * - * @param it The item to be deleted. - * - * @ingroup General - */ -EAPI void elm_object_item_del(Elm_Object_Item *it); - -/** - * Set the text to be shown in a given object item's tooltips. - * - * @param it Target item. - * @param text The text to set in the content. - * - * Setup the text as tooltip to object. The item can have only one tooltip, - * so any previous tooltip data - set with this function or - * elm_object_item_tooltip_content_cb_set() - is removed. - * - * @see elm_object_tooltip_text_set() for more details. - * - * @ingroup General - */ -EAPI void elm_object_item_tooltip_text_set(Elm_Object_Item *it, const char *text); - -/** - * @brief Disable size restrictions on an object's tooltip - * @param it The tooltip's anchor object - * @param disable If @c EINA_TRUE, size restrictions are disabled - * @return @c EINA_FALSE on failure, @c EINA_TRUE on success - * - * This function allows a tooltip to expand beyond its parent window's canvas. - * It will instead be limited only by the size of the display. - */ -EAPI Eina_Bool elm_object_item_tooltip_window_mode_set(Elm_Object_Item *it, Eina_Bool disable); - -/** - * @brief Retrieve size restriction state of an object's tooltip - * @param it The tooltip's anchor object - * @return If @c EINA_TRUE, size restrictions are disabled - * - * This function returns whether a tooltip is allowed to expand beyond - * its parent window's canvas. - * It will instead be limited only by the size of the display. - */ -EAPI Eina_Bool elm_object_item_tooltip_window_mode_get(const Elm_Object_Item *it); - -/** - * Set the content to be shown in the tooltip item. - * - * Setup the tooltip to item. The item can have only one tooltip, - * so any previous tooltip data is removed. @p func(with @p data) will - * be called every time that need show the tooltip and it should - * return a valid Evas_Object. This object is then managed fully by - * tooltip system and is deleted when the tooltip is gone. - * - * @param it the object item being attached a tooltip. - * @param func the function used to create the tooltip contents. - * @param data what to provide to @a func as callback data/context. - * @param del_cb called when data is not needed anymore, either when - * another callback replaces @a func, the tooltip is unset with - * elm_object_item_tooltip_unset() or the owner @a item - * dies. This callback receives as the first parameter the - * given @a data, and @p event_info is the item. - * - * @see elm_object_tooltip_content_cb_set() for more details. - * - * @ingroup General - */ -EAPI void elm_object_item_tooltip_content_cb_set(Elm_Object_Item *it, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb); - -/** - * Unset tooltip from item. - * - * @param it object item to remove previously set tooltip. - * - * Remove tooltip from item. The callback provided as del_cb to - * elm_object_item_tooltip_content_cb_set() will be called to notify - * it is not used anymore. - * - * @see elm_object_tooltip_unset() for more details. - * @see elm_object_item_tooltip_content_cb_set() - * - * @ingroup General - */ -EAPI void elm_object_item_tooltip_unset(Elm_Object_Item *it); - -/** - * Sets a different style for this item tooltip. - * - * @note before you set a style you should define a tooltip with - * elm_object_item_tooltip_content_cb_set() or - * elm_object_item_tooltip_text_set() - * - * @param it object item with tooltip already set. - * @param style the theme style to use (default, transparent, ...) - * - * @see elm_object_tooltip_style_set() for more details. - * - * @ingroup General - */ -EAPI void elm_object_item_tooltip_style_set(Elm_Object_Item *it, const char *style); - -/** - * Get the style for this item tooltip. - * - * @param it object item with tooltip already set. - * @return style the theme style in use, defaults to "default". If the - * object does not have a tooltip set, then NULL is returned. - * - * @see elm_object_tooltip_style_get() for more details. - * @see elm_object_item_tooltip_style_set() - * - * @ingroup General - */ -EAPI const char *elm_object_item_tooltip_style_get(const Elm_Object_Item *it); - -/** - * Set the type of mouse pointer/cursor decoration to be shown, - * when the mouse pointer is over the given item - * - * @param it item to customize cursor on - * @param cursor the cursor type's name - * - * This function works analogously as elm_object_cursor_set(), but - * here the cursor's changing area is restricted to the item's - * area, and not the whole widget's. Note that that item cursors - * have precedence over widget cursors, so that a mouse over an - * item with custom cursor set will always show @b that cursor. - * - * If this function is called twice for an object, a previously set - * cursor will be unset on the second call. - * - * @see elm_object_cursor_set() - * @see elm_object_item_cursor_get() - * @see elm_object_item_cursor_unset() - * - * @ingroup General - */ -EAPI void elm_object_item_cursor_set(Elm_Object_Item *it, const char *cursor); - -/* - * Get the type of mouse pointer/cursor decoration set to be shown, - * when the mouse pointer is over the given item - * - * @param it item with custom cursor set - * @return the cursor type's name or @c NULL, if no custom cursors - * were set to @p item (and on errors) - * - * @see elm_object_cursor_get() - * @see elm_object_item_cursor_set() - * @see elm_object_item_cursor_unset() - * - * @ingroup General - */ -EAPI const char *elm_object_item_cursor_get(const Elm_Object_Item *it); - -/** - * Unset any custom mouse pointer/cursor decoration set to be - * shown, when the mouse pointer is over the given - * item, thus making it show the @b default cursor again. - * - * @param it the item - * - * Use this call to undo any custom settings on this item's cursor - * decoration, bringing it back to defaults (no custom style set). - * - * @see elm_object_cursor_unset() - * @see elm_object_item_cursor_set() - * - * @ingroup General - */ -EAPI void elm_object_item_cursor_unset(Elm_Object_Item *it); - -/** - * Set a different @b style for a given custom cursor set for an - * item. - * - * @param it item with custom cursor set - * @param style the <b>theme style</b> to use (e.g. @c "default", - * @c "transparent", etc) - * - * This function only makes sense when one is using custom mouse - * cursor decorations <b>defined in a theme file</b>, which can have, - * given a cursor name/type, <b>alternate styles</b> on it. It - * works analogously as elm_object_cursor_style_set(), but here - * applies only to item objects. - * - * @warning Before you set a cursor style you should have defined a - * custom cursor previously on the item, with - * elm_object_item_cursor_set() - * - * @see elm_object_item_cursor_engine_only_set() - * @see elm_object_item_cursor_style_get() - * - * @ingroup General - */ -EAPI void elm_object_item_cursor_style_set(Elm_Object_Item *it, const char *style); - -/** - * Get the current @b style set for a given item's custom - * cursor - * - * @param it item with custom cursor set. - * @return style the cursor style in use. If the object does not - * have a cursor set, then @c NULL is returned. - * - * @see elm_object_item_cursor_style_set() for more details - * - * @ingroup General - */ -EAPI const char *elm_object_item_cursor_style_get(const Elm_Object_Item *it); - -/** - * Set if the (custom)cursor for a given item should be - * searched in its theme, also, or should only rely on the - * rendering engine. - * - * @param it item with custom (custom) cursor already set on - * @param engine_only Use @c EINA_TRUE to have cursors looked for - * only on those provided by the rendering engine, @c EINA_FALSE to - * have them searched on the widget's theme, as well. - * - * @note This call is of use only if you've set a custom cursor - * for items, with elm_object_item_cursor_set(). - * - * @note By default, cursors will only be looked for between those - * provided by the rendering engine. - * - * @ingroup General - */ -EAPI void elm_object_item_cursor_engine_only_set(Elm_Object_Item *it, Eina_Bool engine_only); - -/** - * Get if the (custom) cursor for a given item is being - * searched in its theme, also, or is only relying on the rendering - * engine. - * - * @param it an object item - * @return @c EINA_TRUE, if cursors are being looked for only on - * those provided by the rendering engine, @c EINA_FALSE if they - * are being searched on the widget's theme, as well. - * - * @see elm_object_item_cursor_engine_only_set(), for more details - * - * @ingroup General - */ -EAPI Eina_Bool elm_object_item_cursor_engine_only_get(const Elm_Object_Item *it); - -/** - * This returns track object of the item. - * - * @param it The Elementary Object Item to be tracked. - * @return The track object. - * - * @note This gets a rectangle object that represents the object item's internal - * object. If you wanna check the geometry, visibility of the item, you - * can call the evas apis such as evas_object_geometry_get(), - * evas_object_visible_get() to the track object. Note that all of the - * widget items may/may not have the internal object so this api may - * return @c NULL if the widget item doesn't have it. Additionally, the - * widget item is managed/controlled by the widget, the widget item could - * be changed(moved, resized even deleted) anytime by it's own widget's - * decision. So please dont' change the track object as well as don't - * keep the track object in your side as possible but get the track object - * at the moment you need to refer. Otherwise, you need to add some - * callbacks to the track object to track it's attributes changes. - * - * @warning After use the track object, please call the - * elm_object_item_untrack() paired to elm_object_item_track() - * definitely to free the track object properly. Don't delete the - * track object. - * - * @see elm_object_item_untrack() - * @see elm_object_item_track_get() - * - * @since 1.8 - * - * @ingroup General - */ -EAPI Evas_Object *elm_object_item_track(Elm_Object_Item *it); - -/** - * This retrieve the track object of the item. - * - * @param it The Elementary Object Item that returned track object. - * - * @note This retrieves the track object that was returned from - * elm_object_item_track(). - * - * @see elm_object_item_track() - * @see elm_object_item_track_get() - * - * @since 1.8 - * - * @ingroup General - */ -EAPI void elm_object_item_untrack(Elm_Object_Item *it); - -/** - * Get the track object reference count. - * - * @param it The Elementary Object Item that returned track object. - * - * @note This gets the reference count for the track object. Whenever you call - * the elm_object_item_track(), the reference count will be increased by - * one. Likely the referece count will be decreased again when you call - * the elm_object_item_untrack(). Unless the reference count reaches to - * zero, the track object won't be deleted. So please be sure to call - * elm_object_item_untrack() paired to the elm_object_item_track() call - * count. - * - * @see elm_object_item_track() - * @see elm_object_item_track_get() - * - * @since 1.8 - * - * @ingroup General - */ -EAPI int elm_object_item_track_get(const Elm_Object_Item *it); - -/** - * Set a style of an object item - * - * @param it The Elementary object item - * @param part The style - * - * @since 1.9 - * - * @ingroup General - */ -EAPI void elm_object_item_style_set(Elm_Object_Item *it, const char *part); - -/** - * Get the style of an object item - * - * @param it The Elementary object item - * @return The style of object item - * - * @since 1.9 - * - * @ingroup General - */ -EAPI const char *elm_object_item_style_get(Elm_Object_Item *it); diff --git a/src/lib/elm_popup_item.eo b/src/lib/elm_popup_item.eo index 20196773c..cfdc57b5b 100644 --- a/src/lib/elm_popup_item.eo +++ b/src/lib/elm_popup_item.eo @@ -1,6 +1,5 @@ class Elm_Popup_Item(Elm_Widget_Item) { - legacy_prefix: null; eo_prefix: elm_obj_popup_item; implements { Eo.Base.constructor; diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c index d5be57d08..801253c41 100644 --- a/src/lib/elm_segment_control.c +++ b/src/lib/elm_segment_control.c @@ -781,12 +781,6 @@ _elm_segment_control_item_count_get(Eo *obj EINA_UNUSED, Elm_Segment_Control_Dat return eina_list_count(sd->items); } -EAPI Evas_Object * -elm_segment_control_item_object_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_segment_control_item_object_get()); -} - EOLIAN static Evas_Object * _elm_segment_control_item_object_get(Eo *eo_it EINA_UNUSED, Elm_Segment_Control_Item_Data *it) { @@ -799,13 +793,6 @@ _elm_segment_control_item_selected_get(Eo *obj EINA_UNUSED, Elm_Segment_Control_ return EO_OBJ(sd->selected_item); } -EAPI void -elm_segment_control_item_selected_set(Elm_Object_Item *it, - Eina_Bool selected) -{ - eo_do((Eo*)it, elm_obj_segment_control_item_selected_set(selected)); -} - EOLIAN static void _elm_segment_control_item_selected_set(Eo *eo_item EINA_UNUSED, Elm_Segment_Control_Item_Data *item, diff --git a/src/lib/elm_segment_control_common.h b/src/lib/elm_segment_control_common.h index 026836cd9..e69de29bb 100644 --- a/src/lib/elm_segment_control_common.h +++ b/src/lib/elm_segment_control_common.h @@ -1,6 +0,0 @@ -EAPI int elm_segment_control_item_index_get(const Elm_Object_Item *it); - -EAPI Evas_Object *elm_segment_control_item_object_get(const Elm_Object_Item *it); - -EAPI void elm_segment_control_item_selected_set(Elm_Object_Item *it, Eina_Bool select); - diff --git a/src/lib/elm_segment_control_eo.h b/src/lib/elm_segment_control_eo.h index 6631b2beb..3c192e383 100644 --- a/src/lib/elm_segment_control_eo.h +++ b/src/lib/elm_segment_control_eo.h @@ -1 +1,2 @@ -#include "elm_segment_control.eo.h"
\ No newline at end of file +#include "elm_segment_control_item.eo.h" +#include "elm_segment_control.eo.h" diff --git a/src/lib/elm_segment_control_item.eo b/src/lib/elm_segment_control_item.eo index 9d2396578..0d4d7f228 100644 --- a/src/lib/elm_segment_control_item.eo +++ b/src/lib/elm_segment_control_item.eo @@ -1,6 +1,5 @@ class Elm_Segment_Control_Item(Elm_Widget_Item) { - legacy_prefix: null; eo_prefix: elm_obj_segment_control_item; methods { index_get @const { diff --git a/src/lib/elm_segment_control_legacy.h b/src/lib/elm_segment_control_legacy.h index 6b06deef6..ac012ba55 100644 --- a/src/lib/elm_segment_control_legacy.h +++ b/src/lib/elm_segment_control_legacy.h @@ -11,4 +11,5 @@ */ EAPI Evas_Object *elm_segment_control_add(Evas_Object *parent); -#include "elm_segment_control.eo.legacy.h"
\ No newline at end of file +#include "elm_segment_control_item.eo.legacy.h" +#include "elm_segment_control.eo.legacy.h" diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c index 92836e6e2..66015fa77 100644 --- a/src/lib/elm_slideshow.c +++ b/src/lib/elm_slideshow.c @@ -441,12 +441,6 @@ _elm_slideshow_item_sorted_insert(Eo *obj, Elm_Slideshow_Data *sd, const Elm_Sli return eo_item; } -EAPI void -elm_slideshow_item_show(Elm_Object_Item *it) -{ - eo_do(it, elm_obj_slideshow_item_show()); -} - EOLIAN static void _elm_slideshow_item_show(Eo *eo_item EINA_UNUSED, Elm_Slideshow_Item_Data *item) { diff --git a/src/lib/elm_slideshow_common.h b/src/lib/elm_slideshow_common.h index 9c7d9e7ab..d5ca3c26d 100644 --- a/src/lib/elm_slideshow_common.h +++ b/src/lib/elm_slideshow_common.h @@ -18,6 +18,3 @@ struct _Elm_Slideshow_Item_Class } func; }; /**< member definitions of #Elm_Slideshow_Item_Class */ -EAPI void elm_slideshow_item_show(Elm_Object_Item *it); - -EAPI Evas_Object *elm_slideshow_item_object_get(const Elm_Object_Item *it); diff --git a/src/lib/elm_slideshow_eo.h b/src/lib/elm_slideshow_eo.h index 1e598adc1..22021b7f3 100644 --- a/src/lib/elm_slideshow_eo.h +++ b/src/lib/elm_slideshow_eo.h @@ -1 +1,2 @@ -#include "elm_slideshow.eo.h"
\ No newline at end of file +#include "elm_slideshow_item.eo.h" +#include "elm_slideshow.eo.h" diff --git a/src/lib/elm_slideshow_item.eo b/src/lib/elm_slideshow_item.eo index 57e3b9dad..ffe6c59f5 100644 --- a/src/lib/elm_slideshow_item.eo +++ b/src/lib/elm_slideshow_item.eo @@ -1,6 +1,5 @@ class Elm_Slideshow_Item(Elm_Widget_Item) { - legacy_prefix: null; eo_prefix: elm_obj_slideshow_item; methods { show { diff --git a/src/lib/elm_slideshow_legacy.h b/src/lib/elm_slideshow_legacy.h index c56db2367..e5c0dcc36 100644 --- a/src/lib/elm_slideshow_legacy.h +++ b/src/lib/elm_slideshow_legacy.h @@ -11,4 +11,5 @@ */ EAPI Evas_Object *elm_slideshow_add(Evas_Object *parent); -#include "elm_slideshow.eo.legacy.h"
\ No newline at end of file +#include "elm_slideshow_item.eo.legacy.h" +#include "elm_slideshow.eo.legacy.h" diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c index f81a46861..823382de4 100644 --- a/src/lib/elm_toolbar.c +++ b/src/lib/elm_toolbar.c @@ -12,8 +12,6 @@ #include "elm_widget_toolbar.h" #include "els_box.h" -#include "elm_toolbar_item.eo.h" - #define MY_CLASS ELM_TOOLBAR_CLASS #define MY_CLASS_NAME "Elm_Toolbar" @@ -3119,12 +3117,6 @@ _elm_toolbar_last_item_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd) return NULL; } -EAPI Elm_Object_Item * -elm_toolbar_item_next_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_toolbar_item_next_get()); -} - EOLIAN static Elm_Object_Item * _elm_toolbar_item_next_get(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *it) { @@ -3136,12 +3128,6 @@ _elm_toolbar_item_next_get(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *it) else return NULL; } -EAPI Elm_Object_Item * -elm_toolbar_item_prev_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_toolbar_item_prev_get()); -} - EOLIAN static Elm_Object_Item * _elm_toolbar_item_prev_get(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *it) { @@ -3153,13 +3139,6 @@ _elm_toolbar_item_prev_get(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *it) else return NULL; } -EAPI void -elm_toolbar_item_priority_set(Elm_Object_Item *it, - int priority) -{ - eo_do(it, elm_obj_toolbar_item_priority_set(priority)); -} - EOLIAN static void _elm_toolbar_item_priority_set(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item, int priority) { @@ -3168,12 +3147,6 @@ _elm_toolbar_item_priority_set(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *i _resize_cb(WIDGET(item), NULL, NULL, NULL); } -EAPI int -elm_toolbar_item_priority_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_toolbar_item_priority_get()); -} - EOLIAN static int _elm_toolbar_item_priority_get(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item) { @@ -3193,13 +3166,6 @@ _elm_toolbar_item_find_by_label(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd, const return NULL; } -EAPI void -elm_toolbar_item_selected_set(Elm_Object_Item *it, - Eina_Bool selected) -{ - eo_do(it, elm_obj_toolbar_item_selected_set(selected)); -} - EOLIAN static void _elm_toolbar_item_selected_set(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item, Eina_Bool selected) { @@ -3208,12 +3174,6 @@ _elm_toolbar_item_selected_set(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *i else _item_unselect(item); } -EAPI Eina_Bool -elm_toolbar_item_selected_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_toolbar_item_selected_get()); -} - EOLIAN static Eina_Bool _elm_toolbar_item_selected_get(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item) { @@ -3232,13 +3192,6 @@ _elm_toolbar_more_item_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd) return EO_OBJ(sd->more_item); } -EAPI void -elm_toolbar_item_icon_set(Elm_Object_Item *it, - const char *icon) -{ - eo_do(it, elm_obj_toolbar_item_icon_set(icon)); -} - EOLIAN static void _elm_toolbar_item_icon_set(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item, const char *icon) @@ -3265,12 +3218,6 @@ _elm_toolbar_item_icon_set(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item, } } -EAPI const char * -elm_toolbar_item_icon_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_toolbar_item_icon_get()); -} - EOLIAN static const char * _elm_toolbar_item_icon_get(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *it) { @@ -3279,12 +3226,6 @@ _elm_toolbar_item_icon_get(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *it) return it->icon_str; } -EAPI Evas_Object * -elm_toolbar_item_object_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_toolbar_item_object_get()); -} - EOLIAN static Evas_Object * _elm_toolbar_item_object_get(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item) { @@ -3293,12 +3234,6 @@ _elm_toolbar_item_object_get(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *ite return VIEW(item); } -EAPI Evas_Object * -elm_toolbar_item_icon_object_get(Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_toolbar_item_icon_object_get()); -} - EOLIAN static Evas_Object * _elm_toolbar_item_icon_object_get(Eo *eo_it EINA_UNUSED, Elm_Toolbar_Item_Data *it) { @@ -3307,16 +3242,6 @@ _elm_toolbar_item_icon_object_get(Eo *eo_it EINA_UNUSED, Elm_Toolbar_Item_Data * return it->icon; } -EAPI Eina_Bool -elm_toolbar_item_icon_memfile_set(Elm_Object_Item *it, - const void *img, - size_t size, - const char *format, - const char *key) -{ - return eo_do(it, elm_obj_toolbar_item_icon_memfile_set(img, size, format, key)); -} - EOLIAN static Eina_Bool _elm_toolbar_item_icon_memfile_set(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item, const void *img, @@ -3352,14 +3277,6 @@ _elm_toolbar_item_icon_memfile_set(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Dat return EINA_TRUE; } -EAPI Eina_Bool -elm_toolbar_item_icon_file_set(Elm_Object_Item *it, - const char *file, - const char *key) -{ - return eo_do(it, elm_obj_toolbar_item_icon_file_set(file, key)); -} - EOLIAN static Eina_Bool _elm_toolbar_item_icon_file_set(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item, const char *file, @@ -3393,13 +3310,6 @@ _elm_toolbar_item_icon_file_set(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data * return EINA_TRUE; } -EAPI void -elm_toolbar_item_separator_set(Elm_Object_Item *it, - Eina_Bool separator) -{ - eo_do(it, elm_obj_toolbar_item_separator_set(separator)); -} - EOLIAN static void _elm_toolbar_item_separator_set(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item, Eina_Bool separator) @@ -3419,12 +3329,6 @@ _elm_toolbar_item_separator_set(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data * else sd->separator_count--; } -EAPI Eina_Bool -elm_toolbar_item_separator_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_toolbar_item_separator_get()); -} - EOLIAN static Eina_Bool _elm_toolbar_item_separator_get(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *it) { @@ -3565,13 +3469,6 @@ _elm_toolbar_align_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd) return sd->align; } -EAPI void -elm_toolbar_item_menu_set(Elm_Object_Item *it, - Eina_Bool menu) -{ - eo_do(it, elm_obj_toolbar_item_menu_set(menu)); -} - EOLIAN static void _elm_toolbar_item_menu_set(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item, Eina_Bool menu) @@ -3584,12 +3481,6 @@ _elm_toolbar_item_menu_set(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item, else _item_menu_destroy(item); } -EAPI Evas_Object * -elm_toolbar_item_menu_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_toolbar_item_menu_get()); -} - EOLIAN static Evas_Object * _elm_toolbar_item_menu_get(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item) { @@ -3599,16 +3490,6 @@ _elm_toolbar_item_menu_get(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item) return item->o_menu; } -EAPI Elm_Toolbar_Item_State * -elm_toolbar_item_state_add(Elm_Object_Item *it, - const char *icon, - const char *label, - Evas_Smart_Cb func, - const void *data) -{ - return eo_do(it, elm_obj_toolbar_item_state_add(icon, label, func, data)); -} - EOLIAN static Elm_Toolbar_Item_State * _elm_toolbar_item_state_add(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item, const char *icon, @@ -3662,13 +3543,6 @@ error_state_add: return NULL; } -EAPI Eina_Bool -elm_toolbar_item_state_del(Elm_Object_Item *it, - Elm_Toolbar_Item_State *state) -{ - return eo_do(it, elm_obj_toolbar_item_state_del(state)); -} - EOLIAN static Eina_Bool _elm_toolbar_item_state_del(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item, Elm_Toolbar_Item_State *state) @@ -3707,13 +3581,6 @@ _elm_toolbar_item_state_del(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item return EINA_TRUE; } -EAPI Eina_Bool -elm_toolbar_item_state_set(Elm_Object_Item *it, - Elm_Toolbar_Item_State *state) -{ - return eo_do(it, elm_obj_toolbar_item_state_set(state)); -} - EOLIAN static Eina_Bool _elm_toolbar_item_state_set(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item, Elm_Toolbar_Item_State *state) @@ -3772,12 +3639,6 @@ elm_toolbar_item_state_unset(Elm_Object_Item *it) eo_do(it, elm_obj_toolbar_item_state_set(NULL)); } -EAPI Elm_Toolbar_Item_State * -elm_toolbar_item_state_get(const Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_toolbar_item_state_get()); -} - EOLIAN static Elm_Toolbar_Item_State * _elm_toolbar_item_state_get(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item) { @@ -3789,12 +3650,6 @@ _elm_toolbar_item_state_get(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item return eina_list_data_get(item->current_state); } -EAPI Elm_Toolbar_Item_State * -elm_toolbar_item_state_next(Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_toolbar_item_state_next()); -} - EOLIAN static Elm_Toolbar_Item_State * _elm_toolbar_item_state_next(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item) { @@ -3810,12 +3665,6 @@ _elm_toolbar_item_state_next(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *ite return eina_list_data_get(next_state); } -EAPI Elm_Toolbar_Item_State * -elm_toolbar_item_state_prev(Elm_Object_Item *it) -{ - return eo_do(it, elm_obj_toolbar_item_state_prev()); -} - EOLIAN static Elm_Toolbar_Item_State * _elm_toolbar_item_state_prev(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item) { @@ -3933,12 +3782,6 @@ elm_toolbar_reorder_mode_get(const Evas_Object *obj) return sd->reorder_mode; } -EAPI void -elm_toolbar_item_show(Elm_Object_Item *it, Elm_Toolbar_Item_Scrollto_Type type) -{ - eo_do(it, elm_obj_toolbar_item_show(type)); -} - EOLIAN static void _elm_toolbar_item_show(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item, Elm_Toolbar_Item_Scrollto_Type type) @@ -3952,12 +3795,6 @@ _elm_toolbar_item_show(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item, (x, y, w, h)); } -EAPI void -elm_toolbar_item_bring_in(Elm_Object_Item *it, Elm_Toolbar_Item_Scrollto_Type type) -{ - eo_do(it, elm_obj_toolbar_item_bring_in(type)); -} - EOLIAN static void _elm_toolbar_item_bring_in(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item, Elm_Toolbar_Item_Scrollto_Type type) diff --git a/src/lib/elm_toolbar_common.h b/src/lib/elm_toolbar_common.h index 20419e08f..d15a9a24a 100644 --- a/src/lib/elm_toolbar_common.h +++ b/src/lib/elm_toolbar_common.h @@ -41,44 +41,6 @@ typedef enum typedef struct _Elm_Toolbar_Item_State Elm_Toolbar_Item_State; /**< State of a Elm_Toolbar_Item. Can be created with elm_toolbar_item_state_add() and removed with elm_toolbar_item_state_del(). */ -EAPI Elm_Object_Item *elm_toolbar_item_next_get(const Elm_Object_Item *it); - -EAPI Elm_Object_Item *elm_toolbar_item_prev_get(const Elm_Object_Item *it); - -EAPI void elm_toolbar_item_priority_set(Elm_Object_Item *it, int priority); - -EAPI int elm_toolbar_item_priority_get(const Elm_Object_Item *it); - -EAPI Eina_Bool elm_toolbar_item_selected_get(const Elm_Object_Item *it); - -EAPI void elm_toolbar_item_selected_set(Elm_Object_Item *it, Eina_Bool selected); - -EAPI void elm_toolbar_item_icon_set(Elm_Object_Item *it, const char *icon); - -EAPI const char *elm_toolbar_item_icon_get(const Elm_Object_Item *it); - -EAPI Evas_Object *elm_toolbar_item_object_get(const Elm_Object_Item *it); - -EAPI Evas_Object *elm_toolbar_item_icon_object_get(Elm_Object_Item *it); - -EAPI Eina_Bool elm_toolbar_item_icon_memfile_set(Elm_Object_Item *it, const void *img, size_t size, const char *format, const char *key); - -EAPI Eina_Bool elm_toolbar_item_icon_file_set(Elm_Object_Item *it, const char *file, const char *key); - -EAPI void elm_toolbar_item_separator_set(Elm_Object_Item *it, Eina_Bool separator); - -EAPI Eina_Bool elm_toolbar_item_separator_get(const Elm_Object_Item *it); - -EAPI void elm_toolbar_item_menu_set(Elm_Object_Item *it, Eina_Bool menu); - -EAPI Evas_Object *elm_toolbar_item_menu_get(const Elm_Object_Item *it); - -EAPI Elm_Toolbar_Item_State *elm_toolbar_item_state_add(Elm_Object_Item *it, const char *icon, const char *label, Evas_Smart_Cb func, const void *data); - -EAPI Eina_Bool elm_toolbar_item_state_del(Elm_Object_Item *it, Elm_Toolbar_Item_State *state); - -EAPI Eina_Bool elm_toolbar_item_state_set(Elm_Object_Item *it, Elm_Toolbar_Item_State *state); - /** * Unset the state of @p it. * @@ -91,14 +53,3 @@ EAPI Eina_Bool elm_toolbar_item_state_set(Elm_Object_Item *it * @ingroup Toolbar */ EAPI void elm_toolbar_item_state_unset(Elm_Object_Item *it); - -EAPI Elm_Toolbar_Item_State *elm_toolbar_item_state_get(const Elm_Object_Item *it); - -EAPI Elm_Toolbar_Item_State *elm_toolbar_item_state_next(Elm_Object_Item *it); - -EAPI Elm_Toolbar_Item_State *elm_toolbar_item_state_prev(Elm_Object_Item *it); - -EAPI void elm_toolbar_item_show(Elm_Object_Item *it, Elm_Toolbar_Item_Scrollto_Type scrollto); - -EAPI void elm_toolbar_item_bring_in(Elm_Object_Item *it, Elm_Toolbar_Item_Scrollto_Type scrollto); - diff --git a/src/lib/elm_toolbar_eo.h b/src/lib/elm_toolbar_eo.h index 7d3cf2427..8a7c550f3 100644 --- a/src/lib/elm_toolbar_eo.h +++ b/src/lib/elm_toolbar_eo.h @@ -4,6 +4,7 @@ * @{ */ +#include "elm_toolbar_item.eo.h" #include "elm_toolbar.eo.h" /** diff --git a/src/lib/elm_toolbar_item.eo b/src/lib/elm_toolbar_item.eo index 985e4ae8b..b3c910599 100644 --- a/src/lib/elm_toolbar_item.eo +++ b/src/lib/elm_toolbar_item.eo @@ -1,6 +1,5 @@ class Elm_Toolbar_Item(Elm_Widget_Item) { - legacy_prefix: null; eo_prefix: elm_obj_toolbar_item; properties { prev { diff --git a/src/lib/elm_toolbar_legacy.h b/src/lib/elm_toolbar_legacy.h index bc4f76d5d..16d325a3e 100644 --- a/src/lib/elm_toolbar_legacy.h +++ b/src/lib/elm_toolbar_legacy.h @@ -60,4 +60,5 @@ EAPI void elm_toolbar_transverse_expanded_set(Evas_Objec */ EAPI Eina_Bool elm_toolbar_transverse_expanded_get(const Evas_Object *obj); +#include "elm_toolbar_item.eo.legacy.h" #include "elm_toolbar.eo.legacy.h" diff --git a/src/lib/elm_widget_ctxpopup.h b/src/lib/elm_widget_ctxpopup.h index 3db688aa5..12bd9ae39 100644 --- a/src/lib/elm_widget_ctxpopup.h +++ b/src/lib/elm_widget_ctxpopup.h @@ -2,7 +2,6 @@ #define ELM_WIDGET_CTXPOPUP_H #include "elm_widget_layout.h" -#include "elm_ctxpopup_item.eo.h" /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT diff --git a/src/lib/elm_widget_flipselector.h b/src/lib/elm_widget_flipselector.h index f5e06264e..b482feffd 100644 --- a/src/lib/elm_widget_flipselector.h +++ b/src/lib/elm_widget_flipselector.h @@ -8,7 +8,6 @@ * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK * IT AT RUNTIME. */ -#include "elm_flipselector_item.eo.h" /** * @addtogroup Widget diff --git a/src/lib/elm_widget_hoversel.h b/src/lib/elm_widget_hoversel.h index 66da026ae..7e77bb0a3 100644 --- a/src/lib/elm_widget_hoversel.h +++ b/src/lib/elm_widget_hoversel.h @@ -2,7 +2,6 @@ #define ELM_WIDGET_HOVERSEL_H #include "Elementary.h" -#include "elm_hoversel_item.eo.h" #include <Eio.h> diff --git a/src/lib/elm_widget_index.h b/src/lib/elm_widget_index.h index 415ecca1a..7bdba82c7 100644 --- a/src/lib/elm_widget_index.h +++ b/src/lib/elm_widget_index.h @@ -2,8 +2,6 @@ #define ELM_WIDGET_INDEX_H #include "Elementary.h" -#include "elm_index_item.eo.h" - /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT diff --git a/src/lib/elm_widget_item.eo b/src/lib/elm_widget_item.eo index 9faa04638..7d47fe866 100644 --- a/src/lib/elm_widget_item.eo +++ b/src/lib/elm_widget_item.eo @@ -1,7 +1,7 @@ class Elm_Widget_Item(Eo.Base) { - legacy_prefix: null; eo_prefix: elm_wdg_item; + legacy_prefix: elm_object_item; properties { data { get { diff --git a/src/lib/elm_widget_menu.h b/src/lib/elm_widget_menu.h index 3f5f03406..73f6a28be 100644 --- a/src/lib/elm_widget_menu.h +++ b/src/lib/elm_widget_menu.h @@ -8,7 +8,6 @@ * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK * IT AT RUNTIME. */ -#include "elm_menu_item.eo.h" /** * @addtogroup Widget diff --git a/src/lib/elm_widget_multibuttonentry.h b/src/lib/elm_widget_multibuttonentry.h index ba2abde75..5326f2708 100644 --- a/src/lib/elm_widget_multibuttonentry.h +++ b/src/lib/elm_widget_multibuttonentry.h @@ -3,8 +3,6 @@ #include "elm_widget_layout.h" -#include "elm_multibuttonentry_item.eo.h" - /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK diff --git a/src/lib/elm_widget_naviframe.h b/src/lib/elm_widget_naviframe.h index ece815af3..bcfea5b2e 100644 --- a/src/lib/elm_widget_naviframe.h +++ b/src/lib/elm_widget_naviframe.h @@ -2,7 +2,6 @@ #define ELM_WIDGET_NAVIFRAME_H #include "Elementary.h" -#include "elm_naviframe_item.eo.h" /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT diff --git a/src/lib/elm_widget_segment_control.h b/src/lib/elm_widget_segment_control.h index 0fa4b28a8..fcee8a7a9 100644 --- a/src/lib/elm_widget_segment_control.h +++ b/src/lib/elm_widget_segment_control.h @@ -2,7 +2,6 @@ #define ELM_WIDGET_SEGMENT_CONTROL_H #include "Elementary.h" -#include "elm_segment_control_item.eo.h" /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR diff --git a/src/lib/elm_widget_slideshow.h b/src/lib/elm_widget_slideshow.h index 20aa85f87..71e8fddd3 100644 --- a/src/lib/elm_widget_slideshow.h +++ b/src/lib/elm_widget_slideshow.h @@ -2,8 +2,6 @@ #define ELM_WIDGET_SLIDESHOW_H #include "Elementary.h" -#include "elm_slideshow_item.eo.h" - /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT |