summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2018-01-04 11:41:49 -0800
committerCedric BAIL <cedric@osg.samsung.com>2018-01-04 11:45:10 -0800
commit526415d9032fb2c0dd08bf7d21f0b287a839b793 (patch)
treed6d25037613af450710f1a93c469c89e9149f231
parentce373c9b1ff160ad645b1d396393f8679e782fd2 (diff)
eo: make efl_provider_find a @const function.
-rw-r--r--src/lib/ecore/efl_loop.c4
-rw-r--r--src/lib/eio/eio_model.c2
-rw-r--r--src/lib/elementary/efl_ui_focus_manager_calc.c4
-rw-r--r--src/lib/elementary/efl_ui_win.c3
-rw-r--r--src/lib/elementary/elm_gengrid.c2
-rw-r--r--src/lib/elementary/elm_genlist.c2
-rw-r--r--src/lib/elementary/elm_menu.c2
-rw-r--r--src/lib/elementary/elm_widget.c2
-rw-r--r--src/lib/eo/efl_object.eo2
-rw-r--r--src/lib/eo/eo_base_class.c2
-rw-r--r--src/lib/evas/canvas/efl_input_event.c2
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_object.c2
-rw-r--r--src/lib/evas/canvas/evas_main.c5
-rw-r--r--src/lib/evas/canvas/evas_object_main.c2
14 files changed, 19 insertions, 17 deletions
diff --git a/src/lib/ecore/efl_loop.c b/src/lib/ecore/efl_loop.c
index 56b7efe218..cbd656e9b8 100644
--- a/src/lib/ecore/efl_loop.c
+++ b/src/lib/ecore/efl_loop.c
@@ -116,11 +116,11 @@ efl_exit(int exit_code)
116} 116}
117 117
118EOLIAN static Efl_Object * 118EOLIAN static Efl_Object *
119_efl_loop_efl_object_provider_find(Eo *obj, Efl_Loop_Data *pd, const Efl_Object *klass) 119_efl_loop_efl_object_provider_find(const Eo *obj, Efl_Loop_Data *pd, const Efl_Object *klass)
120{ 120{
121 Efl_Object *r; 121 Efl_Object *r;
122 122
123 if (klass == EFL_LOOP_CLASS) return obj; 123 if (klass == EFL_LOOP_CLASS) return (Efl_Object *) obj;
124 124
125 r = eina_hash_find(pd->providers, &klass); 125 r = eina_hash_find(pd->providers, &klass);
126 if (r) return r; 126 if (r) return r;
diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c
index cbed6ee19d..ec2672d7f1 100644
--- a/src/lib/eio/eio_model.c
+++ b/src/lib/eio/eio_model.c
@@ -818,7 +818,7 @@ _eio_model_efl_object_parent_get(Eo *obj , Eio_Model_Data *priv)
818} 818}
819 819
820EOLIAN static Eo * 820EOLIAN static Eo *
821_eio_model_efl_object_provider_find(Eo *obj, Eio_Model_Data *priv EINA_UNUSED, const Efl_Class *klass) 821_eio_model_efl_object_provider_find(const Eo *obj, Eio_Model_Data *priv EINA_UNUSED, const Efl_Class *klass)
822{ 822{
823 Eo *provider = efl_provider_find(efl_super(obj, MY_CLASS), klass); 823 Eo *provider = efl_provider_find(efl_super(obj, MY_CLASS), klass);
824 824
diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.c b/src/lib/elementary/efl_ui_focus_manager_calc.c
index 5b3b06c852..78475588f6 100644
--- a/src/lib/elementary/efl_ui_focus_manager_calc.c
+++ b/src/lib/elementary/efl_ui_focus_manager_calc.c
@@ -1090,10 +1090,10 @@ _efl_ui_focus_manager_calc_efl_object_constructor(Eo *obj, Efl_Ui_Focus_Manager_
1090} 1090}
1091 1091
1092EOLIAN static Efl_Object * 1092EOLIAN static Efl_Object *
1093_efl_ui_focus_manager_calc_efl_object_provider_find(Eo *obj, Efl_Ui_Focus_Manager_Calc_Data *pd EINA_UNUSED, const Efl_Object *klass) 1093_efl_ui_focus_manager_calc_efl_object_provider_find(const Eo *obj, Efl_Ui_Focus_Manager_Calc_Data *pd EINA_UNUSED, const Efl_Object *klass)
1094{ 1094{
1095 if (klass == MY_CLASS) 1095 if (klass == MY_CLASS)
1096 return obj; 1096 return (Efl_Object *) obj;
1097 1097
1098 return efl_provider_find(efl_super(obj, MY_CLASS), klass); 1098 return efl_provider_find(efl_super(obj, MY_CLASS), klass);
1099} 1099}
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index c97dcb51c9..0d7781dad4 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -7061,7 +7061,8 @@ _efl_ui_win_efl_input_state_lock_enabled_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Dat
7061} 7061}
7062 7062
7063EOLIAN static Efl_Object * 7063EOLIAN static Efl_Object *
7064_efl_ui_win_efl_object_provider_find(Eo *obj, Efl_Ui_Win_Data *pd EINA_UNUSED, 7064_efl_ui_win_efl_object_provider_find(const Eo *obj,
7065 Efl_Ui_Win_Data *pd EINA_UNUSED,
7065 const Efl_Object *klass) 7066 const Efl_Object *klass)
7066{ 7067{
7067 if (klass == EFL_UI_WIN_CLASS) 7068 if (klass == EFL_UI_WIN_CLASS)
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index 48b371da71..4db2ed1f4a 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -5697,7 +5697,7 @@ _elm_gengrid_efl_access_selection_child_deselect(Eo *obj EINA_UNUSED, Elm_Gengri
5697} 5697}
5698 5698
5699EOLIAN static Efl_Object* 5699EOLIAN static Efl_Object*
5700_elm_gengrid_efl_object_provider_find(Eo *obj, Elm_Gengrid_Data *pd, const Efl_Object *klass) 5700_elm_gengrid_efl_object_provider_find(const Eo *obj, Elm_Gengrid_Data *pd, const Efl_Object *klass)
5701{ 5701{
5702 if (klass == EFL_UI_FOCUS_PARENT_PROVIDER_INTERFACE) 5702 if (klass == EFL_UI_FOCUS_PARENT_PROVIDER_INTERFACE)
5703 return pd->provider; 5703 return pd->provider;
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 664bee7558..07d2fcb087 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -8749,7 +8749,7 @@ _elm_genlist_efl_access_selection_child_deselect(Eo *obj EINA_UNUSED, Elm_Genlis
8749} 8749}
8750 8750
8751EOLIAN static Efl_Object* 8751EOLIAN static Efl_Object*
8752_elm_genlist_efl_object_provider_find(Eo *obj, Elm_Genlist_Data *pd, const Efl_Object *klass) 8752_elm_genlist_efl_object_provider_find(const Eo *obj, Elm_Genlist_Data *pd, const Efl_Object *klass)
8753{ 8753{
8754 if (klass == EFL_UI_FOCUS_PARENT_PROVIDER_INTERFACE) 8754 if (klass == EFL_UI_FOCUS_PARENT_PROVIDER_INTERFACE)
8755 return pd->provider; 8755 return pd->provider;
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index 446f58e362..92ef38dfca 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -1507,7 +1507,7 @@ _elm_menu_efl_access_selection_selected_child_get(Eo *obj EINA_UNUSED, Elm_Menu_
1507} 1507}
1508 1508
1509EOLIAN static Efl_Object* 1509EOLIAN static Efl_Object*
1510_elm_menu_efl_object_provider_find(Eo *obj, Elm_Menu_Data *pd, const Efl_Object *klass) 1510_elm_menu_efl_object_provider_find(const Eo *obj, Elm_Menu_Data *pd, const Efl_Object *klass)
1511{ 1511{
1512 Efl_Object *result; 1512 Efl_Object *result;
1513 1513
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 61dc2c5c57..3d908f1209 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -5470,7 +5470,7 @@ _elm_widget_item_efl_access_component_alpha_get(Eo *obj EINA_UNUSED, Elm_Widget_
5470} 5470}
5471 5471
5472EOLIAN static Efl_Object * 5472EOLIAN static Efl_Object *
5473_elm_widget_efl_object_provider_find(Eo *obj, Elm_Widget_Smart_Data *pd, const Efl_Object *klass) 5473_elm_widget_efl_object_provider_find(const Eo *obj, Elm_Widget_Smart_Data *pd, const Efl_Object *klass)
5474{ 5474{
5475 Efl_Object *lookup = NULL; 5475 Efl_Object *lookup = NULL;
5476 5476
diff --git a/src/lib/eo/efl_object.eo b/src/lib/eo/efl_object.eo
index c94395d68e..7de713e5be 100644
--- a/src/lib/eo/efl_object.eo
+++ b/src/lib/eo/efl_object.eo
@@ -130,7 +130,7 @@ abstract Efl.Object ()
130 finalized: bool; [[$true if the object is finalized, $false otherwise]] 130 finalized: bool; [[$true if the object is finalized, $false otherwise]]
131 } 131 }
132 } 132 }
133 provider_find { 133 provider_find @const {
134 [[Searches upwards in the object tree for a provider which knows the given class/interface. 134 [[Searches upwards in the object tree for a provider which knows the given class/interface.
135 135
136 The object from the provider will then be returned. 136 The object from the provider will then be returned.
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index aba4fb392e..e5d932addc 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -692,7 +692,7 @@ _efl_object_finalized_get(Eo *obj_id, Efl_Object_Data *pd EINA_UNUSED)
692} 692}
693 693
694EOLIAN static Efl_Object * 694EOLIAN static Efl_Object *
695_efl_object_provider_find(Eo *obj EINA_UNUSED, Efl_Object_Data *pd, const Efl_Object *klass) 695_efl_object_provider_find(const Eo *obj EINA_UNUSED, Efl_Object_Data *pd, const Efl_Object *klass)
696{ 696{
697 if (pd->parent) return efl_provider_find(pd->parent, klass); 697 if (pd->parent) return efl_provider_find(pd->parent, klass);
698 return NULL; 698 return NULL;
diff --git a/src/lib/evas/canvas/efl_input_event.c b/src/lib/evas/canvas/efl_input_event.c
index f18eb3d136..29925b1c46 100644
--- a/src/lib/evas/canvas/efl_input_event.c
+++ b/src/lib/evas/canvas/efl_input_event.c
@@ -50,7 +50,7 @@ _efl_input_event_fake_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED)
50} 50}
51 51
52EOLIAN static Efl_Object * 52EOLIAN static Efl_Object *
53_efl_input_event_efl_object_provider_find(Eo *obj, void *pd EINA_UNUSED, const Efl_Object *klass) 53_efl_input_event_efl_object_provider_find(const Eo *obj, void *pd EINA_UNUSED, const Efl_Object *klass)
54{ 54{
55 // Note: provider_find should probably return self if self is a klass object 55 // Note: provider_find should probably return self if self is a klass object
56 if (klass == EVAS_CANVAS_CLASS) 56 if (klass == EVAS_CANVAS_CLASS)
diff --git a/src/lib/evas/canvas/evas_canvas3d_object.c b/src/lib/evas/canvas/evas_canvas3d_object.c
index 2e36a9f2f3..aca9839e51 100644
--- a/src/lib/evas/canvas/evas_canvas3d_object.c
+++ b/src/lib/evas/canvas/evas_canvas3d_object.c
@@ -17,7 +17,7 @@ _evas_canvas3d_object_efl_object_constructor(Eo *obj, Evas_Canvas3D_Object_Data
17} 17}
18 18
19EOLIAN static Evas * 19EOLIAN static Evas *
20 _evas_canvas3d_object_efl_object_provider_find(Eo *obj, Evas_Canvas3D_Object_Data *pd, const Efl_Class *klass) 20 _evas_canvas3d_object_efl_object_provider_find(const Eo *obj, Evas_Canvas3D_Object_Data *pd, const Efl_Class *klass)
21{ 21{
22 if (klass == EVAS_CANVAS_CLASS) 22 if (klass == EVAS_CANVAS_CLASS)
23 return pd->evas; 23 return pd->evas;
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 1e1cb07674..9089f30037 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -829,8 +829,9 @@ evas_data_argb_unpremul(unsigned int *data, unsigned int len)
829} 829}
830 830
831EOLIAN static Eo * 831EOLIAN static Eo *
832_evas_canvas_efl_object_provider_find(Eo *eo_e, Evas_Public_Data *e EINA_UNUSED, 832_evas_canvas_efl_object_provider_find(const Eo *eo_e,
833 const Efl_Class *klass) 833 Evas_Public_Data *e EINA_UNUSED,
834 const Efl_Class *klass)
834{ 835{
835 if (klass == EVAS_CANVAS_CLASS) 836 if (klass == EVAS_CANVAS_CLASS)
836 return eo_e; 837 return eo_e;
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 8383997af0..b18861f90a 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -2427,7 +2427,7 @@ _efl_canvas_object_efl_object_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Dat
2427} 2427}
2428 2428
2429EOLIAN static Eo * 2429EOLIAN static Eo *
2430_efl_canvas_object_efl_object_provider_find(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, const Efl_Class *klass) 2430_efl_canvas_object_efl_object_provider_find(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, const Efl_Class *klass)
2431{ 2431{
2432 if (klass == EVAS_CANVAS_CLASS) 2432 if (klass == EVAS_CANVAS_CLASS)
2433 { 2433 {