summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel@osg.samsung.com>2017-12-03 16:47:26 +0100
committerMarcel Hollerbach <marcel@osg.samsung.com>2017-12-05 17:19:28 +0100
commit78afa2fb84dbbfaf0fabf4064a8caf3a43152d15 (patch)
tree118d04941605e23c7be864a38f984d5b49e79b8e
parentbaf624680d12cfd7556b2abb9d8199df5c47d216 (diff)
efl_ui_focus_user/object: fix api duplication
just like the commit before, this fixes duplicated api names
-rw-r--r--src/lib/elementary/efl_ui_focus_layer.c2
-rw-r--r--src/lib/elementary/efl_ui_focus_layer.eo2
-rw-r--r--src/lib/elementary/efl_ui_focus_manager_calc.c6
-rw-r--r--src/lib/elementary/efl_ui_focus_manager_sub.c10
-rw-r--r--src/lib/elementary/efl_ui_focus_user.eo4
-rw-r--r--src/lib/elementary/efl_ui_focus_util.c2
-rw-r--r--src/lib/elementary/efl_ui_multibuttonentry.c2
-rw-r--r--src/lib/elementary/efl_ui_spin_button.c4
-rw-r--r--src/lib/elementary/elc_fileselector.c2
-rw-r--r--src/lib/elementary/elc_naviframe.c2
-rw-r--r--src/lib/elementary/elm_access.c2
-rw-r--r--src/lib/elementary/elm_hover.c2
-rw-r--r--src/lib/elementary/elm_main.c14
-rw-r--r--src/lib/elementary/elm_spinner.c2
-rw-r--r--src/lib/elementary/elm_widget.c6
-rw-r--r--src/lib/elementary/elm_widget.eo4
-rw-r--r--src/tests/elementary/elm_test_focus_common.c4
-rw-r--r--src/tests/elementary/elm_test_focus_sub.c4
-rw-r--r--src/tests/elementary/focus_test.eo4
-rw-r--r--src/tests/elementary/focus_test_sub_main.eo4
20 files changed, 41 insertions, 41 deletions
diff --git a/src/lib/elementary/efl_ui_focus_layer.c b/src/lib/elementary/efl_ui_focus_layer.c
index a12361d086..adc1e62e53 100644
--- a/src/lib/elementary/efl_ui_focus_layer.c
+++ b/src/lib/elementary/efl_ui_focus_layer.c
@@ -59,7 +59,7 @@ _efl_ui_focus_layer_efl_object_destructor(Eo *obj, Efl_Ui_Focus_Layer_Data *pd E
59} 59}
60 60
61EOLIAN static Efl_Ui_Focus_Manager* 61EOLIAN static Efl_Ui_Focus_Manager*
62_efl_ui_focus_layer_efl_ui_focus_user_manager_get(Eo *obj, Efl_Ui_Focus_Layer_Data *pd EINA_UNUSED) 62_efl_ui_focus_layer_efl_ui_focus_user_focus_manager_get(Eo *obj, Efl_Ui_Focus_Layer_Data *pd EINA_UNUSED)
63{ 63{
64 return elm_widget_top_get(obj); 64 return elm_widget_top_get(obj);
65} 65}
diff --git a/src/lib/elementary/efl_ui_focus_layer.eo b/src/lib/elementary/efl_ui_focus_layer.eo
index 4a8f7b8442..1728a7dbce 100644
--- a/src/lib/elementary/efl_ui_focus_layer.eo
+++ b/src/lib/elementary/efl_ui_focus_layer.eo
@@ -24,7 +24,7 @@ mixin Efl.Ui.Focus.Layer (Efl.Interface, Elm.Widget, Efl.Gfx, Efl.Ui.Focus.Manag
24 Elm.Widget.focus_state_apply; 24 Elm.Widget.focus_state_apply;
25 Efl.Gfx.visible {set;} 25 Efl.Gfx.visible {set;}
26 Efl.Ui.Focus.Manager.move; 26 Efl.Ui.Focus.Manager.move;
27 Efl.Ui.Focus.User.manager { get; } 27 Efl.Ui.Focus.User.focus_manager { get; }
28 Efl.Object.constructor; 28 Efl.Object.constructor;
29 Efl.Object.destructor; 29 Efl.Object.destructor;
30 } 30 }
diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.c b/src/lib/elementary/efl_ui_focus_manager_calc.c
index 508626aafc..35f59b44e0 100644
--- a/src/lib/elementary/efl_ui_focus_manager_calc.c
+++ b/src/lib/elementary/efl_ui_focus_manager_calc.c
@@ -83,12 +83,12 @@ _manager_in_chain_set(Eo *obj, Efl_Ui_Focus_Manager_Calc_Data *pd)
83 EINA_SAFETY_ON_NULL_RETURN(pd->root); 83 EINA_SAFETY_ON_NULL_RETURN(pd->root);
84 84
85 if (!efl_isa(pd->root->focusable, EFL_UI_WIN_CLASS)) 85 if (!efl_isa(pd->root->focusable, EFL_UI_WIN_CLASS))
86 EINA_SAFETY_ON_NULL_RETURN(efl_ui_focus_user_manager_get(pd->root->focusable)); 86 EINA_SAFETY_ON_NULL_RETURN(efl_ui_focus_user_focus_manager_get(pd->root->focusable));
87 87
88 //so we dont run infinitly this does not fix it, but at least we only have a error 88 //so we dont run infinitly this does not fix it, but at least we only have a error
89 EINA_SAFETY_ON_TRUE_RETURN(efl_ui_focus_user_manager_get(pd->root->focusable) == obj); 89 EINA_SAFETY_ON_TRUE_RETURN(efl_ui_focus_user_focus_manager_get(pd->root->focusable) == obj);
90 90
91 efl_ui_focus_manager_focus_set(efl_ui_focus_user_manager_get(pd->root->focusable), pd->root->focusable); 91 efl_ui_focus_manager_focus_set(efl_ui_focus_user_focus_manager_get(pd->root->focusable), pd->root->focusable);
92} 92}
93 93
94static Efl_Ui_Focus_Direction 94static Efl_Ui_Focus_Direction
diff --git a/src/lib/elementary/efl_ui_focus_manager_sub.c b/src/lib/elementary/efl_ui_focus_manager_sub.c
index 54fd883ccd..5404eb05ee 100644
--- a/src/lib/elementary/efl_ui_focus_manager_sub.c
+++ b/src/lib/elementary/efl_ui_focus_manager_sub.c
@@ -49,7 +49,7 @@ _border_flush(Eo *obj, Efl_Ui_Focus_Manager_Sub_Data *pd)
49 Efl_Ui_Focus_Object *node, *logical; 49 Efl_Ui_Focus_Object *node, *logical;
50 Efl_Ui_Focus_Manager *manager; 50 Efl_Ui_Focus_Manager *manager;
51 51
52 manager = efl_ui_focus_user_manager_get(obj); 52 manager = efl_ui_focus_user_focus_manager_get(obj);
53 logical = obj; 53 logical = obj;
54 borders = efl_ui_focus_manager_border_elements_get(obj); 54 borders = efl_ui_focus_manager_border_elements_get(obj);
55 55
@@ -90,7 +90,7 @@ _border_unregister(Eo *obj, Efl_Ui_Focus_Manager_Sub_Data *pd)
90 Efl_Ui_Focus_Object *node; 90 Efl_Ui_Focus_Object *node;
91 Efl_Ui_Focus_Manager *manager; 91 Efl_Ui_Focus_Manager *manager;
92 92
93 manager = efl_ui_focus_user_manager_get(obj); 93 manager = efl_ui_focus_user_focus_manager_get(obj);
94 EINA_LIST_FREE(pd->current_border, node) 94 EINA_LIST_FREE(pd->current_border, node)
95 { 95 {
96 if (node == obj) continue; 96 if (node == obj) continue;
@@ -137,7 +137,7 @@ _logical_manager_change(void *data EINA_UNUSED, const Efl_Event *ev)
137 Eina_List *n; 137 Eina_List *n;
138 Efl_Ui_Focus_User *b; 138 Efl_Ui_Focus_User *b;
139 Efl_Ui_Focus_Manager *manager; 139 Efl_Ui_Focus_Manager *manager;
140 manager = efl_ui_focus_user_manager_get(ev->object); 140 manager = efl_ui_focus_user_focus_manager_get(ev->object);
141 141
142 if (!ev->info) return; 142 if (!ev->info) return;
143 143
@@ -157,8 +157,8 @@ _flush_manager(Eo *obj, Efl_Ui_Focus_Manager_Sub_Data *pd)
157 Eina_List *n; 157 Eina_List *n;
158 158
159 159
160 logical = efl_ui_focus_user_parent_get(obj); 160 logical = efl_ui_focus_user_focus_parent_get(obj);
161 manager = efl_ui_focus_user_manager_get(obj); 161 manager = efl_ui_focus_user_focus_manager_get(obj);
162 162
163 //unregister from the old 163 //unregister from the old
164 efl_event_callback_array_del(pd->manager, parent_manager(), obj); 164 efl_event_callback_array_del(pd->manager, parent_manager(), obj);
diff --git a/src/lib/elementary/efl_ui_focus_user.eo b/src/lib/elementary/efl_ui_focus_user.eo
index 1b8a6c7559..e54a3d0765 100644
--- a/src/lib/elementary/efl_ui_focus_user.eo
+++ b/src/lib/elementary/efl_ui_focus_user.eo
@@ -4,7 +4,7 @@ interface Efl.Ui.Focus.User {
4 @since 1.20 4 @since 1.20
5 ]] 5 ]]
6 methods { 6 methods {
7 @property manager { 7 @property focus_manager {
8 [[Describes which manager is used to register. 8 [[Describes which manager is used to register.
9 9
10 If a instance of this interface is the root of a manager this instance should not have the manager where it is root as this property. This other manager then this instance will be set as focused in the other manager. 10 If a instance of this interface is the root of a manager this instance should not have the manager where it is root as this property. This other manager then this instance will be set as focused in the other manager.
@@ -15,7 +15,7 @@ interface Efl.Ui.Focus.User {
15 manager : Efl.Ui.Focus.Manager; [[The manager object]] 15 manager : Efl.Ui.Focus.Manager; [[The manager object]]
16 } 16 }
17 } 17 }
18 @property parent { 18 @property focus_parent {
19 [[Describes which logical parent is used by this object.]] 19 [[Describes which logical parent is used by this object.]]
20 get {} 20 get {}
21 values { 21 values {
diff --git a/src/lib/elementary/efl_ui_focus_util.c b/src/lib/elementary/efl_ui_focus_util.c
index 96f41178b3..efb3219fd1 100644
--- a/src/lib/elementary/efl_ui_focus_util.c
+++ b/src/lib/elementary/efl_ui_focus_util.c
@@ -20,7 +20,7 @@ _efl_ui_focus_util_focus(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl_Ui_Focus
20{ 20{
21 Elm_Widget *top, *o; 21 Elm_Widget *top, *o;
22 Efl_Ui_Focus_Manager *m; 22 Efl_Ui_Focus_Manager *m;
23 m = efl_ui_focus_user_manager_get(user); 23 m = efl_ui_focus_user_focus_manager_get(user);
24 24
25 top = elm_widget_top_get(user); 25 top = elm_widget_top_get(user);
26 26
diff --git a/src/lib/elementary/efl_ui_multibuttonentry.c b/src/lib/elementary/efl_ui_multibuttonentry.c
index 4e262b2ee4..0eaa681a8a 100644
--- a/src/lib/elementary/efl_ui_multibuttonentry.c
+++ b/src/lib/elementary/efl_ui_multibuttonentry.c
@@ -1688,7 +1688,7 @@ static void
1688_legacy_manager_changed_cb(void *data EINA_UNUSED, const Efl_Event *ev) 1688_legacy_manager_changed_cb(void *data EINA_UNUSED, const Efl_Event *ev)
1689{ 1689{
1690 efl_event_callback_del(ev->info, EFL_UI_FOCUS_MANAGER_EVENT_FOCUSED, _legacy_focused, ev->object); 1690 efl_event_callback_del(ev->info, EFL_UI_FOCUS_MANAGER_EVENT_FOCUSED, _legacy_focused, ev->object);
1691 efl_event_callback_add(efl_ui_focus_user_manager_get(ev->object), EFL_UI_FOCUS_MANAGER_EVENT_FOCUSED, _legacy_focused, ev->object); 1691 efl_event_callback_add(efl_ui_focus_user_focus_manager_get(ev->object), EFL_UI_FOCUS_MANAGER_EVENT_FOCUSED, _legacy_focused, ev->object);
1692} 1692}
1693 1693
1694EOLIAN static Eo * 1694EOLIAN static Eo *
diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c
index 059c3786c1..ae4eeaa2b9 100644
--- a/src/lib/elementary/efl_ui_spin_button.c
+++ b/src/lib/elementary/efl_ui_spin_button.c
@@ -385,7 +385,7 @@ _toggle_entry(Evas_Object *obj)
385 efl_ui_focus_composition_elements_set(obj, items); 385 efl_ui_focus_composition_elements_set(obj, items);
386 } 386 }
387 387
388 efl_ui_focus_manager_focus_set(efl_ui_focus_user_manager_get(obj), sd->ent); 388 efl_ui_focus_manager_focus_set(efl_ui_focus_user_focus_manager_get(obj), sd->ent);
389 } 389 }
390} 390}
391 391
@@ -404,7 +404,7 @@ _spin_value(void *data)
404 Efl_Ui_Spin_Button_Data *sd = efl_data_scope_get(data, MY_CLASS); 404 Efl_Ui_Spin_Button_Data *sd = efl_data_scope_get(data, MY_CLASS);
405 Efl_Ui_Spin_Data *pd = efl_data_scope_get(data, EFL_UI_SPIN_CLASS); 405 Efl_Ui_Spin_Data *pd = efl_data_scope_get(data, EFL_UI_SPIN_CLASS);
406 406
407 if (_value_set(data, pd->val + (sd->inc_val ? pd->step : -pd->step))) 407 if (_value_set(data, pd->val + (sd->inc_val ? pd->step : -pd->step)))
408 _label_write(data); 408 _label_write(data);
409 409
410 return ECORE_CALLBACK_RENEW; 410 return ECORE_CALLBACK_RENEW;
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 327168b4ff..2cda6eeeef 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -117,7 +117,7 @@ _focus_chain_update(Eo *obj, Elm_Fileselector_Data *pd)
117 117
118#undef A 118#undef A
119 119
120 efl_ui_focus_manager_calc_update_order(efl_ui_focus_user_manager_get(obj), obj, tmp); 120 efl_ui_focus_manager_calc_update_order(efl_ui_focus_user_focus_manager_get(obj), obj, tmp);
121} 121}
122 122
123static void 123static void
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index 412cf63992..256ff2c4fc 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -92,7 +92,7 @@ _prev_page_focus_recover(Elm_Naviframe_Item_Data *it)
92{ 92{
93 Elm_Naviframe *n = it->base->widget; 93 Elm_Naviframe *n = it->base->widget;
94 94
95 efl_ui_focus_manager_focus_set(efl_ui_focus_user_manager_get(n), n); 95 efl_ui_focus_manager_focus_set(efl_ui_focus_user_focus_manager_get(n), n);
96} 96}
97 97
98EOLIAN static void 98EOLIAN static void
diff --git a/src/lib/elementary/elm_access.c b/src/lib/elementary/elm_access.c
index 99b9ad0c58..5cf518f1a3 100644
--- a/src/lib/elementary/elm_access.c
+++ b/src/lib/elementary/elm_access.c
@@ -537,7 +537,7 @@ _access_highlight_next_get(Evas_Object *obj, Elm_Focus_Direction dir)
537 { 537 {
538 Efl_Ui_Focus_Relations *rel; 538 Efl_Ui_Focus_Relations *rel;
539 539
540 rel = efl_ui_focus_manager_fetch(efl_ui_focus_user_manager_get(obj), obj); 540 rel = efl_ui_focus_manager_fetch(efl_ui_focus_user_focus_manager_get(obj), obj);
541 541
542 if (rel) 542 if (rel)
543 { 543 {
diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c
index b92b2ea1a3..e11cf76e53 100644
--- a/src/lib/elementary/elm_hover.c
+++ b/src/lib/elementary/elm_hover.c
@@ -664,7 +664,7 @@ _elm_hover_efl_gfx_visible_set(Eo *obj, Elm_Hover_Data *pd, Eina_Bool vis)
664 { 664 {
665 _hov_show_do(obj); 665 _hov_show_do(obj);
666 //we just set ourself as redirect in the next upper manager 666 //we just set ourself as redirect in the next upper manager
667 pd->redirected = efl_ui_focus_user_manager_get(pd->target); 667 pd->redirected = efl_ui_focus_user_focus_manager_get(pd->target);
668 efl_ui_focus_manager_redirect_set(pd->redirected, obj); 668 efl_ui_focus_manager_redirect_set(pd->redirected, obj);
669 } 669 }
670 else 670 else
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index b16e18e2bf..cf4282c2b8 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -578,7 +578,7 @@ EAPI void
578elm_app_base_scale_set(double base_scale) 578elm_app_base_scale_set(double base_scale)
579{ 579{
580 if (base_scale < 0.0) return; 580 if (base_scale < 0.0) return;
581 if (fabs(base_scale) < DBL_EPSILON) return; 581 if (fabs(base_scale) < DBL_EPSILON) return;
582 app_base_scale = base_scale; 582 app_base_scale = base_scale;
583} 583}
584 584
@@ -1589,13 +1589,13 @@ elm_object_focus_get(const Evas_Object *obj)
1589 if (!elm_widget_is(obj)) 1589 if (!elm_widget_is(obj))
1590 return evas_object_focus_get(obj); 1590 return evas_object_focus_get(obj);
1591 1591
1592 m = efl_ui_focus_user_manager_get(obj); 1592 m = efl_ui_focus_user_focus_manager_get(obj);
1593 1593
1594 //no manager means not registered 1594 //no manager means not registered
1595 if (!m) return EINA_FALSE; 1595 if (!m) return EINA_FALSE;
1596 1596
1597 //assertion: our redirect manager m is in the redirect chain 1597 //assertion: our redirect manager m is in the redirect chain
1598 m = efl_ui_focus_user_manager_get(obj); 1598 m = efl_ui_focus_user_focus_manager_get(obj);
1599 1599
1600 //if obj is the redriect manager its kind of focused 1600 //if obj is the redriect manager its kind of focused
1601 if (efl_ui_focus_manager_redirect_get(m) == obj) return EINA_TRUE; 1601 if (efl_ui_focus_manager_redirect_get(m) == obj) return EINA_TRUE;
@@ -1610,7 +1610,7 @@ elm_object_focus_get(const Evas_Object *obj)
1610 { 1610 {
1611 if (focused_child == obj) return EINA_TRUE; 1611 if (focused_child == obj) return EINA_TRUE;
1612 1612
1613 focused_child = efl_ui_focus_user_parent_get(focused_child); 1613 focused_child = efl_ui_focus_user_focus_parent_get(focused_child);
1614 } 1614 }
1615 1615
1616 return efl_ui_focus_object_focus_get(obj); 1616 return efl_ui_focus_object_focus_get(obj);
@@ -1638,8 +1638,8 @@ elm_object_focus_set(Evas_Object *obj,
1638 efl_ui_focus_util_focus(EFL_UI_FOCUS_UTIL_CLASS, obj); 1638 efl_ui_focus_util_focus(EFL_UI_FOCUS_UTIL_CLASS, obj);
1639 else 1639 else
1640 { 1640 {
1641 if (efl_ui_focus_manager_focus_get(efl_ui_focus_user_manager_get(obj)) == obj) 1641 if (efl_ui_focus_manager_focus_get(efl_ui_focus_user_focus_manager_get(obj)) == obj)
1642 efl_ui_focus_manager_pop_history_stack(efl_ui_focus_user_manager_get(obj)); 1642 efl_ui_focus_manager_pop_history_stack(efl_ui_focus_user_focus_manager_get(obj));
1643 } 1643 }
1644 } 1644 }
1645 else 1645 else
@@ -2080,4 +2080,4 @@ EAPI Elm_Focus_Region_Show_Mode
2080elm_object_focus_region_show_mode_get(const Evas_Object *obj) 2080elm_object_focus_region_show_mode_get(const Evas_Object *obj)
2081{ 2081{
2082 return elm_widget_focus_region_show_mode_get(obj); 2082 return elm_widget_focus_region_show_mode_get(obj);
2083} \ No newline at end of file 2083}
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index ab7bab3de6..5c25079064 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -660,7 +660,7 @@ _toggle_entry(Evas_Object *obj)
660 660
661 efl_ui_focus_composition_elements_set(obj, items); 661 efl_ui_focus_composition_elements_set(obj, items);
662 } 662 }
663 efl_ui_focus_manager_focus_set(efl_ui_focus_user_manager_get(obj), sd->ent); 663 efl_ui_focus_manager_focus_set(efl_ui_focus_user_focus_manager_get(obj), sd->ent);
664 } 664 }
665} 665}
666 666
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 6b9f920a48..43414ce521 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -312,7 +312,7 @@ _focus_manager_eval(Eo *obj, Elm_Widget_Smart_Data *pd)
312 } 312 }
313 else 313 else
314 { 314 {
315 new = efl_ui_focus_user_manager_get(parent); 315 new = efl_ui_focus_user_focus_manager_get(parent);
316 provider = parent; 316 provider = parent;
317 } 317 }
318 318
@@ -5355,13 +5355,13 @@ _elm_widget_efl_object_provider_find(Eo *obj, Elm_Widget_Smart_Data *pd, const E
5355} 5355}
5356 5356
5357EOLIAN static Efl_Ui_Focus_Manager* 5357EOLIAN static Efl_Ui_Focus_Manager*
5358_elm_widget_efl_ui_focus_user_parent_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED) 5358_elm_widget_efl_ui_focus_user_focus_parent_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED)
5359{ 5359{
5360 return pd->focus.parent; 5360 return pd->focus.parent;
5361} 5361}
5362 5362
5363EOLIAN static Efl_Ui_Focus_Manager* 5363EOLIAN static Efl_Ui_Focus_Manager*
5364_elm_widget_efl_ui_focus_user_manager_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED) 5364_elm_widget_efl_ui_focus_user_focus_manager_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED)
5365{ 5365{
5366 return pd->focus.manager; 5366 return pd->focus.manager;
5367} 5367}
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index 1747b4cc60..29912a3e11 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -618,8 +618,8 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access,
618 Efl.Access.parent { get; } 618 Efl.Access.parent { get; }
619 Efl.Access.attributes { get; } 619 Efl.Access.attributes { get; }
620 Efl.Access.Component.focus_grab; 620 Efl.Access.Component.focus_grab;
621 Efl.Ui.Focus.User.manager { get; } 621 Efl.Ui.Focus.User.focus_manager { get; }
622 Efl.Ui.Focus.User.parent { get; } 622 Efl.Ui.Focus.User.focus_parent { get; }
623 Efl.Ui.Focus.Object.focus_geometry { get; } 623 Efl.Ui.Focus.Object.focus_geometry { get; }
624 Efl.Ui.Focus.Object.focus { set; } 624 Efl.Ui.Focus.Object.focus { set; }
625 Efl.Ui.Base.mirrored { get; set; } 625 Efl.Ui.Base.mirrored { get; set; }
diff --git a/src/tests/elementary/elm_test_focus_common.c b/src/tests/elementary/elm_test_focus_common.c
index 3ac6397c75..a84dc062f3 100644
--- a/src/tests/elementary/elm_test_focus_common.c
+++ b/src/tests/elementary/elm_test_focus_common.c
@@ -101,13 +101,13 @@ _focus_test_efl_gfx_geometry_get(Eo *obj EINA_UNUSED, Focus_Test_Data *pd)
101} 101}
102 102
103EOLIAN static Efl_Ui_Focus_Manager* 103EOLIAN static Efl_Ui_Focus_Manager*
104_focus_test_efl_ui_focus_user_manager_get(Eo *obj EINA_UNUSED, Focus_Test_Data *pd) 104_focus_test_efl_ui_focus_user_focus_manager_get(Eo *obj EINA_UNUSED, Focus_Test_Data *pd)
105{ 105{
106 return pd->manager; 106 return pd->manager;
107} 107}
108 108
109EOLIAN static Efl_Ui_Focus_Object* 109EOLIAN static Efl_Ui_Focus_Object*
110_focus_test_efl_ui_focus_user_parent_get(Eo *obj, Focus_Test_Data *pd EINA_UNUSED) 110_focus_test_efl_ui_focus_user_focus_parent_get(Eo *obj, Focus_Test_Data *pd EINA_UNUSED)
111{ 111{
112 return efl_parent_get(obj); 112 return efl_parent_get(obj);
113} 113}
diff --git a/src/tests/elementary/elm_test_focus_sub.c b/src/tests/elementary/elm_test_focus_sub.c
index 32487de8ec..733abb5d96 100644
--- a/src/tests/elementary/elm_test_focus_sub.c
+++ b/src/tests/elementary/elm_test_focus_sub.c
@@ -13,13 +13,13 @@ _focus_test_sub_main_efl_ui_focus_object_focus_geometry_get(Eo *obj EINA_UNUSED,
13} 13}
14 14
15EOLIAN static Efl_Ui_Focus_Manager* 15EOLIAN static Efl_Ui_Focus_Manager*
16_focus_test_sub_main_efl_ui_focus_user_manager_get(Eo *obj, Focus_Test_Sub_Main_Data *pd EINA_UNUSED) 16_focus_test_sub_main_efl_ui_focus_user_focus_manager_get(Eo *obj, Focus_Test_Sub_Main_Data *pd EINA_UNUSED)
17{ 17{
18 return efl_key_data_get(obj, "__user_manager"); 18 return efl_key_data_get(obj, "__user_manager");
19} 19}
20 20
21EOLIAN static Efl_Ui_Focus_Object* 21EOLIAN static Efl_Ui_Focus_Object*
22_focus_test_sub_main_efl_ui_focus_user_parent_get(Eo *obj, Focus_Test_Sub_Main_Data *pd EINA_UNUSED) 22_focus_test_sub_main_efl_ui_focus_user_focus_parent_get(Eo *obj, Focus_Test_Sub_Main_Data *pd EINA_UNUSED)
23{ 23{
24 return efl_key_data_get(obj, "__user_parent"); 24 return efl_key_data_get(obj, "__user_parent");
25} 25}
diff --git a/src/tests/elementary/focus_test.eo b/src/tests/elementary/focus_test.eo
index 93ce9989b6..2e8534ab78 100644
--- a/src/tests/elementary/focus_test.eo
+++ b/src/tests/elementary/focus_test.eo
@@ -18,8 +18,8 @@ class Focus.Test(Efl.Object, Efl.Ui.Focus.Object, Efl.Ui.Focus.User, Efl.Gfx) {
18 Efl.Object.constructor; 18 Efl.Object.constructor;
19 Efl.Ui.Focus.Object.focus_geometry { get; } 19 Efl.Ui.Focus.Object.focus_geometry { get; }
20 Efl.Ui.Focus.Object.focus { set; } 20 Efl.Ui.Focus.Object.focus { set; }
21 Efl.Ui.Focus.User.manager { get; } 21 Efl.Ui.Focus.User.focus_manager { get; }
22 Efl.Ui.Focus.User.parent {get; } 22 Efl.Ui.Focus.User.focus_parent {get; }
23 Efl.Gfx.geometry { get; } 23 Efl.Gfx.geometry { get; }
24 } 24 }
25} 25}
diff --git a/src/tests/elementary/focus_test_sub_main.eo b/src/tests/elementary/focus_test_sub_main.eo
index ccaad330a2..af3f330b12 100644
--- a/src/tests/elementary/focus_test_sub_main.eo
+++ b/src/tests/elementary/focus_test_sub_main.eo
@@ -1,7 +1,7 @@
1class Focus.Test.Sub.Main(Efl.Object, Efl.Ui.Focus.User, Efl.Ui.Focus.Object, Efl.Ui.Focus.Manager.Sub) { 1class Focus.Test.Sub.Main(Efl.Object, Efl.Ui.Focus.User, Efl.Ui.Focus.Object, Efl.Ui.Focus.Manager.Sub) {
2 implements { 2 implements {
3 Efl.Ui.Focus.User.manager { get; } 3 Efl.Ui.Focus.User.focus_manager { get; }
4 Efl.Ui.Focus.User.parent { get; } 4 Efl.Ui.Focus.User.focus_parent { get; }
5 Efl.Ui.Focus.Object.focus_geometry { get; } 5 Efl.Ui.Focus.Object.focus_geometry { get; }
6 } 6 }
7} 7}