diff --git a/legacy/elementary/src/lib/elc_ctxpopup.c b/legacy/elementary/src/lib/elc_ctxpopup.c index 8afe88fbdf..9eb87bd4cf 100644 --- a/legacy/elementary/src/lib/elc_ctxpopup.c +++ b/legacy/elementary/src/lib/elc_ctxpopup.c @@ -39,7 +39,7 @@ static const Elm_Action key_actions[] = { }; EOLIAN static Eina_Bool -_elc_ctxpopup_elm_widget_translate(Eo *obj, Elc_Ctxpopup_Data *sd) +_elm_ctxpopup_elm_widget_translate(Eo *obj, Elm_Ctxpopup_Data *sd) { Eina_List *l; Elm_Ctxpopup_Item *it; @@ -55,19 +55,19 @@ _elc_ctxpopup_elm_widget_translate(Eo *obj, Elc_Ctxpopup_Data *sd) } EOLIAN static Eina_Bool -_elc_ctxpopup_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elc_Ctxpopup_Data *_pd EINA_UNUSED) +_elm_ctxpopup_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *_pd EINA_UNUSED) { return EINA_TRUE; } EOLIAN static Eina_Bool -_elc_ctxpopup_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elc_Ctxpopup_Data *_pd EINA_UNUSED) +_elm_ctxpopup_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *_pd EINA_UNUSED) { return EINA_TRUE; } EOLIAN static Eina_Bool -_elc_ctxpopup_elm_widget_focus_next(Eo *obj EINA_UNUSED, Elc_Ctxpopup_Data *sd, Elm_Focus_Direction dir, Evas_Object **next) +_elm_ctxpopup_elm_widget_focus_next(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *sd, Elm_Focus_Direction dir, Evas_Object **next) { if (!sd) return EINA_FALSE; @@ -82,7 +82,7 @@ _elc_ctxpopup_elm_widget_focus_next(Eo *obj EINA_UNUSED, Elc_Ctxpopup_Data *sd, } EOLIAN static Eina_Bool -_elc_ctxpopup_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Elc_Ctxpopup_Data *sd, const Evas_Object *base, double degree, Evas_Object **direction, double *weight) +_elm_ctxpopup_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *sd, const Evas_Object *base, double degree, Evas_Object **direction, double *weight) { Eina_Bool int_ret; @@ -136,7 +136,7 @@ _key_action_escape(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_elc_ctxpopup_elm_widget_event(Eo *obj, Elc_Ctxpopup_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_ctxpopup_elm_widget_event(Eo *obj, Elm_Ctxpopup_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) { Evas_Event_Key_Down *ev = event_info; (void)src; @@ -595,13 +595,13 @@ _base_shift_by_arrow(Evas_Object *arrow, } EOLIAN static Eina_Bool -_elc_ctxpopup_elm_layout_sub_object_add_enable(Eo *obj EINA_UNUSED, Elc_Ctxpopup_Data *_pd EINA_UNUSED) +_elm_ctxpopup_elm_layout_sub_object_add_enable(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *_pd EINA_UNUSED) { return EINA_FALSE; } EOLIAN static Eina_Bool -_elc_ctxpopup_elm_widget_sub_object_add(Eo *obj, Elc_Ctxpopup_Data *_pd EINA_UNUSED, Evas_Object *sobj) +_elm_ctxpopup_elm_widget_sub_object_add(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED, Evas_Object *sobj) { Eina_Bool int_ret = EINA_FALSE; @@ -611,7 +611,7 @@ _elc_ctxpopup_elm_widget_sub_object_add(Eo *obj, Elc_Ctxpopup_Data *_pd EINA_UNU } EOLIAN static void -_elc_ctxpopup_elm_layout_sizing_eval(Eo *obj, Elc_Ctxpopup_Data *sd) +_elm_ctxpopup_elm_layout_sizing_eval(Eo *obj, Elm_Ctxpopup_Data *sd) { Evas_Coord_Rectangle rect = { 0, 0, 1, 1 }; Evas_Coord_Point list_size = { 0, 0 }, parent_size = {0, 0}; @@ -721,7 +721,7 @@ _on_content_resized(void *data, //FIXME: lost the content size when theme hook is called. EOLIAN static Eina_Bool -_elc_ctxpopup_elm_widget_theme_apply(Eo *obj, Elc_Ctxpopup_Data *sd) +_elm_ctxpopup_elm_widget_theme_apply(Eo *obj, Elm_Ctxpopup_Data *sd) { Eina_Bool int_ret = EINA_FALSE; @@ -751,7 +751,7 @@ _elc_ctxpopup_elm_widget_theme_apply(Eo *obj, Elc_Ctxpopup_Data *sd) /* kind of a big and tricky override here: an internal box will hold * the actual content. content aliases won't be of much help here */ EOLIAN static Eina_Bool -_elc_ctxpopup_elm_container_content_set(Eo *obj, Elc_Ctxpopup_Data *sd, const char *part, Evas_Object *content) +_elm_ctxpopup_elm_container_content_set(Eo *obj, Elm_Ctxpopup_Data *sd, const char *part, Evas_Object *content) { Eina_Bool int_ret = EINA_TRUE; @@ -785,7 +785,7 @@ _elc_ctxpopup_elm_container_content_set(Eo *obj, Elc_Ctxpopup_Data *sd, const ch } EOLIAN static Evas_Object* -_elc_ctxpopup_elm_container_content_get(Eo *obj, Elc_Ctxpopup_Data *sd, const char *part) +_elm_ctxpopup_elm_container_content_get(Eo *obj, Elm_Ctxpopup_Data *sd, const char *part) { if ((part) && (strcmp(part, "default"))) @@ -799,7 +799,7 @@ _elc_ctxpopup_elm_container_content_get(Eo *obj, Elc_Ctxpopup_Data *sd, const ch } EOLIAN static Evas_Object* -_elc_ctxpopup_elm_container_content_unset(Eo *obj, Elc_Ctxpopup_Data *sd, const char *part) +_elm_ctxpopup_elm_container_content_unset(Eo *obj, Elm_Ctxpopup_Data *sd, const char *part) { Evas_Object *content = NULL; @@ -1012,7 +1012,7 @@ _list_resize_cb(void *data, } static void -_list_del(Elc_Ctxpopup_Data *sd) +_list_del(Elm_Ctxpopup_Data *sd) { ELM_SAFE_FREE(sd->list, evas_object_del); } @@ -1046,7 +1046,7 @@ _item_del_pre_hook(Elm_Object_Item *it) } EOLIAN static Eina_Bool -_elc_ctxpopup_elm_widget_disable(Eo *obj, Elc_Ctxpopup_Data *sd) +_elm_ctxpopup_elm_widget_disable(Eo *obj, Elm_Ctxpopup_Data *sd) { Eina_Bool int_ret = EINA_FALSE; @@ -1061,7 +1061,7 @@ _elc_ctxpopup_elm_widget_disable(Eo *obj, Elc_Ctxpopup_Data *sd) } EOLIAN static void -_elc_ctxpopup_evas_smart_add(Eo *obj, Elc_Ctxpopup_Data *priv) +_elm_ctxpopup_evas_smart_add(Eo *obj, Elm_Ctxpopup_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -1114,7 +1114,7 @@ _elc_ctxpopup_evas_smart_add(Eo *obj, Elc_Ctxpopup_Data *priv) } EOLIAN static void -_elc_ctxpopup_evas_smart_del(Eo *obj, Elc_Ctxpopup_Data *sd) +_elm_ctxpopup_evas_smart_del(Eo *obj, Elm_Ctxpopup_Data *sd) { Elm_Ctxpopup_Item *it; @@ -1133,7 +1133,7 @@ _elc_ctxpopup_evas_smart_del(Eo *obj, Elc_Ctxpopup_Data *sd) } EOLIAN static void -_elc_ctxpopup_elm_widget_parent_set(Eo *obj, Elc_Ctxpopup_Data *_pd EINA_UNUSED, Evas_Object *parent) +_elm_ctxpopup_elm_widget_parent_set(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED, Evas_Object *parent) { //default parent is to be hover parent elm_ctxpopup_hover_parent_set(obj, parent); @@ -1155,7 +1155,7 @@ elm_ctxpopup_add(Evas_Object *parent) } EOLIAN static void -_elc_ctxpopup_eo_base_constructor(Eo *obj, Elc_Ctxpopup_Data *_pd EINA_UNUSED) +_elm_ctxpopup_eo_base_constructor(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED) { eo_do_super(obj, MY_CLASS, eo_constructor()); eo_do(obj, @@ -1164,7 +1164,7 @@ _elc_ctxpopup_eo_base_constructor(Eo *obj, Elc_Ctxpopup_Data *_pd EINA_UNUSED) } EOLIAN static void -_elc_ctxpopup_hover_parent_set(Eo *obj, Elc_Ctxpopup_Data *sd, Evas_Object *parent) +_elm_ctxpopup_hover_parent_set(Eo *obj, Elm_Ctxpopup_Data *sd, Evas_Object *parent) { Evas_Coord x, y, w, h; @@ -1192,20 +1192,20 @@ _elc_ctxpopup_hover_parent_set(Eo *obj, Elc_Ctxpopup_Data *sd, Evas_Object *pare } EOLIAN static Evas_Object* -_elc_ctxpopup_hover_parent_get(Eo *obj EINA_UNUSED, Elc_Ctxpopup_Data *sd) +_elm_ctxpopup_hover_parent_get(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *sd) { return sd->parent; } EOLIAN static void -_elc_ctxpopup_clear(Eo *obj EINA_UNUSED, Elc_Ctxpopup_Data *sd) +_elm_ctxpopup_clear(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *sd) { _list_del(sd); sd->dir = ELM_CTXPOPUP_DIRECTION_UNKNOWN; } EOLIAN static void -_elc_ctxpopup_horizontal_set(Eo *obj, Elc_Ctxpopup_Data *sd, Eina_Bool horizontal) +_elm_ctxpopup_horizontal_set(Eo *obj, Elm_Ctxpopup_Data *sd, Eina_Bool horizontal) { sd->horizontal = !!horizontal; @@ -1219,7 +1219,7 @@ _elc_ctxpopup_horizontal_set(Eo *obj, Elc_Ctxpopup_Data *sd, Eina_Bool horizonta } EOLIAN static Eina_Bool -_elc_ctxpopup_horizontal_get(Eo *obj EINA_UNUSED, Elc_Ctxpopup_Data *sd) +_elm_ctxpopup_horizontal_get(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *sd) { return sd->horizontal; } @@ -1233,7 +1233,7 @@ _item_wrap_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UN } EOLIAN static Elm_Object_Item* -_elc_ctxpopup_item_append(Eo *obj, Elc_Ctxpopup_Data *sd, const char *label, Evas_Object *icon, Evas_Smart_Cb func, const void *data) +_elm_ctxpopup_item_append(Eo *obj, Elm_Ctxpopup_Data *sd, const char *label, Evas_Object *icon, Evas_Smart_Cb func, const void *data) { Elm_Ctxpopup_Item *item; @@ -1278,7 +1278,7 @@ _elc_ctxpopup_item_append(Eo *obj, Elc_Ctxpopup_Data *sd, const char *label, Eva } EOLIAN static void -_elc_ctxpopup_direction_priority_set(Eo *obj, Elc_Ctxpopup_Data *sd, Elm_Ctxpopup_Direction first, Elm_Ctxpopup_Direction second, Elm_Ctxpopup_Direction third, Elm_Ctxpopup_Direction fourth) +_elm_ctxpopup_direction_priority_set(Eo *obj, Elm_Ctxpopup_Data *sd, Elm_Ctxpopup_Direction first, Elm_Ctxpopup_Direction second, Elm_Ctxpopup_Direction third, Elm_Ctxpopup_Direction fourth) { sd->dir_priority[0] = first; sd->dir_priority[1] = second; @@ -1289,7 +1289,7 @@ _elc_ctxpopup_direction_priority_set(Eo *obj, Elc_Ctxpopup_Data *sd, Elm_Ctxpopu } EOLIAN static void -_elc_ctxpopup_direction_priority_get(Eo *obj EINA_UNUSED, Elc_Ctxpopup_Data *sd, Elm_Ctxpopup_Direction *first, Elm_Ctxpopup_Direction *second, Elm_Ctxpopup_Direction *third, Elm_Ctxpopup_Direction *fourth) +_elm_ctxpopup_direction_priority_get(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *sd, Elm_Ctxpopup_Direction *first, Elm_Ctxpopup_Direction *second, Elm_Ctxpopup_Direction *third, Elm_Ctxpopup_Direction *fourth) { if (first) *first = sd->dir_priority[0]; if (second) *second = sd->dir_priority[1]; @@ -1298,19 +1298,19 @@ _elc_ctxpopup_direction_priority_get(Eo *obj EINA_UNUSED, Elc_Ctxpopup_Data *sd, } EOLIAN static Elm_Ctxpopup_Direction -_elc_ctxpopup_direction_get(Eo *obj EINA_UNUSED, Elc_Ctxpopup_Data *sd) +_elm_ctxpopup_direction_get(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *sd) { return sd->dir; } EOLIAN static void -_elc_ctxpopup_dismiss(Eo *obj, Elc_Ctxpopup_Data *sd) +_elm_ctxpopup_dismiss(Eo *obj, Elm_Ctxpopup_Data *sd) { _hide_signals_emit(obj, sd->dir); } EOLIAN static void -_elc_ctxpopup_auto_hide_disabled_set(Eo *obj EINA_UNUSED, Elc_Ctxpopup_Data *sd, Eina_Bool disabled) +_elm_ctxpopup_auto_hide_disabled_set(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *sd, Eina_Bool disabled) { disabled = !!disabled; if (sd->auto_hide == !disabled) return; @@ -1318,13 +1318,13 @@ _elc_ctxpopup_auto_hide_disabled_set(Eo *obj EINA_UNUSED, Elc_Ctxpopup_Data *sd, } EOLIAN static Eina_Bool -_elc_ctxpopup_auto_hide_disabled_get(Eo *obj EINA_UNUSED, Elc_Ctxpopup_Data *sd) +_elm_ctxpopup_auto_hide_disabled_get(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *sd) { return sd->auto_hide; } EOLIAN static void -_elc_ctxpopup_class_constructor(Eo_Class *klass) +_elm_ctxpopup_class_constructor(Eo_Class *klass) { evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } diff --git a/legacy/elementary/src/lib/elc_ctxpopup.eo b/legacy/elementary/src/lib/elc_ctxpopup.eo index 281bee69f7..29fdffcae5 100644 --- a/legacy/elementary/src/lib/elc_ctxpopup.eo +++ b/legacy/elementary/src/lib/elc_ctxpopup.eo @@ -1,7 +1,6 @@ -class Elc_Ctxpopup (Elm_Layout) +class Elm_Ctxpopup (Elm_Layout) { eo_prefix: elm_obj_ctxpopup; - legacy_prefix: elm_ctxpopup; properties { horizontal { set { diff --git a/legacy/elementary/src/lib/elc_fileselector.c b/legacy/elementary/src/lib/elc_fileselector.c index 77cf1184ce..f2b97c6cc6 100644 --- a/legacy/elementary/src/lib/elc_fileselector.c +++ b/legacy/elementary/src/lib/elc_fileselector.c @@ -56,7 +56,7 @@ static void _canc(void *data, Evas_Object *obj, void *event_info); /* final routine on deletion */ static void -_elm_fileselector_smart_del_do(Elc_Fileselector_Data *sd) +_elm_fileselector_smart_del_do(Elm_Fileselector_Data *sd) { eina_stringshare_del(sd->path); eina_stringshare_del(sd->selection); @@ -66,7 +66,7 @@ _elm_fileselector_smart_del_do(Elc_Fileselector_Data *sd) } EOLIAN static void -_elc_fileselector_elm_layout_sizing_eval(Eo *obj, Elc_Fileselector_Data *sd EINA_UNUSED) +_elm_fileselector_elm_layout_sizing_eval(Eo *obj, Elm_Fileselector_Data *sd EINA_UNUSED) { Evas_Coord minw = -1, minh = -1; @@ -91,7 +91,7 @@ _mirrored_set(Evas_Object *obj, Eina_Bool rtl) } EOLIAN static Eina_Bool -_elc_fileselector_elm_widget_theme_apply(Eo *obj, Elc_Fileselector_Data *sd) +_elm_fileselector_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Data *sd) { const char *style; const char *data; @@ -161,7 +161,7 @@ _key_action_escape(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_elc_fileselector_elm_widget_event(Eo *obj, Elc_Fileselector_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_fileselector_elm_widget_event(Eo *obj, Elm_Fileselector_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) { Evas_Event_Key_Down *ev = event_info; (void) src; @@ -765,7 +765,7 @@ _on_item_activated(void *data, } static void -_clear_selections(Elc_Fileselector_Data *sd, Elm_Object_Item *last_selected) +_clear_selections(Elm_Fileselector_Data *sd, Elm_Object_Item *last_selected) { Eina_List *items; Elm_Object_Item *sel; @@ -1343,7 +1343,7 @@ _name_entry_activated_cb(void *data, Evas_Object *obj EINA_UNUSED, } EOLIAN static void -_elc_fileselector_evas_smart_add(Eo *obj, Elc_Fileselector_Data *priv) +_elm_fileselector_evas_smart_add(Eo *obj, Elm_Fileselector_Data *priv) { Evas_Object *ic, *bt, *en, *pb; @@ -1454,7 +1454,7 @@ _elc_fileselector_evas_smart_add(Eo *obj, Elc_Fileselector_Data *priv) } EOLIAN static void -_elc_fileselector_evas_smart_del(Eo *obj EINA_UNUSED, Elc_Fileselector_Data *sd) +_elm_fileselector_evas_smart_del(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd) { Elm_Fileselector_Filter *filter; char *path; @@ -1502,7 +1502,7 @@ elm_fileselector_add(Evas_Object *parent) } EOLIAN static void -_elc_fileselector_eo_base_constructor(Eo *obj, Elc_Fileselector_Data *sd) +_elm_fileselector_eo_base_constructor(Eo *obj, Elm_Fileselector_Data *sd) { sd->obj = obj; eo_do_super(obj, MY_CLASS, eo_constructor()); @@ -1520,7 +1520,7 @@ elm_fileselector_is_save_set(Evas_Object *obj, } EOLIAN static void -_elc_fileselector_elm_interface_fileselector_is_save_set(Eo *obj, Elc_Fileselector_Data *sd, Eina_Bool is_save) +_elm_fileselector_elm_interface_fileselector_is_save_set(Eo *obj, Elm_Fileselector_Data *sd, Eina_Bool is_save) { elm_object_disabled_set(sd->name_entry, !is_save); @@ -1538,7 +1538,7 @@ elm_fileselector_is_save_get(const Evas_Object *obj) } EOLIAN static Eina_Bool -_elc_fileselector_elm_interface_fileselector_is_save_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Data *sd) +_elm_fileselector_elm_interface_fileselector_is_save_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd) { return !elm_object_disabled_get(sd->name_entry); } @@ -1552,7 +1552,7 @@ elm_fileselector_folder_only_set(Evas_Object *obj, } EOLIAN static void -_elc_fileselector_elm_interface_fileselector_folder_only_set(Eo *obj, Elc_Fileselector_Data *sd, Eina_Bool only) +_elm_fileselector_elm_interface_fileselector_folder_only_set(Eo *obj, Elm_Fileselector_Data *sd, Eina_Bool only) { if (sd->only_folder == only) return; @@ -1570,13 +1570,13 @@ elm_fileselector_folder_only_get(const Evas_Object *obj) } EOLIAN static Eina_Bool -_elc_fileselector_elm_interface_fileselector_folder_only_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Data *sd) +_elm_fileselector_elm_interface_fileselector_folder_only_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd) { return sd->only_folder; } EOLIAN static void -_elc_fileselector_buttons_ok_cancel_set(Eo *obj, Elc_Fileselector_Data *sd, Eina_Bool visible) +_elm_fileselector_buttons_ok_cancel_set(Eo *obj, Elm_Fileselector_Data *sd, Eina_Bool visible) { Evas_Object *bt; @@ -1610,7 +1610,7 @@ _elc_fileselector_buttons_ok_cancel_set(Eo *obj, Elc_Fileselector_Data *sd, Eina } EOLIAN static Eina_Bool -_elc_fileselector_buttons_ok_cancel_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Data *sd) +_elm_fileselector_buttons_ok_cancel_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd) { return sd->ok_button ? EINA_TRUE : EINA_FALSE; } @@ -1624,7 +1624,7 @@ elm_fileselector_expandable_set(Evas_Object *obj, } EOLIAN static void -_elc_fileselector_elm_interface_fileselector_expandable_set(Eo *obj, Elc_Fileselector_Data *sd, Eina_Bool expand) +_elm_fileselector_elm_interface_fileselector_expandable_set(Eo *obj, Elm_Fileselector_Data *sd, Eina_Bool expand) { sd->expand = !!expand; @@ -1641,7 +1641,7 @@ elm_fileselector_expandable_get(const Evas_Object *obj) } EOLIAN static Eina_Bool -_elc_fileselector_elm_interface_fileselector_expandable_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Data *sd) +_elm_fileselector_elm_interface_fileselector_expandable_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd) { return sd->expand; } @@ -1655,7 +1655,7 @@ elm_fileselector_path_set(Evas_Object *obj, } EOLIAN static void -_elc_fileselector_elm_interface_fileselector_path_set(Eo *obj, Elc_Fileselector_Data *sd EINA_UNUSED, const char *_path) +_elm_fileselector_elm_interface_fileselector_path_set(Eo *obj, Elm_Fileselector_Data *sd EINA_UNUSED, const char *_path) { char *path; @@ -1674,7 +1674,7 @@ elm_fileselector_path_get(const Evas_Object *obj) } EOLIAN static const char* -_elc_fileselector_elm_interface_fileselector_path_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Data *sd) +_elm_fileselector_elm_interface_fileselector_path_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd) { return sd->path; } @@ -1688,7 +1688,7 @@ elm_fileselector_mode_set(Evas_Object *obj, } EOLIAN static void -_elc_fileselector_elm_interface_fileselector_mode_set(Eo *obj, Elc_Fileselector_Data *sd, Elm_Fileselector_Mode mode) +_elm_fileselector_elm_interface_fileselector_mode_set(Eo *obj, Elm_Fileselector_Data *sd, Elm_Fileselector_Mode mode) { Evas_Object *old; @@ -1728,7 +1728,7 @@ elm_fileselector_mode_get(const Evas_Object *obj) } EOLIAN static Elm_Fileselector_Mode -_elc_fileselector_elm_interface_fileselector_mode_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Data *sd) +_elm_fileselector_elm_interface_fileselector_mode_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd) { return sd->mode; } @@ -1741,7 +1741,7 @@ elm_fileselector_multi_select_set(Evas_Object *obj, Eina_Bool multi) } EOLIAN static void -_elc_fileselector_elm_interface_fileselector_multi_select_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Data *sd, Eina_Bool multi) +_elm_fileselector_elm_interface_fileselector_multi_select_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd, Eina_Bool multi) { char *path; @@ -1789,7 +1789,7 @@ elm_fileselector_multi_select_get(const Evas_Object *obj) } EOLIAN static Eina_Bool -_elc_fileselector_elm_interface_fileselector_multi_select_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Data *sd) +_elm_fileselector_elm_interface_fileselector_multi_select_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd) { return sd->multi; } @@ -1804,7 +1804,7 @@ elm_fileselector_selected_get(const Evas_Object *obj) } EOLIAN static const char* -_elc_fileselector_elm_interface_fileselector_selected_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Data *sd) +_elm_fileselector_elm_interface_fileselector_selected_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd) { const char *fp; if (!sd->path) return NULL; @@ -1845,7 +1845,7 @@ elm_fileselector_selected_set(Evas_Object *obj, } EOLIAN static Eina_Bool -_elc_fileselector_elm_interface_fileselector_selected_set(Eo *obj, Elc_Fileselector_Data *sd, const char *_path) +_elm_fileselector_elm_interface_fileselector_selected_set(Eo *obj, Elm_Fileselector_Data *sd, const char *_path) { Eina_Bool ret = EINA_TRUE; char *selected; @@ -1884,7 +1884,7 @@ elm_fileselector_selected_paths_get(const Evas_Object* obj) } EOLIAN static const Eina_List* -_elc_fileselector_elm_interface_fileselector_selected_paths_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Data *sd) +_elm_fileselector_elm_interface_fileselector_selected_paths_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd) { if (sd->multi) return sd->paths; @@ -1893,7 +1893,7 @@ _elc_fileselector_elm_interface_fileselector_selected_paths_get(Eo *obj EINA_UNU } static Elm_Fileselector_Filter * -_filter_add(Elc_Fileselector_Data *sd, const char *filter_name) +_filter_add(Elm_Fileselector_Data *sd, const char *filter_name) { Elm_Fileselector_Filter *ff; ff = malloc(sizeof(Elm_Fileselector_Filter)); @@ -1914,7 +1914,7 @@ elm_fileselector_mime_types_filter_append(Evas_Object *obj, const char *mime_typ } EOLIAN static Eina_Bool -_elc_fileselector_elm_interface_fileselector_mime_types_filter_append(Eo *obj, Elc_Fileselector_Data *sd, const char *mime_types, const char *filter_name) +_elm_fileselector_elm_interface_fileselector_mime_types_filter_append(Eo *obj, Elm_Fileselector_Data *sd, const char *mime_types, const char *filter_name) { Elm_Fileselector_Filter *ff; Eina_Bool need_theme = EINA_FALSE; @@ -1955,7 +1955,7 @@ elm_fileselector_custom_filter_append(Evas_Object *obj, Elm_Fileselector_Filter_ } EOLIAN static Eina_Bool -_elc_fileselector_elm_interface_fileselector_custom_filter_append(Eo *obj, Elc_Fileselector_Data *sd, Elm_Fileselector_Filter_Func func, void *data, const char *filter_name) +_elm_fileselector_elm_interface_fileselector_custom_filter_append(Eo *obj, Elm_Fileselector_Data *sd, Elm_Fileselector_Filter_Func func, void *data, const char *filter_name) { Elm_Fileselector_Filter *ff; Eina_Bool need_theme = EINA_FALSE; @@ -1996,7 +1996,7 @@ elm_fileselector_filters_clear(Evas_Object *obj) } EOLIAN static void -_elc_fileselector_elm_interface_fileselector_filters_clear(Eo *obj, Elc_Fileselector_Data *sd) +_elm_fileselector_elm_interface_fileselector_filters_clear(Eo *obj, Elm_Fileselector_Data *sd) { Elm_Fileselector_Filter *filter; @@ -2028,7 +2028,7 @@ elm_fileselector_hidden_visible_set(Evas_Object *obj, Eina_Bool visible) } EOLIAN static void -_elc_fileselector_elm_interface_fileselector_hidden_visible_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Data *sd, Eina_Bool visible) +_elm_fileselector_elm_interface_fileselector_hidden_visible_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd, Eina_Bool visible) { visible = !!visible; if (sd->hidden_visible == visible) return; @@ -2048,7 +2048,7 @@ elm_fileselector_hidden_visible_get(const Evas_Object *obj) } EOLIAN static Eina_Bool -_elc_fileselector_elm_interface_fileselector_hidden_visible_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Data *sd) +_elm_fileselector_elm_interface_fileselector_hidden_visible_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd) { return sd->hidden_visible; } @@ -2063,7 +2063,7 @@ elm_fileselector_thumbnail_size_set(Evas_Object *obj, } EOLIAN static void -_elc_fileselector_elm_interface_fileselector_thumbnail_size_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_fileselector_elm_interface_fileselector_thumbnail_size_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd, Evas_Coord w, Evas_Coord h) { if (sd->thumbnail_size.w == w && sd->thumbnail_size.h == h) return; @@ -2089,7 +2089,7 @@ elm_fileselector_thumbnail_size_get(const Evas_Object *obj, } EOLIAN static void -_elc_fileselector_elm_interface_fileselector_thumbnail_size_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Data *sd, Evas_Coord *w, Evas_Coord *h) +_elm_fileselector_elm_interface_fileselector_thumbnail_size_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd, Evas_Coord *w, Evas_Coord *h) { if (w) *w = sd->thumbnail_size.w; if (h) *h = sd->thumbnail_size.h; @@ -2103,7 +2103,7 @@ elm_fileselector_sort_method_set(Evas_Object *obj, Elm_Fileselector_Sort sort) } EOLIAN static void -_elc_fileselector_elm_interface_fileselector_sort_method_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Data *sd, Elm_Fileselector_Sort sort) +_elm_fileselector_elm_interface_fileselector_sort_method_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd, Elm_Fileselector_Sort sort) { if (sd->sort_type == sort) return; sd->sort_type = sort; @@ -2153,25 +2153,25 @@ elm_fileselector_sort_method_get(const Evas_Object *obj) } EOLIAN static Elm_Fileselector_Sort -_elc_fileselector_elm_interface_fileselector_sort_method_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Data *sd) +_elm_fileselector_elm_interface_fileselector_sort_method_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd) { return sd->sort_type; } EOLIAN static Eina_Bool -_elc_fileselector_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elc_Fileselector_Data *sd EINA_UNUSED) +_elm_fileselector_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd EINA_UNUSED) { return EINA_FALSE; } EOLIAN static Eina_Bool -_elc_fileselector_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elc_Fileselector_Data *sd EINA_UNUSED) +_elm_fileselector_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd EINA_UNUSED) { return EINA_FALSE; } EOLIAN static Eina_Bool -_elc_fileselector_elm_layout_text_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Data *sd, const char *part, const char *label) +_elm_fileselector_elm_layout_text_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd, const char *part, const char *label) { if (!part) return EINA_FALSE; @@ -2196,7 +2196,7 @@ _elc_fileselector_elm_layout_text_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Data } EOLIAN static void -_elc_fileselector_class_constructor(Eo_Class *klass) +_elm_fileselector_class_constructor(Eo_Class *klass) { unsigned int i; @@ -2225,7 +2225,7 @@ _elc_fileselector_class_constructor(Eo_Class *klass) } EOLIAN static void -_elc_fileselector_class_destructor(Eo_Class *klass EINA_UNUSED) +_elm_fileselector_class_destructor(Eo_Class *klass EINA_UNUSED) { unsigned int i; diff --git a/legacy/elementary/src/lib/elc_fileselector.eo b/legacy/elementary/src/lib/elc_fileselector.eo index fc2c129915..65878a312c 100644 --- a/legacy/elementary/src/lib/elc_fileselector.eo +++ b/legacy/elementary/src/lib/elc_fileselector.eo @@ -1,6 +1,5 @@ -class Elc_Fileselector (Elm_Layout, Elm_Interface_Fileselector) +class Elm_Fileselector (Elm_Layout, Elm_Interface_Fileselector) { - legacy_prefix: elm_fileselector; eo_prefix: elm_obj_fileselector; properties { buttons_ok_cancel { diff --git a/legacy/elementary/src/lib/elc_fileselector_button.c b/legacy/elementary/src/lib/elc_fileselector_button.c index f6067b1808..8d0d2f6c54 100644 --- a/legacy/elementary/src/lib/elc_fileselector_button.c +++ b/legacy/elementary/src/lib/elc_fileselector_button.c @@ -33,7 +33,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { #undef ELM_PRIV_FILESELECTOR_BUTTON_SIGNALS EOLIAN static Eina_Bool -_elc_fileselector_button_elm_widget_theme_apply(Eo *obj, Elc_Fileselector_Button_Data *sd EINA_UNUSED) +_elm_fileselector_button_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Button_Data *sd EINA_UNUSED) { Eina_Bool int_ret = EINA_FALSE; @@ -64,7 +64,7 @@ _selection_done(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) { - Elc_Fileselector_Button_Data *sd = data; + Elm_Fileselector_Button_Data *sd = data; const char *file = event_info; Evas_Object *del; @@ -80,7 +80,7 @@ _selection_done(void *data, } static Evas_Object * -_new_window_add(Elc_Fileselector_Button_Data *sd) +_new_window_add(Elm_Fileselector_Button_Data *sd) { Evas_Object *win, *bg; @@ -108,7 +108,7 @@ _parent_win_get(Evas_Object *obj) } static void -_activate(Elc_Fileselector_Button_Data *sd) +_activate(Elm_Fileselector_Button_Data *sd) { Eina_Bool is_inwin = EINA_FALSE; @@ -164,7 +164,7 @@ _button_clicked(void *data, } EOLIAN static void -_elc_fileselector_button_evas_smart_add(Eo *obj, Elc_Fileselector_Button_Data *priv) +_elm_fileselector_button_evas_smart_add(Eo *obj, Elm_Fileselector_Button_Data *priv) { eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); elm_widget_sub_object_parent_add(obj); @@ -187,7 +187,7 @@ _elc_fileselector_button_evas_smart_add(Eo *obj, Elc_Fileselector_Button_Data *p } EOLIAN static void -_elc_fileselector_button_evas_smart_del(Eo *obj, Elc_Fileselector_Button_Data *sd) +_elm_fileselector_button_evas_smart_del(Eo *obj, Elm_Fileselector_Button_Data *sd) { eina_stringshare_del(sd->window_title); eina_stringshare_del(sd->fsd.path); @@ -198,7 +198,7 @@ _elc_fileselector_button_evas_smart_del(Eo *obj, Elc_Fileselector_Button_Data *s } EOLIAN static Eina_Bool -_elc_fileselector_button_elm_button_admits_autorepeat_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd EINA_UNUSED) +_elm_fileselector_button_elm_button_admits_autorepeat_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd EINA_UNUSED) { return EINA_FALSE; } @@ -213,7 +213,7 @@ elm_fileselector_button_add(Evas_Object *parent) } EOLIAN static void -_elc_fileselector_button_eo_base_constructor(Eo *obj, Elc_Fileselector_Button_Data *sd) +_elm_fileselector_button_eo_base_constructor(Eo *obj, Elm_Fileselector_Button_Data *sd) { sd->obj = obj; @@ -224,7 +224,7 @@ _elc_fileselector_button_eo_base_constructor(Eo *obj, Elc_Fileselector_Button_Da } EOLIAN static void -_elc_fileselector_button_window_title_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd, const char *title) +_elm_fileselector_button_window_title_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd, const char *title) { eina_stringshare_replace(&sd->window_title, title); @@ -232,13 +232,13 @@ _elc_fileselector_button_window_title_set(Eo *obj EINA_UNUSED, Elc_Fileselector_ } EOLIAN static const char * -_elc_fileselector_button_window_title_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd) +_elm_fileselector_button_window_title_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd) { return sd->window_title; } EOLIAN static void -_elc_fileselector_button_window_size_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd, Evas_Coord width, Evas_Coord height) +_elm_fileselector_button_window_size_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd, Evas_Coord width, Evas_Coord height) { sd->w = width; sd->h = height; @@ -247,7 +247,7 @@ _elc_fileselector_button_window_size_set(Eo *obj EINA_UNUSED, Elc_Fileselector_B } EOLIAN static void -_elc_fileselector_button_window_size_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd, Evas_Coord *width, Evas_Coord *height) +_elm_fileselector_button_window_size_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd, Evas_Coord *width, Evas_Coord *height) { if (width) *width = sd->w; if (height) *height = sd->h; @@ -262,7 +262,7 @@ elm_fileselector_button_path_set(Evas_Object *obj, } EOLIAN static void -_elc_fileselector_button_elm_interface_fileselector_path_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd, const char *path) +_elm_fileselector_button_elm_interface_fileselector_path_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd, const char *path) { eina_stringshare_replace(&sd->fsd.path, path); @@ -279,7 +279,7 @@ elm_fileselector_button_path_get(const Evas_Object *obj) } EOLIAN static const char * -_elc_fileselector_button_elm_interface_fileselector_path_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd) +_elm_fileselector_button_elm_interface_fileselector_path_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd) { return sd->fsd.path; } @@ -293,7 +293,7 @@ elm_fileselector_button_expandable_set(Evas_Object *obj, } EOLIAN static void -_elc_fileselector_button_elm_interface_fileselector_expandable_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd, Eina_Bool value) +_elm_fileselector_button_elm_interface_fileselector_expandable_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd, Eina_Bool value) { sd->fsd.expandable = value; @@ -310,7 +310,7 @@ elm_fileselector_button_expandable_get(const Evas_Object *obj) } EOLIAN static Eina_Bool -_elc_fileselector_button_elm_interface_fileselector_expandable_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd) +_elm_fileselector_button_elm_interface_fileselector_expandable_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd) { return sd->fsd.expandable; } @@ -324,7 +324,7 @@ elm_fileselector_button_folder_only_set(Evas_Object *obj, } EOLIAN static void -_elc_fileselector_button_elm_interface_fileselector_folder_only_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd, Eina_Bool value) +_elm_fileselector_button_elm_interface_fileselector_folder_only_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd, Eina_Bool value) { sd->fsd.folder_only = value; @@ -341,7 +341,7 @@ elm_fileselector_button_folder_only_get(const Evas_Object *obj) } EOLIAN static Eina_Bool -_elc_fileselector_button_elm_interface_fileselector_folder_only_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd) +_elm_fileselector_button_elm_interface_fileselector_folder_only_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd) { return sd->fsd.folder_only; } @@ -355,7 +355,7 @@ elm_fileselector_button_is_save_set(Evas_Object *obj, } EOLIAN static void -_elc_fileselector_button_elm_interface_fileselector_is_save_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd, Eina_Bool value) +_elm_fileselector_button_elm_interface_fileselector_is_save_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd, Eina_Bool value) { sd->fsd.is_save = value; @@ -372,13 +372,13 @@ elm_fileselector_button_is_save_get(const Evas_Object *obj) } EOLIAN static Eina_Bool -_elc_fileselector_button_elm_interface_fileselector_is_save_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd) +_elm_fileselector_button_elm_interface_fileselector_is_save_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd) { return sd->fsd.is_save; } EOLIAN static void -_elc_fileselector_button_elm_interface_fileselector_mode_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd, Elm_Fileselector_Mode mode) +_elm_fileselector_button_elm_interface_fileselector_mode_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd, Elm_Fileselector_Mode mode) { sd->fsd.mode = mode; @@ -386,13 +386,13 @@ _elc_fileselector_button_elm_interface_fileselector_mode_set(Eo *obj EINA_UNUSED } EOLIAN static Elm_Fileselector_Mode -_elc_fileselector_button_elm_interface_fileselector_mode_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd) +_elm_fileselector_button_elm_interface_fileselector_mode_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd) { return sd->fsd.mode; } EOLIAN static void -_elc_fileselector_button_elm_interface_fileselector_sort_method_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd, Elm_Fileselector_Sort sort) +_elm_fileselector_button_elm_interface_fileselector_sort_method_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd, Elm_Fileselector_Sort sort) { sd->fsd.sort_type = sort; @@ -400,13 +400,13 @@ _elc_fileselector_button_elm_interface_fileselector_sort_method_set(Eo *obj EINA } EOLIAN static Elm_Fileselector_Sort -_elc_fileselector_button_elm_interface_fileselector_sort_method_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd) +_elm_fileselector_button_elm_interface_fileselector_sort_method_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd) { return sd->fsd.sort_type; } EOLIAN static void -_elc_fileselector_button_elm_interface_fileselector_multi_select_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd, Eina_Bool value) +_elm_fileselector_button_elm_interface_fileselector_multi_select_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd, Eina_Bool value) { sd->fsd.multi = value; @@ -414,13 +414,13 @@ _elc_fileselector_button_elm_interface_fileselector_multi_select_set(Eo *obj EIN } EOLIAN static Eina_Bool -_elc_fileselector_button_elm_interface_fileselector_multi_select_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd) +_elm_fileselector_button_elm_interface_fileselector_multi_select_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd) { return sd->fsd.multi; } EOLIAN static const Eina_List* -_elc_fileselector_button_elm_interface_fileselector_selected_paths_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd) +_elm_fileselector_button_elm_interface_fileselector_selected_paths_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd) { if (sd->fs) return elm_fileselector_selected_paths_get(sd->fs); @@ -428,7 +428,7 @@ _elc_fileselector_button_elm_interface_fileselector_selected_paths_get(Eo *obj E } EOLIAN static const char* -_elc_fileselector_button_elm_interface_fileselector_selected_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd) +_elm_fileselector_button_elm_interface_fileselector_selected_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd) { if (sd->fs) return elm_fileselector_selected_get(sd->fs); @@ -436,7 +436,7 @@ _elc_fileselector_button_elm_interface_fileselector_selected_get(Eo *obj EINA_UN } EOLIAN static Eina_Bool -_elc_fileselector_button_elm_interface_fileselector_selected_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd, const char *_path) +_elm_fileselector_button_elm_interface_fileselector_selected_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd, const char *_path) { Eina_Bool ret = EINA_TRUE; @@ -457,7 +457,7 @@ _elc_fileselector_button_elm_interface_fileselector_selected_set(Eo *obj EINA_UN } EOLIAN static void -_elc_fileselector_button_elm_interface_fileselector_thumbnail_size_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_fileselector_button_elm_interface_fileselector_thumbnail_size_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd, Evas_Coord w, Evas_Coord h) { if (sd->fs) { @@ -472,14 +472,14 @@ _elc_fileselector_button_elm_interface_fileselector_thumbnail_size_set(Eo *obj E } EOLIAN static void -_elc_fileselector_button_elm_interface_fileselector_thumbnail_size_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd, Evas_Coord *w, Evas_Coord *h) +_elm_fileselector_button_elm_interface_fileselector_thumbnail_size_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd, Evas_Coord *w, Evas_Coord *h) { if (w) *w = sd->fsd.thumbnail_size.w; if (h) *h = sd->fsd.thumbnail_size.h; } EOLIAN static void -_elc_fileselector_button_elm_interface_fileselector_hidden_visible_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd, Eina_Bool visible) +_elm_fileselector_button_elm_interface_fileselector_hidden_visible_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd, Eina_Bool visible) { sd->fsd.hidden_visible = visible; @@ -487,19 +487,19 @@ _elc_fileselector_button_elm_interface_fileselector_hidden_visible_set(Eo *obj E } EOLIAN static Eina_Bool -_elc_fileselector_button_elm_interface_fileselector_hidden_visible_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd) +_elm_fileselector_button_elm_interface_fileselector_hidden_visible_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd) { return sd->fsd.hidden_visible; } EOLIAN static void -_elc_fileselector_button_inwin_mode_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd, Eina_Bool value) +_elm_fileselector_button_inwin_mode_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd, Eina_Bool value) { sd->inwin_mode = value; } EOLIAN static Eina_Bool -_elc_fileselector_button_inwin_mode_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Button_Data *sd) +_elm_fileselector_button_inwin_mode_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd) { return sd->inwin_mode; } diff --git a/legacy/elementary/src/lib/elc_fileselector_button.eo b/legacy/elementary/src/lib/elc_fileselector_button.eo index 59de0cf853..f2945758e4 100644 --- a/legacy/elementary/src/lib/elc_fileselector_button.eo +++ b/legacy/elementary/src/lib/elc_fileselector_button.eo @@ -1,6 +1,5 @@ -class Elc_Fileselector_Button (Elm_Button, Elm_Interface_Fileselector) +class Elm_Fileselector_Button (Elm_Button, Elm_Interface_Fileselector) { - legacy_prefix: elm_fileselector_button; eo_prefix: elm_obj_fileselector_button; properties { inwin_mode { diff --git a/legacy/elementary/src/lib/elc_fileselector_entry.c b/legacy/elementary/src/lib/elc_fileselector_entry.c index efa6485f39..85bdda0e10 100644 --- a/legacy/elementary/src/lib/elc_fileselector_entry.c +++ b/legacy/elementary/src/lib/elc_fileselector_entry.c @@ -92,7 +92,7 @@ _ACTIVATED_fwd(void *data, } EOLIAN static void -_elc_fileselector_entry_elm_layout_sizing_eval(Eo *obj, Elc_Fileselector_Entry_Data *sd EINA_UNUSED) +_elm_fileselector_entry_elm_layout_sizing_eval(Eo *obj, Elm_Fileselector_Entry_Data *sd EINA_UNUSED) { Evas_Coord minw = -1, minh = -1; @@ -104,19 +104,19 @@ _elc_fileselector_entry_elm_layout_sizing_eval(Eo *obj, Elc_Fileselector_Entry_D } EOLIAN static Eina_Bool -_elc_fileselector_entry_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elc_Fileselector_Entry_Data *sd EINA_UNUSED) +_elm_fileselector_entry_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Fileselector_Entry_Data *sd EINA_UNUSED) { return EINA_TRUE; } EOLIAN static Eina_Bool -_elc_fileselector_entry_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elc_Fileselector_Entry_Data *sd EINA_UNUSED) +_elm_fileselector_entry_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Fileselector_Entry_Data *sd EINA_UNUSED) { return EINA_FALSE; } EOLIAN static Eina_Bool -_elc_fileselector_entry_elm_widget_focus_next(Eo *obj EINA_UNUSED, Elc_Fileselector_Entry_Data *sd, Elm_Focus_Direction dir, Evas_Object **next) +_elm_fileselector_entry_elm_widget_focus_next(Eo *obj EINA_UNUSED, Elm_Fileselector_Entry_Data *sd, Elm_Focus_Direction dir, Evas_Object **next) { Evas_Object *chain[2]; Evas_Object *to_focus; @@ -152,7 +152,7 @@ _elc_fileselector_entry_elm_widget_focus_next(Eo *obj EINA_UNUSED, Elc_Fileselec } EOLIAN static Eina_Bool -_elc_fileselector_entry_elm_widget_theme_apply(Eo *obj, Elc_Fileselector_Entry_Data *sd) +_elm_fileselector_entry_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Entry_Data *sd) { const char *style; char buf[1024]; @@ -183,7 +183,7 @@ _elc_fileselector_entry_elm_widget_theme_apply(Eo *obj, Elc_Fileselector_Entry_D } EOLIAN static Eina_Bool -_elc_fileselector_entry_elm_widget_disable(Eo *obj, Elc_Fileselector_Entry_Data *sd) +_elm_fileselector_entry_elm_widget_disable(Eo *obj, Elm_Fileselector_Entry_Data *sd) { Eina_Bool val; @@ -200,7 +200,7 @@ _elc_fileselector_entry_elm_widget_disable(Eo *obj, Elc_Fileselector_Entry_Data } EOLIAN static Eina_Bool -_elc_fileselector_entry_elm_layout_text_set(Eo *obj, Elc_Fileselector_Entry_Data *sd, const char *part, const char *label) +_elm_fileselector_entry_elm_layout_text_set(Eo *obj, Elm_Fileselector_Entry_Data *sd, const char *part, const char *label) { if (part && strcmp(part, "default")) { @@ -215,7 +215,7 @@ _elc_fileselector_entry_elm_layout_text_set(Eo *obj, Elc_Fileselector_Entry_Data } EOLIAN static const char * -_elc_fileselector_entry_elm_layout_text_get(Eo *obj, Elc_Fileselector_Entry_Data *sd, const char *part) +_elm_fileselector_entry_elm_layout_text_get(Eo *obj, Elm_Fileselector_Entry_Data *sd, const char *part) { if (part && strcmp(part, "default")) { @@ -228,7 +228,7 @@ _elc_fileselector_entry_elm_layout_text_get(Eo *obj, Elc_Fileselector_Entry_Data } EOLIAN static Eina_Bool -_elc_fileselector_entry_elm_container_content_set(Eo *obj, Elc_Fileselector_Entry_Data *sd, const char *part, Evas_Object *content) +_elm_fileselector_entry_elm_container_content_set(Eo *obj, Elm_Fileselector_Entry_Data *sd, const char *part, Evas_Object *content) { if (part && strcmp(part, "button icon")) { @@ -243,7 +243,7 @@ _elc_fileselector_entry_elm_container_content_set(Eo *obj, Elc_Fileselector_Entr } EOLIAN static Evas_Object * -_elc_fileselector_entry_elm_container_content_get(Eo *obj, Elc_Fileselector_Entry_Data *sd, const char *part) +_elm_fileselector_entry_elm_container_content_get(Eo *obj, Elm_Fileselector_Entry_Data *sd, const char *part) { if (part && strcmp(part, "button icon")) { @@ -256,7 +256,7 @@ _elc_fileselector_entry_elm_container_content_get(Eo *obj, Elc_Fileselector_Entr } EOLIAN static Evas_Object * -_elc_fileselector_entry_elm_container_content_unset(Eo *obj, Elc_Fileselector_Entry_Data *sd, const char *part) +_elm_fileselector_entry_elm_container_content_unset(Eo *obj, Elm_Fileselector_Entry_Data *sd, const char *part) { if (part && strcmp(part, "button icon")) { @@ -269,7 +269,7 @@ _elc_fileselector_entry_elm_container_content_unset(Eo *obj, Elc_Fileselector_En } EOLIAN static void -_elc_fileselector_entry_evas_smart_add(Eo *obj, Elc_Fileselector_Entry_Data *priv) +_elm_fileselector_entry_evas_smart_add(Eo *obj, Elm_Fileselector_Entry_Data *priv) { eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); elm_widget_sub_object_parent_add(obj); @@ -326,7 +326,7 @@ _elc_fileselector_entry_evas_smart_add(Eo *obj, Elc_Fileselector_Entry_Data *pri } EOLIAN static void -_elc_fileselector_entry_evas_smart_del(Eo *obj, Elc_Fileselector_Entry_Data *sd) +_elm_fileselector_entry_evas_smart_del(Eo *obj, Elm_Fileselector_Entry_Data *sd) { free(sd->path); @@ -343,7 +343,7 @@ elm_fileselector_entry_add(Evas_Object *parent) } EOLIAN static void -_elc_fileselector_entry_eo_base_constructor(Eo *obj, Elc_Fileselector_Entry_Data *sd EINA_UNUSED) +_elm_fileselector_entry_eo_base_constructor(Eo *obj, Elm_Fileselector_Entry_Data *sd EINA_UNUSED) { eo_do_super(obj, MY_CLASS, eo_constructor()); eo_do(obj, @@ -360,7 +360,7 @@ elm_fileselector_entry_selected_set(Evas_Object *obj, } EOLIAN static Eina_Bool -_elc_fileselector_entry_elm_interface_fileselector_selected_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Entry_Data *sd, const char *path) +_elm_fileselector_entry_elm_interface_fileselector_selected_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Entry_Data *sd, const char *path) { elm_fileselector_path_set(sd->button, path); return EINA_TRUE; @@ -376,31 +376,31 @@ elm_fileselector_entry_selected_get(const Evas_Object *obj) } EOLIAN static const char * -_elc_fileselector_entry_elm_interface_fileselector_selected_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Entry_Data *sd) +_elm_fileselector_entry_elm_interface_fileselector_selected_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Entry_Data *sd) { return elm_fileselector_path_get(sd->button); } EOLIAN static void -_elc_fileselector_entry_window_title_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Entry_Data *sd, const char *title) +_elm_fileselector_entry_window_title_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Entry_Data *sd, const char *title) { elm_fileselector_button_window_title_set(sd->button, title); } EOLIAN static const char * -_elc_fileselector_entry_window_title_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Entry_Data *sd) +_elm_fileselector_entry_window_title_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Entry_Data *sd) { return elm_fileselector_button_window_title_get(sd->button); } EOLIAN static void -_elc_fileselector_entry_window_size_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Entry_Data *sd, Evas_Coord width, Evas_Coord height) +_elm_fileselector_entry_window_size_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Entry_Data *sd, Evas_Coord width, Evas_Coord height) { elm_fileselector_button_window_size_set(sd->button, width, height); } EOLIAN static void -_elc_fileselector_entry_window_size_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Entry_Data *sd, Evas_Coord *width, Evas_Coord *height) +_elm_fileselector_entry_window_size_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Entry_Data *sd, Evas_Coord *width, Evas_Coord *height) { elm_fileselector_button_window_size_get(sd->button, width, height); } @@ -414,7 +414,7 @@ elm_fileselector_entry_path_set(Evas_Object *obj, } EOLIAN static void -_elc_fileselector_entry_elm_interface_fileselector_path_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Entry_Data *sd, const char *path) +_elm_fileselector_entry_elm_interface_fileselector_path_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Entry_Data *sd, const char *path) { char *s; @@ -437,7 +437,7 @@ elm_fileselector_entry_path_get(const Evas_Object *obj) } EOLIAN static const char * -_elc_fileselector_entry_elm_interface_fileselector_path_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Entry_Data *sd) +_elm_fileselector_entry_elm_interface_fileselector_path_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Entry_Data *sd) { free(sd->path); sd->path = elm_entry_markup_to_utf8(elm_object_text_get(sd->entry)); @@ -453,7 +453,7 @@ elm_fileselector_entry_expandable_set(Evas_Object *obj, } EOLIAN static void -_elc_fileselector_entry_elm_interface_fileselector_expandable_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Entry_Data *sd, Eina_Bool value) +_elm_fileselector_entry_elm_interface_fileselector_expandable_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Entry_Data *sd, Eina_Bool value) { elm_fileselector_expandable_set(sd->button, value); } @@ -468,7 +468,7 @@ elm_fileselector_entry_expandable_get(const Evas_Object *obj) } EOLIAN static Eina_Bool -_elc_fileselector_entry_elm_interface_fileselector_expandable_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Entry_Data *sd) +_elm_fileselector_entry_elm_interface_fileselector_expandable_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Entry_Data *sd) { return elm_fileselector_expandable_get(sd->button); } @@ -482,7 +482,7 @@ elm_fileselector_entry_folder_only_set(Evas_Object *obj, } EOLIAN static void -_elc_fileselector_entry_elm_interface_fileselector_folder_only_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Entry_Data *sd, Eina_Bool value) +_elm_fileselector_entry_elm_interface_fileselector_folder_only_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Entry_Data *sd, Eina_Bool value) { elm_fileselector_folder_only_set(sd->button, value); } @@ -497,7 +497,7 @@ elm_fileselector_entry_folder_only_get(const Evas_Object *obj) } EOLIAN static Eina_Bool -_elc_fileselector_entry_elm_interface_fileselector_folder_only_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Entry_Data *sd) +_elm_fileselector_entry_elm_interface_fileselector_folder_only_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Entry_Data *sd) { return elm_fileselector_folder_only_get(sd->button); } @@ -511,7 +511,7 @@ elm_fileselector_entry_is_save_set(Evas_Object *obj, } EOLIAN static void -_elc_fileselector_entry_elm_interface_fileselector_is_save_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Entry_Data *sd, Eina_Bool value) +_elm_fileselector_entry_elm_interface_fileselector_is_save_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Entry_Data *sd, Eina_Bool value) { elm_fileselector_is_save_set(sd->button, value); } @@ -526,25 +526,25 @@ elm_fileselector_entry_is_save_get(const Evas_Object *obj) } EOLIAN static Eina_Bool -_elc_fileselector_entry_elm_interface_fileselector_is_save_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Entry_Data *sd) +_elm_fileselector_entry_elm_interface_fileselector_is_save_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Entry_Data *sd) { return elm_fileselector_is_save_get(sd->button); } EOLIAN static void -_elc_fileselector_entry_inwin_mode_set(Eo *obj EINA_UNUSED, Elc_Fileselector_Entry_Data *sd, Eina_Bool value) +_elm_fileselector_entry_inwin_mode_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Entry_Data *sd, Eina_Bool value) { elm_fileselector_button_inwin_mode_set(sd->button, value); } EOLIAN static Eina_Bool -_elc_fileselector_entry_inwin_mode_get(Eo *obj EINA_UNUSED, Elc_Fileselector_Entry_Data *sd) +_elm_fileselector_entry_inwin_mode_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Entry_Data *sd) { return elm_fileselector_button_inwin_mode_get(sd->button); } EOLIAN static void -_elc_fileselector_entry_class_constructor(Eo_Class *klass) +_elm_fileselector_entry_class_constructor(Eo_Class *klass) { evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } diff --git a/legacy/elementary/src/lib/elc_fileselector_entry.eo b/legacy/elementary/src/lib/elc_fileselector_entry.eo index 1eaff3eb8c..df03b109c6 100644 --- a/legacy/elementary/src/lib/elc_fileselector_entry.eo +++ b/legacy/elementary/src/lib/elc_fileselector_entry.eo @@ -1,6 +1,5 @@ -class Elc_Fileselector_Entry (Elm_Layout, Elm_Interface_Fileselector) +class Elm_Fileselector_Entry (Elm_Layout, Elm_Interface_Fileselector) { - legacy_prefix: elm_fileselector_entry; eo_prefix: elm_obj_fileselector_entry; properties { inwin_mode { diff --git a/legacy/elementary/src/lib/elc_hoversel.c b/legacy/elementary/src/lib/elc_hoversel.c index 1b99a8840d..b4fdc4932e 100644 --- a/legacy/elementary/src/lib/elc_hoversel.c +++ b/legacy/elementary/src/lib/elc_hoversel.c @@ -37,7 +37,7 @@ static const Elm_Action key_actions[] = { }; EOLIAN static Eina_Bool -_elc_hoversel_elm_widget_translate(Eo *obj EINA_UNUSED, Elc_Hoversel_Data *sd) +_elm_hoversel_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd) { Elm_Hoversel_Item *it; Eina_List *l; @@ -51,7 +51,7 @@ _elc_hoversel_elm_widget_translate(Eo *obj EINA_UNUSED, Elc_Hoversel_Data *sd) } EOLIAN static Eina_Bool -_elc_hoversel_elm_widget_theme_apply(Eo *obj, Elc_Hoversel_Data *sd) +_elm_hoversel_elm_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd) { Eina_Bool int_ret = EINA_FALSE; @@ -277,7 +277,7 @@ _item_del_pre_hook(Elm_Object_Item *it) } EOLIAN static void -_elc_hoversel_evas_smart_add(Eo *obj, Elc_Hoversel_Data *_pd EINA_UNUSED) +_elm_hoversel_evas_smart_add(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED) { eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); elm_widget_sub_object_parent_add(obj); @@ -291,7 +291,7 @@ _elc_hoversel_evas_smart_add(Eo *obj, Elc_Hoversel_Data *_pd EINA_UNUSED) } EOLIAN static void -_elc_hoversel_evas_smart_del(Eo *obj, Elc_Hoversel_Data *sd) +_elm_hoversel_evas_smart_del(Eo *obj, Elm_Hoversel_Data *sd) { Elm_Hoversel_Item *item; @@ -308,27 +308,27 @@ _elc_hoversel_evas_smart_del(Eo *obj, Elc_Hoversel_Data *sd) } EOLIAN static void -_elc_hoversel_evas_smart_show(Eo *obj, Elc_Hoversel_Data *sd) +_elm_hoversel_evas_smart_show(Eo *obj, Elm_Hoversel_Data *sd) { eo_do_super(obj, MY_CLASS, evas_obj_smart_show()); evas_object_show(sd->hover); } EOLIAN static void -_elc_hoversel_evas_smart_hide(Eo *obj, Elc_Hoversel_Data *sd) +_elm_hoversel_evas_smart_hide(Eo *obj, Elm_Hoversel_Data *sd) { eo_do_super(obj, MY_CLASS, evas_obj_smart_hide()); evas_object_hide(sd->hover); } EOLIAN static void -_elc_hoversel_elm_widget_parent_set(Eo *obj, Elc_Hoversel_Data *_pd EINA_UNUSED, Evas_Object *parent) +_elm_hoversel_elm_widget_parent_set(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED, Evas_Object *parent) { elm_hoversel_hover_parent_set(obj, parent); } EOLIAN static Eina_Bool -_elc_hoversel_elm_button_admits_autorepeat_get(Eo *obj EINA_UNUSED, Elc_Hoversel_Data *sd EINA_UNUSED) +_elm_hoversel_elm_button_admits_autorepeat_get(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd EINA_UNUSED) { return EINA_FALSE; } @@ -343,7 +343,7 @@ elm_hoversel_add(Evas_Object *parent) } EOLIAN static void -_elc_hoversel_eo_base_constructor(Eo *obj, Elc_Hoversel_Data *_pd EINA_UNUSED) +_elm_hoversel_eo_base_constructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED) { eo_do_super(obj, MY_CLASS, eo_constructor()); eo_do(obj, @@ -352,7 +352,7 @@ _elc_hoversel_eo_base_constructor(Eo *obj, Elc_Hoversel_Data *_pd EINA_UNUSED) } EOLIAN static void -_elc_hoversel_hover_parent_set(Eo *obj, Elc_Hoversel_Data *sd, Evas_Object *parent) +_elm_hoversel_hover_parent_set(Eo *obj, Elm_Hoversel_Data *sd, Evas_Object *parent) { if (sd->hover_parent) evas_object_event_callback_del_full @@ -365,13 +365,13 @@ _elc_hoversel_hover_parent_set(Eo *obj, Elc_Hoversel_Data *sd, Evas_Object *pare } EOLIAN static Evas_Object* -_elc_hoversel_hover_parent_get(Eo *obj EINA_UNUSED, Elc_Hoversel_Data *sd) +_elm_hoversel_hover_parent_get(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd) { return sd->hover_parent; } EOLIAN static void -_elc_hoversel_horizontal_set(Eo *obj, Elc_Hoversel_Data *sd, Eina_Bool horizontal) +_elm_hoversel_horizontal_set(Eo *obj, Elm_Hoversel_Data *sd, Eina_Bool horizontal) { sd->horizontal = !!horizontal; @@ -379,13 +379,13 @@ _elc_hoversel_horizontal_set(Eo *obj, Elc_Hoversel_Data *sd, Eina_Bool horizonta } EOLIAN static Eina_Bool -_elc_hoversel_horizontal_get(Eo *obj EINA_UNUSED, Elc_Hoversel_Data *sd) +_elm_hoversel_horizontal_get(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd) { return sd->horizontal; } EOLIAN static void -_elc_hoversel_hover_begin(Eo *obj, Elc_Hoversel_Data *sd) +_elm_hoversel_hover_begin(Eo *obj, Elm_Hoversel_Data *sd) { if (sd->hover) return; @@ -393,7 +393,7 @@ _elc_hoversel_hover_begin(Eo *obj, Elc_Hoversel_Data *sd) } EOLIAN static void -_elc_hoversel_hover_end(Eo *obj, Elc_Hoversel_Data *sd) +_elm_hoversel_hover_end(Eo *obj, Elm_Hoversel_Data *sd) { Elm_Object_Item *it; Eina_List *l; @@ -412,13 +412,13 @@ _elc_hoversel_hover_end(Eo *obj, Elc_Hoversel_Data *sd) } EOLIAN static Eina_Bool -_elc_hoversel_expanded_get(Eo *obj EINA_UNUSED, Elc_Hoversel_Data *sd) +_elm_hoversel_expanded_get(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd) { return (sd->hover) ? EINA_TRUE : EINA_FALSE; } EOLIAN static void -_elc_hoversel_clear(Eo *obj EINA_UNUSED, Elc_Hoversel_Data *sd) +_elm_hoversel_clear(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd) { Elm_Object_Item *it; Eina_List *l, *ll; @@ -430,13 +430,13 @@ _elc_hoversel_clear(Eo *obj EINA_UNUSED, Elc_Hoversel_Data *sd) } EOLIAN static const Eina_List* -_elc_hoversel_items_get(Eo *obj EINA_UNUSED, Elc_Hoversel_Data *sd) +_elm_hoversel_items_get(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd) { return sd->items; } EOLIAN static Elm_Object_Item* -_elc_hoversel_item_add(Eo *obj, Elc_Hoversel_Data *sd, const char *label, const char *icon_file, Elm_Icon_Type icon_type, Evas_Smart_Cb func, const void *data) +_elm_hoversel_item_add(Eo *obj, Elm_Hoversel_Data *sd, const char *label, const char *icon_file, Elm_Icon_Type icon_type, Evas_Smart_Cb func, const void *data) { Elm_Hoversel_Item *item = elm_widget_item_new(obj, Elm_Hoversel_Item); if (!item) return NULL; @@ -490,7 +490,7 @@ elm_hoversel_item_icon_get(const Elm_Object_Item *it, } static Elm_Hoversel_Item * -item_focused_get(Elc_Hoversel_Data *sd) +item_focused_get(Elm_Hoversel_Data *sd) { Elm_Hoversel_Item *item; Eina_List *l; @@ -555,7 +555,7 @@ _key_action_move(Evas_Object *obj, const char *params) } EOLIAN static Eina_Bool -_elc_hoversel_elm_widget_event(Eo *obj, Elc_Hoversel_Data *sd, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_hoversel_elm_widget_event(Eo *obj, Elm_Hoversel_Data *sd, Evas_Object *src, Evas_Callback_Type type, void *event_info) { (void) src; Eina_Bool int_ret = EINA_FALSE; @@ -576,7 +576,7 @@ _elc_hoversel_elm_widget_event(Eo *obj, Elc_Hoversel_Data *sd, Evas_Object *src, } static void -_elc_hoversel_class_constructor(Eo_Class *klass) +_elm_hoversel_class_constructor(Eo_Class *klass) { evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } diff --git a/legacy/elementary/src/lib/elc_hoversel.eo b/legacy/elementary/src/lib/elc_hoversel.eo index 0f20c7a730..51b60bde9c 100644 --- a/legacy/elementary/src/lib/elc_hoversel.eo +++ b/legacy/elementary/src/lib/elc_hoversel.eo @@ -1,7 +1,6 @@ -class Elc_Hoversel (Elm_Button, Evas_Selectable_Interface) +class Elm_Hoversel (Elm_Button, Evas_Selectable_Interface) { eo_prefix: elm_obj_hoversel; - legacy_prefix: elm_hoversel; properties { horizontal { set { diff --git a/legacy/elementary/src/lib/elc_multibuttonentry.c b/legacy/elementary/src/lib/elc_multibuttonentry.c index 226fb8061c..15b08bf146 100644 --- a/legacy/elementary/src/lib/elc_multibuttonentry.c +++ b/legacy/elementary/src/lib/elc_multibuttonentry.c @@ -40,7 +40,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { }; EOLIAN static Eina_Bool -_elc_multibuttonentry_elm_widget_translate(Eo *obj EINA_UNUSED, Elc_Multibuttonentry_Data *sd) +_elm_multibuttonentry_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd) { Elm_Multibuttonentry_Item *it; Eina_List *l; @@ -63,7 +63,7 @@ _format_count(int count, void *data EINA_UNUSED) } EOLIAN static Eina_Bool -_elc_multibuttonentry_elm_widget_theme_apply(Eo *obj, Elc_Multibuttonentry_Data *sd) +_elm_multibuttonentry_elm_widget_theme_apply(Eo *obj, Elm_Multibuttonentry_Data *sd) { Eina_List *l; Elm_Multibuttonentry_Item *item; @@ -262,7 +262,7 @@ _shrink_mode_set(Evas_Object *obj, } static void -_view_update(Elc_Multibuttonentry_Data *sd) +_view_update(Elm_Multibuttonentry_Data *sd) { Evas_Coord width = 1, height = 1; Evas_Object *obj = sd->parent; @@ -293,7 +293,7 @@ _view_update(Elc_Multibuttonentry_Data *sd) } EOLIAN static Eina_Bool -_elc_multibuttonentry_elm_widget_on_focus(Eo *obj, Elc_Multibuttonentry_Data *sd) +_elm_multibuttonentry_elm_widget_on_focus(Eo *obj, Elm_Multibuttonentry_Data *sd) { if (elm_widget_focus_get(obj)) { @@ -633,7 +633,7 @@ _access_multibuttonentry_item_register(Evas_Object *obj, } static Elm_Object_Item * -_button_item_add(Elc_Multibuttonentry_Data *sd, +_button_item_add(Elm_Multibuttonentry_Data *sd, const char *str, Multibuttonentry_Pos pos, const void *ref, @@ -831,7 +831,7 @@ _button_item_add(Elc_Multibuttonentry_Data *sd, //FIXME: having an empty event handling function and reacting on Evas //events on specific objects is crazy, someone should fix that. EOLIAN static Eina_Bool -_elc_multibuttonentry_elm_widget_event(Eo *obj EINA_UNUSED, Elc_Multibuttonentry_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *ev) +_elm_multibuttonentry_elm_widget_event(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *ev) { (void)src; (void)type; @@ -844,7 +844,7 @@ _elc_multibuttonentry_elm_widget_event(Eo *obj EINA_UNUSED, Elc_Multibuttonentry } EOLIAN static void -_elc_multibuttonentry_elm_layout_sizing_eval(Eo *obj, Elc_Multibuttonentry_Data *sd) +_elm_multibuttonentry_elm_layout_sizing_eval(Eo *obj, Elm_Multibuttonentry_Data *sd) { Evas_Coord minw = -1, minh = -1; Evas_Coord left, right, top, bottom; @@ -870,7 +870,7 @@ _mouse_clicked_signal_cb(void *data, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { - Elc_Multibuttonentry_Data *sd = data; + Elm_Multibuttonentry_Data *sd = data; _view_update(sd); @@ -1331,7 +1331,7 @@ _box_layout_cb(Evas_Object *o, } static void -_view_init(Evas_Object *obj, Elc_Multibuttonentry_Data *sd) +_view_init(Evas_Object *obj, Elm_Multibuttonentry_Data *sd) { sd->box = elm_box_add(obj); @@ -1383,7 +1383,7 @@ _view_init(Evas_Object *obj, Elc_Multibuttonentry_Data *sd) } EOLIAN static Eina_Bool -_elc_multibuttonentry_elm_layout_text_set(Eo *obj, Elc_Multibuttonentry_Data *sd EINA_UNUSED, const char *part, const char *label) +_elm_multibuttonentry_elm_layout_text_set(Eo *obj, Elm_Multibuttonentry_Data *sd EINA_UNUSED, const char *part, const char *label) { Eina_Bool int_ret = EINA_FALSE; @@ -1404,7 +1404,7 @@ _elc_multibuttonentry_elm_layout_text_set(Eo *obj, Elc_Multibuttonentry_Data *sd } EOLIAN static const char* -_elc_multibuttonentry_elm_layout_text_get(Eo *obj, Elc_Multibuttonentry_Data *sd, const char *part) +_elm_multibuttonentry_elm_layout_text_get(Eo *obj, Elm_Multibuttonentry_Data *sd, const char *part) { const char *text = NULL; @@ -1461,7 +1461,7 @@ _access_info_cb(void *data EINA_UNUSED, Evas_Object *obj) } EOLIAN static void -_elc_multibuttonentry_evas_smart_add(Eo *obj, Elc_Multibuttonentry_Data *priv) +_elm_multibuttonentry_evas_smart_add(Eo *obj, Elm_Multibuttonentry_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -1491,7 +1491,7 @@ _elc_multibuttonentry_evas_smart_add(Eo *obj, Elc_Multibuttonentry_Data *priv) } EOLIAN static void -_elc_multibuttonentry_evas_smart_del(Eo *obj, Elc_Multibuttonentry_Data *sd) +_elm_multibuttonentry_evas_smart_del(Eo *obj, Elm_Multibuttonentry_Data *sd) { Elm_Multibuttonentry_Item *item; @@ -1517,19 +1517,19 @@ _elc_multibuttonentry_evas_smart_del(Eo *obj, Elc_Multibuttonentry_Data *sd) static Eina_Bool _elm_multibuttonentry_smart_focus_next_enable = EINA_FALSE; EOLIAN static Eina_Bool -_elc_multibuttonentry_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elc_Multibuttonentry_Data *sd EINA_UNUSED) +_elm_multibuttonentry_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd EINA_UNUSED) { return EINA_FALSE; } EOLIAN static Eina_Bool -_elc_multibuttonentry_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elc_Multibuttonentry_Data *sd EINA_UNUSED) +_elm_multibuttonentry_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd EINA_UNUSED) { return _elm_multibuttonentry_smart_focus_next_enable; } EOLIAN static Eina_Bool -_elc_multibuttonentry_elm_widget_focus_next(Eo *obj, Elc_Multibuttonentry_Data *sd, Elm_Focus_Direction dir, Evas_Object **next) +_elm_multibuttonentry_elm_widget_focus_next(Eo *obj, Elm_Multibuttonentry_Data *sd, Elm_Focus_Direction dir, Evas_Object **next) { Eina_Bool int_ret = EINA_FALSE; @@ -1595,7 +1595,7 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access) } EOLIAN static void -_elc_multibuttonentry_elm_widget_access(Eo *obj, Elc_Multibuttonentry_Data *sd EINA_UNUSED, Eina_Bool acs) +_elm_multibuttonentry_elm_widget_access(Eo *obj, Elm_Multibuttonentry_Data *sd EINA_UNUSED, Eina_Bool acs) { _elm_multibuttonentry_smart_focus_next_enable = acs; _access_obj_process(obj, _elm_multibuttonentry_smart_focus_next_enable); @@ -1611,7 +1611,7 @@ elm_multibuttonentry_add(Evas_Object *parent) } EOLIAN static void -_elc_multibuttonentry_eo_base_constructor(Eo *obj, Elc_Multibuttonentry_Data *sd EINA_UNUSED) +_elm_multibuttonentry_eo_base_constructor(Eo *obj, Elm_Multibuttonentry_Data *sd EINA_UNUSED) { eo_do_super(obj, MY_CLASS, eo_constructor()); eo_do(obj, @@ -1620,20 +1620,20 @@ _elc_multibuttonentry_eo_base_constructor(Eo *obj, Elc_Multibuttonentry_Data *sd } EOLIAN static Evas_Object* -_elc_multibuttonentry_entry_get(Eo *obj EINA_UNUSED, Elc_Multibuttonentry_Data *sd) +_elm_multibuttonentry_entry_get(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd) { return sd->entry; } EOLIAN static Eina_Bool -_elc_multibuttonentry_expanded_get(Eo *obj EINA_UNUSED, Elc_Multibuttonentry_Data *sd) +_elm_multibuttonentry_expanded_get(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd) { return sd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK ? EINA_FALSE : EINA_TRUE; } EOLIAN static void -_elc_multibuttonentry_format_function_set(Eo *obj EINA_UNUSED, Elc_Multibuttonentry_Data *sd, Elm_Multibuttonentry_Format_Cb f_func, const void *data) +_elm_multibuttonentry_format_function_set(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd, Elm_Multibuttonentry_Format_Cb f_func, const void *data) { sd->format_func = f_func; if (!sd->format_func) sd->format_func = _format_count; @@ -1644,7 +1644,7 @@ _elc_multibuttonentry_format_function_set(Eo *obj EINA_UNUSED, Elc_Multibuttonen } EOLIAN static void -_elc_multibuttonentry_expanded_set(Eo *obj, Elc_Multibuttonentry_Data *sd, Eina_Bool expanded) +_elm_multibuttonentry_expanded_set(Eo *obj, Elm_Multibuttonentry_Data *sd, Eina_Bool expanded) { if (((sd->view_state == MULTIBUTTONENTRY_VIEW_SHRINK) ? EINA_FALSE : EINA_TRUE) == expanded) return; @@ -1656,7 +1656,7 @@ _elc_multibuttonentry_expanded_set(Eo *obj, Elc_Multibuttonentry_Data *sd, Eina_ } EOLIAN static void -_elc_multibuttonentry_editable_set(Eo *obj EINA_UNUSED, Elc_Multibuttonentry_Data *sd, Eina_Bool editable) +_elm_multibuttonentry_editable_set(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd, Eina_Bool editable) { editable = !!editable; if (sd->editable == editable) return; @@ -1672,55 +1672,55 @@ _elc_multibuttonentry_editable_set(Eo *obj EINA_UNUSED, Elc_Multibuttonentry_Dat } EOLIAN static Eina_Bool -_elc_multibuttonentry_editable_get(Eo *obj EINA_UNUSED, Elc_Multibuttonentry_Data *sd) +_elm_multibuttonentry_editable_get(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd) { return sd->editable; } EOLIAN static Elm_Object_Item* -_elc_multibuttonentry_item_prepend(Eo *obj EINA_UNUSED, Elc_Multibuttonentry_Data *sd, const char *label, Evas_Smart_Cb func, void *data) +_elm_multibuttonentry_item_prepend(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd, const char *label, Evas_Smart_Cb func, void *data) { return _button_item_add(sd, label, MULTIBUTTONENTRY_POS_START, NULL, func, data); } EOLIAN static Elm_Object_Item* -_elc_multibuttonentry_item_append(Eo *obj EINA_UNUSED, Elc_Multibuttonentry_Data *sd, const char *label, Evas_Smart_Cb func, void *data) +_elm_multibuttonentry_item_append(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd, const char *label, Evas_Smart_Cb func, void *data) { return _button_item_add(sd, label, MULTIBUTTONENTRY_POS_END, NULL, func, data); } EOLIAN static Elm_Object_Item* -_elc_multibuttonentry_item_insert_before(Eo *obj EINA_UNUSED, Elc_Multibuttonentry_Data *sd, Elm_Object_Item *before, const char *label, Evas_Smart_Cb func, void *data) +_elm_multibuttonentry_item_insert_before(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd, Elm_Object_Item *before, const char *label, Evas_Smart_Cb func, void *data) { return _button_item_add(sd, label, MULTIBUTTONENTRY_POS_BEFORE, before, func, data); } EOLIAN static Elm_Object_Item* -_elc_multibuttonentry_item_insert_after(Eo *obj EINA_UNUSED, Elc_Multibuttonentry_Data *sd, Elm_Object_Item *after, const char *label, Evas_Smart_Cb func, void *data) +_elm_multibuttonentry_item_insert_after(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd, Elm_Object_Item *after, const char *label, Evas_Smart_Cb func, void *data) { return _button_item_add(sd, label, MULTIBUTTONENTRY_POS_AFTER, after, func, data); } EOLIAN static const Eina_List* -_elc_multibuttonentry_items_get(Eo *obj EINA_UNUSED, Elc_Multibuttonentry_Data *sd) +_elm_multibuttonentry_items_get(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd) { return sd->items; } EOLIAN static Elm_Object_Item* -_elc_multibuttonentry_first_item_get(Eo *obj EINA_UNUSED, Elc_Multibuttonentry_Data *sd) +_elm_multibuttonentry_first_item_get(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd) { return eina_list_data_get(sd->items); } EOLIAN static Elm_Object_Item* -_elc_multibuttonentry_last_item_get(Eo *obj EINA_UNUSED, Elc_Multibuttonentry_Data *sd) +_elm_multibuttonentry_last_item_get(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd) { return eina_list_data_get(eina_list_last(sd->items)); } EOLIAN static Elm_Object_Item* -_elc_multibuttonentry_selected_item_get(Eo *obj EINA_UNUSED, Elc_Multibuttonentry_Data *sd) +_elm_multibuttonentry_selected_item_get(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd) { return sd->selected_it; } @@ -1747,7 +1747,7 @@ elm_multibuttonentry_item_selected_get(const Elm_Object_Item *it) } EOLIAN static void -_elc_multibuttonentry_clear(Eo *obj EINA_UNUSED, Elc_Multibuttonentry_Data *sd) +_elm_multibuttonentry_clear(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd) { Elm_Multibuttonentry_Item *item; @@ -1821,7 +1821,7 @@ elm_multibuttonentry_item_data_set(Elm_Object_Item *it, } EOLIAN static void -_elc_multibuttonentry_item_filter_append(Eo *obj EINA_UNUSED, Elc_Multibuttonentry_Data *sd, Elm_Multibuttonentry_Item_Filter_Cb func, void *data) +_elm_multibuttonentry_item_filter_append(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd, Elm_Multibuttonentry_Item_Filter_Cb func, void *data) { Elm_Multibuttonentry_Item_Filter *new_item_filter = NULL; Elm_Multibuttonentry_Item_Filter *_item_filter = NULL; @@ -1845,7 +1845,7 @@ _elc_multibuttonentry_item_filter_append(Eo *obj EINA_UNUSED, Elc_Multibuttonent } EOLIAN static void -_elc_multibuttonentry_item_filter_prepend(Eo *obj EINA_UNUSED, Elc_Multibuttonentry_Data *sd, Elm_Multibuttonentry_Item_Filter_Cb func, void *data) +_elm_multibuttonentry_item_filter_prepend(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd, Elm_Multibuttonentry_Item_Filter_Cb func, void *data) { Elm_Multibuttonentry_Item_Filter *new_item_filter = NULL; Elm_Multibuttonentry_Item_Filter *_item_filter = NULL; @@ -1870,7 +1870,7 @@ _elc_multibuttonentry_item_filter_prepend(Eo *obj EINA_UNUSED, Elc_Multibuttonen } EOLIAN static void -_elc_multibuttonentry_item_filter_remove(Eo *obj EINA_UNUSED, Elc_Multibuttonentry_Data *sd, Elm_Multibuttonentry_Item_Filter_Cb func, void *data) +_elm_multibuttonentry_item_filter_remove(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Data *sd, Elm_Multibuttonentry_Item_Filter_Cb func, void *data) { Eina_List *l; Elm_Multibuttonentry_Item_Filter *item_filter; @@ -1890,7 +1890,7 @@ _elc_multibuttonentry_item_filter_remove(Eo *obj EINA_UNUSED, Elc_Multibuttonent } static void -_elc_multibuttonentry_class_constructor(Eo_Class *klass) +_elm_multibuttonentry_class_constructor(Eo_Class *klass) { evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); diff --git a/legacy/elementary/src/lib/elc_multibuttonentry.eo b/legacy/elementary/src/lib/elc_multibuttonentry.eo index 8598f1d2b7..ee09831758 100644 --- a/legacy/elementary/src/lib/elc_multibuttonentry.eo +++ b/legacy/elementary/src/lib/elc_multibuttonentry.eo @@ -1,6 +1,5 @@ -class Elc_Multibuttonentry (Elm_Layout) +class Elm_Multibuttonentry (Elm_Layout) { - legacy_prefix: elm_multibuttonentry; eo_prefix: elm_obj_multibuttonentry; properties { editable { diff --git a/legacy/elementary/src/lib/elc_naviframe.c b/legacy/elementary/src/lib/elc_naviframe.c index 53369dd8de..72aadf6472 100644 --- a/legacy/elementary/src/lib/elc_naviframe.c +++ b/legacy/elementary/src/lib/elc_naviframe.c @@ -75,7 +75,7 @@ _prev_page_focus_recover(Elm_Naviframe_Item *it) } EOLIAN static Eina_Bool -_elc_naviframe_elm_widget_translate(Eo *obj EINA_UNUSED, Elc_Naviframe_Data *sd) +_elm_naviframe_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd) { Elm_Naviframe_Item *it; @@ -340,7 +340,7 @@ _item_title_enabled_update(Elm_Naviframe_Item *nit, Eina_Bool transition) } EOLIAN static Eina_Bool -_elc_naviframe_elm_widget_theme_apply(Eo *obj, Elc_Naviframe_Data *sd) +_elm_naviframe_elm_widget_theme_apply(Eo *obj, Elm_Naviframe_Data *sd) { Elm_Naviframe_Item *it; const char *style = NULL, *sstyle = NULL; @@ -871,7 +871,7 @@ _item_signal_emit_hook(Elm_Object_Item *it, } EOLIAN static void -_elc_naviframe_elm_layout_sizing_eval(Eo *obj, Elc_Naviframe_Data *sd) +_elm_naviframe_elm_layout_sizing_eval(Eo *obj, Elm_Naviframe_Data *sd) { Evas_Coord minw = -1, minh = -1; Elm_Naviframe_Item *it, *top; @@ -954,7 +954,7 @@ _back_btn_new(Evas_Object *obj, const char *title_label) } EOLIAN static void -_elc_naviframe_elm_layout_signal_emit(Eo *obj, Elc_Naviframe_Data *sd, const char *emission, const char *source) +_elm_naviframe_elm_layout_signal_emit(Eo *obj, Elm_Naviframe_Data *sd, const char *emission, const char *source) { if (!sd->stack) return; @@ -964,7 +964,7 @@ _elc_naviframe_elm_layout_signal_emit(Eo *obj, Elc_Naviframe_Data *sd, const cha /* content/text smart functions proxying things to the top item, which * is the resize object of the layout */ EOLIAN static Eina_Bool -_elc_naviframe_elm_layout_text_set(Eo *obj, Elc_Naviframe_Data *sd EINA_UNUSED, const char *part, const char *label) +_elm_naviframe_elm_layout_text_set(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, const char *part, const char *label) { Elm_Object_Item *it; @@ -976,7 +976,7 @@ _elc_naviframe_elm_layout_text_set(Eo *obj, Elc_Naviframe_Data *sd EINA_UNUSED, } EOLIAN static const char* -_elc_naviframe_elm_layout_text_get(Eo *obj, Elc_Naviframe_Data *sd EINA_UNUSED, const char *part) +_elm_naviframe_elm_layout_text_get(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, const char *part) { Elm_Object_Item *it = elm_naviframe_top_item_get(obj); if (!it) return NULL; @@ -987,7 +987,7 @@ _elc_naviframe_elm_layout_text_get(Eo *obj, Elc_Naviframe_Data *sd EINA_UNUSED, /* we have to keep a "manual" set here because of the callbacks on the * children */ EOLIAN static Eina_Bool -_elc_naviframe_elm_container_content_set(Eo *obj, Elc_Naviframe_Data *sd EINA_UNUSED, const char *part, Evas_Object *content) +_elm_naviframe_elm_container_content_set(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, const char *part, Evas_Object *content) { Elm_Object_Item *it; @@ -1003,7 +1003,7 @@ _elc_naviframe_elm_container_content_set(Eo *obj, Elc_Naviframe_Data *sd EINA_UN } EOLIAN static Evas_Object* -_elc_naviframe_elm_container_content_get(Eo *obj, Elc_Naviframe_Data *sd EINA_UNUSED, const char *part) +_elm_naviframe_elm_container_content_get(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, const char *part) { Elm_Object_Item *it = elm_naviframe_top_item_get(obj); @@ -1013,7 +1013,7 @@ _elc_naviframe_elm_container_content_get(Eo *obj, Elc_Naviframe_Data *sd EINA_UN } EOLIAN static Evas_Object* -_elc_naviframe_elm_container_content_unset(Eo *obj, Elc_Naviframe_Data *sd EINA_UNUSED, const char *part) +_elm_naviframe_elm_container_content_unset(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, const char *part) { Elm_Object_Item *it = elm_naviframe_top_item_get(obj); @@ -1234,7 +1234,7 @@ _on_obj_size_hints_changed(void *data EINA_UNUSED, Evas *e EINA_UNUSED, } EOLIAN static Eina_Bool -_elc_naviframe_elm_widget_focus_next(Eo *obj, Elc_Naviframe_Data *sd EINA_UNUSED, Elm_Focus_Direction dir, Evas_Object **next) +_elm_naviframe_elm_widget_focus_next(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, Elm_Focus_Direction dir, Evas_Object **next) { Evas_Object *ao; @@ -1272,13 +1272,13 @@ end: } EOLIAN static Eina_Bool -_elc_naviframe_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elc_Naviframe_Data *sd EINA_UNUSED) +_elm_naviframe_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd EINA_UNUSED) { return EINA_TRUE; } EOLIAN static Eina_Bool -_elc_naviframe_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Elc_Naviframe_Data *sd EINA_UNUSED, const Evas_Object *base, double degree, Evas_Object **direction, double *weight) +_elm_naviframe_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd EINA_UNUSED, const Evas_Object *base, double degree, Evas_Object **direction, double *weight) { Eina_Bool int_ret; @@ -1302,7 +1302,7 @@ _elc_naviframe_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Elc_Naviframe_Dat } EOLIAN static void -_elc_naviframe_evas_smart_add(Eo *obj, Elc_Naviframe_Data *priv) +_elm_naviframe_evas_smart_add(Eo *obj, Elm_Naviframe_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -1342,7 +1342,7 @@ _pop_transition_cb(void *data) } EOLIAN static void -_elc_naviframe_evas_smart_del(Eo *obj, Elc_Naviframe_Data *sd) +_elm_naviframe_evas_smart_del(Eo *obj, Elm_Naviframe_Data *sd) { Elm_Naviframe_Item *it; @@ -1368,7 +1368,7 @@ _elc_naviframe_evas_smart_del(Eo *obj, Elc_Naviframe_Data *sd) //Show only the top item view EOLIAN static void -_elc_naviframe_evas_smart_show(Eo *obj, Elc_Naviframe_Data *sd EINA_UNUSED) +_elm_naviframe_evas_smart_show(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED) { Elm_Naviframe_Item *top; @@ -1393,7 +1393,7 @@ _key_action_top_item_get(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_elc_naviframe_elm_widget_event(Eo *obj, Elc_Naviframe_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_naviframe_elm_widget_event(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) { (void)src; Evas_Event_Key_Down *ev = event_info; @@ -1407,7 +1407,7 @@ _elc_naviframe_elm_widget_event(Eo *obj, Elc_Naviframe_Data *sd EINA_UNUSED, Eva } EOLIAN static void -_elc_naviframe_elm_widget_access(Eo *obj EINA_UNUSED, Elc_Naviframe_Data *sd, Eina_Bool is_access) +_elm_naviframe_elm_widget_access(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd, Eina_Bool is_access) { Elm_Naviframe_Item *it; @@ -1491,7 +1491,7 @@ elm_naviframe_add(Evas_Object *parent) } EOLIAN static void -_elc_naviframe_eo_base_constructor(Eo *obj, Elc_Naviframe_Data *sd EINA_UNUSED) +_elm_naviframe_eo_base_constructor(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED) { eo_do_super(obj, MY_CLASS, eo_constructor()); eo_do(obj, @@ -1500,7 +1500,7 @@ _elc_naviframe_eo_base_constructor(Eo *obj, Elc_Naviframe_Data *sd EINA_UNUSED) } EOLIAN static Elm_Object_Item* -_elc_naviframe_item_push(Eo *obj, Elc_Naviframe_Data *sd EINA_UNUSED, const char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object *content, const char *item_style) +_elm_naviframe_item_push(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, const char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object *content, const char *item_style) { Elm_Naviframe_Item *top_item, *item; @@ -1513,7 +1513,7 @@ _elc_naviframe_item_push(Eo *obj, Elc_Naviframe_Data *sd EINA_UNUSED, const char } EOLIAN static Elm_Object_Item* -_elc_naviframe_item_insert_before(Eo *obj, Elc_Naviframe_Data *sd, Elm_Object_Item *before, const char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object *content, const char *item_style) +_elm_naviframe_item_insert_before(Eo *obj, Elm_Naviframe_Data *sd, Elm_Object_Item *before, const char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object *content, const char *item_style) { Elm_Naviframe_Item *it, *prev_it = NULL; @@ -1539,7 +1539,7 @@ _elc_naviframe_item_insert_before(Eo *obj, Elc_Naviframe_Data *sd, Elm_Object_It } EOLIAN static Elm_Object_Item* -_elc_naviframe_item_insert_after(Eo *obj, Elc_Naviframe_Data *sd, Elm_Object_Item *after, const char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object *content, const char *item_style) +_elm_naviframe_item_insert_after(Eo *obj, Elm_Naviframe_Data *sd, Elm_Object_Item *after, const char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object *content, const char *item_style) { Elm_Naviframe_Item *it; Eina_Bool top_inserted = EINA_FALSE; @@ -1577,7 +1577,7 @@ _elc_naviframe_item_insert_after(Eo *obj, Elc_Naviframe_Data *sd, Elm_Object_Ite } EOLIAN static Evas_Object* -_elc_naviframe_item_pop(Eo *obj, Elc_Naviframe_Data *sd) +_elm_naviframe_item_pop(Eo *obj, Elm_Naviframe_Data *sd) { Elm_Naviframe_Item *it, *prev_it = NULL; Evas_Object *content = NULL; @@ -1703,7 +1703,7 @@ elm_naviframe_item_promote(Elm_Object_Item *it) } EOLIAN static void -_elc_naviframe_item_simple_promote(Eo *obj EINA_UNUSED, Elc_Naviframe_Data *sd, Evas_Object *content) +_elm_naviframe_item_simple_promote(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd, Evas_Object *content) { Elm_Naviframe_Item *itr; @@ -1718,19 +1718,19 @@ _elc_naviframe_item_simple_promote(Eo *obj EINA_UNUSED, Elc_Naviframe_Data *sd, } EOLIAN static void -_elc_naviframe_content_preserve_on_pop_set(Eo *obj EINA_UNUSED, Elc_Naviframe_Data *sd, Eina_Bool preserve) +_elm_naviframe_content_preserve_on_pop_set(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd, Eina_Bool preserve) { sd->preserve = !!preserve; } EOLIAN static Eina_Bool -_elc_naviframe_content_preserve_on_pop_get(Eo *obj EINA_UNUSED, Elc_Naviframe_Data *sd) +_elm_naviframe_content_preserve_on_pop_get(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd) { return sd->preserve; } EOLIAN static Elm_Object_Item* -_elc_naviframe_top_item_get(Eo *obj EINA_UNUSED, Elc_Naviframe_Data *sd) +_elm_naviframe_top_item_get(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd) { if (!sd->stack) return NULL; return (Elm_Object_Item *)(EINA_INLIST_CONTAINER_GET @@ -1738,7 +1738,7 @@ _elc_naviframe_top_item_get(Eo *obj EINA_UNUSED, Elc_Naviframe_Data *sd) } EOLIAN static Elm_Object_Item* -_elc_naviframe_bottom_item_get(Eo *obj EINA_UNUSED, Elc_Naviframe_Data *sd) +_elm_naviframe_bottom_item_get(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd) { if (!sd->stack) return NULL; return (Elm_Object_Item *)(EINA_INLIST_CONTAINER_GET @@ -1826,19 +1826,19 @@ elm_naviframe_item_pop_cb_set(Elm_Object_Item *it, Elm_Naviframe_Item_Pop_Cb fun } EOLIAN static void -_elc_naviframe_prev_btn_auto_pushed_set(Eo *obj EINA_UNUSED, Elc_Naviframe_Data *sd, Eina_Bool auto_pushed) +_elm_naviframe_prev_btn_auto_pushed_set(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd, Eina_Bool auto_pushed) { sd->auto_pushed = !!auto_pushed; } EOLIAN static Eina_Bool -_elc_naviframe_prev_btn_auto_pushed_get(Eo *obj EINA_UNUSED, Elc_Naviframe_Data *sd) +_elm_naviframe_prev_btn_auto_pushed_get(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd) { return sd->auto_pushed; } EOLIAN static Eina_List* -_elc_naviframe_items_get(Eo *obj EINA_UNUSED, Elc_Naviframe_Data *sd) +_elm_naviframe_items_get(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd) { Eina_List *ret = NULL; Elm_Naviframe_Item *itr; @@ -1850,7 +1850,7 @@ _elc_naviframe_items_get(Eo *obj EINA_UNUSED, Elc_Naviframe_Data *sd) } EOLIAN static void -_elc_naviframe_event_enabled_set(Eo *obj EINA_UNUSED, Elc_Naviframe_Data *sd, Eina_Bool enabled) +_elm_naviframe_event_enabled_set(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd, Eina_Bool enabled) { enabled = !!enabled; if (sd->freeze_events == !enabled) return; @@ -1858,19 +1858,19 @@ _elc_naviframe_event_enabled_set(Eo *obj EINA_UNUSED, Elc_Naviframe_Data *sd, Ei } EOLIAN static Eina_Bool -_elc_naviframe_event_enabled_get(Eo *obj EINA_UNUSED, Elc_Naviframe_Data *sd) +_elm_naviframe_event_enabled_get(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd) { return !sd->freeze_events; } EOLIAN static Eina_Bool -_elc_naviframe_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elc_Naviframe_Data *sd EINA_UNUSED) +_elm_naviframe_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd EINA_UNUSED) { return EINA_TRUE; } static void -_elc_naviframe_class_constructor(Eo_Class *klass) +_elm_naviframe_class_constructor(Eo_Class *klass) { evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } diff --git a/legacy/elementary/src/lib/elc_naviframe.eo b/legacy/elementary/src/lib/elc_naviframe.eo index 51602903cb..ce7f4084ba 100644 --- a/legacy/elementary/src/lib/elc_naviframe.eo +++ b/legacy/elementary/src/lib/elc_naviframe.eo @@ -1,6 +1,5 @@ -class Elc_Naviframe (Elm_Layout) +class Elm_Naviframe (Elm_Layout) { - legacy_prefix: elm_naviframe; eo_prefix: elm_obj_naviframe; properties { event_enabled { diff --git a/legacy/elementary/src/lib/elc_popup.c b/legacy/elementary/src/lib/elc_popup.c index 83d1b9d4fb..1129e8a84a 100644 --- a/legacy/elementary/src/lib/elc_popup.c +++ b/legacy/elementary/src/lib/elc_popup.c @@ -46,7 +46,7 @@ static const Elm_Action key_actions[] = { static void _on_content_del(void *data, Evas *e, Evas_Object *obj, void *event_info); EOLIAN static Eina_Bool -_elc_popup_elm_widget_translate(Eo *obj EINA_UNUSED, Elc_Popup_Data *sd) +_elm_popup_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd) { Elm_Popup_Item *it; Eina_List *l; @@ -188,7 +188,7 @@ _size_hints_changed_cb(void *data, } static void -_list_del(Elc_Popup_Data *sd) +_list_del(Elm_Popup_Data *sd) { if (!sd->scr) return; @@ -202,7 +202,7 @@ _list_del(Elc_Popup_Data *sd) } static void -_items_remove(Elc_Popup_Data *sd) +_items_remove(Elm_Popup_Data *sd) { Elm_Popup_Item *it; @@ -215,7 +215,7 @@ _items_remove(Elc_Popup_Data *sd) } EOLIAN static void -_elc_popup_evas_smart_del(Eo *obj, Elc_Popup_Data *sd) +_elm_popup_evas_smart_del(Eo *obj, Elm_Popup_Data *sd) { unsigned int i; @@ -315,7 +315,7 @@ _access_obj_process(Eo *obj, Eina_Bool is_access) } EOLIAN static Eina_Bool -_elc_popup_elm_widget_theme_apply(Eo *obj, Elc_Popup_Data *sd) +_elm_popup_elm_widget_theme_apply(Eo *obj, Elm_Popup_Data *sd) { Elm_Popup_Item *it; unsigned int i = 0; @@ -410,7 +410,7 @@ _item_sizing_eval(Elm_Popup_Item *it) } EOLIAN static void -_elc_popup_elm_layout_sizing_eval(Eo *obj, Elc_Popup_Data *sd) +_elm_popup_elm_layout_sizing_eval(Eo *obj, Elm_Popup_Data *sd) { Eina_List *elist; Elm_Popup_Item *it; @@ -442,7 +442,7 @@ _elc_popup_elm_layout_sizing_eval(Eo *obj, Elc_Popup_Data *sd) } EOLIAN static Eina_Bool -_elc_popup_elm_widget_sub_object_del(Eo *obj, Elc_Popup_Data *sd, Evas_Object *sobj) +_elm_popup_elm_widget_sub_object_del(Eo *obj, Elm_Popup_Data *sd, Evas_Object *sobj) { Elm_Popup_Item *it; Eina_Bool int_ret = EINA_FALSE; @@ -997,7 +997,7 @@ end: } EOLIAN static Eina_Bool -_elc_popup_elm_layout_text_set(Eo *obj, Elc_Popup_Data *_pd EINA_UNUSED, const char *part, const char *label) +_elm_popup_elm_layout_text_set(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, const char *part, const char *label) { Eina_Bool int_ret = EINA_FALSE; @@ -1033,7 +1033,7 @@ _content_text_get(const Evas_Object *obj) } EOLIAN static const char* -_elc_popup_elm_layout_text_get(Eo *obj, Elc_Popup_Data *_pd EINA_UNUSED, const char *part) +_elm_popup_elm_layout_text_get(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, const char *part) { const char *text = NULL; @@ -1180,7 +1180,7 @@ _action_button_set(Evas_Object *obj, } EOLIAN static Eina_Bool -_elc_popup_elm_container_content_set(Eo *obj, Elc_Popup_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content) +_elm_popup_elm_container_content_set(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content) { unsigned int i; @@ -1243,7 +1243,7 @@ _action_button_get(const Evas_Object *obj, } EOLIAN static Evas_Object* -_elc_popup_elm_container_content_get(Eo *obj, Elc_Popup_Data *_pd EINA_UNUSED, const char *part) +_elm_popup_elm_container_content_get(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, const char *part) { Evas_Object *content = NULL; unsigned int i; @@ -1315,7 +1315,7 @@ _title_icon_unset(Evas_Object *obj) } EOLIAN static Evas_Object* -_elc_popup_elm_container_content_unset(Eo *obj, Elc_Popup_Data *_pd EINA_UNUSED, const char *part) +_elm_popup_elm_container_content_unset(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, const char *part) { Evas_Object *content = NULL; unsigned int i; @@ -1345,13 +1345,13 @@ err: } EOLIAN static Eina_Bool -_elc_popup_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elc_Popup_Data *_pd EINA_UNUSED) +_elm_popup_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Popup_Data *_pd EINA_UNUSED) { return EINA_TRUE; } EOLIAN static Eina_Bool -_elc_popup_elm_widget_focus_next(Eo *obj EINA_UNUSED, Elc_Popup_Data *sd, Elm_Focus_Direction dir, Evas_Object **next) +_elm_popup_elm_widget_focus_next(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd, Elm_Focus_Direction dir, Evas_Object **next) { Evas_Object *ao; Eina_List *items = NULL; @@ -1392,13 +1392,13 @@ _elc_popup_elm_widget_focus_next(Eo *obj EINA_UNUSED, Elc_Popup_Data *sd, Elm_Fo } EOLIAN static Eina_Bool -_elc_popup_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elc_Popup_Data *_pd EINA_UNUSED) +_elm_popup_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Popup_Data *_pd EINA_UNUSED) { return EINA_TRUE; } EOLIAN static Eina_Bool -_elc_popup_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Elc_Popup_Data *sd, const Evas_Object *base, double degree, Evas_Object **direction, double *weight) +_elm_popup_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd, const Evas_Object *base, double degree, Evas_Object **direction, double *weight) { Evas_Object *ao; Eina_List *items = NULL; @@ -1462,7 +1462,7 @@ _key_action_move(Evas_Object *obj, const char *params) } EOLIAN static Eina_Bool -_elc_popup_elm_widget_event(Eo *obj, Elc_Popup_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) +_elm_popup_elm_widget_event(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) { (void)src; Evas_Event_Key_Down *ev = event_info; @@ -1478,7 +1478,7 @@ _elc_popup_elm_widget_event(Eo *obj, Elc_Popup_Data *_pd EINA_UNUSED, Evas_Objec } EOLIAN static void -_elc_popup_evas_smart_add(Eo *obj, Elc_Popup_Data *priv) +_elm_popup_evas_smart_add(Eo *obj, Elm_Popup_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); char style[1024]; @@ -1542,13 +1542,13 @@ _elc_popup_evas_smart_add(Eo *obj, Elc_Popup_Data *priv) } EOLIAN static void -_elc_popup_elm_widget_parent_set(Eo *obj EINA_UNUSED, Elc_Popup_Data *sd, Evas_Object *parent) +_elm_popup_elm_widget_parent_set(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd, Evas_Object *parent) { elm_notify_parent_set(sd->notify, parent); } EOLIAN static void -_elc_popup_elm_widget_access(Eo *obj, Elc_Popup_Data *_pd EINA_UNUSED, Eina_Bool is_access) +_elm_popup_elm_widget_access(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, Eina_Bool is_access) { _access_obj_process(obj, is_access); } @@ -1567,7 +1567,7 @@ elm_popup_add(Evas_Object *parent) } EOLIAN static void -_elc_popup_eo_base_constructor(Eo *obj, Elc_Popup_Data *_pd EINA_UNUSED) +_elm_popup_eo_base_constructor(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED) { eo_do_super(obj, MY_CLASS, eo_constructor()); eo_do(obj, @@ -1576,7 +1576,7 @@ _elc_popup_eo_base_constructor(Eo *obj, Elc_Popup_Data *_pd EINA_UNUSED) } EOLIAN static void -_elc_popup_content_text_wrap_type_set(Eo *obj EINA_UNUSED, Elc_Popup_Data *sd, Elm_Wrap_Type wrap) +_elm_popup_content_text_wrap_type_set(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd, Elm_Wrap_Type wrap) { //Need to wrap the content text, so not allowing ELM_WRAP_NONE if (sd->content_text_wrap_type == ELM_WRAP_NONE) return; @@ -1587,7 +1587,7 @@ _elc_popup_content_text_wrap_type_set(Eo *obj EINA_UNUSED, Elc_Popup_Data *sd, E } EOLIAN static Elm_Wrap_Type -_elc_popup_content_text_wrap_type_get(Eo *obj EINA_UNUSED, Elc_Popup_Data *sd) +_elm_popup_content_text_wrap_type_get(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd) { return sd->content_text_wrap_type; } @@ -1678,44 +1678,44 @@ _elm_notify_orient_set(Evas_Object *obj, } EOLIAN static void -_elc_popup_orient_set(Eo *obj EINA_UNUSED, Elc_Popup_Data *sd, Elm_Popup_Orient orient) +_elm_popup_orient_set(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd, Elm_Popup_Orient orient) { if (orient >= ELM_POPUP_ORIENT_LAST) return; _elm_notify_orient_set(sd->notify, (Elm_Notify_Orient)orient); } EOLIAN static Elm_Popup_Orient -_elc_popup_orient_get(Eo *obj EINA_UNUSED, Elc_Popup_Data *sd) +_elm_popup_orient_get(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd) { return (Elm_Popup_Orient)_elm_notify_orient_get(sd->notify); } EOLIAN static void -_elc_popup_align_set(Eo *obj EINA_UNUSED, Elc_Popup_Data *sd, double horizontal, double vertical) +_elm_popup_align_set(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd, double horizontal, double vertical) { elm_notify_align_set(sd->notify, horizontal, vertical); } EOLIAN static void -_elc_popup_align_get(Eo *obj EINA_UNUSED, Elc_Popup_Data *sd, double *horizontal, double *vertical) +_elm_popup_align_get(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd, double *horizontal, double *vertical) { elm_notify_align_get(sd->notify, horizontal, vertical); } EOLIAN static void -_elc_popup_timeout_set(Eo *obj EINA_UNUSED, Elc_Popup_Data *sd, double timeout) +_elm_popup_timeout_set(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd, double timeout) { elm_notify_timeout_set(sd->notify, timeout); } EOLIAN static double -_elc_popup_timeout_get(Eo *obj EINA_UNUSED, Elc_Popup_Data *sd) +_elm_popup_timeout_get(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd) { return elm_notify_timeout_get(sd->notify); } EOLIAN static void -_elc_popup_allow_events_set(Eo *obj EINA_UNUSED, Elc_Popup_Data *sd, Eina_Bool allow) +_elm_popup_allow_events_set(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd, Eina_Bool allow) { Eina_Bool allow_events = !!allow; @@ -1723,13 +1723,13 @@ _elc_popup_allow_events_set(Eo *obj EINA_UNUSED, Elc_Popup_Data *sd, Eina_Bool a } EOLIAN static Eina_Bool -_elc_popup_allow_events_get(Eo *obj EINA_UNUSED, Elc_Popup_Data *sd) +_elm_popup_allow_events_get(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd) { return elm_notify_allow_events_get(sd->notify); } EOLIAN static Elm_Object_Item* -_elc_popup_item_append(Eo *obj, Elc_Popup_Data *sd, const char *label, Evas_Object *icon, Evas_Smart_Cb func, const void *data) +_elm_popup_item_append(Eo *obj, Elm_Popup_Data *sd, const char *label, Evas_Object *icon, Evas_Smart_Cb func, const void *data) { Evas_Object *prev_content; Elm_Popup_Item *it; @@ -1765,7 +1765,7 @@ _elc_popup_item_append(Eo *obj, Elc_Popup_Data *sd, const char *label, Evas_Obje } static void -_elc_popup_class_constructor(Eo_Class *klass) +_elm_popup_class_constructor(Eo_Class *klass) { evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } diff --git a/legacy/elementary/src/lib/elc_popup.eo b/legacy/elementary/src/lib/elc_popup.eo index fdb189b5ac..1c7f116bfc 100644 --- a/legacy/elementary/src/lib/elc_popup.eo +++ b/legacy/elementary/src/lib/elc_popup.eo @@ -1,7 +1,6 @@ -class Elc_Popup (Elm_Layout) +class Elm_Popup (Elm_Layout) { eo_prefix: elm_obj_popup; - legacy_prefix: elm_popup; properties { align { set { diff --git a/legacy/elementary/src/lib/elm_widget_ctxpopup.h b/legacy/elementary/src/lib/elm_widget_ctxpopup.h index eaae034570..123e04043a 100644 --- a/legacy/elementary/src/lib/elm_widget_ctxpopup.h +++ b/legacy/elementary/src/lib/elm_widget_ctxpopup.h @@ -19,7 +19,7 @@ typedef struct _Elm_Ctxpopup_Item Elm_Ctxpopup_Item; /** * Base widget smart data extended with ctxpopup instance data. */ -typedef struct _Elc_Ctxpopup_Data Elc_Ctxpopup_Data; +typedef struct _Elm_Ctxpopup_Data Elm_Ctxpopup_Data; struct _Elm_Ctxpopup_Item { ELM_WIDGET_ITEM; @@ -34,7 +34,7 @@ struct _Elm_Ctxpopup_Item } wcb; }; -struct _Elc_Ctxpopup_Data +struct _Elm_Ctxpopup_Data { Evas_Object *parent; Evas_Object *list; @@ -61,7 +61,7 @@ struct _Elc_Ctxpopup_Data */ #define ELM_CTXPOPUP_DATA_GET(o, sd) \ - Elc_Ctxpopup_Data * sd = eo_data_scope_get(o, ELM_OBJ_CTXPOPUP_CLASS) + Elm_Ctxpopup_Data * sd = eo_data_scope_get(o, ELM_OBJ_CTXPOPUP_CLASS) #define ELM_CTXPOPUP_DATA_GET_OR_RETURN(o, ptr) \ ELM_CTXPOPUP_DATA_GET(o, ptr); \ diff --git a/legacy/elementary/src/lib/elm_widget_fileselector.h b/legacy/elementary/src/lib/elm_widget_fileselector.h index 080aaa7be2..51cff5049a 100644 --- a/legacy/elementary/src/lib/elm_widget_fileselector.h +++ b/legacy/elementary/src/lib/elm_widget_fileselector.h @@ -19,8 +19,8 @@ typedef struct _Elm_Fileselector_Filter Elm_Fileselector_Filter; /** * Base layout smart data extended with fileselector instance data. */ -typedef struct _Elc_Fileselector_Data Elc_Fileselector_Data; -struct _Elc_Fileselector_Data +typedef struct _Elm_Fileselector_Data Elm_Fileselector_Data; +struct _Elm_Fileselector_Data { EINA_REFCOUNT; @@ -82,7 +82,7 @@ struct sel_data typedef struct _Listing_Request Listing_Request; struct _Listing_Request { - Elc_Fileselector_Data *sd; + Elm_Fileselector_Data *sd; Elm_Object_Item *parent_it; Evas_Object *obj; @@ -114,7 +114,7 @@ struct _Elm_Fileselector_Custom_Filter struct _Elm_Fileselector_Filter { const char *filter_name; - Elc_Fileselector_Data *sd; + Elm_Fileselector_Data *sd; union { char **mime_types; @@ -129,7 +129,7 @@ struct _Elm_Fileselector_Filter */ #define ELM_FILESELECTOR_DATA_GET(o, sd) \ - Elc_Fileselector_Data * sd = eo_data_scope_get(o, ELM_OBJ_FILESELECTOR_CLASS) + Elm_Fileselector_Data * sd = eo_data_scope_get(o, ELM_OBJ_FILESELECTOR_CLASS) #define ELM_FILESELECTOR_DATA_GET_OR_RETURN(o, ptr) \ ELM_FILESELECTOR_DATA_GET(o, ptr); \ diff --git a/legacy/elementary/src/lib/elm_widget_fileselector_button.h b/legacy/elementary/src/lib/elm_widget_fileselector_button.h index 515190f424..5a26f79853 100644 --- a/legacy/elementary/src/lib/elm_widget_fileselector_button.h +++ b/legacy/elementary/src/lib/elm_widget_fileselector_button.h @@ -20,9 +20,9 @@ /** * Base button smart data extended with fileselector_button instance data. */ -typedef struct _Elc_Fileselector_Button_Data \ - Elc_Fileselector_Button_Data; -struct _Elc_Fileselector_Button_Data +typedef struct _Elm_Fileselector_Button_Data \ + Elm_Fileselector_Button_Data; +struct _Elm_Fileselector_Button_Data { Evas_Object *obj; // the object itself Evas_Object *fs, *fsw; @@ -51,7 +51,7 @@ struct _Elc_Fileselector_Button_Data */ #define ELM_FILESELECTOR_BUTTON_DATA_GET(o, sd) \ - Elc_Fileselector_Button_Data * sd = eo_data_scope_get(o, ELM_OBJ_FILESELECTOR_BUTTON_CLASS) + Elm_Fileselector_Button_Data * sd = eo_data_scope_get(o, ELM_OBJ_FILESELECTOR_BUTTON_CLASS) #define ELM_FILESELECTOR_BUTTON_DATA_GET_OR_RETURN(o, ptr) \ ELM_FILESELECTOR_BUTTON_DATA_GET(o, ptr); \ diff --git a/legacy/elementary/src/lib/elm_widget_fileselector_entry.h b/legacy/elementary/src/lib/elm_widget_fileselector_entry.h index f1295346ff..4b5c007ace 100644 --- a/legacy/elementary/src/lib/elm_widget_fileselector_entry.h +++ b/legacy/elementary/src/lib/elm_widget_fileselector_entry.h @@ -20,9 +20,9 @@ /** * Base entry smart data extended with fileselector_entry instance data. */ -typedef struct _Elc_Fileselector_Entry_Data \ -Elc_Fileselector_Entry_Data; -struct _Elc_Fileselector_Entry_Data +typedef struct _Elm_Fileselector_Entry_Data \ +Elm_Fileselector_Entry_Data; +struct _Elm_Fileselector_Entry_Data { Evas_Object *button; Evas_Object *entry; @@ -35,7 +35,7 @@ struct _Elc_Fileselector_Entry_Data #define ELM_FILESELECTOR_ENTRY_DATA_GET(o, sd) \ - Elc_Fileselector_Entry_Data * sd = eo_data_scope_get(o, ELM_OBJ_FILESELECTOR_ENTRY_CLASS) + Elm_Fileselector_Entry_Data * sd = eo_data_scope_get(o, ELM_OBJ_FILESELECTOR_ENTRY_CLASS) #define ELM_FILESELECTOR_ENTRY_DATA_GET_OR_RETURN(o, ptr) \ ELM_FILESELECTOR_ENTRY_DATA_GET(o, ptr); \ diff --git a/legacy/elementary/src/lib/elm_widget_hoversel.h b/legacy/elementary/src/lib/elm_widget_hoversel.h index 66c3677239..7f6b14ebfb 100644 --- a/legacy/elementary/src/lib/elm_widget_hoversel.h +++ b/legacy/elementary/src/lib/elm_widget_hoversel.h @@ -19,8 +19,8 @@ /** * Base button smart data extended with hoversel instance data. */ -typedef struct _Elc_Hoversel_Data Elc_Hoversel_Data; -struct _Elc_Hoversel_Data +typedef struct _Elm_Hoversel_Data Elm_Hoversel_Data; +struct _Elm_Hoversel_Data { /* aggregates a hover */ Evas_Object *hover; @@ -50,7 +50,7 @@ struct _Elm_Hoversel_Item */ #define ELM_HOVERSEL_DATA_GET(o, sd) \ - Elc_Hoversel_Data * sd = eo_data_scope_get(o, ELM_OBJ_HOVERSEL_CLASS) + Elm_Hoversel_Data * sd = eo_data_scope_get(o, ELM_OBJ_HOVERSEL_CLASS) #define ELM_HOVERSEL_DATA_GET_OR_RETURN(o, ptr) \ ELM_HOVERSEL_DATA_GET(o, ptr); \ diff --git a/legacy/elementary/src/lib/elm_widget_multibuttonentry.h b/legacy/elementary/src/lib/elm_widget_multibuttonentry.h index a6858325a9..f5eb2e0526 100644 --- a/legacy/elementary/src/lib/elm_widget_multibuttonentry.h +++ b/legacy/elementary/src/lib/elm_widget_multibuttonentry.h @@ -65,9 +65,9 @@ typedef struct _Elm_Multibuttonentry_Item_Filter void *data; } Elm_Multibuttonentry_Item_Filter; -typedef struct _Elc_Multibuttonentry_Data - Elc_Multibuttonentry_Data; -struct _Elc_Multibuttonentry_Data +typedef struct _Elm_Multibuttonentry_Data + Elm_Multibuttonentry_Data; +struct _Elm_Multibuttonentry_Data { Evas_Object *parent; Evas_Object *box; @@ -106,7 +106,7 @@ struct _Elc_Multibuttonentry_Data */ #define ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(o, ptr) \ - Elc_Multibuttonentry_Data *ptr = eo_data_scope_get(o, ELM_OBJ_MULTIBUTTONENTRY_CLASS); \ + Elm_Multibuttonentry_Data *ptr = eo_data_scope_get(o, ELM_OBJ_MULTIBUTTONENTRY_CLASS); \ if (EINA_UNLIKELY(!ptr)) \ { \ CRI("No widget data for object %p (%s)", \ @@ -115,7 +115,7 @@ struct _Elc_Multibuttonentry_Data } #define ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ - Elc_Multibuttonentry_Data * ptr = eo_data_scope_get(o, ELM_OBJ_MULTIBUTTONENTRY_CLASS); \ + Elm_Multibuttonentry_Data * ptr = eo_data_scope_get(o, ELM_OBJ_MULTIBUTTONENTRY_CLASS); \ if (EINA_UNLIKELY(!ptr)) \ { \ CRI("No widget data for object %p (%s)", \ diff --git a/legacy/elementary/src/lib/elm_widget_naviframe.h b/legacy/elementary/src/lib/elm_widget_naviframe.h index 4446977bf1..0a64c55366 100644 --- a/legacy/elementary/src/lib/elm_widget_naviframe.h +++ b/legacy/elementary/src/lib/elm_widget_naviframe.h @@ -17,8 +17,8 @@ /** * Base layout smart data extended with naviframe instance data. */ -typedef struct _Elc_Naviframe_Data Elc_Naviframe_Data; -struct _Elc_Naviframe_Data +typedef struct _Elm_Naviframe_Data Elm_Naviframe_Data; +struct _Elm_Naviframe_Data { Eina_Inlist *stack; /* top item is the list's LAST item */ Eina_List *popping; @@ -82,7 +82,7 @@ struct _Elm_Naviframe_Text_Item_Pair */ #define ELM_NAVIFRAME_DATA_GET(o, sd) \ - Elc_Naviframe_Data * sd = eo_data_scope_get(o, ELM_OBJ_NAVIFRAME_CLASS) + Elm_Naviframe_Data * sd = eo_data_scope_get(o, ELM_OBJ_NAVIFRAME_CLASS) #define ELM_NAVIFRAME_DATA_GET_OR_RETURN(o, ptr) \ ELM_NAVIFRAME_DATA_GET(o, ptr); \ diff --git a/legacy/elementary/src/lib/elm_widget_popup.h b/legacy/elementary/src/lib/elm_widget_popup.h index 7d374ad48e..b9171a5904 100644 --- a/legacy/elementary/src/lib/elm_widget_popup.h +++ b/legacy/elementary/src/lib/elm_widget_popup.h @@ -22,8 +22,8 @@ typedef struct _Action_Area_Data Action_Area_Data; /** * Base layout smart data extended with popup instance data. */ -typedef struct _Elc_Popup_Data Elc_Popup_Data; -struct _Elc_Popup_Data +typedef struct _Elm_Popup_Data Elm_Popup_Data; +struct _Elm_Popup_Data { Evas_Object *notify; Evas_Object *title_icon; @@ -70,7 +70,7 @@ struct _Action_Area_Data */ #define ELM_POPUP_DATA_GET(o, sd) \ - Elc_Popup_Data * sd = eo_data_scope_get(o, ELM_OBJ_POPUP_CLASS) + Elm_Popup_Data * sd = eo_data_scope_get(o, ELM_OBJ_POPUP_CLASS) #define ELM_POPUP_DATA_GET_OR_RETURN(o, ptr) \ ELM_POPUP_DATA_GET(o, ptr); \