diff options
Diffstat (limited to 'src/lib/elementary/elm_slideshow.c')
| -rw-r--r-- | src/lib/elementary/elm_slideshow.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/lib/elementary/elm_slideshow.c b/src/lib/elementary/elm_slideshow.c index dd9d48ef0f..24d82883d8 100644 --- a/src/lib/elementary/elm_slideshow.c +++ b/src/lib/elementary/elm_slideshow.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define EFL_ACCESS_PROTECTED +#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED @@ -131,7 +131,7 @@ _item_realize(Elm_Slideshow_Item_Data *item) if ((!VIEW(item)) && (item->itc->func.get)) { - VIEW(item) = item->itc->func.get(elm_object_item_data_get(EO_OBJ(item)), obj); + VIEW_SET(item, item->itc->func.get(elm_object_item_data_get(EO_OBJ(item)), obj)); item->l_built = eina_list_append(NULL, item); sd->items_built = eina_list_merge(sd->items_built, item->l_built); //FIXME: item could be shown by obj @@ -161,9 +161,9 @@ _item_realize(Elm_Slideshow_Item_Data *item) && (_item_next->itc->func.get)) { ic++; - VIEW(_item_next) = + VIEW_SET(_item_next, _item_next->itc->func.get( - elm_object_item_data_get(EO_OBJ(_item_next)), obj); + elm_object_item_data_get(EO_OBJ(_item_next)), obj)); _item_next->l_built = eina_list_append(NULL, _item_next); sd->items_built = eina_list_merge @@ -193,9 +193,9 @@ _item_realize(Elm_Slideshow_Item_Data *item) && (_item_prev->itc->func.get)) { ic++; - VIEW(_item_prev) = + VIEW_SET(_item_prev, _item_prev->itc->func.get( - elm_object_item_data_get(EO_OBJ(_item_prev)), obj); + elm_object_item_data_get(EO_OBJ(_item_prev)), obj)); _item_prev->l_built = eina_list_append(NULL, _item_prev); sd->items_built = eina_list_merge @@ -376,7 +376,7 @@ _elm_slideshow_efl_object_constructor(Eo *obj, Elm_Slideshow_Data *_pd EINA_UNUS obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_role_set(obj, EFL_ACCESS_ROLE_DOCUMENT_PRESENTATION); + efl_access_object_role_set(obj, EFL_ACCESS_ROLE_DOCUMENT_PRESENTATION); return obj; } @@ -547,13 +547,13 @@ _elm_slideshow_previous(Eo *obj, Elm_Slideshow_Data *sd) } EOLIAN static const Eina_List* -_elm_slideshow_transitions_get(Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd) +_elm_slideshow_transitions_get(const Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd) { return sd->transitions; } EOLIAN static const Eina_List* -_elm_slideshow_layouts_get(Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd) +_elm_slideshow_layouts_get(const Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd) { return sd->layout.list; } @@ -565,7 +565,7 @@ _elm_slideshow_transition_set(Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd, const } EOLIAN static const char* -_elm_slideshow_transition_get(Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd) +_elm_slideshow_transition_get(const Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd) { return sd->transition; } @@ -581,20 +581,20 @@ _elm_slideshow_timeout_set(Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd, double t } EOLIAN static double -_elm_slideshow_timeout_get(Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd) +_elm_slideshow_timeout_get(const Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd) { return sd->timeout; } EOLIAN static void -_elm_slideshow_loop_set(Eo *obj, Elm_Slideshow_Data *sd, Eina_Bool loop) +_elm_slideshow_items_loop_set(Eo *obj, Elm_Slideshow_Data *sd, Eina_Bool loop) { ELM_SLIDESHOW_CHECK(obj); sd->loop = loop; } EOLIAN static const char* -_elm_slideshow_layout_get(Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd) +_elm_slideshow_layout_get(const Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd) { return sd->layout.current; } @@ -614,7 +614,7 @@ _elm_slideshow_layout_set(Eo *obj, Elm_Slideshow_Data *sd, const char *layout) } EOLIAN static Eina_Bool -_elm_slideshow_loop_get(Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd) +_elm_slideshow_items_loop_get(const Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd) { return sd->loop; } @@ -632,13 +632,13 @@ _elm_slideshow_clear(Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd) } EOLIAN static const Eina_List* -_elm_slideshow_items_get(Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd) +_elm_slideshow_items_get(const Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd) { return sd->items; } EOLIAN static Elm_Object_Item* -_elm_slideshow_item_current_get(Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd) +_elm_slideshow_item_current_get(const Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd) { return EO_OBJ(sd->current); } @@ -650,7 +650,7 @@ _elm_slideshow_item_object_get(const Eo *eo_item EINA_UNUSED, Elm_Slideshow_Item } EOLIAN static int -_elm_slideshow_cache_before_get(Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd) +_elm_slideshow_cache_before_get(const Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd) { return sd->count_item_pre_before; } @@ -664,7 +664,7 @@ _elm_slideshow_cache_before_set(Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd, int } EOLIAN static int -_elm_slideshow_cache_after_get(Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd) +_elm_slideshow_cache_after_get(const Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd) { return sd->count_item_pre_after; } @@ -683,7 +683,7 @@ _elm_slideshow_item_nth_get(const Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd, u } EOLIAN static unsigned int -_elm_slideshow_count_get(Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd) +_elm_slideshow_count_get(const Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd) { return eina_list_count(sd->items); } @@ -695,7 +695,7 @@ _elm_slideshow_class_constructor(Efl_Class *klass) } EOLIAN static const Efl_Access_Action_Data* -_elm_slideshow_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd EINA_UNUSED) +_elm_slideshow_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd EINA_UNUSED) { static Efl_Access_Action_Data atspi_actions[] = { { "move,left", "move", "left", _key_action_move}, |