summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel@osg.samsung.com>2017-12-03 13:26:16 +0100
committerMarcel Hollerbach <marcel@osg.samsung.com>2017-12-05 17:19:28 +0100
commitbaf624680d12cfd7556b2abb9d8199df5c47d216 (patch)
tree4308ed40d99d7db6b28d5879e6de0fb4dacedde0
parentfd868bff347e7dd08cd619ac7cdad9e2ab87b12c (diff)
efl_ui_focus_manager: fix api duplication
-rw-r--r--src/lib/elementary/efl_ui_focus_manager.eo2
-rw-r--r--src/lib/elementary/efl_ui_focus_manager_calc.c4
-rw-r--r--src/lib/elementary/efl_ui_focus_manager_calc.eo2
-rw-r--r--src/lib/elementary/efl_ui_focus_manager_root_focus.c4
-rw-r--r--src/lib/elementary/efl_ui_focus_manager_root_focus.eo2
5 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/elementary/efl_ui_focus_manager.eo b/src/lib/elementary/efl_ui_focus_manager.eo
index 85e87b2a64..3d26ab20fc 100644
--- a/src/lib/elementary/efl_ui_focus_manager.eo
+++ b/src/lib/elementary/efl_ui_focus_manager.eo
@@ -57,7 +57,7 @@ interface Efl.Ui.Focus.Manager {
57 } 57 }
58 return : Efl.Ui.Focus.Object; [[Next object to focus]] 58 return : Efl.Ui.Focus.Object; [[Next object to focus]]
59 } 59 }
60 @property focus { 60 @property manager_focus {
61 [[The element which is currently focused by this manager 61 [[The element which is currently focused by this manager
62 62
63 For the case focus is a logical child, then the item will go to the next none logical element. If there is none, focus will stay where it is right now. 63 For the case focus is a logical child, then the item will go to the next none logical element. If there is none, focus will stay where it is right now.
diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.c b/src/lib/elementary/efl_ui_focus_manager_calc.c
index e48cf262e5..508626aafc 100644
--- a/src/lib/elementary/efl_ui_focus_manager_calc.c
+++ b/src/lib/elementary/efl_ui_focus_manager_calc.c
@@ -1353,7 +1353,7 @@ _request_subchild(Node *node)
1353} 1353}
1354 1354
1355EOLIAN static void 1355EOLIAN static void
1356_efl_ui_focus_manager_calc_efl_ui_focus_manager_focus_set(Eo *obj, Efl_Ui_Focus_Manager_Calc_Data *pd, Efl_Ui_Focus_Object *focus) 1356_efl_ui_focus_manager_calc_efl_ui_focus_manager_manager_focus_set(Eo *obj, Efl_Ui_Focus_Manager_Calc_Data *pd, Efl_Ui_Focus_Object *focus)
1357{ 1357{
1358 Node *node, *last; 1358 Node *node, *last;
1359 Efl_Ui_Focus_Object *last_focusable = NULL; 1359 Efl_Ui_Focus_Object *last_focusable = NULL;
@@ -1601,7 +1601,7 @@ _convert(Eina_List *node_list)
1601} 1601}
1602 1602
1603EOLIAN static Efl_Ui_Focus_Object* 1603EOLIAN static Efl_Ui_Focus_Object*
1604_efl_ui_focus_manager_calc_efl_ui_focus_manager_focus_get(Eo *obj EINA_UNUSED, Efl_Ui_Focus_Manager_Calc_Data *pd) 1604_efl_ui_focus_manager_calc_efl_ui_focus_manager_manager_focus_get(Eo *obj EINA_UNUSED, Efl_Ui_Focus_Manager_Calc_Data *pd)
1605{ 1605{
1606 Node *upper = NULL; 1606 Node *upper = NULL;
1607 1607
diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.eo b/src/lib/elementary/efl_ui_focus_manager_calc.eo
index e5e49bb109..8103262013 100644
--- a/src/lib/elementary/efl_ui_focus_manager_calc.eo
+++ b/src/lib/elementary/efl_ui_focus_manager_calc.eo
@@ -92,7 +92,7 @@ class Efl.Ui.Focus.Manager.Calc (Efl.Object, Efl.Ui.Focus.Manager) {
92 class.destructor; 92 class.destructor;
93 Efl.Ui.Focus.Manager.move; 93 Efl.Ui.Focus.Manager.move;
94 Efl.Ui.Focus.Manager.request_move; 94 Efl.Ui.Focus.Manager.request_move;
95 Efl.Ui.Focus.Manager.focus {get; set;} 95 Efl.Ui.Focus.Manager.manager_focus {get; set;}
96 Efl.Ui.Focus.Manager.redirect {set; get;} 96 Efl.Ui.Focus.Manager.redirect {set; get;}
97 Efl.Ui.Focus.Manager.border_elements {get;} 97 Efl.Ui.Focus.Manager.border_elements {get;}
98 Efl.Ui.Focus.Manager.root {set; get;} 98 Efl.Ui.Focus.Manager.root {set; get;}
diff --git a/src/lib/elementary/efl_ui_focus_manager_root_focus.c b/src/lib/elementary/efl_ui_focus_manager_root_focus.c
index 040aba24f7..ce4352d98e 100644
--- a/src/lib/elementary/efl_ui_focus_manager_root_focus.c
+++ b/src/lib/elementary/efl_ui_focus_manager_root_focus.c
@@ -70,7 +70,7 @@ _efl_ui_focus_manager_root_focus_efl_ui_focus_manager_calc_unregister(Eo *obj, E
70 70
71 71
72EOLIAN static void 72EOLIAN static void
73_efl_ui_focus_manager_root_focus_efl_ui_focus_manager_focus_set(Eo *obj, Efl_Ui_Focus_Manager_Root_Focus_Data *pd, Efl_Ui_Focus_Object *focus) 73_efl_ui_focus_manager_root_focus_efl_ui_focus_manager_manager_focus_set(Eo *obj, Efl_Ui_Focus_Manager_Root_Focus_Data *pd, Efl_Ui_Focus_Object *focus)
74{ 74{
75 EINA_SAFETY_ON_NULL_RETURN(focus); 75 EINA_SAFETY_ON_NULL_RETURN(focus);
76 efl_ui_focus_manager_focus_set(efl_super(obj, MY_CLASS), _trap(pd, focus)); 76 efl_ui_focus_manager_focus_set(efl_super(obj, MY_CLASS), _trap(pd, focus));
@@ -78,7 +78,7 @@ _efl_ui_focus_manager_root_focus_efl_ui_focus_manager_focus_set(Eo *obj, Efl_Ui_
78 78
79 79
80EOLIAN static Efl_Ui_Focus_Object* 80EOLIAN static Efl_Ui_Focus_Object*
81_efl_ui_focus_manager_root_focus_efl_ui_focus_manager_focus_get(Eo *obj, Efl_Ui_Focus_Manager_Root_Focus_Data *pd) 81_efl_ui_focus_manager_root_focus_efl_ui_focus_manager_manager_focus_get(Eo *obj, Efl_Ui_Focus_Manager_Root_Focus_Data *pd)
82{ 82{
83 return _trap(pd, efl_ui_focus_manager_focus_get(efl_super(obj, MY_CLASS))); 83 return _trap(pd, efl_ui_focus_manager_focus_get(efl_super(obj, MY_CLASS)));
84} 84}
diff --git a/src/lib/elementary/efl_ui_focus_manager_root_focus.eo b/src/lib/elementary/efl_ui_focus_manager_root_focus.eo
index 90404d5d99..4c86d3d563 100644
--- a/src/lib/elementary/efl_ui_focus_manager_root_focus.eo
+++ b/src/lib/elementary/efl_ui_focus_manager_root_focus.eo
@@ -3,7 +3,7 @@ class Efl.Ui.Focus.Manager.Root_Focus(Efl.Ui.Focus.Manager.Calc) {
3 implements { 3 implements {
4 Efl.Ui.Focus.Manager.Calc.register; 4 Efl.Ui.Focus.Manager.Calc.register;
5 Efl.Ui.Focus.Manager.Calc.unregister; 5 Efl.Ui.Focus.Manager.Calc.unregister;
6 Efl.Ui.Focus.Manager.focus {set; get;} 6 Efl.Ui.Focus.Manager.manager_focus {set; get;}
7 Efl.Ui.Focus.Manager.fetch; 7 Efl.Ui.Focus.Manager.fetch;
8 Efl.Ui.Focus.Manager.logical_end; 8 Efl.Ui.Focus.Manager.logical_end;
9 Efl.Ui.Focus.Manager.border_elements {get;} 9 Efl.Ui.Focus.Manager.border_elements {get;}