enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

update according to latest efl changes: _CLASS -> _CLASS/INTERFACE/MIXIN

This commit is contained in:
Daniel Kolesa 2014-06-30 21:37:04 +01:00
parent f9fdf1009b
commit 20525deb55
10 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/elementary/src/lib/elm_atspi_app_object.c
View File

@ -40,7 +40,7 @@ _elm_atspi_app_object_elm_interface_atspi_accessible_children_get(Eo *obj EINA_U
EINA_LIST_FOREACH(_elm_win_list, l, win)
{
if (!win) continue;
if (eo_isa(win, ELM_INTERFACE_ATSPI_ACCESSIBLE_CLASS))
if (eo_isa(win, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
accs = eina_list_append(accs, win);
}

46
legacy/elementary/src/lib/elm_atspi_bridge.c
View File

@ -1746,7 +1746,7 @@ _access_object_from_path(const char *path)
sscanf(tmp, "%llu", &eo_ptr);
eo = (Eo *) (uintptr_t) eo_ptr;
return eo_isa(eo, ELM_INTERFACE_ATSPI_ACCESSIBLE_CLASS) ? eo : NULL;
return eo_isa(eo, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN) ? eo : NULL;
}
static char *
@ -2074,21 +2074,21 @@ _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj)
iter_array = eldbus_message_iter_container_new(iter, 'a', "s");
if (!iter_array) return;
if (eo_isa(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_CLASS))
if (eo_isa(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_ACCESSIBLE);
if (eo_isa(obj, ELM_INTERFACE_ATSPI_COMPONENT_CLASS))
if (eo_isa(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN))
eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COMPONENT);
if (eo_isa(obj, ELM_INTERFACE_ATSPI_ACTION_CLASS))
if (eo_isa(obj, ELM_INTERFACE_ATSPI_ACTION_MIXIN))
eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_ACTION);
if (eo_isa(obj, ELM_INTERFACE_ATSPI_VALUE_CLASS))
if (eo_isa(obj, ELM_INTERFACE_ATSPI_VALUE_INTERFACE))
eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_VALUE);
if (eo_isa(obj, ELM_INTERFACE_ATSPI_IMAGE_CLASS))
if (eo_isa(obj, ELM_INTERFACE_ATSPI_IMAGE_MIXIN))
eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_IMAGE);
if (eo_isa(obj, ELM_INTERFACE_ATSPI_TEXT_CLASS))
if (eo_isa(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE))
eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_TEXT);
if (eo_isa(obj, ELM_INTERFACE_ATSPI_EDITABLE_TEXT_CLASS))
if (eo_isa(obj, ELM_INTERFACE_ATSPI_EDITABLE_TEXT_INTERFACE))
eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_EDITABLE_TEXT);
if (eo_isa(obj, ELM_INTERFACE_ATSPI_SELECTION_CLASS))
if (eo_isa(obj, ELM_INTERFACE_ATSPI_SELECTION_INTERFACE))
eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_SELECTION);
eldbus_message_iter_container_close(iter, iter_array);
@ -3122,7 +3122,7 @@ _cache_build(void *obj)
Eo *child;
char *path = NULL;
if (!eo_isa(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_CLASS))
if (!eo_isa(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
return;
path = _path_from_access_object(obj);
@ -3178,7 +3178,7 @@ static void _object_register(Eo *obj, char *path)
{
Eldbus_Service_Interface *infc = NULL, *event_infc;
if (!eo_isa(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_CLASS))
if (!eo_isa(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
{
WRN("Unable to register class w/o Elm_Interface_Atspi_Accessible!");
return;
@ -3192,31 +3192,31 @@ static void _object_register(Eo *obj, char *path)
eo_do(obj, eo_key_data_set("event_interface", event_infc, NULL));
eo_do(obj, eo_event_callback_array_add(_events_cb(), event_infc));
if (eo_isa(obj, ELM_INTERFACE_ATSPI_COMPONENT_CLASS))
if (eo_isa(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN))
eldbus_service_interface_register(_a11y_bus, path, &component_iface_desc);
if (eo_isa(obj, ELM_INTERFACE_ATSPI_WINDOW_CLASS))
if (eo_isa(obj, ELM_INTERFACE_ATSPI_WINDOW_INTERFACE))
{
infc = eldbus_service_interface_register(_a11y_bus, path, &window_iface_desc);
eo_do(obj, eo_key_data_set("window_interface", infc, NULL));
eo_do(obj, eo_event_callback_array_add(_window_cb(), infc));
}
if (eo_isa(obj, ELM_INTERFACE_ATSPI_ACTION_CLASS))
if (eo_isa(obj, ELM_INTERFACE_ATSPI_ACTION_MIXIN))
eldbus_service_interface_register(_a11y_bus, path, &action_iface_desc);
if (eo_isa(obj, ELM_INTERFACE_ATSPI_VALUE_CLASS))
if (eo_isa(obj, ELM_INTERFACE_ATSPI_VALUE_INTERFACE))
eldbus_service_interface_register(_a11y_bus, path, &value_iface_desc);
if (eo_isa(obj, ELM_INTERFACE_ATSPI_IMAGE_CLASS))
if (eo_isa(obj, ELM_INTERFACE_ATSPI_IMAGE_MIXIN))
eldbus_service_interface_register(_a11y_bus, path, &image_iface_desc);
if (eo_isa(obj, ELM_INTERFACE_ATSPI_SELECTION_CLASS))
if (eo_isa(obj, ELM_INTERFACE_ATSPI_SELECTION_INTERFACE))
{
eldbus_service_interface_register(_a11y_bus, path, &selection_iface_desc);
eo_do(obj, eo_event_callback_array_add(_selection_cb(), event_infc));
}
if (eo_isa(obj, ELM_INTERFACE_ATSPI_TEXT_CLASS))
if (eo_isa(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE))
{
eldbus_service_interface_register(_a11y_bus, path, &text_iface_desc);
eo_do(obj, eo_event_callback_array_add(_text_cb(), event_infc));
}
if (eo_isa(obj, ELM_INTERFACE_ATSPI_EDITABLE_TEXT_CLASS))
if (eo_isa(obj, ELM_INTERFACE_ATSPI_EDITABLE_TEXT_INTERFACE))
eldbus_service_interface_register(_a11y_bus, path, &editable_text_iface_desc);
}
}
@ -3234,16 +3234,16 @@ static void _object_unregister(void *obj)
eo_do(obj, eo_event_callback_del(EO_EV_DEL, _on_cache_item_del, NULL));
if (eo_isa(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_CLASS))
if (eo_isa(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
eo_do(obj, eo_event_callback_array_del(_events_cb(), event_infc));
if (eo_isa(obj, ELM_INTERFACE_ATSPI_WINDOW_CLASS))
if (eo_isa(obj, ELM_INTERFACE_ATSPI_WINDOW_INTERFACE))
{
eo_do(obj, infc = eo_key_data_get("window_interface"));
eo_do(obj, eo_event_callback_array_del(_window_cb(), infc));
}
if (eo_isa(obj, ELM_INTERFACE_ATSPI_SELECTION_CLASS))
if (eo_isa(obj, ELM_INTERFACE_ATSPI_SELECTION_INTERFACE))
eo_do(obj, eo_event_callback_array_del(_selection_cb(), event_infc));
if (eo_isa(obj, ELM_INTERFACE_ATSPI_TEXT_CLASS))
if (eo_isa(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE))
eo_do(obj, eo_event_callback_array_del(_text_cb(), event_infc));
}

2
legacy/elementary/src/lib/elm_entry.c
View File

@ -422,7 +422,7 @@ _viewport_region_get(Evas_Object *obj)
parent = elm_widget_parent_get(obj);
while (parent)
{
if (eo_isa(parent, ELM_INTERFACE_SCROLLABLE_CLASS))
if (eo_isa(parent, ELM_INTERFACE_SCROLLABLE_MIXIN))
{
Eina_Rectangle *pr = eina_rectangle_new(0, 0, 0, 0);
evas_object_geometry_get(parent, &pr->x, &pr->y, &pr->w, &pr->h);

4
legacy/elementary/src/lib/elm_interface_atspi_accessible.c
View File

@ -156,7 +156,7 @@ _elm_interface_atspi_accessible_parent_get(Eo *obj EINA_UNUSED, void *pd EINA_UN
eo_do(obj, parent = eo_parent_get());
if (!parent) return NULL;
return eo_isa(parent, ELM_INTERFACE_ATSPI_ACCESSIBLE_CLASS) ? parent : NULL;
return eo_isa(parent, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN) ? parent : NULL;
}
EOLIAN static void
@ -250,7 +250,7 @@ _elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, void *pd EINA_
EINA_ITERATOR_FOREACH(iter, chld)
{
if (eo_isa(chld, ELM_INTERFACE_ATSPI_ACCESSIBLE_CLASS))
if (eo_isa(chld, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
children = eina_list_append(children, chld);
}
eina_iterator_free(iter);

2
legacy/elementary/src/lib/elm_interface_atspi_component.c
View File

@ -89,7 +89,7 @@ _elm_interface_atspi_component_accessible_at_point_get(Eo *obj, void *_pd EINA_U
EINA_LIST_FOREACH(objs, l, evobj)
{
// return first only, test if there is atspi interface for eo
if (eo_isa(evobj, ELM_INTERFACE_ATSPI_ACCESSIBLE_CLASS))
if (eo_isa(evobj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
{
ret = evobj;
break;

12
legacy/elementary/src/lib/elm_interface_atspi_widget.c
View File

@ -33,7 +33,7 @@ _on_focus_change(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
EOLIAN void
_elm_interface_atspi_widget_eo_base_constructor(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Widget_Data *pd)
{
eo_do_super(obj, ELM_INTERFACE_ATSPI_WIDGET_CLASS, eo_constructor());
eo_do_super(obj, ELM_INTERFACE_ATSPI_WIDGET_MIXIN, eo_constructor());
pd->role = ELM_ATSPI_ROLE_UNKNOWN;
@ -55,7 +55,7 @@ _elm_interface_atspi_widget_eo_base_destructor(Eo *obj EINA_UNUSED, Elm_Interfac
if (parent && !eo_destructed_is(parent))
elm_interface_atspi_accessible_children_changed_del_signal_emit(parent, obj);
eo_do_super(obj, ELM_INTERFACE_ATSPI_WIDGET_CLASS, eo_destructor());
eo_do_super(obj, ELM_INTERFACE_ATSPI_WIDGET_MIXIN, eo_destructor());
}
EOLIAN static Eina_Bool
@ -115,7 +115,7 @@ _elm_interface_atspi_widget_elm_interface_atspi_accessible_children_get(Eo *obj
EINA_LIST_FOREACH(wd->subobjs, l, widget)
{
if (!elm_object_widget_check(widget)) continue;
if (eo_isa(widget, ELM_INTERFACE_ATSPI_ACCESSIBLE_CLASS))
if (eo_isa(widget, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
accs = eina_list_append(accs, widget);
}
return accs;
@ -127,7 +127,7 @@ _elm_interface_atspi_widget_elm_interface_atspi_accessible_state_set_get(Eo *obj
Elm_Atspi_State_Set states = 0;
Evas *evas = NULL;
eo_do_super(obj, ELM_INTERFACE_ATSPI_WIDGET_CLASS, states = elm_interface_atspi_accessible_state_set_get());
eo_do_super(obj, ELM_INTERFACE_ATSPI_WIDGET_MIXIN, states = elm_interface_atspi_accessible_state_set_get());
if (evas_object_visible_get(obj))
STATE_TYPE_SET(states, ELM_ATSPI_STATE_VISIBLE);
@ -190,14 +190,14 @@ _elm_interface_atspi_widget_elm_interface_atspi_accessible_relation_set_get(Eo *
Evas_Object *rel_obj;
rel_obj = elm_object_focus_next_object_get(obj, ELM_FOCUS_NEXT);
if (eo_isa(rel_obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_CLASS))
if (eo_isa(rel_obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
{
rel = _relation_new(ELM_ATSPI_RELATION_FLOWS_TO, rel_obj);
list = eina_list_append(list, rel);
}
rel_obj = elm_object_focus_next_object_get(obj, ELM_FOCUS_PREVIOUS);
if (eo_isa(rel_obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_CLASS))
if (eo_isa(rel_obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
{
rel = _relation_new(ELM_ATSPI_RELATION_FLOWS_FROM, rel_obj);
list = eina_list_append(list, rel);

2
legacy/elementary/src/lib/elm_interface_fileselector.h
View File

@ -4,7 +4,7 @@
#include "elm_interface_fileselector.eo.h"
#define ELM_FILESELECTOR_INTERFACE_CHECK(obj, ...) \
if (EINA_UNLIKELY(!eo_isa(obj, ELM_INTERFACE_FILESELECTOR_CLASS))) \
if (EINA_UNLIKELY(!eo_isa(obj, ELM_INTERFACE_FILESELECTOR_INTERFACE))) \
{ \
ERR("The object (%p) doesn't implement the Elementary fileselector" \
" interface", obj); \

2
legacy/elementary/src/lib/elm_interface_scrollable.c
View File

@ -308,7 +308,7 @@ _elm_pan_class_constructor(Eo_Class *klass)
/* pan smart object on top, scroller interface on bottom */
/* ============================================================ */
#define MY_SCROLLABLE_INTERFACE ELM_INTERFACE_SCROLLABLE_CLASS
#define MY_SCROLLABLE_INTERFACE ELM_INTERFACE_SCROLLABLE_MIXIN
#define MY_SCROLLABLE_INTERFACE_NAME "Elm_Interface_Scrollable"
#define MY_SCROLLABLE_INTERFACE_NAME_LEGACY "elm_interface_scrollable"

2
legacy/elementary/src/lib/elm_interface_scrollable.h
View File

@ -214,7 +214,7 @@ struct _Elm_Scrollable_Smart_Interface_Data
#define ELM_SCROLLABLE_CHECK(obj, ...) \
\
if (!eo_isa(obj, ELM_INTERFACE_SCROLLABLE_CLASS)) \
if (!eo_isa(obj, ELM_INTERFACE_SCROLLABLE_MIXIN)) \
{ \
ERR("The object (%p) doesn't implement the Elementary scrollable" \
" interface", obj); \

2
legacy/elementary/src/lib/elm_widget.c
View File

@ -80,7 +80,7 @@ _elm_scrollable_is(const Evas_Object *obj)
{
INTERNAL_ENTRY EINA_FALSE;
return
eo_isa(obj, ELM_INTERFACE_SCROLLABLE_CLASS);
eo_isa(obj, ELM_INTERFACE_SCROLLABLE_MIXIN);
}
void