summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bin/elementary/test_efl_ui_text.c4
-rw-r--r--src/bin/eolian/headers.c2
-rw-r--r--src/bin/eolian/sources.c94
-rw-r--r--src/bin/eolian_mono/eolian/mono/function_definition.hh15
-rw-r--r--src/examples/ecore/efl_net_ip_address_example.c4
-rw-r--r--src/examples/ecore/efl_net_socket_ssl_dialer_example.c2
-rw-r--r--src/lib/ecore/ecore_event_message_handler.c2
-rw-r--r--src/lib/ecore/ecore_events.c3
-rw-r--r--src/lib/ecore/efl_app.c2
-rw-r--r--src/lib/ecore/efl_core_proc_env.c2
-rw-r--r--src/lib/ecore/efl_loop.c8
-rw-r--r--src/lib/ecore_con/ecore_con_url.c2
-rw-r--r--src/lib/ecore_con/efl_net_dialer_http.c4
-rw-r--r--src/lib/ecore_con/efl_net_dialer_ssl.c2
-rw-r--r--src/lib/ecore_con/efl_net_dialer_udp.c2
-rw-r--r--src/lib/ecore_con/efl_net_ip_address.c16
-rw-r--r--src/lib/ecore_con/efl_net_ssl_context.c4
-rw-r--r--src/lib/edje/edje_util.c1
-rw-r--r--src/lib/efl/interfaces/efl_text_markup_util.c6
-rw-r--r--src/lib/elementary/efl_access_object.c8
-rw-r--r--src/lib/elementary/efl_access_object.h26
-rw-r--r--src/lib/elementary/efl_access_window.h14
-rw-r--r--src/lib/elementary/efl_ui_dnd.c4
-rw-r--r--src/lib/elementary/efl_ui_focus_layer.c2
-rw-r--r--src/lib/elementary/efl_ui_focus_manager_calc.c6
-rw-r--r--src/lib/elementary/efl_ui_focus_util.c8
-rw-r--r--src/lib/elementary/efl_ui_widget.c2
-rw-r--r--src/lib/elementary/efl_ui_win.c12
-rw-r--r--src/lib/elementary/elm_access.c2
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c20
-rw-r--r--src/lib/elementary/elm_entry.c12
-rw-r--r--src/lib/elementary/elm_focus_legacy.c10
-rw-r--r--src/lib/elementary/elm_menu.c4
-rw-r--r--src/lib/elementary/elm_sys_notify.c7
-rw-r--r--src/lib/elementary/elm_theme.c2
-rw-r--r--src/lib/eo/eo_base_class.c6
-rw-r--r--src/lib/eolian_cxx/grammar/function_definition.hpp19
-rw-r--r--src/lib/evas/canvas/efl_input_event.c4
-rw-r--r--src/tests/ecore/efl_app_suite.c2
-rw-r--r--src/tests/ecore/efl_app_test_env.c4
-rw-r--r--src/tests/ecore/efl_app_test_loop.c14
-rw-r--r--src/tests/ecore/efl_app_test_loop_timer.c2
-rw-r--r--src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c92
-rw-r--r--src/tests/efl_mono/libefl_mono_native_test.c23
-rw-r--r--src/tests/elementary/efl_ui_model.c6
-rw-r--r--src/tests/elementary/efl_ui_test_focus.c4
-rw-r--r--src/tests/elementary/elm_test_genlist.c6
-rw-r--r--src/tests/elementary/elm_test_win.c5
-rw-r--r--src/tests/elementary/suite_helpers.c8
-rw-r--r--src/tests/eo/signals/signals_main.c30
-rw-r--r--src/tests/eolian/data/class_simple_ref.c9
-rw-r--r--src/tests/eolian/data/function_as_argument_ref.c9
-rw-r--r--src/tests/eolian/data/override_ref.c9
-rw-r--r--src/tests/eolian/data/owning.eo.c9
54 files changed, 282 insertions, 293 deletions
diff --git a/src/bin/elementary/test_efl_ui_text.c b/src/bin/elementary/test_efl_ui_text.c
index f8280f0612..1ef0873935 100644
--- a/src/bin/elementary/test_efl_ui_text.c
+++ b/src/bin/elementary/test_efl_ui_text.c
@@ -71,7 +71,7 @@ test_efl_ui_text_label(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, voi
71 efl_text_multiline_set(en, EINA_TRUE); 71 efl_text_multiline_set(en, EINA_TRUE);
72 72
73 en = _create_label(win, bx); 73 en = _create_label(win, bx);
74 markup = efl_text_markup_util_text_to_markup(EFL_TEXT_MARKUP_UTIL_CLASS, 74 markup = efl_text_markup_util_text_to_markup(
75 "You can use the text -> markup helper\nto make coding easier."); 75 "You can use the text -> markup helper\nto make coding easier.");
76 efl_text_markup_set(en, markup); 76 efl_text_markup_set(en, markup);
77 free(markup); 77 free(markup);
@@ -80,7 +80,7 @@ test_efl_ui_text_label(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, voi
80 efl_text_multiline_set(en, EINA_TRUE); 80 efl_text_multiline_set(en, EINA_TRUE);
81 81
82 en = _create_label(win, bx); 82 en = _create_label(win, bx);
83 markup = efl_text_markup_util_markup_to_text(EFL_TEXT_MARKUP_UTIL_CLASS, 83 markup = efl_text_markup_util_markup_to_text(
84 "You can use markup -&gt; text helpers<ps>to make coding easier."); 84 "You can use markup -&gt; text helpers<ps>to make coding easier.");
85 efl_text_set(en, markup); 85 efl_text_set(en, markup);
86 free(markup); 86 free(markup);
diff --git a/src/bin/eolian/headers.c b/src/bin/eolian/headers.c
index 4ebf9a7fdd..70520fc7a2 100644
--- a/src/bin/eolian/headers.c
+++ b/src/bin/eolian/headers.c
@@ -125,7 +125,7 @@ _gen_func(const Eolian_State *state, const Eolian_Function *fid,
125 eina_stringshare_del(fcn); 125 eina_stringshare_del(fcn);
126 126
127 Eina_Strbuf *flagbuf = NULL; 127 Eina_Strbuf *flagbuf = NULL;
128 int nidx = !legacy || !eolian_function_is_class(fid); 128 int nidx = !eolian_function_is_class(fid);
129 129
130 eina_strbuf_append_char(buf, '('); 130 eina_strbuf_append_char(buf, '(');
131 if (nidx) 131 if (nidx)
diff --git a/src/bin/eolian/sources.c b/src/bin/eolian/sources.c
index eb2ad41ace..493ec1ad40 100644
--- a/src/bin/eolian/sources.c
+++ b/src/bin/eolian/sources.c
@@ -386,8 +386,14 @@ _gen_func(const Eolian_Class *cl, const Eolian_Function *fid,
386 eina_strbuf_append(params, ", "); 386 eina_strbuf_append(params, ", ");
387 eina_strbuf_append(params, prn); 387 eina_strbuf_append(params, prn);
388 388
389 eina_strbuf_append_printf(params_full, ", %s", ptn); 389 if (eina_strbuf_length_get(params_full) || !eolian_function_is_class(fid))
390 eina_strbuf_append_printf(params_full_imp, ", %s", ptn); 390 {
391 eina_strbuf_append(params_full, ", ");
392 eina_strbuf_append(params_full_imp, ", ");
393 }
394 eina_strbuf_append_printf(params_full, "%s", ptn);
395 eina_strbuf_append_printf(params_full_imp, "%s", ptn);
396
391 if (ptn[strlen(ptn) - 1] != '*') 397 if (ptn[strlen(ptn) - 1] != '*')
392 { 398 {
393 eina_strbuf_append_char(params_full, ' '); 399 eina_strbuf_append_char(params_full, ' ');
@@ -470,7 +476,8 @@ _gen_func(const Eolian_Class *cl, const Eolian_Function *fid,
470 if (eina_strbuf_length_get(params)) 476 if (eina_strbuf_length_get(params))
471 eina_strbuf_append(params, ", "); 477 eina_strbuf_append(params, ", ");
472 478
473 eina_strbuf_append(params_full_imp, ", "); 479 if (eina_strbuf_length_get(params_full_imp) || !eolian_function_is_class(fid))
480 eina_strbuf_append(params_full_imp, ", ");
474 eina_strbuf_append(params_full_imp, ptn); 481 eina_strbuf_append(params_full_imp, ptn);
475 if (!had_star) 482 if (!had_star)
476 eina_strbuf_append_char(params_full_imp, ' '); 483 eina_strbuf_append_char(params_full_imp, ' ');
@@ -480,7 +487,8 @@ _gen_func(const Eolian_Class *cl, const Eolian_Function *fid,
480 eina_strbuf_append(params_full_imp, " EINA_UNUSED"); 487 eina_strbuf_append(params_full_imp, " EINA_UNUSED");
481 eina_strbuf_append(params, prn); 488 eina_strbuf_append(params, prn);
482 489
483 eina_strbuf_append(params_full, ", "); 490 if (eina_strbuf_length_get(params_full) || !eolian_function_is_class(fid))
491 eina_strbuf_append(params_full, ", ");
484 eina_strbuf_append(params_full, ptn); 492 eina_strbuf_append(params_full, ptn);
485 if (!had_star) 493 if (!had_star)
486 eina_strbuf_append_char(params_full, ' '); 494 eina_strbuf_append_char(params_full, ' ');
@@ -559,12 +567,17 @@ _gen_func(const Eolian_Class *cl, const Eolian_Function *fid,
559 eina_strbuf_append(buf, func_suffix); 567 eina_strbuf_append(buf, func_suffix);
560 /* ([const ]Eo *obj, Data_Type *pd, impl_full_params); */ 568 /* ([const ]Eo *obj, Data_Type *pd, impl_full_params); */
561 eina_strbuf_append_char(buf, '('); 569 eina_strbuf_append_char(buf, '(');
562 if ((ftype == EOLIAN_PROP_GET) || eolian_function_object_is_const(fid)) 570 if (!eolian_function_is_class(fid))
563 eina_strbuf_append(buf, "const "); 571 {
564 eina_strbuf_append(buf, "Eo *obj, "); 572 if ((ftype == EOLIAN_PROP_GET) || eolian_function_object_is_const(fid))
565 eina_strbuf_append(buf, dt); 573 eina_strbuf_append(buf, "const ");
566 eina_strbuf_append(buf, " *pd"); 574 eina_strbuf_append(buf, "Eo *obj, ");
575 eina_strbuf_append(buf, dt);
576 eina_strbuf_append(buf, " *pd");
577 }
567 eina_strbuf_append(buf, eina_strbuf_string_get(params_full_imp)); 578 eina_strbuf_append(buf, eina_strbuf_string_get(params_full_imp));
579 if (eina_strbuf_length_get(params_full_imp) == 0 && eolian_function_is_class(fid))
580 eina_strbuf_append(buf, "void");
568 eina_strbuf_append(buf, ");\n\n"); 581 eina_strbuf_append(buf, ");\n\n");
569 } 582 }
570 583
@@ -635,7 +648,7 @@ _gen_func(const Eolian_Class *cl, const Eolian_Function *fid,
635 eina_stringshare_del(dt); 648 eina_stringshare_del(dt);
636 } 649 }
637 650
638 if (impl_same_class) 651 if (impl_same_class && !eolian_function_is_class(fid))
639 { 652 {
640 void *data; 653 void *data;
641 Eina_Iterator *itr = eolian_property_keys_get(fid, ftype); 654 Eina_Iterator *itr = eolian_property_keys_get(fid, ftype);
@@ -746,6 +759,36 @@ _gen_func(const Eolian_Class *cl, const Eolian_Function *fid,
746 eina_stringshare_del(lfn); 759 eina_stringshare_del(lfn);
747 eina_stringshare_del(eofn); 760 eina_stringshare_del(eofn);
748 } 761 }
762 if (impl_same_class && eolian_function_is_class(fid))
763 {
764 eina_strbuf_append(buf, "EOAPI ");
765 if (rtp)
766 eina_strbuf_append(buf, eolian_type_c_type_get(rtp, EOLIAN_C_TYPE_RETURN));
767 else
768 eina_strbuf_append(buf, "void");
769 eina_strbuf_append(buf, " ");
770 eina_strbuf_append(buf, eolian_function_full_c_name_get(fid, ftype, EINA_FALSE));
771 eina_strbuf_append(buf, "(");
772 if (eina_strbuf_length_get(params_full) == 0)
773 eina_strbuf_append(buf, "void");
774 else
775 eina_strbuf_append_buffer(buf, params_full);
776 eina_strbuf_append(buf, ")\n");
777 eina_strbuf_append(buf, "{\n");
778 eina_strbuf_append_printf(buf, " %s();\n", eolian_class_c_get_function_name_get(cl));
779 if (rtp)
780 eina_strbuf_append(buf, " return ");
781 else
782 eina_strbuf_append(buf, " ");
783 eina_strbuf_append_printf(buf, "_%s", ocnamel);
784 eina_strbuf_append_char(buf, '_');
785 eina_strbuf_append(buf, eolian_function_name_get(fid));
786 eina_strbuf_append(buf, func_suffix);
787 eina_strbuf_append(buf, "(");
788 eina_strbuf_append_buffer(buf, params);
789 eina_strbuf_append(buf, ");\n");
790 eina_strbuf_append(buf, "}\n");
791 }
749 792
750 free(cname); 793 free(cname);
751 free(cnamel); 794 free(cnamel);
@@ -797,9 +840,9 @@ _gen_initializer(const Eolian_Class *cl, Eina_Strbuf *buf)
797 eina_strbuf_append(buf, "\nstatic Eina_Bool\n_"); 840 eina_strbuf_append(buf, "\nstatic Eina_Bool\n_");
798 eina_strbuf_append(buf, cnamel); 841 eina_strbuf_append(buf, cnamel);
799 eina_strbuf_append(buf, "_class_initializer(Efl_Class *klass)\n{\n"); 842 eina_strbuf_append(buf, "_class_initializer(Efl_Class *klass)\n{\n");
800 eina_strbuf_append(buf, " const Efl_Object_Ops *opsp = NULL, *copsp = NULL;\n\n"); 843 eina_strbuf_append(buf, " const Efl_Object_Ops *opsp = NULL;\n\n");
801 844
802 Eina_Strbuf *ops = eina_strbuf_new(), *cops = eina_strbuf_new(); 845 Eina_Strbuf *ops = eina_strbuf_new();
803 846
804 /* start over with clean itearator */ 847 /* start over with clean itearator */
805 const Eolian_Implement *imp; 848 const Eolian_Implement *imp;
@@ -810,13 +853,12 @@ _gen_initializer(const Eolian_Class *cl, Eina_Strbuf *buf)
810 Eolian_Function_Type ftype; 853 Eolian_Function_Type ftype;
811 const Eolian_Function *fid = eolian_implement_function_get(imp, &ftype); 854 const Eolian_Function *fid = eolian_implement_function_get(imp, &ftype);
812 855
856 if (eolian_function_is_class(fid)) continue;
857
813 Eina_Strbuf *obuf = ops; 858 Eina_Strbuf *obuf = ops;
814 if (eolian_function_is_class(fid))
815 obuf = cops;
816 859
817 if (!eina_strbuf_length_get(obuf)) 860 if (!eina_strbuf_length_get(obuf))
818 eina_strbuf_append_printf(obuf, " EFL_OPS_DEFINE(%s,\n", 861 eina_strbuf_append_printf(obuf, " EFL_OPS_DEFINE(ops,\n");
819 (obuf == ops) ? "ops" : "cops");
820 862
821 Eina_Bool found_get = !!eina_hash_find(_funcs_params_init_get, &imp); 863 Eina_Bool found_get = !!eina_hash_find(_funcs_params_init_get, &imp);
822 Eina_Bool found_set = !!eina_hash_find(_funcs_params_init_set, &imp); 864 Eina_Bool found_set = !!eina_hash_find(_funcs_params_init_set, &imp);
@@ -864,28 +906,10 @@ _gen_initializer(const Eolian_Class *cl, Eina_Strbuf *buf)
864 eina_strbuf_append(buf, " opsp = &ops;\n"); 906 eina_strbuf_append(buf, " opsp = &ops;\n");
865 eina_strbuf_append(buf, "#endif\n\n"); 907 eina_strbuf_append(buf, "#endif\n\n");
866 } 908 }
867 if (eina_strbuf_length_get(cops))
868 {
869 eina_strbuf_append_printf(buf, "#ifndef %s_EXTRA_CLASS_OPS\n", cnameu);
870 eina_strbuf_append_printf(buf, "#define %s_EXTRA_CLASS_OPS\n", cnameu);
871 eina_strbuf_append(buf, "#endif\n\n");
872
873 eina_strbuf_append_printf(cops, " %s_EXTRA_CLASS_OPS\n );\n", cnameu);
874 eina_strbuf_append(buf, eina_strbuf_string_get(cops));
875 eina_strbuf_append(buf, " copsp = &cops;\n\n");
876 }
877 else
878 {
879 eina_strbuf_append_printf(buf, "#ifdef %s_EXTRA_CLASS_OPS\n", cnameu);
880 eina_strbuf_append_printf(buf, " EFL_OPS_DEFINE(cops, %s_EXTRA_CLASS_OPS);\n", cnameu);
881 eina_strbuf_append(buf, " copsp = &cops;\n");
882 eina_strbuf_append(buf, "#endif\n\n");
883 }
884 909
885 eina_strbuf_append(buf, " return efl_class_functions_set(klass, opsp, copsp, NULL);\n"); 910 eina_strbuf_append(buf, " return efl_class_functions_set(klass, opsp, NULL, NULL);\n");
886 911
887 eina_strbuf_free(ops); 912 eina_strbuf_free(ops);
888 eina_strbuf_free(cops);
889 913
890 eina_strbuf_append(buf, "}\n\n"); 914 eina_strbuf_append(buf, "}\n\n");
891 915
diff --git a/src/bin/eolian_mono/eolian/mono/function_definition.hh b/src/bin/eolian_mono/eolian/mono/function_definition.hh
index f89ac954cb..9fef462002 100644
--- a/src/bin/eolian_mono/eolian/mono/function_definition.hh
+++ b/src/bin/eolian_mono/eolian/mono/function_definition.hh
@@ -147,11 +147,12 @@ struct function_definition_generator
147 << (do_super ? " protected " : " private ") << "static extern " 147 << (do_super ? " protected " : " private ") << "static extern "
148 << eolian_mono::marshall_type(true) 148 << eolian_mono::marshall_type(true)
149 << " " << string 149 << " " << string
150 << "(System.IntPtr obj" 150 << "(" << (f.is_static ? "" : "System.IntPtr obj")
151 << *grammar::attribute_reorder<-1, -1> 151 << ((!f.is_static && (f.parameters.size() > 0)) ? ", " : "")
152 << (grammar::attribute_reorder<-1, -1>
152 ( 153 (
153 (", " << marshall_annotation << " " << marshall_parameter) 154 (marshall_annotation << " " << marshall_parameter)
154 ) 155 ) % ",")
155 << ");\n") 156 << ");\n")
156 .generate(sink, std::make_tuple(f.return_type, f.return_type, f.c_name, f.parameters), context)) 157 .generate(sink, std::make_tuple(f.return_type, f.return_type, f.c_name, f.parameters), context))
157 return false; 158 return false;
@@ -170,14 +171,14 @@ struct function_definition_generator
170 if (do_super && !f.is_static) 171 if (do_super && !f.is_static)
171 self = "(inherited ? Efl.Eo.Globals.efl_super(" + self + ", this.NativeClass) : " + self + ")"; 172 self = "(inherited ? Efl.Eo.Globals.efl_super(" + self + ", this.NativeClass) : " + self + ")";
172 else if (f.is_static) 173 else if (f.is_static)
173 self = name_helpers::klass_get_full_name(f.klass) + "()"; 174 self = "";
174 175
175 if(!as_generator 176 if(!as_generator
176 (scope_tab << ((do_super && !f.is_static) ? "virtual " : "") << "public " << (f.is_static ? "static " : "") << return_type << " " << string << "(" << (parameter % ", ") 177 (scope_tab << ((do_super && !f.is_static) ? "virtual " : "") << "public " << (f.is_static ? "static " : "") << return_type << " " << string << "(" << (parameter % ", ")
177 << ") {\n " 178 << ") {\n "
178 << eolian_mono::function_definition_preamble() << string << "(" 179 << eolian_mono::function_definition_preamble() << string << "("
179 << self 180 << self << ((!f.is_static && (f.parameters.size() > 0)) ? "," : "")
180 << *(", " << argument_invocation ) << ");\n" 181 << (argument_invocation % ", ") << ");\n"
181 << eolian_mono::function_definition_epilogue() 182 << eolian_mono::function_definition_epilogue()
182 << " }\n") 183 << " }\n")
183 .generate(sink, std::make_tuple(name_helpers::managed_method_name(f), f.parameters, f, f.c_name, f.parameters, f), context)) 184 .generate(sink, std::make_tuple(name_helpers::managed_method_name(f), f.parameters, f, f.c_name, f.parameters, f), context))
diff --git a/src/examples/ecore/efl_net_ip_address_example.c b/src/examples/ecore/efl_net_ip_address_example.c
index 16fc876117..0097c2ac72 100644
--- a/src/examples/ecore/efl_net_ip_address_example.c
+++ b/src/examples/ecore/efl_net_ip_address_example.c
@@ -123,7 +123,7 @@ main(int argc, char *argv[])
123 for (i = 1; i < argc; i++) 123 for (i = 1; i < argc; i++)
124 { 124 {
125 const char *address = argv[i]; 125 const char *address = argv[i];
126 Eo *o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, address); 126 Eo *o = efl_net_ip_address_parse( address);
127 if (o) 127 if (o)
128 { 128 {
129 _print_ip_addr_info(o); 129 _print_ip_addr_info(o);
@@ -131,7 +131,7 @@ main(int argc, char *argv[])
131 } 131 }
132 else 132 else
133 { 133 {
134 Eina_Future *f = efl_net_ip_address_resolve(EFL_NET_IP_ADDRESS_CLASS, address, 0, 0); 134 Eina_Future *f = efl_net_ip_address_resolve( address, 0, 0);
135 eina_future_then(f, _resolved, address); 135 eina_future_then(f, _resolved, address);
136 printf("INFO: %s is not numeric, resolving...\n", address); 136 printf("INFO: %s is not numeric, resolving...\n", address);
137 resolving = eina_list_append(resolving, f); 137 resolving = eina_list_append(resolving, f);
diff --git a/src/examples/ecore/efl_net_socket_ssl_dialer_example.c b/src/examples/ecore/efl_net_socket_ssl_dialer_example.c
index 10cec47dda..45dc189d09 100644
--- a/src/examples/ecore/efl_net_socket_ssl_dialer_example.c
+++ b/src/examples/ecore/efl_net_socket_ssl_dialer_example.c
@@ -464,7 +464,7 @@ efl_main(void *data EINA_UNUSED,
464 efl_net_ssl_context_hostname_set(efl_added, hostname_override), 464 efl_net_ssl_context_hostname_set(efl_added, hostname_override),
465 efl_net_ssl_context_setup(efl_added, cipher, EINA_TRUE)); 465 efl_net_ssl_context_setup(efl_added, cipher, EINA_TRUE));
466#else 466#else
467 ssl_ctx = efl_net_ssl_context_default_dialer_get(EFL_NET_SSL_CONTEXT_CLASS); 467 ssl_ctx = efl_net_ssl_context_default_dialer_get();
468 fprintf(stderr, "INFO: using default context for dialers.\n"); 468 fprintf(stderr, "INFO: using default context for dialers.\n");
469#endif 469#endif
470 470
diff --git a/src/lib/ecore/ecore_event_message_handler.c b/src/lib/ecore/ecore_event_message_handler.c
index 60ab2c9395..52a63b9677 100644
--- a/src/lib/ecore/ecore_event_message_handler.c
+++ b/src/lib/ecore/ecore_event_message_handler.c
@@ -87,7 +87,7 @@ _ecore_event_filters_call(Eo *obj, Efl_Loop_Data *pd)
87 Filter *f; 87 Filter *f;
88 Ecore_Event_Message_Handler_Data *eemhd; 88 Ecore_Event_Message_Handler_Data *eemhd;
89 Eo *ecore_event_handler = efl_loop_message_handler_get 89 Eo *ecore_event_handler = efl_loop_message_handler_get
90 (EFL_LOOP_CLASS, obj, ECORE_EVENT_MESSAGE_HANDLER_CLASS); 90 (obj, ECORE_EVENT_MESSAGE_HANDLER_CLASS);
91 91
92 if (!ecore_event_handler) return; 92 if (!ecore_event_handler) return;
93 eemhd = efl_data_scope_get(ecore_event_handler, MY_CLASS); 93 eemhd = efl_data_scope_get(ecore_event_handler, MY_CLASS);
diff --git a/src/lib/ecore/ecore_events.c b/src/lib/ecore/ecore_events.c
index 258e10e663..59c04f127c 100644
--- a/src/lib/ecore/ecore_events.c
+++ b/src/lib/ecore/ecore_events.c
@@ -246,8 +246,7 @@ _ecore_event_init(void)
246 if ((!choice) || (!choice[0])) choice = "chained_mempool"; 246 if ((!choice) || (!choice[0])) choice = "chained_mempool";
247 247
248 _event_msg_handler = 248 _event_msg_handler =
249 efl_loop_message_handler_get(EFL_LOOP_CLASS, 249 efl_loop_message_handler_get(_mainloop_singleton,
250 _mainloop_singleton,
251 ECORE_EVENT_MESSAGE_HANDLER_CLASS); 250 ECORE_EVENT_MESSAGE_HANDLER_CLASS);
252 if (!_event_msg_handler) 251 if (!_event_msg_handler)
253 { 252 {
diff --git a/src/lib/ecore/efl_app.c b/src/lib/ecore/efl_app.c
index 3d090ca4d6..6bfa80088b 100644
--- a/src/lib/ecore/efl_app.c
+++ b/src/lib/ecore/efl_app.c
@@ -15,7 +15,7 @@
15Efl_Version _app_efl_version = { 0, 0, 0, 0, NULL, NULL }; 15Efl_Version _app_efl_version = { 0, 0, 0, 0, NULL, NULL };
16 16
17EOLIAN static Efl_App* 17EOLIAN static Efl_App*
18_efl_app_app_main_get(const Eo *obj EINA_UNUSED, void *pd EINA_UNUSED) 18_efl_app_app_main_get(void)
19{ 19{
20 if (_mainloop_singleton) return _mainloop_singleton; 20 if (_mainloop_singleton) return _mainloop_singleton;
21 _mainloop_singleton = efl_add_ref(EFL_APP_CLASS, NULL); 21 _mainloop_singleton = efl_add_ref(EFL_APP_CLASS, NULL);
diff --git a/src/lib/ecore/efl_core_proc_env.c b/src/lib/ecore/efl_core_proc_env.c
index 846b69a350..74519461ae 100644
--- a/src/lib/ecore/efl_core_proc_env.c
+++ b/src/lib/ecore/efl_core_proc_env.c
@@ -131,7 +131,7 @@ _efl_core_proc_env_efl_object_constructor(Eo *obj, Efl_Core_Proc_Env_Data *pd EI
131} 131}
132 132
133EOLIAN static Efl_Core_Env* 133EOLIAN static Efl_Core_Env*
134_efl_core_proc_env_self(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED) 134_efl_core_proc_env_self(void)
135{ 135{
136 if (!env) 136 if (!env)
137 { 137 {
diff --git a/src/lib/ecore/efl_loop.c b/src/lib/ecore/efl_loop.c
index cf8600c998..342a6f7725 100644
--- a/src/lib/ecore/efl_loop.c
+++ b/src/lib/ecore/efl_loop.c
@@ -29,7 +29,7 @@ struct _Efl_Loop_Promise_Simple_Data
29GENERIC_ALLOC_SIZE_DECLARE(Efl_Loop_Promise_Simple_Data); 29GENERIC_ALLOC_SIZE_DECLARE(Efl_Loop_Promise_Simple_Data);
30 30
31EOLIAN static Efl_Loop_Message_Handler * 31EOLIAN static Efl_Loop_Message_Handler *
32_efl_loop_message_handler_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl_Loop *loop, const Efl_Class *klass) 32_efl_loop_message_handler_get(Efl_Loop *loop, const Efl_Class *klass)
33{ 33{
34 Message_Handler mh = { 0 }, *mh2; 34 Message_Handler mh = { 0 }, *mh2;
35 Efl_Loop_Data *ld = efl_data_scope_get(loop, EFL_LOOP_CLASS); 35 Efl_Loop_Data *ld = efl_data_scope_get(loop, EFL_LOOP_CLASS);
@@ -54,7 +54,7 @@ Efl_Loop_Data *_mainloop_singleton_data = NULL;
54EAPI Eo * 54EAPI Eo *
55efl_main_loop_get(void) 55efl_main_loop_get(void)
56{ 56{
57 return efl_app_main_get(EFL_APP_CLASS); 57 return efl_app_main_get();
58} 58}
59 59
60EOLIAN static void 60EOLIAN static void
@@ -309,7 +309,7 @@ _efl_loop_efl_object_constructor(Eo *obj, Efl_Loop_Data *pd)
309 pd->epoll_fd = -1; 309 pd->epoll_fd = -1;
310 pd->timer_fd = -1; 310 pd->timer_fd = -1;
311 pd->future_message_handler = efl_loop_message_handler_get 311 pd->future_message_handler = efl_loop_message_handler_get
312 (EFL_LOOP_CLASS, obj, EFL_LOOP_MESSAGE_FUTURE_HANDLER_CLASS); 312 (obj, EFL_LOOP_MESSAGE_FUTURE_HANDLER_CLASS);
313 return obj; 313 return obj;
314} 314}
315 315
@@ -395,7 +395,7 @@ ecore_loop_arguments_send(int argc, const char **argv)
395 eina_array_push(cml, arg); 395 eina_array_push(cml, arg);
396 } 396 }
397 397
398 efl_core_command_line_command_array_set(efl_app_main_get(EFL_APP_CLASS), cml); 398 efl_core_command_line_command_array_set(efl_app_main_get(), cml);
399 efl_future_then(efl_main_loop_get(), efl_loop_job(efl_main_loop_get()), 399 efl_future_then(efl_main_loop_get(), efl_loop_job(efl_main_loop_get()),
400 .success = _efl_loop_arguments_send, 400 .success = _efl_loop_arguments_send,
401 .free = _efl_loop_arguments_cleanup, 401 .free = _efl_loop_arguments_cleanup,
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index 3c9faea28c..dd8d249304 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -734,7 +734,7 @@ _ecore_con_url_request_prepare(Ecore_Con_Url *url_con, const char *method)
734 734
735 if (url_con->time.condition != ECORE_CON_URL_TIME_NONE) 735 if (url_con->time.condition != ECORE_CON_URL_TIME_NONE)
736 { 736 {
737 char *ts = efl_net_dialer_http_date_serialize(EFL_NET_DIALER_HTTP_CLASS, url_con->time.stamp); 737 char *ts = efl_net_dialer_http_date_serialize(url_con->time.stamp);
738 if (ts) 738 if (ts)
739 { 739 {
740 efl_net_dialer_http_request_header_add(url_con->dialer, 740 efl_net_dialer_http_request_header_add(url_con->dialer,
diff --git a/src/lib/ecore_con/efl_net_dialer_http.c b/src/lib/ecore_con/efl_net_dialer_http.c
index 8bfe967c32..53788514e1 100644
--- a/src/lib/ecore_con/efl_net_dialer_http.c
+++ b/src/lib/ecore_con/efl_net_dialer_http.c
@@ -2375,14 +2375,14 @@ _efl_net_dialer_http_ssl_certificate_revocation_list_get(const Eo *o EINA_UNUSED
2375} 2375}
2376 2376
2377EOLIAN static int64_t 2377EOLIAN static int64_t
2378_efl_net_dialer_http_date_parse(Efl_Class *cls EINA_UNUSED, void *cd EINA_UNUSED, const char *str) 2378_efl_net_dialer_http_date_parse(const char *str)
2379{ 2379{
2380 EINA_SAFETY_ON_NULL_RETURN_VAL(str, 0); 2380 EINA_SAFETY_ON_NULL_RETURN_VAL(str, 0);
2381 return curl_getdate(str, NULL); 2381 return curl_getdate(str, NULL);
2382} 2382}
2383 2383
2384EOLIAN static char * 2384EOLIAN static char *
2385_efl_net_dialer_http_date_serialize(Efl_Class *cls EINA_UNUSED, void *cd EINA_UNUSED, int64_t ts) 2385_efl_net_dialer_http_date_serialize(int64_t ts)
2386{ 2386{
2387 static const char *const wkday[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; 2387 static const char *const wkday[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
2388 static const char * const month[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; 2388 static const char * const month[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
diff --git a/src/lib/ecore_con/efl_net_dialer_ssl.c b/src/lib/ecore_con/efl_net_dialer_ssl.c
index 78b587973a..33d314f2f4 100644
--- a/src/lib/ecore_con/efl_net_dialer_ssl.c
+++ b/src/lib/ecore_con/efl_net_dialer_ssl.c
@@ -84,7 +84,7 @@ _efl_net_dialer_ssl_efl_object_finalize(Eo *o, Efl_Net_Dialer_Ssl_Data *pd)
84 else 84 else
85 { 85 {
86 if (!pd->ssl_ctx) 86 if (!pd->ssl_ctx)
87 pd->ssl_ctx = efl_ref(efl_net_ssl_context_default_dialer_get(EFL_NET_SSL_CONTEXT_CLASS)); 87 pd->ssl_ctx = efl_ref(efl_net_ssl_context_default_dialer_get());
88 88
89 efl_net_socket_ssl_adopt(o, pd->sock, pd->ssl_ctx); 89 efl_net_socket_ssl_adopt(o, pd->sock, pd->ssl_ctx);
90 } 90 }
diff --git a/src/lib/ecore_con/efl_net_dialer_udp.c b/src/lib/ecore_con/efl_net_dialer_udp.c
index 953ae7dd2f..b42e9d414e 100644
--- a/src/lib/ecore_con/efl_net_dialer_udp.c
+++ b/src/lib/ecore_con/efl_net_dialer_udp.c
@@ -180,7 +180,7 @@ _efl_net_dialer_udp_resolved_bind(Eo *o, Efl_Net_Dialer_Udp_Data *pd EINA_UNUSED
180 } 180 }
181 } 181 }
182 182
183 remote_address = efl_net_ip_address_create_sockaddr(EFL_NET_IP_ADDRESS_CLASS, addr->ai_addr); 183 remote_address = efl_net_ip_address_create_sockaddr(addr->ai_addr);
184 if (remote_address) 184 if (remote_address)
185 { 185 {
186 efl_net_socket_udp_init(o, remote_address); 186 efl_net_socket_udp_init(o, remote_address);
diff --git a/src/lib/ecore_con/efl_net_ip_address.c b/src/lib/ecore_con/efl_net_ip_address.c
index 9a79c07b3e..cc29aba680 100644
--- a/src/lib/ecore_con/efl_net_ip_address.c
+++ b/src/lib/ecore_con/efl_net_ip_address.c
@@ -300,7 +300,7 @@ _efl_net_ip_address_any_check(const Eo *o EINA_UNUSED, Efl_Net_Ip_Address_Data *
300} 300}
301 301
302EOLIAN static Efl_Net_Ip_Address * 302EOLIAN static Efl_Net_Ip_Address *
303_efl_net_ip_address_create(Eo *cls, void *pd EINA_UNUSED, uint16_t port, const Eina_Slice address) 303_efl_net_ip_address_create(uint16_t port, const Eina_Slice address)
304{ 304{
305 int family; 305 int family;
306 306
@@ -311,26 +311,26 @@ _efl_net_ip_address_create(Eo *cls, void *pd EINA_UNUSED, uint16_t port, const E
311 else 311 else
312 family = AF_INET; 312 family = AF_INET;
313 313
314 return efl_add_ref(cls, efl_main_loop_get(), 314 return efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(),
315 efl_net_ip_address_family_set(efl_added, family), 315 efl_net_ip_address_family_set(efl_added, family),
316 efl_net_ip_address_port_set(efl_added, port), 316 efl_net_ip_address_port_set(efl_added, port),
317 efl_net_ip_address_set(efl_added, address)); 317 efl_net_ip_address_set(efl_added, address));
318} 318}
319 319
320EOLIAN static Efl_Net_Ip_Address * 320EOLIAN static Efl_Net_Ip_Address *
321_efl_net_ip_address_create_sockaddr(Eo *cls, void *pd EINA_UNUSED, const void *ptr) 321_efl_net_ip_address_create_sockaddr(const void *ptr)
322{ 322{
323 const struct sockaddr *sockaddr = ptr; 323 const struct sockaddr *sockaddr = ptr;
324 324
325 EINA_SAFETY_ON_NULL_RETURN_VAL(sockaddr, NULL); 325 EINA_SAFETY_ON_NULL_RETURN_VAL(sockaddr, NULL);
326 EINA_SAFETY_ON_TRUE_RETURN_VAL((sockaddr->sa_family != AF_INET) && (sockaddr->sa_family != AF_INET6), NULL); 326 EINA_SAFETY_ON_TRUE_RETURN_VAL((sockaddr->sa_family != AF_INET) && (sockaddr->sa_family != AF_INET6), NULL);
327 327
328 return efl_add_ref(cls, efl_main_loop_get(), 328 return efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(),
329 efl_net_ip_address_sockaddr_set(efl_added, sockaddr)); 329 efl_net_ip_address_sockaddr_set(efl_added, sockaddr));
330} 330}
331 331
332EOLIAN static Efl_Net_Ip_Address * 332EOLIAN static Efl_Net_Ip_Address *
333_efl_net_ip_address_parse(Eo *cls, void *pd EINA_UNUSED, const char *numeric_address) 333_efl_net_ip_address_parse(const char *numeric_address)
334{ 334{
335 struct sockaddr_storage ss; 335 struct sockaddr_storage ss;
336 Eina_Bool r; 336 Eina_Bool r;
@@ -368,7 +368,7 @@ _efl_net_ip_address_parse(Eo *cls, void *pd EINA_UNUSED, const char *numeric_add
368 return NULL; 368 return NULL;
369 } 369 }
370 370
371 return efl_add_ref(cls, efl_main_loop_get(), 371 return efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(),
372 efl_net_ip_address_sockaddr_set(efl_added, &ss)); 372 efl_net_ip_address_sockaddr_set(efl_added, &ss));
373} 373}
374 374
@@ -509,7 +509,7 @@ _efl_net_ip_address_resolve_done(void *data,
509 if (EINA_UNLIKELY(_efl_net_ip_address_find(&r, a->ai_addr) >= 0)) 509 if (EINA_UNLIKELY(_efl_net_ip_address_find(&r, a->ai_addr) >= 0))
510 continue; 510 continue;
511 511
512 o = efl_net_ip_address_create_sockaddr(EFL_NET_IP_ADDRESS_CLASS, a->ai_addr); 512 o = efl_net_ip_address_create_sockaddr(a->ai_addr);
513 if (!o) continue ; 513 if (!o) continue ;
514 514
515 eina_value_array_append(&r, o); 515 eina_value_array_append(&r, o);
@@ -536,7 +536,7 @@ _efl_net_ip_address_resolve_done(void *data,
536} 536}
537 537
538EOLIAN static Eina_Future * 538EOLIAN static Eina_Future *
539_efl_net_ip_address_resolve(Eo *cls EINA_UNUSED, void *pd EINA_UNUSED, const char *address, int family, int flags) 539_efl_net_ip_address_resolve(const char *address, int family, int flags)
540{ 540{
541 Efl_Net_Ip_Address_Resolve_Context *ctx; 541 Efl_Net_Ip_Address_Resolve_Context *ctx;
542 struct addrinfo hints = { }; 542 struct addrinfo hints = { };
diff --git a/src/lib/ecore_con/efl_net_ssl_context.c b/src/lib/ecore_con/efl_net_ssl_context.c
index 271cd8afc2..a625fe81ee 100644
--- a/src/lib/ecore_con/efl_net_ssl_context.c
+++ b/src/lib/ecore_con/efl_net_ssl_context.c
@@ -357,11 +357,11 @@ _efl_net_ssl_context_default_dialer_del(void *data EINA_UNUSED, const Efl_Event
357} 357}
358 358
359EOLIAN static Efl_Net_Ssl_Context * 359EOLIAN static Efl_Net_Ssl_Context *
360_efl_net_ssl_context_default_dialer_get(const Efl_Class *klass, void *pd EINA_UNUSED) 360_efl_net_ssl_context_default_dialer_get(void)
361{ 361{
362 if (!_efl_net_ssl_context_default_dialer) 362 if (!_efl_net_ssl_context_default_dialer)
363 { 363 {
364 _efl_net_ssl_context_default_dialer = efl_add(klass, efl_main_loop_get(), 364 _efl_net_ssl_context_default_dialer = efl_add(EFL_NET_SSL_CONTEXT_CLASS, efl_main_loop_get(),
365 efl_net_ssl_context_verify_mode_set(efl_added, EFL_NET_SSL_VERIFY_MODE_REQUIRED), 365 efl_net_ssl_context_verify_mode_set(efl_added, EFL_NET_SSL_VERIFY_MODE_REQUIRED),
366 efl_net_ssl_context_hostname_verify_set(efl_added, EINA_TRUE), 366 efl_net_ssl_context_hostname_verify_set(efl_added, EINA_TRUE),
367 efl_net_ssl_context_default_paths_load_set(efl_added, EINA_TRUE), 367 efl_net_ssl_context_default_paths_load_set(efl_added, EINA_TRUE),
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index f5e80ce151..ba7da81abc 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -1979,7 +1979,6 @@ _edje_object_part_text_raw_generic_set(Edje *ed, Evas_Object *obj, Edje_Real_Par
1979 { 1979 {
1980 char *mkup; 1980 char *mkup;
1981 mkup = efl_text_markup_util_text_to_markup( 1981 mkup = efl_text_markup_util_text_to_markup(
1982 EFL_TEXT_MARKUP_UTIL_CLASS,
1983 text); 1982 text);
1984 rp->typedata.text->text = eina_stringshare_add(mkup); 1983 rp->typedata.text->text = eina_stringshare_add(mkup);
1985 free(mkup); 1984 free(mkup);
diff --git a/src/lib/efl/interfaces/efl_text_markup_util.c b/src/lib/efl/interfaces/efl_text_markup_util.c
index bf296c11fb..239915b4ac 100644
--- a/src/lib/efl/interfaces/efl_text_markup_util.c
+++ b/src/lib/efl/interfaces/efl_text_markup_util.c
@@ -68,8 +68,7 @@ _markup_get_text_utf8_append(Eina_Strbuf *sbuf, const char *text)
68} 68}
69 69
70EOLIAN static char* 70EOLIAN static char*
71_efl_text_markup_util_text_to_markup(Eo *class EINA_UNUSED, 71_efl_text_markup_util_text_to_markup(const char *text)
72 void *_pd EINA_UNUSED, const char *text)
73{ 72{
74 Eina_Strbuf *sbuf; 73 Eina_Strbuf *sbuf;
75 char *str = NULL; 74 char *str = NULL;
@@ -491,8 +490,7 @@ _text_util_markup_to_text(const char *text)
491} 490}
492 491
493static EOLIAN char* 492static EOLIAN char*
494_efl_text_markup_util_markup_to_text(Eo *class EINA_UNUSED, 493_efl_text_markup_util_markup_to_text(const char *text)
495 void *_pd EINA_UNUSED, const char *text)
496{ 494{
497 return _text_util_markup_to_text(text); 495 return _text_util_markup_to_text(text);
498} 496}
diff --git a/src/lib/elementary/efl_access_object.c b/src/lib/elementary/efl_access_object.c
index 3c56eae6a5..84ae798cc0 100644
--- a/src/lib/elementary/efl_access_object.c
+++ b/src/lib/elementary/efl_access_object.c
@@ -401,7 +401,7 @@ EAPI void efl_access_attributes_list_free(Eina_List *list)
401} 401}
402 402
403EOLIAN void 403EOLIAN void
404_efl_access_object_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *accessible, const Efl_Event_Description *event, void *event_info) 404_efl_access_object_event_emit(Eo *accessible, const Efl_Event_Description *event, void *event_info)
405{ 405{
406 Eina_List *l; 406 Eina_List *l;
407 Efl_Access_Event_Handler *hdl; 407 Efl_Access_Event_Handler *hdl;
@@ -437,7 +437,7 @@ _efl_access_object_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *a
437} 437}
438 438
439EOLIAN Efl_Access_Event_Handler * 439EOLIAN Efl_Access_Event_Handler *
440_efl_access_object_event_handler_add(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Event_Cb cb, void *data) 440_efl_access_object_event_handler_add(Efl_Event_Cb cb, void *data)
441{ 441{
442 Efl_Access_Event_Handler *ret = calloc(1, sizeof(Efl_Access_Event_Handler)); 442 Efl_Access_Event_Handler *ret = calloc(1, sizeof(Efl_Access_Event_Handler));
443 if (!ret) return NULL; 443 if (!ret) return NULL;
@@ -451,7 +451,7 @@ _efl_access_object_event_handler_add(Eo *class EINA_UNUSED, void *pd EINA_UNUSED
451} 451}
452 452
453EOLIAN void 453EOLIAN void
454_efl_access_object_event_handler_del(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Access_Event_Handler *handler) 454_efl_access_object_event_handler_del(Efl_Access_Event_Handler *handler)
455{ 455{
456 Eina_List *l, *l2; 456 Eina_List *l, *l2;
457 Efl_Access_Event_Handler *hdl; 457 Efl_Access_Event_Handler *hdl;
@@ -596,7 +596,7 @@ _efl_access_object_relationships_clear(Eo *obj EINA_UNUSED, Efl_Access_Object_Da
596} 596}
597 597
598EOLIAN Eo* 598EOLIAN Eo*
599_efl_access_object_access_root_get(const Eo *class EINA_UNUSED, void *pd EINA_UNUSED) 599_efl_access_object_access_root_get(void)
600{ 600{
601 if (!root) 601 if (!root)
602 root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get()); 602 root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
diff --git a/src/lib/elementary/efl_access_object.h b/src/lib/elementary/efl_access_object.h
index 22dc4bf9ad..b42db31f7f 100644
--- a/src/lib/elementary/efl_access_object.h
+++ b/src/lib/elementary/efl_access_object.h
@@ -46,7 +46,7 @@ efl_access_attribute_free(Efl_Access_Attribute *attr);
46 Efl_Access_Event_State_Changed_Data evinfo; \ 46 Efl_Access_Event_State_Changed_Data evinfo; \
47 evinfo.type = (tp); \ 47 evinfo.type = (tp); \
48 evinfo.new_value = (nvl); \ 48 evinfo.new_value = (nvl); \
49 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_STATE_CHANGED, (void*)&evinfo); \ 49 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_STATE_CHANGED, (void*)&evinfo); \
50 } while(0); } 50 } while(0); }
51 51
52/** 52/**
@@ -55,38 +55,38 @@ efl_access_attribute_free(Efl_Access_Attribute *attr);
55#define efl_access_bounds_changed_signal_emit(obj, x, y, width, height) \ 55#define efl_access_bounds_changed_signal_emit(obj, x, y, width, height) \
56 do { \ 56 do { \
57 Efl_Access_Event_Geometry_Changed_Data evinfo = { x, y, width, height }; \ 57 Efl_Access_Event_Geometry_Changed_Data evinfo = { x, y, width, height }; \
58 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_BOUNDS_CHANGED, (void*)&evinfo); \ 58 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_BOUNDS_CHANGED, (void*)&evinfo); \
59 } while(0); 59 } while(0);
60 60
61/** 61/**
62 * Emits Accessible 'PropertyChanged' signal for 'Name' property. 62 * Emits Accessible 'PropertyChanged' signal for 'Name' property.
63 */ 63 */
64#define efl_access_i18n_name_changed_signal_emit(obj) \ 64#define efl_access_i18n_name_changed_signal_emit(obj) \
65 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "i18n_name"); 65 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "i18n_name");
66 66
67/** 67/**
68 * Emits Accessible 'PropertyChanged' signal for 'Description' property. 68 * Emits Accessible 'PropertyChanged' signal for 'Description' property.
69 */ 69 */
70#define efl_access_description_changed_signal_emit(obj) \ 70#define efl_access_description_changed_signal_emit(obj) \
71 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "description"); 71 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "description");
72 72
73/** 73/**
74 * Emits Accessible 'PropertyChanged' signal for 'Parent' property. 74 * Emits Accessible 'PropertyChanged' signal for 'Parent' property.
75 */ 75 */
76#define efl_access_parent_changed_signal_emit(obj) \ 76#define efl_access_parent_changed_signal_emit(obj) \
77 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "parent"); 77 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "parent");
78 78
79/** 79/**
80 * Emits Accessible 'PropertyChanged' signal for 'Role' property. 80 * Emits Accessible 'PropertyChanged' signal for 'Role' property.
81 */ 81 */
82#define efl_access_role_changed_signal_emit(obj) \ 82#define efl_access_role_changed_signal_emit(obj) \
83 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "role"); 83 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "role");
84 84
85/** 85/**
86 * Emits Accessible 'PropertyChanged' signal for 'Value' property. 86 * Emits Accessible 'PropertyChanged' signal for 'Value' property.
87 */ 87 */
88#define efl_access_value_changed_signal_emit(obj) \ 88#define efl_access_value_changed_signal_emit(obj) \
89 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "value"); 89 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "value");
90 90
91/** 91/**
92 * Emits Accessible 'ChildrenChanged' signal with added child as argument. 92 * Emits Accessible 'ChildrenChanged' signal with added child as argument.
@@ -94,7 +94,7 @@ efl_access_attribute_free(Efl_Access_Attribute *attr);
94#define efl_access_children_changed_added_signal_emit(obj, child) \ 94#define efl_access_children_changed_added_signal_emit(obj, child) \
95 do { \ 95 do { \
96 Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_TRUE, child }; \ 96 Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_TRUE, child }; \
97 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, &atspi_data); \ 97 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, &atspi_data); \
98 } while(0); 98 } while(0);
99 99
100/** 100/**
@@ -103,32 +103,32 @@ efl_access_attribute_free(Efl_Access_Attribute *attr);
103#define efl_access_children_changed_del_signal_emit(obj, child) \ 103#define efl_access_children_changed_del_signal_emit(obj, child) \
104 do { \ 104 do { \
105 Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_FALSE, child }; \ 105 Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_FALSE, child }; \
106 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, &atspi_data); \ 106 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, &atspi_data); \
107 } while(0); 107 } while(0);
108 108
109/** 109/**
110 * Emits Accessible 'ActiveDescendantChanged' signal. 110 * Emits Accessible 'ActiveDescendantChanged' signal.
111 */ 111 */
112#define efl_access_active_descendant_changed_signal_emit(obj, child) \ 112#define efl_access_active_descendant_changed_signal_emit(obj, child) \
113 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED, child); 113 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED, child);
114 114
115/** 115/**
116 * Emits Accessible 'VisibleDataChanged' signal. 116 * Emits Accessible 'VisibleDataChanged' signal.
117 */ 117 */
118#define efl_access_visible_data_changed_signal_emit(obj) \ 118#define efl_access_visible_data_changed_signal_emit(obj) \
119 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_VISIBLE_DATA_CHANGED, NULL); 119 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_VISIBLE_DATA_CHANGED, NULL);
120 120
121/** 121/**
122 * Emits Accessible 'AddAccessible' signal. 122 * Emits Accessible 'AddAccessible' signal.
123 */ 123 */
124#define efl_access_added(obj) \ 124#define efl_access_added(obj) \
125 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_ADDED, NULL); 125 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_ADDED, NULL);
126 126
127/** 127/**
128 * Emits Accessible 'RemoveAccessible' signal. 128 * Emits Accessible 'RemoveAccessible' signal.
129 */ 129 */
130#define efl_access_removed(obj) \ 130#define efl_access_removed(obj) \
131 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_REMOVED, NULL); 131 efl_access_object_event_emit(obj, EFL_ACCESS_OBJECT_EVENT_REMOVED, NULL);
132 132
133#endif 133#endif
134 134
diff --git a/src/lib/elementary/efl_access_window.h b/src/lib/elementary/efl_access_window.h
index 38938d21ca..c4b3d3c398 100644
--- a/src/lib/elementary/efl_access_window.h
+++ b/src/lib/elementary/efl_access_window.h
@@ -14,43 +14,43 @@
14 * Emits 'Window:Activated' accessible signal. 14 * Emits 'Window:Activated' accessible signal.
15 */ 15 */
16#define efl_access_window_activated_signal_emit(obj) \ 16#define efl_access_window_activated_signal_emit(obj) \
17 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, NULL); 17 efl_access_object_event_emit(obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, NULL);
18 18
19/** 19/**
20 * Emits 'Window:Deactivated' accessible signal. 20 * Emits 'Window:Deactivated' accessible signal.
21 */ 21 */
22#define efl_access_window_deactivated_signal_emit(obj) \ 22#define efl_access_window_deactivated_signal_emit(obj) \
23 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DEACTIVATED, NULL); 23 efl_access_object_event_emit(obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DEACTIVATED, NULL);
24 24
25/** 25/**
26 * Emits 'Window:Created' accessible signal. 26 * Emits 'Window:Created' accessible signal.
27 */ 27 */
28#define efl_access_window_created_signal_emit(obj) \ 28#define efl_access_window_created_signal_emit(obj) \
29 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, NULL); 29 efl_access_object_event_emit(obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, NULL);
30 30
31/** 31/**
32 * Emits 'Window:Destroyed' accessible signal. 32 * Emits 'Window:Destroyed' accessible signal.
33 */ 33 */
34#define efl_access_window_destroyed_signal_emit(obj) \ 34#define efl_access_window_destroyed_signal_emit(obj) \
35 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, NULL); 35 efl_access_object_event_emit(obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, NULL);
36 36
37/** 37/**
38 * Emits 'Window:Maximized' accessible signal. 38 * Emits 'Window:Maximized' accessible signal.
39 */ 39 */
40#define efl_access_window_maximized_signal_emit(obj) \ 40#define efl_access_window_maximized_signal_emit(obj) \
41 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED, NULL); 41 efl_access_object_event_emit(obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED, NULL);
42 42
43/** 43/**
44 * Emits 'Window:Minimized' accessible signal. 44 * Emits 'Window:Minimized' accessible signal.
45 */ 45 */
46#define efl_access_window_minimized_signal_emit(obj) \ 46#define efl_access_window_minimized_signal_emit(obj) \
47 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, NULL); 47 efl_access_object_event_emit(obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, NULL);
48 48
49/** 49/**
50 * Emits 'Window:Restored' accessible signal. 50 * Emits 'Window:Restored' accessible signal.
51 */ 51 */
52#define efl_access_window_restored_signal_emit(obj) \ 52#define efl_access_window_restored_signal_emit(obj) \
53 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, NULL); 53 efl_access_object_event_emit(obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, NULL);
54 54
55#endif 55#endif
56#endif 56#endif
diff --git a/src/lib/elementary/efl_ui_dnd.c b/src/lib/elementary/efl_ui_dnd.c
index db13fbf242..4ed23e7d76 100644
--- a/src/lib/elementary/efl_ui_dnd.c
+++ b/src/lib/elementary/efl_ui_dnd.c
@@ -28,7 +28,7 @@ Eo*
28_efl_ui_selection_manager_get(Eo *obj) 28_efl_ui_selection_manager_get(Eo *obj)
29{ 29{
30 if (!efl_isa(obj, EFL_UI_WIDGET_CLASS)) return NULL; 30 if (!efl_isa(obj, EFL_UI_WIDGET_CLASS)) return NULL;
31 Eo *app = efl_app_main_get(EFL_APP_CLASS); 31 Eo *app = efl_app_main_get();
32 Eo *sel_man = efl_key_data_get(app, "__selection_manager"); 32 Eo *sel_man = efl_key_data_get(app, "__selection_manager");
33 if (!sel_man) 33 if (!sel_man)
34 { 34 {
@@ -41,7 +41,7 @@ _efl_ui_selection_manager_get(Eo *obj)
41void 41void
42_efl_ui_dnd_shutdown(void) 42_efl_ui_dnd_shutdown(void)
43{ 43{
44 Eo *app = efl_app_main_get(EFL_APP_CLASS); 44 Eo *app = efl_app_main_get();
45 Eo *sel_man = efl_key_data_get(app, "__selection_manager"); 45 Eo *sel_man = efl_key_data_get(app, "__selection_manager");
46 46
47 efl_del(sel_man); 47 efl_del(sel_man);
diff --git a/src/lib/elementary/efl_ui_focus_layer.c b/src/lib/elementary/efl_ui_focus_layer.c
index 1069956881..9cab1327b8 100644
--- a/src/lib/elementary/efl_ui_focus_layer.c
+++ b/src/lib/elementary/efl_ui_focus_layer.c
@@ -112,7 +112,7 @@ _efl_ui_focus_layer_enable_set(Eo *obj, Efl_Ui_Focus_Layer_Data *pd, Eina_Bool v
112 112
113 pd->registered_manager = elm_widget_top_get(obj); 113 pd->registered_manager = elm_widget_top_get(obj);
114 EINA_SAFETY_ON_FALSE_RETURN(efl_isa(pd->registered_manager, EFL_UI_WIN_CLASS)); 114 EINA_SAFETY_ON_FALSE_RETURN(efl_isa(pd->registered_manager, EFL_UI_WIN_CLASS));
115 manager = efl_ui_focus_util_active_manager(EFL_UI_FOCUS_UTIL_CLASS, pd->registered_manager); 115 manager = efl_ui_focus_util_active_manager(pd->registered_manager);
116 116
117 efl_ui_focus_manager_calc_register_logical(pd->registered_manager, obj, efl_ui_focus_manager_root_get(pd->registered_manager), obj); 117 efl_ui_focus_manager_calc_register_logical(pd->registered_manager, obj, efl_ui_focus_manager_root_get(pd->registered_manager), obj);
118 _publish_state_change(obj, NULL, NULL); 118 _publish_state_change(obj, NULL, NULL);
diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.c b/src/lib/elementary/efl_ui_focus_manager_calc.c
index b2b8356cf4..308cdd861e 100644
--- a/src/lib/elementary/efl_ui_focus_manager_calc.c
+++ b/src/lib/elementary/efl_ui_focus_manager_calc.c
@@ -157,7 +157,7 @@ border_onedirection_set(Node *node, Efl_Ui_Focus_Direction direction, Eina_List
157 157
158 EINA_LIST_FREE(border->one_direction, partner) 158 EINA_LIST_FREE(border->one_direction, partner)
159 { 159 {
160 Border *b = &DIRECTION_ACCESS(partner, efl_ui_focus_util_direction_complement(EFL_UI_FOCUS_UTIL_CLASS,direction)); 160 Border *b = &DIRECTION_ACCESS(partner, efl_ui_focus_util_direction_complement(direction));
161 b->cleanup_nodes = eina_list_remove(b->cleanup_nodes, node); 161 b->cleanup_nodes = eina_list_remove(b->cleanup_nodes, node);
162 } 162 }
163 163
@@ -165,7 +165,7 @@ border_onedirection_set(Node *node, Efl_Ui_Focus_Direction direction, Eina_List
165 165
166 EINA_LIST_FOREACH(border->one_direction, lnode, partner) 166 EINA_LIST_FOREACH(border->one_direction, lnode, partner)
167 { 167 {
168 Border *comp_border = &DIRECTION_ACCESS(partner,efl_ui_focus_util_direction_complement(EFL_UI_FOCUS_UTIL_CLASS,direction)); 168 Border *comp_border = &DIRECTION_ACCESS(partner,efl_ui_focus_util_direction_complement(direction));
169 169
170 comp_border->cleanup_nodes = eina_list_append(comp_border->cleanup_nodes, node); 170 comp_border->cleanup_nodes = eina_list_append(comp_border->cleanup_nodes, node);
171 } 171 }
@@ -183,7 +183,7 @@ border_onedirection_cleanup(Node *node, Efl_Ui_Focus_Direction direction)
183 183
184 EINA_LIST_FREE(border->cleanup_nodes, partner) 184 EINA_LIST_FREE(border->cleanup_nodes, partner)
185 { 185 {
186 Border *b = &DIRECTION_ACCESS(partner, efl_ui_focus_util_direction_complement(EFL_UI_FOCUS_UTIL_CLASS,direction)); 186 Border *b = &DIRECTION_ACCESS(partner, efl_ui_focus_util_direction_complement(direction));
187 b->one_direction = eina_list_remove(b->one_direction, node); 187 b->one_direction = eina_list_remove(b->one_direction, node);
188 } 188 }
189} 189}
diff --git a/src/lib/elementary/efl_ui_focus_util.c b/src/lib/elementary/efl_ui_focus_util.c
index f422266101..3021c683eb 100644
--- a/src/lib/elementary/efl_ui_focus_util.c
+++ b/src/lib/elementary/efl_ui_focus_util.c
@@ -12,7 +12,7 @@ typedef struct {
12static void 12static void
13_manager_changed(void *data, const Efl_Event *event EINA_UNUSED) 13_manager_changed(void *data, const Efl_Event *event EINA_UNUSED)
14{ 14{
15 efl_ui_focus_util_focus(EFL_UI_FOCUS_UTIL_CLASS, data); 15 efl_ui_focus_util_focus(data);
16} 16}
17 17
18static Eina_Bool 18static Eina_Bool
@@ -25,7 +25,7 @@ _can_take_focus(Efl_Ui_Focus_Manager *m, Efl_Ui_Focus_Object *user)
25} 25}
26 26
27EOLIAN static void 27EOLIAN static void
28_efl_ui_focus_util_focus(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl_Ui_Focus_Object *user) 28_efl_ui_focus_util_focus(Efl_Ui_Focus_Object *user)
29{ 29{
30 Efl_Ui_Focus_Object *entry; 30 Efl_Ui_Focus_Object *entry;
31 Efl_Ui_Widget *top, *o; 31 Efl_Ui_Widget *top, *o;
@@ -64,7 +64,7 @@ _efl_ui_focus_util_focus(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl_Ui_Focus
64} 64}
65 65
66EOLIAN static Efl_Ui_Focus_Manager* 66EOLIAN static Efl_Ui_Focus_Manager*
67_efl_ui_focus_util_active_manager(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl_Ui_Focus_Manager *manager) 67_efl_ui_focus_util_active_manager(Efl_Ui_Focus_Manager *manager)
68{ 68{
69 while (efl_ui_focus_manager_redirect_get(manager)) 69 while (efl_ui_focus_manager_redirect_get(manager))
70 manager = efl_ui_focus_manager_redirect_get(manager); 70 manager = efl_ui_focus_manager_redirect_get(manager);
@@ -73,7 +73,7 @@ _efl_ui_focus_util_active_manager(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl
73} 73}
74 74
75EOLIAN static Efl_Ui_Focus_Direction 75EOLIAN static Efl_Ui_Focus_Direction
76_efl_ui_focus_util_direction_complement(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl_Ui_Focus_Direction dir) 76_efl_ui_focus_util_direction_complement(Efl_Ui_Focus_Direction dir)
77{ 77{
78 #define COMP(a,b) \ 78 #define COMP(a,b) \
79 if (dir == a) return b; \ 79 if (dir == a) return b; \
diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index 065bc3577f..67a2a01bba 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -3422,7 +3422,7 @@ elm_widget_focus_mouse_up_handle(Eo *obj)
3422 3422
3423 if (pd->focus.manager && !pd->focus.logical) 3423 if (pd->focus.manager && !pd->focus.logical)
3424 { 3424 {
3425 efl_ui_focus_util_focus(EFL_UI_FOCUS_UTIL_CLASS, obj); 3425 efl_ui_focus_util_focus(obj);
3426 } 3426 }
3427} 3427}
3428 3428
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 2e9e463205..74d741f4e2 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -2372,7 +2372,7 @@ _efl_ui_win_show(Eo *obj, Efl_Ui_Win_Data *sd)
2372 { 2372 {
2373 Eo *root; 2373 Eo *root;
2374 efl_access_window_created_signal_emit(obj); 2374 efl_access_window_created_signal_emit(obj);
2375 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 2375 root = efl_access_object_access_root_get();
2376 if (root) 2376 if (root)
2377 efl_access_children_changed_added_signal_emit(root, obj); 2377 efl_access_children_changed_added_signal_emit(root, obj);
2378 } 2378 }
@@ -2441,7 +2441,7 @@ _efl_ui_win_hide(Eo *obj, Efl_Ui_Win_Data *sd)
2441 if (_elm_config->atspi_mode) 2441 if (_elm_config->atspi_mode)
2442 { 2442 {
2443 Eo *root; 2443 Eo *root;
2444 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 2444 root = efl_access_object_access_root_get();
2445 efl_access_window_destroyed_signal_emit(obj); 2445 efl_access_window_destroyed_signal_emit(obj);
2446 if (root) 2446 if (root)
2447 efl_access_children_changed_del_signal_emit(root, obj); 2447 efl_access_children_changed_del_signal_emit(root, obj);
@@ -2996,7 +2996,7 @@ _efl_ui_win_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Win_Data *sd)
2996 } 2996 }
2997 if (!_elm_win_list) 2997 if (!_elm_win_list)
2998 { 2998 {
2999 efl_event_callback_call(efl_app_main_get(EFL_APP_CLASS), EFL_APP_EVENT_STANDBY, NULL); 2999 efl_event_callback_call(efl_app_main_get(), EFL_APP_EVENT_STANDBY, NULL);
3000 if (eina_value_type_get(&exit_on_all_windows_closed)) 3000 if (eina_value_type_get(&exit_on_all_windows_closed))
3001 efl_loop_quit(efl_loop_get(obj), exit_on_all_windows_closed); 3001 efl_loop_quit(efl_loop_get(obj), exit_on_all_windows_closed);
3002 } 3002 }
@@ -6266,13 +6266,13 @@ _dbus_menu_set(Eina_Bool dbus_connect, void *data)
6266} 6266}
6267 6267
6268EOLIAN static const Eina_Value * 6268EOLIAN static const Eina_Value *
6269_efl_ui_win_exit_on_all_windows_closed_get(const Eo *obj EINA_UNUSED, void *pd EINA_UNUSED) 6269_efl_ui_win_exit_on_all_windows_closed_get(void)
6270{ 6270{
6271 return &exit_on_all_windows_closed; 6271 return &exit_on_all_windows_closed;
6272} 6272}
6273 6273
6274EOLIAN static void 6274EOLIAN static void
6275_efl_ui_win_exit_on_all_windows_closed_set(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, const Eina_Value *exit_code) 6275_efl_ui_win_exit_on_all_windows_closed_set(const Eina_Value *exit_code)
6276{ 6276{
6277 const Eina_Value_Type *type = eina_value_type_get(exit_code); 6277 const Eina_Value_Type *type = eina_value_type_get(exit_code);
6278 6278
@@ -7385,7 +7385,7 @@ _efl_ui_win_efl_object_provider_find(const Eo *obj,
7385 return (Eo *)obj; 7385 return (Eo *)obj;
7386 7386
7387 // attach all kinds of windows directly to ATSPI application root object 7387 // attach all kinds of windows directly to ATSPI application root object
7388 if (klass == EFL_ACCESS_OBJECT_MIXIN) return efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 7388 if (klass == EFL_ACCESS_OBJECT_MIXIN) return efl_access_object_access_root_get();
7389 7389
7390 if (klass == EFL_UI_FOCUS_PARENT_PROVIDER_INTERFACE) 7390 if (klass == EFL_UI_FOCUS_PARENT_PROVIDER_INTERFACE)
7391 return pd->provider; 7391 return pd->provider;
diff --git a/src/lib/elementary/elm_access.c b/src/lib/elementary/elm_access.c
index f5dcb242dd..588a0c6762 100644
--- a/src/lib/elementary/elm_access.c
+++ b/src/lib/elementary/elm_access.c
@@ -701,7 +701,7 @@ _elm_access_highlight_cycle(Evas_Object *obj, Elm_Focus_Direction dir)
701 } 701 }
702 else 702 else
703 { 703 {
704 efl_ui_focus_util_focus(EFL_UI_FOCUS_UTIL_CLASS, obj); 704 efl_ui_focus_util_focus(obj);
705 efl_ui_focus_manager_move(elm_widget_top_get(obj), dir); 705 efl_ui_focus_manager_move(elm_widget_top_get(obj), dir);
706 } 706 }
707 } 707 }
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index e75f935a71..91ad3dfc93 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -588,7 +588,7 @@ _accessible_get_application(const Eldbus_Service_Interface *iface, const Eldbus_
588 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 588 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
589 589
590 Eldbus_Message_Iter *iter = eldbus_message_iter_get(ret); 590 Eldbus_Message_Iter *iter = eldbus_message_iter_get(ret);
591 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 591 root = efl_access_object_access_root_get();
592 _bridge_iter_object_reference_append(bridge, iter, root); 592 _bridge_iter_object_reference_append(bridge, iter, root);
593 593
594 return ret; 594 return ret;
@@ -2026,7 +2026,7 @@ _bridge_object_from_path(Eo *bridge, const char *path)
2026 tmp = path + len; /* Skip over the prefix */ 2026 tmp = path + len; /* Skip over the prefix */
2027 if (!strcmp(ELM_ACCESS_OBJECT_PATH_ROOT, tmp)) 2027 if (!strcmp(ELM_ACCESS_OBJECT_PATH_ROOT, tmp))
2028 { 2028 {
2029 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 2029 root = efl_access_object_access_root_get();
2030 return root; 2030 return root;
2031 } 2031 }
2032 2032
@@ -2053,7 +2053,7 @@ _path_from_object(const Eo *eo)
2053 2053
2054 if (!eo) 2054 if (!eo)
2055 return ATSPI_DBUS_PATH_NULL; 2055 return ATSPI_DBUS_PATH_NULL;
2056 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 2056 root = efl_access_object_access_root_get();
2057 2057
2058 if (eo == root) 2058 if (eo == root)
2059 snprintf(path, sizeof(path), "%s%s", ELM_ACCESS_OBJECT_PATH_PREFIX, ELM_ACCESS_OBJECT_PATH_ROOT); 2059 snprintf(path, sizeof(path), "%s%s", ELM_ACCESS_OBJECT_PATH_PREFIX, ELM_ACCESS_OBJECT_PATH_ROOT);
@@ -3201,7 +3201,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_
3201 Efl_Access_State_Set states; 3201 Efl_Access_State_Set states;
3202 Efl_Access_Role role; 3202 Efl_Access_Role role;
3203 Eo *root; 3203 Eo *root;
3204 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 3204 root = efl_access_object_access_root_get();
3205 3205
3206 role = efl_access_object_role_get(data); 3206 role = efl_access_object_role_get(data);
3207 3207
@@ -3298,7 +3298,7 @@ _cache_get_items(const Eldbus_Service_Interface *iface, const Eldbus_Message *ms
3298 iter_array = eldbus_message_iter_container_new(iter, 'a', CACHE_ITEM_SIGNATURE); 3298 iter_array = eldbus_message_iter_container_new(iter, 'a', CACHE_ITEM_SIGNATURE);
3299 EINA_SAFETY_ON_NULL_GOTO(iter_array, fail); 3299 EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
3300 3300
3301 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 3301 root = efl_access_object_access_root_get();
3302 to_process = eina_list_append(NULL, root); 3302 to_process = eina_list_append(NULL, root);
3303 3303
3304 while (to_process) 3304 while (to_process)
@@ -3703,7 +3703,7 @@ _elm_atspi_bridge_app_register(Eo *bridge)
3703 "Embed"); 3703 "Embed");
3704 Eldbus_Message_Iter *iter = eldbus_message_iter_get(message); 3704 Eldbus_Message_Iter *iter = eldbus_message_iter_get(message);
3705 3705
3706 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 3706 root = efl_access_object_access_root_get();
3707 _bridge_iter_object_reference_append(bridge, iter, root); 3707 _bridge_iter_object_reference_append(bridge, iter, root);
3708 eldbus_connection_send(pd->a11y_bus, message, _on_elm_atspi_bridge_app_register, NULL, -1); 3708 eldbus_connection_send(pd->a11y_bus, message, _on_elm_atspi_bridge_app_register, NULL, -1);
3709 3709
@@ -3716,7 +3716,7 @@ _elm_atspi_bridge_app_unregister(Eo *bridge)
3716 Eo *root; 3716 Eo *root;
3717 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(bridge, pd, EINA_FALSE); 3717 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(bridge, pd, EINA_FALSE);
3718 3718
3719 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 3719 root = efl_access_object_access_root_get();
3720 3720
3721 Eldbus_Message *message = eldbus_message_method_call_new(ATSPI_DBUS_NAME_REGISTRY, 3721 Eldbus_Message *message = eldbus_message_method_call_new(ATSPI_DBUS_NAME_REGISTRY,
3722 ATSPI_DBUS_PATH_ROOT, 3722 ATSPI_DBUS_PATH_ROOT,
@@ -4116,7 +4116,7 @@ static void _bridge_signal_send(Eo *bridge, Eo *obj, const char *infc, const Eld
4116 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd); 4116 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd);
4117 4117
4118 path = _path_from_object(obj); 4118 path = _path_from_object(obj);
4119 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 4119 root = efl_access_object_access_root_get();
4120 4120
4121 msg = eldbus_message_signal_new(path, infc, signal->name); 4121 msg = eldbus_message_signal_new(path, infc, signal->name);
4122 if (!msg) return; 4122 if (!msg) return;
@@ -4366,7 +4366,7 @@ _a11y_connection_shutdown(Eo *bridge)
4366 if (pd->event_hash) eina_hash_free(pd->event_hash); 4366 if (pd->event_hash) eina_hash_free(pd->event_hash);
4367 pd->event_hash = NULL; 4367 pd->event_hash = NULL;
4368 4368
4369 efl_access_object_event_handler_del(EFL_ACCESS_OBJECT_MIXIN, pd->event_hdlr); 4369 efl_access_object_event_handler_del(pd->event_hdlr);
4370 pd->event_hdlr = NULL; 4370 pd->event_hdlr = NULL;
4371 4371
4372 efl_event_callback_legacy_call(bridge, ELM_ATSPI_BRIDGE_EVENT_DISCONNECTED, NULL); 4372 efl_event_callback_legacy_call(bridge, ELM_ATSPI_BRIDGE_EVENT_DISCONNECTED, NULL);
@@ -4458,7 +4458,7 @@ _a11y_bus_initialize(Eo *obj, const char *socket_addr)
4458 _elm_atspi_bridge_app_register(obj); 4458 _elm_atspi_bridge_app_register(obj);
4459 4459
4460 // register accessible object event listener 4460 // register accessible object event listener
4461 pd->event_hdlr = efl_access_object_event_handler_add(EFL_ACCESS_OBJECT_MIXIN, _bridge_accessible_event_dispatch, obj); 4461 pd->event_hdlr = efl_access_object_event_handler_add(_bridge_accessible_event_dispatch, obj);
4462} 4462}
4463 4463
4464static void 4464static void
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index c811e16cb4..336b0f7ae8 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -2231,14 +2231,14 @@ _entry_changed_user_signal_cb(void *data,
2231 atspi_info.content = edje_info->change.insert.content; 2231 atspi_info.content = edje_info->change.insert.content;
2232 atspi_info.pos = edje_info->change.insert.pos; 2232 atspi_info.pos = edje_info->change.insert.pos;
2233 atspi_info.len = edje_info->change.insert.plain_length; 2233 atspi_info.len = edje_info->change.insert.plain_length;
2234 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info); 2234 efl_access_object_event_emit( data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info);
2235 } 2235 }
2236 else if (edje_info && !edje_info->insert) 2236 else if (edje_info && !edje_info->insert)
2237 { 2237 {
2238 atspi_info.content = edje_info->change.del.content; 2238 atspi_info.content = edje_info->change.del.content;
2239 atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end); 2239 atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end);
2240 atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos; 2240 atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos;
2241 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info); 2241 efl_access_object_event_emit( data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info);
2242 } 2242 }
2243 } 2243 }
2244} 2244}
@@ -2263,7 +2263,7 @@ _entry_preedit_changed_signal_cb(void *data,
2263 atspi_info.content = text; 2263 atspi_info.content = text;
2264 atspi_info.pos = edje_info->change.insert.pos; 2264 atspi_info.pos = edje_info->change.insert.pos;
2265 atspi_info.len = edje_info->change.insert.plain_length; 2265 atspi_info.len = edje_info->change.insert.plain_length;
2266 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, 2266 efl_access_object_event_emit(
2267 data, 2267 data,
2268 EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, 2268 EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED,
2269 &atspi_info); 2269 &atspi_info);
@@ -2355,7 +2355,7 @@ _entry_selection_changed_signal_cb(void *data,
2355 _selection_store(ELM_SEL_TYPE_PRIMARY, data); 2355 _selection_store(ELM_SEL_TYPE_PRIMARY, data);
2356 _update_selection_handler(data); 2356 _update_selection_handler(data);
2357 if (_elm_config->atspi_mode) 2357 if (_elm_config->atspi_mode)
2358 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_SELECTION_CHANGED, NULL); 2358 efl_access_object_event_emit( data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_SELECTION_CHANGED, NULL);
2359} 2359}
2360 2360
2361static void 2361static void
@@ -2466,7 +2466,7 @@ _entry_cursor_changed_signal_cb(void *data,
2466 efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_CURSOR_CHANGED, NULL); 2466 efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_CURSOR_CHANGED, NULL);
2467 2467
2468 if (_elm_config->atspi_mode) 2468 if (_elm_config->atspi_mode)
2469 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); 2469 efl_access_object_event_emit( data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
2470} 2470}
2471 2471
2472static void 2472static void
@@ -2478,7 +2478,7 @@ _entry_cursor_changed_manual_signal_cb(void *data,
2478 efl_event_callback_legacy_call 2478 efl_event_callback_legacy_call
2479 (data, ELM_ENTRY_EVENT_CURSOR_CHANGED_MANUAL, NULL); 2479 (data, ELM_ENTRY_EVENT_CURSOR_CHANGED_MANUAL, NULL);
2480 if (_elm_config->atspi_mode) 2480 if (_elm_config->atspi_mode)
2481 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); 2481 efl_access_object_event_emit( data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
2482} 2482}
2483 2483
2484static void 2484static void
diff --git a/src/lib/elementary/elm_focus_legacy.c b/src/lib/elementary/elm_focus_legacy.c
index 31e1c32db1..5c9651fb15 100644
--- a/src/lib/elementary/elm_focus_legacy.c
+++ b/src/lib/elementary/elm_focus_legacy.c
@@ -110,7 +110,7 @@ elm_object_focus_next_object_set(Evas_Object *obj,
110 #define MAP(direction, field) if (dir == EFL_UI_FOCUS_DIRECTION_ ##direction) pd->legacy_focus.field = next; 110 #define MAP(direction, field) if (dir == EFL_UI_FOCUS_DIRECTION_ ##direction) pd->legacy_focus.field = next;
111 MAPPING() 111 MAPPING()
112 #undef MAP 112 #undef MAP
113 dir = efl_ui_focus_util_direction_complement(EFL_UI_FOCUS_UTIL_CLASS, dir); 113 dir = efl_ui_focus_util_direction_complement(dir);
114 #define MAP(direction, field) if (dir == EFL_UI_FOCUS_DIRECTION_ ##direction) next_pd->legacy_focus.field = obj; 114 #define MAP(direction, field) if (dir == EFL_UI_FOCUS_DIRECTION_ ##direction) next_pd->legacy_focus.field = obj;
115 MAPPING() 115 MAPPING()
116 #undef MAP 116 #undef MAP
@@ -218,7 +218,7 @@ elm_object_focus_next(Evas_Object *obj,
218 top = elm_object_top_widget_get(obj); 218 top = elm_object_top_widget_get(obj);
219 EINA_SAFETY_ON_FALSE_RETURN(efl_isa(top, EFL_UI_WIN_CLASS)); 219 EINA_SAFETY_ON_FALSE_RETURN(efl_isa(top, EFL_UI_WIN_CLASS));
220 220
221 manager_top = efl_ui_focus_util_active_manager(EFL_UI_FOCUS_UTIL_CLASS, obj); 221 manager_top = efl_ui_focus_util_active_manager(obj);
222 logical = efl_ui_focus_manager_focus_get(manager_top); 222 logical = efl_ui_focus_manager_focus_get(manager_top);
223 223
224 if (elm_widget_is(logical)) 224 if (elm_widget_is(logical))
@@ -255,7 +255,7 @@ elm_object_focus_next(Evas_Object *obj,
255 255
256 if (legacy_target) 256 if (legacy_target)
257 { 257 {
258 efl_ui_focus_util_focus(EFL_UI_FOCUS_UTIL_CLASS, legacy_target); 258 efl_ui_focus_util_focus(legacy_target);
259 if (elm_object_focused_object_get(top) == legacy_target) 259 if (elm_object_focused_object_get(top) == legacy_target)
260 { 260 {
261 legacy_focus_move = EINA_TRUE; 261 legacy_focus_move = EINA_TRUE;
@@ -289,7 +289,7 @@ elm_object_focus_next_object_get(const Evas_Object *obj,
289 MAPPING() 289 MAPPING()
290 #undef MAP 290 #undef MAP
291 291
292 return efl_ui_focus_manager_request_move(efl_ui_focus_util_active_manager(EFL_UI_FOCUS_UTIL_CLASS, top), dir, NULL, EINA_FALSE); 292 return efl_ui_focus_manager_request_move(efl_ui_focus_util_active_manager(top), dir, NULL, EINA_FALSE);
293} 293}
294 294
295EAPI Elm_Object_Item * 295EAPI Elm_Object_Item *
@@ -364,7 +364,7 @@ elm_object_focus_set(Evas_Object *obj,
364 else if (elm_widget_is(obj)) 364 else if (elm_widget_is(obj))
365 { 365 {
366 if (focus) 366 if (focus)
367 efl_ui_focus_util_focus(EFL_UI_FOCUS_UTIL_CLASS, obj); 367 efl_ui_focus_util_focus(obj);
368 else 368 else
369 { 369 {
370 if (efl_ui_focus_manager_focus_get(efl_ui_focus_object_focus_manager_get(obj)) == obj) 370 if (efl_ui_focus_manager_focus_get(efl_ui_focus_object_focus_manager_get(obj)) == obj)
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index 53cc85f2c9..19225b7287 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -498,7 +498,7 @@ _menu_item_activate_cb(void *data,
498 if (eo_item2 != EO_OBJ(item)) 498 if (eo_item2 != EO_OBJ(item))
499 elm_menu_item_selected_set(eo_item2, 0); 499 elm_menu_item_selected_set(eo_item2, 0);
500 } 500 }
501 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, EO_OBJ(item->parent), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL); 501 efl_access_object_event_emit(EO_OBJ(item->parent), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL);
502 } 502 }
503 else 503 else
504 { 504 {
@@ -513,7 +513,7 @@ _menu_item_activate_cb(void *data,
513 elm_menu_item_selected_set(eo_item2, 0); 513 elm_menu_item_selected_set(eo_item2, 0);
514 } 514 }
515 } 515 }
516 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, WIDGET(item), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL); 516 efl_access_object_event_emit(WIDGET(item), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL);
517 if (sd->menu_bar && was_open) 517 if (sd->menu_bar && was_open)
518 _menu_item_select_cb(item, NULL, NULL, NULL); 518 _menu_item_select_cb(item, NULL, NULL, NULL);
519 } 519 }
diff --git a/src/lib/elementary/elm_sys_notify.c b/src/lib/elementary/elm_sys_notify.c
index a993a8cc3a..a4789cd12c 100644
--- a/src/lib/elementary/elm_sys_notify.c
+++ b/src/lib/elementary/elm_sys_notify.c
@@ -199,8 +199,7 @@ _elm_sys_notify_servers_get(const Eo *obj EINA_UNUSED,
199} 199}
200 200
201EOLIAN static Elm_Sys_Notify * 201EOLIAN static Elm_Sys_Notify *
202_elm_sys_notify_singleton_get(Eo *obj EINA_UNUSED, 202_elm_sys_notify_singleton_get(void)
203 void *sd EINA_UNUSED)
204{ 203{
205 if (!_singleton) 204 if (!_singleton)
206 _singleton = efl_add(MY_CLASS, efl_main_loop_get()); 205 _singleton = efl_add(MY_CLASS, efl_main_loop_get());
@@ -224,7 +223,7 @@ _elm_sys_notify_class_constructor(Efl_Class *klass EINA_UNUSED)
224void 223void
225_elm_unneed_sys_notify(void) 224_elm_unneed_sys_notify(void)
226{ 225{
227 Elm_Sys_Notify *manager = elm_sys_notify_singleton_get(); 226 Elm_Sys_Notify *manager = elm_obj_sys_notify_singleton_get();
228 if (manager) 227 if (manager)
229 { 228 {
230 elm_obj_sys_notify_servers_set(manager, ELM_SYS_NOTIFY_SERVER_NONE); 229 elm_obj_sys_notify_servers_set(manager, ELM_SYS_NOTIFY_SERVER_NONE);
@@ -242,7 +241,7 @@ elm_need_sys_notify(void)
242 /* In theory, there can be N notification managers, but 241 /* In theory, there can be N notification managers, but
243 * in the implementation there will be only one: the 242 * in the implementation there will be only one: the
244 * singleton which is initialized here. */ 243 * singleton which is initialized here. */
245 manager = elm_sys_notify_singleton_get(); 244 manager = elm_obj_sys_notify_singleton_get();
246 if (EINA_UNLIKELY(!manager)) 245 if (EINA_UNLIKELY(!manager))
247 { 246 {
248 CRI("Failed to get notification manager"); 247 CRI("Failed to get notification manager");
diff --git a/src/lib/elementary/elm_theme.c b/src/lib/elementary/elm_theme.c
index 6025a95930..13ebf233ca 100644
--- a/src/lib/elementary/elm_theme.c
+++ b/src/lib/elementary/elm_theme.c
@@ -1122,7 +1122,7 @@ _efl_ui_theme_efl_object_destructor(Eo *obj, Efl_Ui_Theme_Data *pd)
1122} 1122}
1123 1123
1124EOLIAN static Efl_Ui_Theme * 1124EOLIAN static Efl_Ui_Theme *
1125_efl_ui_theme_default_get(const Eo *obj EINA_UNUSED, void *pd EINA_UNUSED) 1125_efl_ui_theme_default_get(void)
1126{ 1126{
1127 if (theme_default) 1127 if (theme_default)
1128 return theme_default->eo_theme; 1128 return theme_default->eo_theme;
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index 63074cce17..9e33e6e3a0 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -1850,13 +1850,13 @@ _efl_object_event_freeze_count_get(const Eo *obj EINA_UNUSED, Efl_Object_Data *p
1850} 1850}
1851 1851
1852EOLIAN static void 1852EOLIAN static void
1853_efl_object_event_global_freeze(Eo *klass EINA_UNUSED, void *pd EINA_UNUSED) 1853_efl_object_event_global_freeze(void)
1854{ 1854{
1855 event_freeze_count++; 1855 event_freeze_count++;
1856} 1856}
1857 1857
1858EOLIAN static void 1858EOLIAN static void
1859_efl_object_event_global_thaw(Eo *klass EINA_UNUSED, void *pd EINA_UNUSED) 1859_efl_object_event_global_thaw(void)
1860{ 1860{
1861 if (event_freeze_count > 0) 1861 if (event_freeze_count > 0)
1862 { 1862 {
@@ -1869,7 +1869,7 @@ _efl_object_event_global_thaw(Eo *klass EINA_UNUSED, void *pd EINA_UNUSED)
1869} 1869}
1870 1870
1871EOLIAN static int 1871EOLIAN static int
1872_efl_object_event_global_freeze_count_get(const Eo *klass EINA_UNUSED, void *pd EINA_UNUSED) 1872_efl_object_event_global_freeze_count_get(void)
1873{ 1873{
1874 return event_freeze_count; 1874 return event_freeze_count;
1875} 1875}
diff --git a/src/lib/eolian_cxx/grammar/function_definition.hpp b/src/lib/eolian_cxx/grammar/function_definition.hpp
index b3080e4c67..893218155c 100644
--- a/src/lib/eolian_cxx/grammar/function_definition.hpp
+++ b/src/lib/eolian_cxx/grammar/function_definition.hpp
@@ -121,24 +121,27 @@ struct function_definition_generator
121 << " __return_value = " 121 << " __return_value = "
122 ).generate(sink, attributes::unused, ctx)) return false; 122 ).generate(sink, attributes::unused, ctx)) return false;
123 123
124 std::string object_flag; 124 std::tuple<std::string, std::string, std::vector<attributes::parameter_def> > params;
125 if (f.is_static) object_flag = "_eo_class()"; 125 if (f.is_static)
126 else object_flag = "_eo_ptr()"; 126 params = std::make_tuple(f.c_name, "", f.parameters);
127 else
128 params = std::make_tuple(f.c_name, "_eo_ptr()", f.parameters);
127 129
128 if(!as_generator 130 if(!as_generator
129 (" ::" << string << "(" << string << 131 (" ::" << string << "(" << string << ((!f.is_static && (f.parameters.size() > 0)) ? "," : "")
130 *( 132 <<
131 "\n" << scope_tab << scope_tab << ", " 133 (
134 ("\n" << scope_tab << scope_tab
132 << 135 <<
133 ( 136 (
134 attribute_conditional([] (attributes::parameter_def const& p) 137 attribute_conditional([] (attributes::parameter_def const& p)
135 { return p.direction == attributes::parameter_direction::in; }) 138 { return p.direction == attributes::parameter_direction::in; })
136 [converting_argument] 139 [converting_argument]
137 | ("& __out_param_" << attribute_reorder<2>(string)) 140 | ("& __out_param_" << attribute_reorder<2>(string))
138 ) 141 )) % ","
139 ) 142 )
140 << ");\n" 143 << ");\n"
141 ).generate(sink, std::make_tuple(f.c_name, object_flag, f.parameters), ctx)) 144 ).generate(sink, params, ctx))
142 return false; 145 return false;
143 146
144 auto out_assignments = 147 auto out_assignments =
diff --git a/src/lib/evas/canvas/efl_input_event.c b/src/lib/evas/canvas/efl_input_event.c
index 8b02713ad7..a617e504eb 100644
--- a/src/lib/evas/canvas/efl_input_event.c
+++ b/src/lib/evas/canvas/efl_input_event.c
@@ -136,14 +136,10 @@ efl_input_event_instance_clean(Eo *klass)
136/* Internal EO APIs */ 136/* Internal EO APIs */
137 137
138EOAPI EFL_FUNC_BODY_CONST(efl_input_legacy_info_get, void *, NULL) 138EOAPI EFL_FUNC_BODY_CONST(efl_input_legacy_info_get, void *, NULL)
139EOAPI EFL_FUNC_BODYV_CONST(efl_input_instance_get, Efl_Input_Event *, NULL, EFL_FUNC_CALL(owner, priv), Efl_Object *owner, void **priv)
140 139
141#define EFL_INPUT_EVENT_EXTRA_OPS \ 140#define EFL_INPUT_EVENT_EXTRA_OPS \
142 EFL_OBJECT_OP_FUNC(efl_input_legacy_info_get, NULL) 141 EFL_OBJECT_OP_FUNC(efl_input_legacy_info_get, NULL)
143 142
144#define EFL_INPUT_EVENT_EXTRA_CLASS_OPS \
145 EFL_OBJECT_OP_FUNC(efl_input_instance_get, NULL)
146
147#include "efl_input_event.eo.c" 143#include "efl_input_event.eo.c"
148#include "efl_input_state.eo.c" 144#include "efl_input_state.eo.c"
149#include "efl_input_interface.eo.c" 145#include "efl_input_interface.eo.c"
diff --git a/src/tests/ecore/efl_app_suite.c b/src/tests/ecore/efl_app_suite.c
index 2cab632622..957cb3099e 100644
--- a/src/tests/ecore/efl_app_suite.c
+++ b/src/tests/ecore/efl_app_suite.c
@@ -16,7 +16,7 @@ EFL_START_TEST(efl_app_test_efl_build_version)
16 16
17 ecore_init(); 17 ecore_init();
18 18
19 app = efl_app_main_get(EFL_APP_CLASS); 19 app = efl_app_main_get();
20 fail_if(!efl_isa(app, EFL_APP_CLASS)); 20 fail_if(!efl_isa(app, EFL_APP_CLASS));
21 21
22 efl_build_version_set(EFL_VERSION_MAJOR, EFL_VERSION_MINOR, 0, 0, NULL, EFL_BUILD_ID); 22 efl_build_version_set(EFL_VERSION_MAJOR, EFL_VERSION_MINOR, 0, 0, NULL, EFL_BUILD_ID);
diff --git a/src/tests/ecore/efl_app_test_env.c b/src/tests/ecore/efl_app_test_env.c
index 63bad166a2..e7e5a2e034 100644
--- a/src/tests/ecore/efl_app_test_env.c
+++ b/src/tests/ecore/efl_app_test_env.c
@@ -96,7 +96,7 @@ EFL_END_TEST
96 96
97EFL_START_TEST(efl_core_env_test_process) 97EFL_START_TEST(efl_core_env_test_process)
98{ 98{
99 Efl_Core_Env *env_fork, *env = efl_env_self(EFL_CORE_PROC_ENV_CLASS); 99 Efl_Core_Env *env_fork, *env = efl_env_self();
100 100
101 ck_assert(env); 101 ck_assert(env);
102 102
@@ -110,7 +110,7 @@ EFL_END_TEST
110 110
111EFL_START_TEST(efl_core_env_test_undepend_fork) 111EFL_START_TEST(efl_core_env_test_undepend_fork)
112{ 112{
113 Efl_Core_Env *env_fork, *env = efl_env_self(EFL_CORE_PROC_ENV_CLASS); 113 Efl_Core_Env *env_fork, *env = efl_env_self();
114 114
115 ck_assert(env); 115 ck_assert(env);
116 116
diff --git a/src/tests/ecore/efl_app_test_loop.c b/src/tests/ecore/efl_app_test_loop.c
index b37ba414ab..0ab7bb6bdb 100644
--- a/src/tests/ecore/efl_app_test_loop.c
+++ b/src/tests/ecore/efl_app_test_loop.c
@@ -15,24 +15,24 @@ EFL_START_TEST(efl_app_test_efl_loop_register)
15 15
16 ecore_init(); 16 ecore_init();
17 17
18 t = efl_provider_find(efl_app_main_get(EFL_APP_CLASS), EFL_LOOP_CLASS); 18 t = efl_provider_find(efl_app_main_get(), EFL_LOOP_CLASS);
19 fail_if(!efl_isa(t, EFL_LOOP_CLASS)); 19 fail_if(!efl_isa(t, EFL_LOOP_CLASS));
20 fail_if(!efl_isa(t, EFL_APP_CLASS)); 20 fail_if(!efl_isa(t, EFL_APP_CLASS));
21 21
22 t = efl_provider_find(efl_app_main_get(EFL_APP_CLASS), EFL_LOOP_TIMER_CLASS); 22 t = efl_provider_find(efl_app_main_get(), EFL_LOOP_TIMER_CLASS);
23 fail_if(t != NULL); 23 fail_if(t != NULL);
24 24
25 n = efl_add(EFL_LOOP_TIMER_CLASS, efl_app_main_get(EFL_APP_CLASS), 25 n = efl_add(EFL_LOOP_TIMER_CLASS, efl_app_main_get(),
26 efl_loop_timer_interval_set(efl_added, 1.0)); 26 efl_loop_timer_interval_set(efl_added, 1.0));
27 efl_loop_register(efl_app_main_get(EFL_APP_CLASS), EFL_LOOP_TIMER_CLASS, n); 27 efl_loop_register(efl_app_main_get(), EFL_LOOP_TIMER_CLASS, n);
28 28
29 t = efl_provider_find(efl_app_main_get(EFL_APP_CLASS), EFL_LOOP_TIMER_CLASS); 29 t = efl_provider_find(efl_app_main_get(), EFL_LOOP_TIMER_CLASS);
30 fail_if(!efl_isa(t, EFL_LOOP_TIMER_CLASS)); 30 fail_if(!efl_isa(t, EFL_LOOP_TIMER_CLASS));
31 fail_if(t != n); 31 fail_if(t != n);
32 32
33 efl_loop_unregister(efl_app_main_get(EFL_APP_CLASS), EFL_LOOP_TIMER_CLASS, n); 33 efl_loop_unregister(efl_app_main_get(), EFL_LOOP_TIMER_CLASS, n);
34 34
35 t = efl_provider_find(efl_app_main_get(EFL_APP_CLASS), EFL_LOOP_TIMER_CLASS); 35 t = efl_provider_find(efl_app_main_get(), EFL_LOOP_TIMER_CLASS);
36 fail_if(t != NULL); 36 fail_if(t != NULL);
37 37
38 ecore_shutdown(); 38 ecore_shutdown();
diff --git a/src/tests/ecore/efl_app_test_loop_timer.c b/src/tests/ecore/efl_app_test_loop_timer.c
index 999c5f1743..38d16a9728 100644
--- a/src/tests/ecore/efl_app_test_loop_timer.c
+++ b/src/tests/ecore/efl_app_test_loop_timer.c
@@ -66,7 +66,7 @@ EFL_END_TEST
66 66
67EFL_START_TEST(efl_app_test_loop_timer_invalid) 67EFL_START_TEST(efl_app_test_loop_timer_invalid)
68{ 68{
69 Efl_Object *t = efl_add(EFL_LOOP_TIMER_CLASS, efl_app_main_get(EFL_APP_CLASS)); 69 Efl_Object *t = efl_add(EFL_LOOP_TIMER_CLASS, efl_app_main_get());
70 fail_if(t != NULL); 70 fail_if(t != NULL);
71} 71}
72EFL_END_TEST 72EFL_END_TEST
diff --git a/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c b/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
index 1a150ffd5c..cf83eaf402 100644
--- a/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
+++ b/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
@@ -236,7 +236,7 @@ _resolve_done(void *data, const Eina_Value v, const Eina_Future *dead_future EIN
236static void 236static void
237_resolve(struct resolve_ctx *ctx, const char *address, int family, int flags) 237_resolve(struct resolve_ctx *ctx, const char *address, int family, int flags)
238{ 238{
239 ctx->future = efl_net_ip_address_resolve(EFL_NET_IP_ADDRESS_CLASS, 239 ctx->future = efl_net_ip_address_resolve(
240 address, family, flags); 240 address, family, flags);
241 ck_assert_ptr_ne(ctx->future, NULL); 241 ck_assert_ptr_ne(ctx->future, NULL);
242 ctx->future = eina_future_then(ctx->future, _resolve_done, ctx, NULL); 242 ctx->future = eina_future_then(ctx->future, _resolve_done, ctx, NULL);
@@ -402,7 +402,7 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_create_ok)
402 402
403 addr.sin_port = eina_htons(12345); 403 addr.sin_port = eina_htons(12345);
404 addr.sin_addr.s_addr = eina_htonl(0xabcdefafU); 404 addr.sin_addr.s_addr = eina_htonl(0xabcdefafU);
405 o = efl_net_ip_address_create(EFL_NET_IP_ADDRESS_CLASS, 405 o = efl_net_ip_address_create(
406 eina_ntohs(addr.sin_port), 406 eina_ntohs(addr.sin_port),
407 slice); 407 slice);
408 _ipv4_check(o, &addr); 408 _ipv4_check(o, &addr);
@@ -410,7 +410,7 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_create_ok)
410 410
411 addr.sin_port = eina_htons(8081); 411 addr.sin_port = eina_htons(8081);
412 addr.sin_addr.s_addr = eina_htonl(0); 412 addr.sin_addr.s_addr = eina_htonl(0);
413 o = efl_net_ip_address_create(EFL_NET_IP_ADDRESS_CLASS, 413 o = efl_net_ip_address_create(
414 eina_ntohs(addr.sin_port), 414 eina_ntohs(addr.sin_port),
415 slice); 415 slice);
416 _ipv4_check(o, &addr); 416 _ipv4_check(o, &addr);
@@ -418,7 +418,7 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_create_ok)
418 418
419 addr.sin_port = eina_htons(0); 419 addr.sin_port = eina_htons(0);
420 addr.sin_addr.s_addr = eina_htonl(0x12345678); 420 addr.sin_addr.s_addr = eina_htonl(0x12345678);
421 o = efl_net_ip_address_create(EFL_NET_IP_ADDRESS_CLASS, 421 o = efl_net_ip_address_create(
422 eina_ntohs(addr.sin_port), 422 eina_ntohs(addr.sin_port),
423 slice); 423 slice);
424 _ipv4_check(o, &addr); 424 _ipv4_check(o, &addr);
@@ -434,7 +434,7 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_create_fail)
434 Eo *o; 434 Eo *o;
435 435
436 TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: address.len != 4 && address.len != 16 is true"); 436 TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: address.len != 4 && address.len != 16 is true");
437 o = efl_net_ip_address_create(EFL_NET_IP_ADDRESS_CLASS, 437 o = efl_net_ip_address_create(
438 1234, 438 1234,
439 wrong_slice); 439 wrong_slice);
440 ck_assert_ptr_eq(o, NULL); 440 ck_assert_ptr_eq(o, NULL);
@@ -452,14 +452,14 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_create_sockaddr_ok)
452 452
453 addr.sin_port = eina_htons(12345); 453 addr.sin_port = eina_htons(12345);
454 addr.sin_addr.s_addr = eina_htonl(0xabcdefafU); 454 addr.sin_addr.s_addr = eina_htonl(0xabcdefafU);
455 o = efl_net_ip_address_create_sockaddr(EFL_NET_IP_ADDRESS_CLASS, &addr); 455 o = efl_net_ip_address_create_sockaddr(&addr);
456 ck_assert_ptr_ne(&addr, efl_net_ip_address_sockaddr_get(o)); 456 ck_assert_ptr_ne(&addr, efl_net_ip_address_sockaddr_get(o));
457 _ipv4_check(o, &addr); 457 _ipv4_check(o, &addr);
458 efl_unref(o); 458 efl_unref(o);
459 459
460 addr.sin_port = eina_htons(0); 460 addr.sin_port = eina_htons(0);
461 addr.sin_addr.s_addr = eina_htonl(0); 461 addr.sin_addr.s_addr = eina_htonl(0);
462 o = efl_net_ip_address_create_sockaddr(EFL_NET_IP_ADDRESS_CLASS, &addr); 462 o = efl_net_ip_address_create_sockaddr(&addr);
463 ck_assert_ptr_ne(&addr, efl_net_ip_address_sockaddr_get(o)); 463 ck_assert_ptr_ne(&addr, efl_net_ip_address_sockaddr_get(o));
464 _ipv4_check(o, &addr); 464 _ipv4_check(o, &addr);
465 efl_unref(o); 465 efl_unref(o);
@@ -475,12 +475,12 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_create_sockaddr_fail)
475 Eo *o; 475 Eo *o;
476 476
477 TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: sockaddr == NULL"); 477 TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: sockaddr == NULL");
478 o = efl_net_ip_address_create_sockaddr(EFL_NET_IP_ADDRESS_CLASS, NULL); 478 o = efl_net_ip_address_create_sockaddr(NULL);
479 ck_assert_ptr_eq(o, NULL); 479 ck_assert_ptr_eq(o, NULL);
480 TRAP_ERRORS_FINISH(1); 480 TRAP_ERRORS_FINISH(1);
481 481
482 TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: (sockaddr->sa_family != AF_INET) && (sockaddr->sa_family != AF_INET6) is true"); 482 TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: (sockaddr->sa_family != AF_INET) && (sockaddr->sa_family != AF_INET6) is true");
483 o = efl_net_ip_address_create_sockaddr(EFL_NET_IP_ADDRESS_CLASS, &addr); 483 o = efl_net_ip_address_create_sockaddr(&addr);
484 ck_assert_ptr_eq(o, NULL); 484 ck_assert_ptr_eq(o, NULL);
485 TRAP_ERRORS_FINISH(1); 485 TRAP_ERRORS_FINISH(1);
486 486
@@ -491,22 +491,22 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_parse_ok)
491{ 491{
492 Eo *o; 492 Eo *o;
493 493
494 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "127.0.0.1:12345"); 494 o = efl_net_ip_address_parse( "127.0.0.1:12345");
495 ck_assert_ptr_ne(o, NULL); 495 ck_assert_ptr_ne(o, NULL);
496 ck_assert_str_eq(efl_net_ip_address_string_get(o), "127.0.0.1:12345"); 496 ck_assert_str_eq(efl_net_ip_address_string_get(o), "127.0.0.1:12345");
497 efl_unref(o); 497 efl_unref(o);
498 498
499 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "127.0.0.1:0"); 499 o = efl_net_ip_address_parse( "127.0.0.1:0");
500 ck_assert_ptr_ne(o, NULL); 500 ck_assert_ptr_ne(o, NULL);
501 ck_assert_str_eq(efl_net_ip_address_string_get(o), "127.0.0.1"); 501 ck_assert_str_eq(efl_net_ip_address_string_get(o), "127.0.0.1");
502 efl_unref(o); 502 efl_unref(o);
503 503
504 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "127.0.0.1"); 504 o = efl_net_ip_address_parse( "127.0.0.1");
505 ck_assert_ptr_ne(o, NULL); 505 ck_assert_ptr_ne(o, NULL);
506 ck_assert_str_eq(efl_net_ip_address_string_get(o), "127.0.0.1"); 506 ck_assert_str_eq(efl_net_ip_address_string_get(o), "127.0.0.1");
507 efl_unref(o); 507 efl_unref(o);
508 508
509 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "192.168.0.123:80"); 509 o = efl_net_ip_address_parse( "192.168.0.123:80");
510 ck_assert_ptr_ne(o, NULL); 510 ck_assert_ptr_ne(o, NULL);
511 ck_assert_str_eq(efl_net_ip_address_string_get(o), "192.168.0.123:80"); 511 ck_assert_str_eq(efl_net_ip_address_string_get(o), "192.168.0.123:80");
512 efl_unref(o); 512 efl_unref(o);
@@ -519,30 +519,30 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_parse_fail)
519 Eo *o; 519 Eo *o;
520 520
521 TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: numeric_address == NULL"); 521 TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: numeric_address == NULL");
522 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, NULL); 522 o = efl_net_ip_address_parse( NULL);
523 ck_assert_ptr_eq(o, NULL); 523 ck_assert_ptr_eq(o, NULL);
524 TRAP_ERRORS_FINISH(1); 524 TRAP_ERRORS_FINISH(1);
525 525
526 /* incomplete numbers */ 526 /* incomplete numbers */
527 TRAP_ERRORS_BEGIN(eina_safety, ERR, NULL); 527 TRAP_ERRORS_BEGIN(eina_safety, ERR, NULL);
528 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "127."); 528 o = efl_net_ip_address_parse( "127.");
529 ck_assert_ptr_eq(o, NULL); 529 ck_assert_ptr_eq(o, NULL);
530 TRAP_ERRORS_FINISH(0); /* no error messages! */ 530 TRAP_ERRORS_FINISH(0); /* no error messages! */
531 531
532 TRAP_ERRORS_BEGIN(eina_safety, ERR, NULL); 532 TRAP_ERRORS_BEGIN(eina_safety, ERR, NULL);
533 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "127.0.0."); 533 o = efl_net_ip_address_parse( "127.0.0.");
534 ck_assert_ptr_eq(o, NULL); 534 ck_assert_ptr_eq(o, NULL);
535 TRAP_ERRORS_FINISH(0); /* no error messages! */ 535 TRAP_ERRORS_FINISH(0); /* no error messages! */
536 536
537 /* hostnames are not numeric, shouldn't return an object */ 537 /* hostnames are not numeric, shouldn't return an object */
538 TRAP_ERRORS_BEGIN(eina_safety, ERR, NULL); 538 TRAP_ERRORS_BEGIN(eina_safety, ERR, NULL);
539 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "google.com"); 539 o = efl_net_ip_address_parse( "google.com");
540 ck_assert_ptr_eq(o, NULL); 540 ck_assert_ptr_eq(o, NULL);
541 TRAP_ERRORS_FINISH(0); /* no error messages! */ 541 TRAP_ERRORS_FINISH(0); /* no error messages! */
542 542
543 /* port names are not numeric, shouldn't return an object */ 543 /* port names are not numeric, shouldn't return an object */
544 TRAP_ERRORS_BEGIN(eina_safety, ERR, NULL); 544 TRAP_ERRORS_BEGIN(eina_safety, ERR, NULL);
545 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "127.0.0.1:http"); 545 o = efl_net_ip_address_parse( "127.0.0.1:http");
546 ck_assert_ptr_eq(o, NULL); 546 ck_assert_ptr_eq(o, NULL);
547 TRAP_ERRORS_FINISH(0); /* no error messages! */ 547 TRAP_ERRORS_FINISH(0); /* no error messages! */
548 548
@@ -589,13 +589,13 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_resolve_fail)
589 struct resolve_ctx ctx = { }; 589 struct resolve_ctx ctx = { };
590 590
591 TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: address == NULL"); 591 TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: address == NULL");
592 ctx.future = efl_net_ip_address_resolve(EFL_NET_IP_ADDRESS_CLASS, 592 ctx.future = efl_net_ip_address_resolve(
593 NULL, 0, 0); 593 NULL, 0, 0);
594 ck_assert_ptr_eq(ctx.future, NULL); 594 ck_assert_ptr_eq(ctx.future, NULL);
595 TRAP_ERRORS_FINISH(1); 595 TRAP_ERRORS_FINISH(1);
596 596
597 TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: (family != AF_UNSPEC) && (family != AF_INET) && (family != AF_INET6) is true"); 597 TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: (family != AF_UNSPEC) && (family != AF_INET) && (family != AF_INET6) is true");
598 ctx.future = efl_net_ip_address_resolve(EFL_NET_IP_ADDRESS_CLASS, 598 ctx.future = efl_net_ip_address_resolve(
599 "localhost", 1234, 0); 599 "localhost", 1234, 0);
600 ck_assert_ptr_eq(ctx.future, NULL); 600 ck_assert_ptr_eq(ctx.future, NULL);
601 TRAP_ERRORS_FINISH(1); 601 TRAP_ERRORS_FINISH(1);
@@ -643,7 +643,7 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_checks)
643 .sin_port = 0, 643 .sin_port = 0,
644 .sin_addr.s_addr = eina_htonl(itr->addr), 644 .sin_addr.s_addr = eina_htonl(itr->addr),
645 }; 645 };
646 Eo *o = efl_net_ip_address_create_sockaddr(EFL_NET_IP_ADDRESS_CLASS, &a); 646 Eo *o = efl_net_ip_address_create_sockaddr(&a);
647 ck_assert_ptr_ne(o, NULL); 647 ck_assert_ptr_ne(o, NULL);
648 648
649 ck_assert_int_eq(efl_net_ip_address_ipv4_class_a_check(o), itr->is_a); 649 ck_assert_int_eq(efl_net_ip_address_ipv4_class_a_check(o), itr->is_a);
@@ -799,7 +799,7 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_create_ok)
799 799
800 addr.sin6_port = eina_htons(12365); 800 addr.sin6_port = eina_htons(12365);
801 _ipv6_set(&addr, 1, 2, 3, 4, 5, 6, 7, 8); 801 _ipv6_set(&addr, 1, 2, 3, 4, 5, 6, 7, 8);
802 o = efl_net_ip_address_create(EFL_NET_IP_ADDRESS_CLASS, 802 o = efl_net_ip_address_create(
803 eina_ntohs(addr.sin6_port), 803 eina_ntohs(addr.sin6_port),
804 slice); 804 slice);
805 _ipv6_check(o, &addr); 805 _ipv6_check(o, &addr);
@@ -807,7 +807,7 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_create_ok)
807 807
808 addr.sin6_port = eina_htons(8081); 808 addr.sin6_port = eina_htons(8081);
809 _ipv6_set(&addr, 0, 0, 0, 0, 0, 0, 0, 0); 809 _ipv6_set(&addr, 0, 0, 0, 0, 0, 0, 0, 0);
810 o = efl_net_ip_address_create(EFL_NET_IP_ADDRESS_CLASS, 810 o = efl_net_ip_address_create(
811 eina_ntohs(addr.sin6_port), 811 eina_ntohs(addr.sin6_port),
812 slice); 812 slice);
813 _ipv6_check(o, &addr); 813 _ipv6_check(o, &addr);
@@ -815,7 +815,7 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_create_ok)
815 815
816 addr.sin6_port = eina_htons(0); 816 addr.sin6_port = eina_htons(0);
817 _ipv6_set(&addr, 0, 0, 0, 0, 0, 0, 0, 1); 817 _ipv6_set(&addr, 0, 0, 0, 0, 0, 0, 0, 1);
818 o = efl_net_ip_address_create(EFL_NET_IP_ADDRESS_CLASS, 818 o = efl_net_ip_address_create(
819 eina_ntohs(addr.sin6_port), 819 eina_ntohs(addr.sin6_port),
820 slice); 820 slice);
821 _ipv6_check(o, &addr); 821 _ipv6_check(o, &addr);
@@ -833,14 +833,14 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_create_sockaddr_ok)
833 833
834 addr.sin6_port = eina_htons(12345); 834 addr.sin6_port = eina_htons(12345);
835 _ipv6_set(&addr, 1, 2, 3, 4, 5, 6, 7, 8); 835 _ipv6_set(&addr, 1, 2, 3, 4, 5, 6, 7, 8);
836 o = efl_net_ip_address_create_sockaddr(EFL_NET_IP_ADDRESS_CLASS, &addr); 836 o = efl_net_ip_address_create_sockaddr(&addr);
837 ck_assert_ptr_ne(&addr, efl_net_ip_address_sockaddr_get(o)); 837 ck_assert_ptr_ne(&addr, efl_net_ip_address_sockaddr_get(o));
838 _ipv6_check(o, &addr); 838 _ipv6_check(o, &addr);
839 efl_unref(o); 839 efl_unref(o);
840 840
841 addr.sin6_port = eina_htons(0); 841 addr.sin6_port = eina_htons(0);
842 _ipv6_set(&addr, 0, 0, 0, 0, 0, 0, 0, 0); 842 _ipv6_set(&addr, 0, 0, 0, 0, 0, 0, 0, 0);
843 o = efl_net_ip_address_create_sockaddr(EFL_NET_IP_ADDRESS_CLASS, &addr); 843 o = efl_net_ip_address_create_sockaddr(&addr);
844 ck_assert_ptr_ne(&addr, efl_net_ip_address_sockaddr_get(o)); 844 ck_assert_ptr_ne(&addr, efl_net_ip_address_sockaddr_get(o));
845 _ipv6_check(o, &addr); 845 _ipv6_check(o, &addr);
846 efl_unref(o); 846 efl_unref(o);
@@ -852,86 +852,86 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_parse_ok)
852{ 852{
853 Eo *o; 853 Eo *o;
854 854
855 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[::1]:12345"); 855 o = efl_net_ip_address_parse( "[::1]:12345");
856 ck_assert_ptr_ne(o, NULL); 856 ck_assert_ptr_ne(o, NULL);
857 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::1]:12345"); 857 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::1]:12345");
858 efl_unref(o); 858 efl_unref(o);
859 859
860 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[::1]:0"); 860 o = efl_net_ip_address_parse( "[::1]:0");
861 ck_assert_ptr_ne(o, NULL); 861 ck_assert_ptr_ne(o, NULL);
862 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::1]"); 862 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::1]");
863 efl_unref(o); 863 efl_unref(o);
864 864
865 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[::1]"); 865 o = efl_net_ip_address_parse( "[::1]");
866 ck_assert_ptr_ne(o, NULL); 866 ck_assert_ptr_ne(o, NULL);
867 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::1]"); 867 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::1]");
868 efl_unref(o); 868 efl_unref(o);
869 869
870 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "::1"); 870 o = efl_net_ip_address_parse( "::1");
871 ck_assert_ptr_ne(o, NULL); 871 ck_assert_ptr_ne(o, NULL);
872 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::1]"); 872 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::1]");
873 efl_unref(o); 873 efl_unref(o);
874 874
875 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[::]:12345"); 875 o = efl_net_ip_address_parse( "[::]:12345");
876 ck_assert_ptr_ne(o, NULL); 876 ck_assert_ptr_ne(o, NULL);
877 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::]:12345"); 877 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::]:12345");
878 efl_unref(o); 878 efl_unref(o);
879 879
880 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[::]:0"); 880 o = efl_net_ip_address_parse( "[::]:0");
881 ck_assert_ptr_ne(o, NULL); 881 ck_assert_ptr_ne(o, NULL);
882 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::]"); 882 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::]");
883 efl_unref(o); 883 efl_unref(o);
884 884
885 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[::]"); 885 o = efl_net_ip_address_parse( "[::]");
886 ck_assert_ptr_ne(o, NULL); 886 ck_assert_ptr_ne(o, NULL);
887 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::]"); 887 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::]");
888 efl_unref(o); 888 efl_unref(o);
889 889
890 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "::"); 890 o = efl_net_ip_address_parse( "::");
891 ck_assert_ptr_ne(o, NULL); 891 ck_assert_ptr_ne(o, NULL);
892 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::]"); 892 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::]");
893 efl_unref(o); 893 efl_unref(o);
894 894
895 /* IPv4 Mapped */ 895 /* IPv4 Mapped */
896 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[::ffff:192.168.0.1]:12345"); 896 o = efl_net_ip_address_parse( "[::ffff:192.168.0.1]:12345");
897 ck_assert_ptr_ne(o, NULL); 897 ck_assert_ptr_ne(o, NULL);
898 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::ffff:192.168.0.1]:12345"); 898 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::ffff:192.168.0.1]:12345");
899 efl_unref(o); 899 efl_unref(o);
900 900
901 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[::ffff:192.168.0.1]"); 901 o = efl_net_ip_address_parse( "[::ffff:192.168.0.1]");
902 ck_assert_ptr_ne(o, NULL); 902 ck_assert_ptr_ne(o, NULL);
903 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::ffff:192.168.0.1]"); 903 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::ffff:192.168.0.1]");
904 efl_unref(o); 904 efl_unref(o);
905 905
906 /* IPv4 Compatible */ 906 /* IPv4 Compatible */
907 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[::192.168.0.1]:12345"); 907 o = efl_net_ip_address_parse( "[::192.168.0.1]:12345");
908 ck_assert_ptr_ne(o, NULL); 908 ck_assert_ptr_ne(o, NULL);
909 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::192.168.0.1]:12345"); 909 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::192.168.0.1]:12345");
910 efl_unref(o); 910 efl_unref(o);
911 911
912 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[::192.168.0.1]"); 912 o = efl_net_ip_address_parse( "[::192.168.0.1]");
913 ck_assert_ptr_ne(o, NULL); 913 ck_assert_ptr_ne(o, NULL);
914 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::192.168.0.1]"); 914 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::192.168.0.1]");
915 efl_unref(o); 915 efl_unref(o);
916 916
917 /* Link Local */ 917 /* Link Local */
918 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[fe80::1]:12345"); 918 o = efl_net_ip_address_parse( "[fe80::1]:12345");
919 ck_assert_ptr_ne(o, NULL); 919 ck_assert_ptr_ne(o, NULL);
920 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[fe80::1]:12345"); 920 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[fe80::1]:12345");
921 efl_unref(o); 921 efl_unref(o);
922 922
923 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[fe80::1]"); 923 o = efl_net_ip_address_parse( "[fe80::1]");
924 ck_assert_ptr_ne(o, NULL); 924 ck_assert_ptr_ne(o, NULL);
925 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[fe80::1]"); 925 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[fe80::1]");
926 efl_unref(o); 926 efl_unref(o);
927 927
928 /* Site Local */ 928 /* Site Local */
929 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[fc00::1]:12345"); 929 o = efl_net_ip_address_parse( "[fc00::1]:12345");
930 ck_assert_ptr_ne(o, NULL); 930 ck_assert_ptr_ne(o, NULL);
931 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[fc00::1]:12345"); 931 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[fc00::1]:12345");
932 efl_unref(o); 932 efl_unref(o);
933 933
934 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[fc00::1]"); 934 o = efl_net_ip_address_parse( "[fc00::1]");
935 ck_assert_ptr_ne(o, NULL); 935 ck_assert_ptr_ne(o, NULL);
936 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[fc00::1]"); 936 ck_assert_str_eq(efl_net_ip_address_string_get(o), "[fc00::1]");
937 efl_unref(o); 937 efl_unref(o);
@@ -947,18 +947,18 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_parse_fail)
947 947
948 /* incomplete numbers */ 948 /* incomplete numbers */
949 TRAP_ERRORS_BEGIN(eina_safety, ERR, NULL); 949 TRAP_ERRORS_BEGIN(eina_safety, ERR, NULL);
950 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "::9999999"); 950 o = efl_net_ip_address_parse( "::9999999");
951 ck_assert_ptr_eq(o, NULL); 951 ck_assert_ptr_eq(o, NULL);
952 TRAP_ERRORS_FINISH(0); /* no error messages! */ 952 TRAP_ERRORS_FINISH(0); /* no error messages! */
953 953
954 TRAP_ERRORS_BEGIN(eina_safety, ERR, NULL); 954 TRAP_ERRORS_BEGIN(eina_safety, ERR, NULL);
955 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "ab:cd:ef:gh"); 955 o = efl_net_ip_address_parse( "ab:cd:ef:gh");
956 ck_assert_ptr_eq(o, NULL); 956 ck_assert_ptr_eq(o, NULL);
957 TRAP_ERRORS_FINISH(0); /* no error messages! */ 957 TRAP_ERRORS_FINISH(0); /* no error messages! */
958 958
959 /* port names are not numeric, shouldn't return an object */ 959 /* port names are not numeric, shouldn't return an object */
960 TRAP_ERRORS_BEGIN(eina_safety, ERR, NULL); 960 TRAP_ERRORS_BEGIN(eina_safety, ERR, NULL);
961 o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[::1]:http"); 961 o = efl_net_ip_address_parse( "[::1]:http");
962 ck_assert_ptr_eq(o, NULL); 962 ck_assert_ptr_eq(o, NULL);
963 TRAP_ERRORS_FINISH(0); /* no error messages! */ 963 TRAP_ERRORS_FINISH(0); /* no error messages! */
964 964
@@ -1152,7 +1152,7 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_checks)
1152 r = inet_pton(AF_INET6, itr->str, ia); 1152 r = inet_pton(AF_INET6, itr->str, ia);
1153 ck_assert_int_eq(r, 1); 1153 ck_assert_int_eq(r, 1);
1154 1154
1155 Eo *o = efl_net_ip_address_create_sockaddr(EFL_NET_IP_ADDRESS_CLASS, &a); 1155 Eo *o = efl_net_ip_address_create_sockaddr(&a);
1156 ck_assert_ptr_ne(o, NULL); 1156 ck_assert_ptr_ne(o, NULL);
1157 1157
1158 ck_assert_int_eq(efl_net_ip_address_ipv4_class_a_check(o), EINA_FALSE); 1158 ck_assert_int_eq(efl_net_ip_address_ipv4_class_a_check(o), EINA_FALSE);
diff --git a/src/tests/efl_mono/libefl_mono_native_test.c b/src/tests/efl_mono/libefl_mono_native_test.c
index 51086216e3..674d1f8f23 100644
--- a/src/tests/efl_mono/libefl_mono_native_test.c
+++ b/src/tests/efl_mono/libefl_mono_native_test.c
@@ -3827,24 +3827,15 @@ Dummy_MyInt _dummy_test_object_bypass_typedef(EINA_UNUSED Eo *obj, EINA_UNUSED D
3827/* Class Properties */ 3827/* Class Properties */
3828static int _dummy_test_object_klass_prop = 0; 3828static int _dummy_test_object_klass_prop = 0;
3829 3829
3830int _dummy_test_object_klass_prop_get(const Eo *klass, EINA_UNUSED void *pd) 3830int _dummy_test_object_klass_prop_get(void)
3831{ 3831{
3832 EINA_LOG_ERR("FAIL on GET"); 3832 EINA_LOG_ERR("FAIL on GET");
3833 if (klass != dummy_test_object_class_get())
3834 {
3835 eina_error_set(EINVAL);
3836 return -1;
3837 }
3838 return _dummy_test_object_klass_prop; 3833 return _dummy_test_object_klass_prop;
3839} 3834}
3840 3835
3841void _dummy_test_object_klass_prop_set(Eo *klass, EINA_UNUSED void *pd, int value) 3836void _dummy_test_object_klass_prop_set(int value)
3842{ 3837{
3843 EINA_LOG_ERR("FAIL on SET"); 3838 EINA_LOG_ERR("FAIL on SET");
3844 if (klass != dummy_test_object_class_get())
3845 {
3846 eina_error_set(EINVAL);
3847 }
3848 _dummy_test_object_klass_prop = value; 3839 _dummy_test_object_klass_prop = value;
3849} 3840}
3850 3841
@@ -3858,7 +3849,7 @@ Eina_Future* _dummy_test_object_get_future(EINA_UNUSED Eo *obj, Dummy_Test_Objec
3858{ 3849{
3859 if (pd->promise == NULL) 3850 if (pd->promise == NULL)
3860 { 3851 {
3861 Eo *loop = efl_app_main_get(EFL_APP_CLASS); 3852 Eo *loop = efl_app_main_get();
3862 Eina_Future_Scheduler *scheduler = efl_loop_future_scheduler_get(loop); 3853 Eina_Future_Scheduler *scheduler = efl_loop_future_scheduler_get(loop);
3863 pd->promise = eina_promise_new(scheduler, _promise_cancelled, pd); 3854 pd->promise = eina_promise_new(scheduler, _promise_cancelled, pd);
3864 } 3855 }
@@ -3989,14 +3980,14 @@ _dummy_child_class_destructor(Efl_Class *klass)
3989} 3980}
3990 3981
3991// Inherit 3982// Inherit
3992int _dummy_inherit_helper_receive_dummy_and_call_int_out(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Dummy_Test_Object *x) 3983int _dummy_inherit_helper_receive_dummy_and_call_int_out(Dummy_Test_Object *x)
3993{ 3984{
3994 int v = 8; 3985 int v = 8;
3995 dummy_test_object_int_out (x, 5, &v); 3986 dummy_test_object_int_out (x, 5, &v);
3996 return v; 3987 return v;
3997} 3988}
3998 3989
3999const char* _dummy_inherit_helper_receive_dummy_and_call_in_stringshare(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Dummy_Test_Object *x) 3990const char* _dummy_inherit_helper_receive_dummy_and_call_in_stringshare(Dummy_Test_Object *x)
4000{ 3991{
4001 return dummy_inherit_iface_stringshare_test (x, eina_stringshare_add("hello world")); 3992 return dummy_inherit_iface_stringshare_test (x, eina_stringshare_add("hello world"));
4002} 3993}
diff --git a/src/tests/elementary/efl_ui_model.c b/src/tests/elementary/efl_ui_model.c
index 8b1d87c5d4..79056a726a 100644
--- a/src/tests/elementary/efl_ui_model.c
+++ b/src/tests/elementary/efl_ui_model.c
@@ -169,7 +169,7 @@ EFL_START_TEST(efl_ui_homogeneous_model_test)
169 ck_assert_int_eq(_property_error_expected(model, "item.width"), EAGAIN); 169 ck_assert_int_eq(_property_error_expected(model, "item.width"), EAGAIN);
170 ck_assert_int_eq(_property_error_expected(model, "item.height"), EAGAIN); 170 ck_assert_int_eq(_property_error_expected(model, "item.height"), EAGAIN);
171 171
172 ret__ = efl_loop_begin(efl_app_main_get(EFL_APP_CLASS)); 172 ret__ = efl_loop_begin(efl_app_main_get());
173 real__ = efl_loop_exit_code_process(ret__); 173 real__ = efl_loop_exit_code_process(ret__);
174 fail_if(real__ != 0); 174 fail_if(real__ != 0);
175 175
@@ -240,7 +240,7 @@ EFL_START_TEST(efl_ui_exact_model_test)
240 ck_assert_int_eq(_property_error_expected(model, "item.width"), EAGAIN); 240 ck_assert_int_eq(_property_error_expected(model, "item.width"), EAGAIN);
241 ck_assert_int_eq(_property_error_expected(model, "item.height"), EAGAIN); 241 ck_assert_int_eq(_property_error_expected(model, "item.height"), EAGAIN);
242 242
243 ret__ = efl_loop_begin(efl_app_main_get(EFL_APP_CLASS)); 243 ret__ = efl_loop_begin(efl_app_main_get());
244 real__ = efl_loop_exit_code_process(ret__); 244 real__ = efl_loop_exit_code_process(ret__);
245 fail_if(real__ != 0); 245 fail_if(real__ != 0);
246 246
@@ -328,7 +328,7 @@ EFL_START_TEST(efl_ui_average_model_test)
328 ck_assert_int_eq(_property_error_expected(model, "item.width"), EAGAIN); 328 ck_assert_int_eq(_property_error_expected(model, "item.width"), EAGAIN);
329 ck_assert_int_eq(_property_error_expected(model, "item.height"), EAGAIN); 329 ck_assert_int_eq(_property_error_expected(model, "item.height"), EAGAIN);
330 330
331 ret__ = efl_loop_begin(efl_app_main_get(EFL_APP_CLASS)); 331 ret__ = efl_loop_begin(efl_app_main_get());
332 real__ = efl_loop_exit_code_process(ret__); 332 real__ = efl_loop_exit_code_process(ret__);
333 fail_if(real__ != 0); 333 fail_if(real__ != 0);
334 334
diff --git a/src/tests/elementary/efl_ui_test_focus.c b/src/tests/elementary/efl_ui_test_focus.c
index 13791a231f..16fce9fb05 100644
--- a/src/tests/elementary/efl_ui_test_focus.c
+++ b/src/tests/elementary/efl_ui_test_focus.c
@@ -297,7 +297,7 @@ _check_chain(Efl_Ui_Focus_Manager *m, Efl_Ui_Focus_Object *objects[])
297 efl_ui_focus_manager_reset_history(m); 297 efl_ui_focus_manager_reset_history(m);
298 efl_ui_focus_manager_setup_on_first_touch(m, EFL_UI_FOCUS_DIRECTION_NEXT, root); 298 efl_ui_focus_manager_setup_on_first_touch(m, EFL_UI_FOCUS_DIRECTION_NEXT, root);
299 } 299 }
300 next = efl_ui_focus_manager_focus_get(efl_ui_focus_util_active_manager(EFL_UI_FOCUS_UTIL_CLASS, m)); 300 next = efl_ui_focus_manager_focus_get(efl_ui_focus_util_active_manager(m));
301 301
302 ck_assert_ptr_eq(next, objects[i]); 302 ck_assert_ptr_eq(next, objects[i]);
303 } 303 }
@@ -317,7 +317,7 @@ _check_chain(Efl_Ui_Focus_Manager *m, Efl_Ui_Focus_Object *objects[])
317 efl_ui_focus_manager_setup_on_first_touch(m, EFL_UI_FOCUS_DIRECTION_PREVIOUS, root); 317 efl_ui_focus_manager_setup_on_first_touch(m, EFL_UI_FOCUS_DIRECTION_PREVIOUS, root);
318 } 318 }
319 319
320 prev = efl_ui_focus_manager_focus_get(efl_ui_focus_util_active_manager(EFL_UI_FOCUS_UTIL_CLASS, m)); 320 prev = efl_ui_focus_manager_focus_get(efl_ui_focus_util_active_manager(m));
321 ck_assert_ptr_eq(prev, objects[i - 1]); 321 ck_assert_ptr_eq(prev, objects[i - 1]);
322 } 322 }
323 ck_assert_ptr_eq(efl_ui_focus_manager_move(m, EFL_UI_FOCUS_DIRECTION_PREVIOUS), NULL); 323 ck_assert_ptr_eq(efl_ui_focus_manager_move(m, EFL_UI_FOCUS_DIRECTION_PREVIOUS), NULL);
diff --git a/src/tests/elementary/elm_test_genlist.c b/src/tests/elementary/elm_test_genlist.c
index a50f3b869d..d0f89aa4d7 100644
--- a/src/tests/elementary/elm_test_genlist.c
+++ b/src/tests/elementary/elm_test_genlist.c
@@ -220,7 +220,7 @@ EFL_START_TEST(elm_genlist_test_atspi_children_events_add)
220 220
221 Elm_Object_Item *it[3]; 221 Elm_Object_Item *it[3];
222 222
223 efl_access_object_event_handler_add(EFL_ACCESS_OBJECT_MIXIN, _children_changed_cb, NULL); 223 efl_access_object_event_handler_add(_children_changed_cb, NULL);
224 224
225 it[0] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); 225 it[0] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
226 ck_assert(genlist == current); 226 ck_assert(genlist == current);
@@ -256,7 +256,7 @@ EFL_START_TEST(elm_genlist_test_atspi_children_events_del1)
256 it[1] = elm_genlist_item_prepend(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); 256 it[1] = elm_genlist_item_prepend(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
257 it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_TREE, NULL, NULL); 257 it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_TREE, NULL, NULL);
258 258
259 efl_access_object_event_handler_add(EFL_ACCESS_OBJECT_MIXIN, _children_changed_cb, NULL); 259 efl_access_object_event_handler_add(_children_changed_cb, NULL);
260 260
261 elm_object_item_del(it[0]); 261 elm_object_item_del(it[0]);
262 ck_assert(genlist == current); 262 ck_assert(genlist == current);
@@ -283,7 +283,7 @@ EFL_START_TEST(elm_genlist_test_atspi_children_events_del2)
283 283
284 it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); 284 it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
285 285
286 efl_access_object_event_handler_add(EFL_ACCESS_OBJECT_MIXIN, _children_changed_cb, NULL); 286 efl_access_object_event_handler_add(_children_changed_cb, NULL);
287 elm_genlist_clear(genlist); 287 elm_genlist_clear(genlist);
288 288
289 ck_assert(genlist == current); 289 ck_assert(genlist == current);
diff --git a/src/tests/elementary/elm_test_win.c b/src/tests/elementary/elm_test_win.c
index 0c346911e9..06b268d80d 100644
--- a/src/tests/elementary/elm_test_win.c
+++ b/src/tests/elementary/elm_test_win.c
@@ -165,12 +165,11 @@ EFL_END_TEST
165EFL_START_TEST (elm_win_test_app_exit_on_windows_close) 165EFL_START_TEST (elm_win_test_app_exit_on_windows_close)
166{ 166{
167 Eo *win = win_add(NULL, "win", ELM_WIN_BASIC); 167 Eo *win = win_add(NULL, "win", ELM_WIN_BASIC);
168 Eo *app = efl_app_main_get(EFL_APP_CLASS);
169 Eina_Value val, *exit_val; 168 Eina_Value val, *exit_val;
170 int code; 169 int code;
171 170
172 val = eina_value_int_init(66); 171 val = eina_value_int_init(66);
173 efl_ui_win_exit_on_all_windows_closed_set(win, &val); 172 efl_ui_win_exit_on_all_windows_closed_set(&val);
174 efl_gfx_entity_visible_set(win, EINA_TRUE); 173 efl_gfx_entity_visible_set(win, EINA_TRUE);
175 174
176 Eina_Bool fail_flag = EINA_FALSE; 175 Eina_Bool fail_flag = EINA_FALSE;
@@ -180,7 +179,7 @@ EFL_START_TEST (elm_win_test_app_exit_on_windows_close)
180 exit_val = efl_loop_begin(efl_loop_get(win)); 179 exit_val = efl_loop_begin(efl_loop_get(win));
181 ck_assert(eina_value_int_get(exit_val, &code)); 180 ck_assert(eina_value_int_get(exit_val, &code));
182 ck_assert_int_eq(code, 66); 181 ck_assert_int_eq(code, 66);
183 efl_ui_win_exit_on_all_windows_closed_set(app, &EINA_VALUE_EMPTY); 182 efl_ui_win_exit_on_all_windows_closed_set(&EINA_VALUE_EMPTY);
184} 183}
185EFL_END_TEST 184EFL_END_TEST
186 185
diff --git a/src/tests/elementary/suite_helpers.c b/src/tests/elementary/suite_helpers.c
index de175fc420..4352b65408 100644
--- a/src/tests/elementary/suite_helpers.c
+++ b/src/tests/elementary/suite_helpers.c
@@ -64,7 +64,7 @@ efl_main(void *data EINA_UNUSED,
64{ 64{
65 Efl_Loop_Arguments *arge = ev->info; 65 Efl_Loop_Arguments *arge = ev->info;
66 66
67 67
68 fail_if(!arge->initialization); 68 fail_if(!arge->initialization);
69 fprintf(stderr, "ARGC %d\n", eina_array_count(arge->argv)); 69 fprintf(stderr, "ARGC %d\n", eina_array_count(arge->argv));
70 fail_if(eina_array_count(arge->argv) != 2); 70 fail_if(eina_array_count(arge->argv) != 2);
@@ -84,10 +84,10 @@ EFL_START_TEST(efl_ui_test_init)
84 _efl_startup_time = ecore_time_unix_get(); 84 _efl_startup_time = ecore_time_unix_get();
85 _EFL_APP_VERSION_SET(); 85 _EFL_APP_VERSION_SET();
86 fail_if(!ecore_init()); 86 fail_if(!ecore_init());
87 efl_event_callback_add(efl_app_main_get(EFL_APP_CLASS), EFL_LOOP_EVENT_ARGUMENTS, efl_main, NULL); 87 efl_event_callback_add(efl_app_main_get(), EFL_LOOP_EVENT_ARGUMENTS, efl_main, NULL);
88 fail_if(!ecore_init_ex(argc, argv)); 88 fail_if(!ecore_init_ex(argc, argv));
89 __EFL_MAIN_CONSTRUCTOR; 89 __EFL_MAIN_CONSTRUCTOR;
90 ret__ = efl_loop_begin(efl_app_main_get(EFL_APP_CLASS)); 90 ret__ = efl_loop_begin(efl_app_main_get());
91 real__ = efl_loop_exit_code_process(ret__); 91 real__ = efl_loop_exit_code_process(ret__);
92 fail_if(real__ != 0); 92 fail_if(real__ != 0);
93 __EFL_MAIN_DESTRUCTOR; 93 __EFL_MAIN_DESTRUCTOR;
@@ -270,7 +270,7 @@ suite_setup(Eina_Bool legacy)
270 else 270 else
271 failed_count = _efl_suite_build_and_run(0, NULL, 271 failed_count = _efl_suite_build_and_run(0, NULL,
272 "Efl_Ui_Init", ui_init, NULL, NULL); 272 "Efl_Ui_Init", ui_init, NULL, NULL);
273 273
274 failed_count += !elm_init(1, (char*[]){"exe"}); 274 failed_count += !elm_init(1, (char*[]){"exe"});
275 if (buffer) 275 if (buffer)
276 { 276 {
diff --git a/src/tests/eo/signals/signals_main.c b/src/tests/eo/signals/signals_main.c
index 58b9eda958..c3b1648c17 100644
--- a/src/tests/eo/signals/signals_main.c
+++ b/src/tests/eo/signals/signals_main.c
@@ -171,15 +171,15 @@ main(int argc, char *argv[])
171 efl_event_callback_priority_add(obj, EV_A_CHANGED, EFL_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1); 171 efl_event_callback_priority_add(obj, EV_A_CHANGED, EFL_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1);
172 fail_if(pd->cb_count != 1); 172 fail_if(pd->cb_count != 1);
173 173
174 fcount = efl_event_global_freeze_count_get(EO_CLASS); 174 fcount = efl_event_global_freeze_count_get();
175 fail_if(fcount != 0); 175 fail_if(fcount != 0);
176 176
177 efl_event_global_freeze(EO_CLASS); 177 efl_event_global_freeze();
178 fcount = efl_event_global_freeze_count_get(EO_CLASS); 178 fcount = efl_event_global_freeze_count_get();
179 fail_if(fcount != 1); 179 fail_if(fcount != 1);
180 180
181 efl_event_global_freeze(EO_CLASS); 181 efl_event_global_freeze();
182 fcount = efl_event_global_freeze_count_get(EO_CLASS); 182 fcount = efl_event_global_freeze_count_get();
183 fail_if(fcount != 2); 183 fail_if(fcount != 2);
184 184
185 efl_event_callback_priority_add(obj, EV_A_CHANGED, EFL_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2); 185 efl_event_callback_priority_add(obj, EV_A_CHANGED, EFL_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2);
@@ -187,30 +187,30 @@ main(int argc, char *argv[])
187 187
188 simple_a_set(obj, 2); 188 simple_a_set(obj, 2);
189 fail_if(cb_count != 0); 189 fail_if(cb_count != 0);
190 efl_event_global_thaw(EO_CLASS); 190 efl_event_global_thaw();
191 fcount = efl_event_global_freeze_count_get(EO_CLASS); 191 fcount = efl_event_global_freeze_count_get();
192 fail_if(fcount != 1); 192 fail_if(fcount != 1);
193 193
194 efl_event_global_thaw(EO_CLASS); 194 efl_event_global_thaw();
195 fcount = efl_event_global_freeze_count_get(EO_CLASS); 195 fcount = efl_event_global_freeze_count_get();
196 fail_if(fcount != 0); 196 fail_if(fcount != 0);
197 197
198 simple_a_set(obj, 3); 198 simple_a_set(obj, 3);
199 fail_if(cb_count != 2); 199 fail_if(cb_count != 2);
200 200
201 cb_count = 0; 201 cb_count = 0;
202 efl_event_global_thaw(EO_CLASS); 202 efl_event_global_thaw();
203 fcount = efl_event_global_freeze_count_get(EO_CLASS); 203 fcount = efl_event_global_freeze_count_get();
204 fail_if(fcount != 0); 204 fail_if(fcount != 0);
205 205
206 efl_event_global_freeze(EO_CLASS); 206 efl_event_global_freeze();
207 fcount = efl_event_global_freeze_count_get(EO_CLASS); 207 fcount = efl_event_global_freeze_count_get();
208 fail_if(fcount != 1); 208 fail_if(fcount != 1);
209 209
210 simple_a_set(obj, 2); 210 simple_a_set(obj, 2);
211 fail_if(cb_count != 0); 211 fail_if(cb_count != 0);
212 efl_event_global_thaw(EO_CLASS); 212 efl_event_global_thaw();
213 fcount = efl_event_global_freeze_count_get(EO_CLASS); 213 fcount = efl_event_global_freeze_count_get();
214 fail_if(fcount != 0); 214 fail_if(fcount != 0);
215 215
216 efl_event_callback_priority_add(obj, EV_RESTART, EFL_CALLBACK_PRIORITY_DEFAULT, _restart_1_cb, NULL); 216 efl_event_callback_priority_add(obj, EV_RESTART, EFL_CALLBACK_PRIORITY_DEFAULT, _restart_1_cb, NULL);
diff --git a/src/tests/eolian/data/class_simple_ref.c b/src/tests/eolian/data/class_simple_ref.c
index e6c0244a55..ba1e647ee9 100644
--- a/src/tests/eolian/data/class_simple_ref.c
+++ b/src/tests/eolian/data/class_simple_ref.c
@@ -29,7 +29,7 @@ EOAPI EFL_FUNC_BODYV(efl_canvas_object_simple_bar, int *, NULL, EFL_FUNC_CALL(x)
29static Eina_Bool 29static Eina_Bool
30_class_simple_class_initializer(Efl_Class *klass) 30_class_simple_class_initializer(Efl_Class *klass)
31{ 31{
32 const Efl_Object_Ops *opsp = NULL, *copsp = NULL; 32 const Efl_Object_Ops *opsp = NULL;
33 33
34#ifndef CLASS_SIMPLE_EXTRA_OPS 34#ifndef CLASS_SIMPLE_EXTRA_OPS
35#define CLASS_SIMPLE_EXTRA_OPS 35#define CLASS_SIMPLE_EXTRA_OPS
@@ -45,12 +45,7 @@ _class_simple_class_initializer(Efl_Class *klass)
45 ); 45 );
46 opsp = &ops; 46 opsp = &ops;
47 47
48#ifdef CLASS_SIMPLE_EXTRA_CLASS_OPS 48 return efl_class_functions_set(klass, opsp, NULL, NULL);
49 EFL_OPS_DEFINE(cops, CLASS_SIMPLE_EXTRA_CLASS_OPS);
50 copsp = &cops;
51#endif
52
53 return efl_class_functions_set(klass, opsp, copsp, NULL);
54} 49}
55 50
56static const Efl_Class_Description _class_simple_class_desc = { 51static const Efl_Class_Description _class_simple_class_desc = {
diff --git a/src/tests/eolian/data/function_as_argument_ref.c b/src/tests/eolian/data/function_as_argument_ref.c
index ee9ccccdf7..0728dd4299 100644
--- a/src/tests/eolian/data/function_as_argument_ref.c
+++ b/src/tests/eolian/data/function_as_argument_ref.c
@@ -14,7 +14,7 @@ EOAPI EFL_FUNC_BODYV(function_as_argument_call_cb, char *, NULL, EFL_FUNC_CALL(a
14static Eina_Bool 14static Eina_Bool
15_function_as_argument_class_initializer(Efl_Class *klass) 15_function_as_argument_class_initializer(Efl_Class *klass)
16{ 16{
17 const Efl_Object_Ops *opsp = NULL, *copsp = NULL; 17 const Efl_Object_Ops *opsp = NULL;
18 18
19#ifndef FUNCTION_AS_ARGUMENT_EXTRA_OPS 19#ifndef FUNCTION_AS_ARGUMENT_EXTRA_OPS
20#define FUNCTION_AS_ARGUMENT_EXTRA_OPS 20#define FUNCTION_AS_ARGUMENT_EXTRA_OPS
@@ -28,12 +28,7 @@ _function_as_argument_class_initializer(Efl_Class *klass)
28 ); 28 );
29 opsp = &ops; 29 opsp = &ops;
30 30
31#ifdef FUNCTION_AS_ARGUMENT_EXTRA_CLASS_OPS 31 return efl_class_functions_set(klass, opsp, NULL, NULL);
32 EFL_OPS_DEFINE(cops, FUNCTION_AS_ARGUMENT_EXTRA_CLASS_OPS);
33 copsp = &cops;
34#endif
35
36 return efl_class_functions_set(klass, opsp, copsp, NULL);
37} 32}
38 33
39static const Efl_Class_Description _function_as_argument_class_desc = { 34static const Efl_Class_Description _function_as_argument_class_desc = {
diff --git a/src/tests/eolian/data/override_ref.c b/src/tests/eolian/data/override_ref.c
index 45cec764a5..2a6c28b813 100644
--- a/src/tests/eolian/data/override_ref.c
+++ b/src/tests/eolian/data/override_ref.c
@@ -59,7 +59,7 @@ static void __eolian_override_base_z_get(const Eo *obj EINA_UNUSED, Override_Dat
59static Eina_Bool 59static Eina_Bool
60_override_class_initializer(Efl_Class *klass) 60_override_class_initializer(Efl_Class *klass)
61{ 61{
62 const Efl_Object_Ops *opsp = NULL, *copsp = NULL; 62 const Efl_Object_Ops *opsp = NULL;
63 63
64#ifndef OVERRIDE_EXTRA_OPS 64#ifndef OVERRIDE_EXTRA_OPS
65#define OVERRIDE_EXTRA_OPS 65#define OVERRIDE_EXTRA_OPS
@@ -81,12 +81,7 @@ _override_class_initializer(Efl_Class *klass)
81 ); 81 );
82 opsp = &ops; 82 opsp = &ops;
83 83
84#ifdef OVERRIDE_EXTRA_CLASS_OPS 84 return efl_class_functions_set(klass, opsp, NULL, NULL);
85 EFL_OPS_DEFINE(cops, OVERRIDE_EXTRA_CLASS_OPS);
86 copsp = &cops;
87#endif
88
89 return efl_class_functions_set(klass, opsp, copsp, NULL);
90} 85}
91 86
92static const Efl_Class_Description _override_class_desc = { 87static const Efl_Class_Description _override_class_desc = {
diff --git a/src/tests/eolian/data/owning.eo.c b/src/tests/eolian/data/owning.eo.c
index 8712993c9b..bf7e78bf9f 100644
--- a/src/tests/eolian/data/owning.eo.c
+++ b/src/tests/eolian/data/owning.eo.c
@@ -43,7 +43,7 @@ EOAPI EFL_VOID_FUNC_BODYV_FALLBACK(owning_test2, _owning_test2_ownership_fallbac
43static Eina_Bool 43static Eina_Bool
44_owning_class_initializer(Efl_Class *klass) 44_owning_class_initializer(Efl_Class *klass)
45{ 45{
46 const Efl_Object_Ops *opsp = NULL, *copsp = NULL; 46 const Efl_Object_Ops *opsp = NULL;
47 47
48#ifndef OWNING_EXTRA_OPS 48#ifndef OWNING_EXTRA_OPS
49#define OWNING_EXTRA_OPS 49#define OWNING_EXTRA_OPS
@@ -56,12 +56,7 @@ _owning_class_initializer(Efl_Class *klass)
56 ); 56 );
57 opsp = &ops; 57 opsp = &ops;
58 58
59#ifdef OWNING_EXTRA_CLASS_OPS 59 return efl_class_functions_set(klass, opsp, NULL, NULL);
60 EFL_OPS_DEFINE(cops, OWNING_EXTRA_CLASS_OPS);
61 copsp = &cops;
62#endif
63
64 return efl_class_functions_set(klass, opsp, copsp, NULL);
65} 60}
66 61
67static const Efl_Class_Description _owning_class_desc = { 62static const Efl_Class_Description _owning_class_desc = {