summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Zaoui <daniel.zaoui@samsung.com>2014-05-26 14:45:29 +0300
committerDaniel Zaoui <daniel.zaoui@samsung.com>2014-05-26 14:46:34 +0300
commit03c26ab4213c5e4b35c3e2d729bdbdda0cef5fb6 (patch)
tree61acf9991601cd397e1d8d7bf08a3b19d50f667a
parenta0ef5591742a1bf47cc228b386b6b2810e7fe3c1 (diff)
Eolian: adapt code to new API
-rw-r--r--src/bin/egui_gui/props_helper.c5
-rw-r--r--src/lib/database.c3
-rw-r--r--src/lib/plugin_C.c7
3 files changed, 9 insertions, 6 deletions
diff --git a/src/bin/egui_gui/props_helper.c b/src/bin/egui_gui/props_helper.c
index efbc4e2..eae505f 100644
--- a/src/bin/egui_gui/props_helper.c
+++ b/src/bin/egui_gui/props_helper.c
@@ -197,7 +197,7 @@ Eo *
197props_hoversel_events_add(Eo *box, Eo *hover_parent, const Gui_Widget_Callback *cb) 197props_hoversel_events_add(Eo *box, Eo *hover_parent, const Gui_Widget_Callback *cb)
198{ 198{
199 Eina_List *classes = eo_class_mro_get(wdg_class_name_get(cb_wdg_get(cb))); 199 Eina_List *classes = eo_class_mro_get(wdg_class_name_get(cb_wdg_get(cb)));
200 const char *class; 200 const char *classname;
201 201
202 Eo *hoversel = eo_add(ELM_OBJ_HOVERSEL_CLASS, box); 202 Eo *hoversel = eo_add(ELM_OBJ_HOVERSEL_CLASS, box);
203 eo_unref(hoversel); 203 eo_unref(hoversel);
@@ -206,8 +206,9 @@ props_hoversel_events_add(Eo *box, Eo *hover_parent, const Gui_Widget_Callback *
206 if (cb_type_get(cb)) dflt_val = cb_type_get(cb); 206 if (cb_type_get(cb)) dflt_val = cb_type_get(cb);
207 elm_object_text_set(hoversel, dflt_val); 207 elm_object_text_set(hoversel, dflt_val);
208 208
209 EINA_LIST_FREE(classes, class) 209 EINA_LIST_FREE(classes, classname)
210 { 210 {
211 Eolian_Class class = eolian_class_find_by_name(classname);
211 const Eina_List *events = eolian_class_events_list_get(class), *itr; 212 const Eina_List *events = eolian_class_events_list_get(class), *itr;
212 Eolian_Event event; 213 Eolian_Event event;
213 EINA_LIST_FOREACH(events, itr, event) 214 EINA_LIST_FOREACH(events, itr, event)
diff --git a/src/lib/database.c b/src/lib/database.c
index 47825f6..436583f 100644
--- a/src/lib/database.c
+++ b/src/lib/database.c
@@ -173,7 +173,8 @@ eo_class_mro_get(const char *class_name)
173 Eina_List *list2; 173 Eina_List *list2;
174 EINA_LIST_FOREACH(list, itr, class_name) 174 EINA_LIST_FOREACH(list, itr, class_name)
175 { 175 {
176 const Eina_List *inherits_list = eolian_class_inherits_list_get(class_name); 176 Eolian_Class class = eolian_class_find_by_name(class_name);
177 const Eina_List *inherits_list = eolian_class_inherits_list_get(class);
177 const Eina_List *inherit_itr; 178 const Eina_List *inherit_itr;
178 const char *inherit_name; 179 const char *inherit_name;
179 EINA_LIST_FOREACH(inherits_list, inherit_itr, inherit_name) 180 EINA_LIST_FOREACH(inherits_list, inherit_itr, inherit_name)
diff --git a/src/lib/plugin_C.c b/src/lib/plugin_C.c
index a56dccb..4b3ca45 100644
--- a/src/lib/plugin_C.c
+++ b/src/lib/plugin_C.c
@@ -11,10 +11,11 @@ static Eina_Strbuf *
11_eo_event_name_get(const char *class_name, const char *event_name) 11_eo_event_name_get(const char *class_name, const char *event_name)
12{ 12{
13 Eina_List *classes = eo_class_mro_get(class_name); 13 Eina_List *classes = eo_class_mro_get(class_name);
14 const char *class; 14 const char *inherit;
15 15
16 EINA_LIST_FREE(classes, class) 16 EINA_LIST_FREE(classes, inherit)
17 { 17 {
18 Eolian_Class class = eolian_class_find_by_name(inherit);
18 const Eina_List *events = eolian_class_events_list_get(class), *itr; 19 const Eina_List *events = eolian_class_events_list_get(class), *itr;
19 Eolian_Event event; 20 Eolian_Event event;
20 EINA_LIST_FOREACH(events, itr, event) 21 EINA_LIST_FOREACH(events, itr, event)
@@ -24,7 +25,7 @@ _eo_event_name_get(const char *class_name, const char *event_name)
24 if (!strcmp(ev_name, event_name)) 25 if (!strcmp(ev_name, event_name))
25 { 26 {
26 Eina_Strbuf *eo_event = eina_strbuf_new(); 27 Eina_Strbuf *eo_event = eina_strbuf_new();
27 eina_strbuf_append_printf(eo_event, "%s_EVENT_%s", class, event_name); 28 eina_strbuf_append_printf(eo_event, "%s_EVENT_%s", inherit, event_name);
28 eina_strbuf_replace_all(eo_event, ",", "_"); 29 eina_strbuf_replace_all(eo_event, ",", "_");
29 char *str = (char *)eina_strbuf_string_get(eo_event); 30 char *str = (char *)eina_strbuf_string_get(eo_event);
30 eina_str_toupper(&str); 31 eina_str_toupper(&str);