summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/eolian/eo_generator.c19
-rw-r--r--src/bin/eolian_cxx/eolian_wrappers.hh3
2 files changed, 6 insertions, 16 deletions
diff --git a/src/bin/eolian/eo_generator.c b/src/bin/eolian/eo_generator.c
index ca04359ccb..7d98eb9342 100644
--- a/src/bin/eolian/eo_generator.c
+++ b/src/bin/eolian/eo_generator.c
@@ -285,7 +285,6 @@ eo_header_generate(const Eolian_Class *class, Eina_Strbuf *buf)
285 EINA_ITERATOR_FOREACH(itr, event) 285 EINA_ITERATOR_FOREACH(itr, event)
286 { 286 {
287 Eina_Stringshare *evname = eolian_event_c_name_get(event); 287 Eina_Stringshare *evname = eolian_event_c_name_get(event);
288 const char *evdesc = eolian_event_description_get(event);
289 const Eolian_Documentation *evdoc = eolian_event_documentation_get(event); 288 const Eolian_Documentation *evdoc = eolian_event_documentation_get(event);
290 Eolian_Object_Scope scope = eolian_event_scope_get(event); 289 Eolian_Object_Scope scope = eolian_event_scope_get(event);
291 290
@@ -316,14 +315,7 @@ eo_header_generate(const Eolian_Class *class, Eina_Strbuf *buf)
316 eina_strbuf_free(evdbuf); 315 eina_strbuf_free(evdbuf);
317 } 316 }
318 else 317 else
319 { 318 eina_strbuf_append(str_ev, "/**\n * No description\n */\n");
320 if (!evdesc) evdesc = "No description";
321 eina_strbuf_reset(tmpbuf);
322 eina_strbuf_append(tmpbuf, evdesc);
323 eina_strbuf_replace_all(tmpbuf, "\n", "\n * ");
324 eina_strbuf_prepend(tmpbuf," * ");
325 eina_strbuf_append_printf(str_ev, "/**\n%s\n */\n", eina_strbuf_string_get(tmpbuf));
326 }
327 319
328 eina_strbuf_append_printf(str_ev, "#define %s (&(_%s))\n", evname, evname); 320 eina_strbuf_append_printf(str_ev, "#define %s (&(_%s))\n", evname, evname);
329 eina_strbuf_append_printf(str_extrn_ev, "EOAPI extern const Eo_Event_Description _%s;\n", evname); 321 eina_strbuf_append_printf(str_extrn_ev, "EOAPI extern const Eo_Event_Description _%s;\n", evname);
@@ -701,12 +693,9 @@ eo_source_beginning_generate(const Eolian_Class *class, Eina_Strbuf *buf)
701 EINA_ITERATOR_FOREACH(itr, event) 693 EINA_ITERATOR_FOREACH(itr, event)
702 { 694 {
703 Eina_Stringshare *evname = eolian_event_c_name_get(event); 695 Eina_Stringshare *evname = eolian_event_c_name_get(event);
704 const char *evdesc = eolian_event_description_get(event); 696 const char *evdesc = NULL;
705 if (!evdesc) 697 const Eolian_Documentation *doc = eolian_event_documentation_get(event);
706 { 698 if (doc) evdesc = eolian_documentation_summary_get(doc);
707 const Eolian_Documentation *doc = eolian_event_documentation_get(event);
708 if (doc) evdesc = eolian_documentation_summary_get(doc);
709 }
710 char *evdesc_line1 = _source_desc_get(evdesc); 699 char *evdesc_line1 = _source_desc_get(evdesc);
711 700
712 eina_strbuf_append_printf(tmpbuf, 701 eina_strbuf_append_printf(tmpbuf,
diff --git a/src/bin/eolian_cxx/eolian_wrappers.hh b/src/bin/eolian_cxx/eolian_wrappers.hh
index 9e7ba07fbd..65f218d6e4 100644
--- a/src/bin/eolian_cxx/eolian_wrappers.hh
+++ b/src/bin/eolian_cxx/eolian_wrappers.hh
@@ -361,7 +361,8 @@ event_create(Eolian_Class const& klass, const Eolian_Event *event_)
361 event.name = normalize_spaces(name_); 361 event.name = normalize_spaces(name_);
362 event.eo_name = safe_upper 362 event.eo_name = safe_upper
363 (find_replace(class_full_name(klass), ".", "_") + "_EVENT_" + event.name); 363 (find_replace(class_full_name(klass), ".", "_") + "_EVENT_" + event.name);
364 event.comment = safe_str(eolian_event_description_get(event_)); 364 /* FIXME: use doc api */
365 event.comment = safe_str("");
365 } 366 }
366 return event; 367 return event;
367} 368}