diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am index 467ace551a..6eb3b48d2a 100644 --- a/src/Makefile_Edje.am +++ b/src/Makefile_Edje.am @@ -2,9 +2,9 @@ ### Library BUILT_SOURCES += \ - lib/edje/edje.eo.c \ - lib/edje/edje.eo.h \ - lib/edje/edje.eo.legacy.h \ + lib/edje/edje_object.eo.c \ + lib/edje/edje_object.eo.h \ + lib/edje/edje_object.eo.legacy.h \ lib/edje/edje_edit.eo.c \ lib/edje/edje_edit.eo.h \ lib/edje/edje_edit.eo.legacy.h @@ -12,7 +12,7 @@ BUILT_SOURCES += \ edjeeolianfilesdir = $(datadir)/eolian/include/edje-@VMAJ@ edjeeolianfiles_DATA = \ - lib/edje/edje.eo \ + lib/edje/edje_object.eo \ lib/edje/edje_edit.eo EXTRA_DIST += \ @@ -40,9 +40,9 @@ lib/edje/Edje_Legacy.h \ lib/edje/Edje_Edit.h nodist_installed_edjemainheaders_DATA = \ - lib/edje/edje.eo.h \ + lib/edje/edje_object.eo.h \ lib/edje/edje_edit.eo.h \ - lib/edje/edje.eo.legacy.h \ + lib/edje/edje_object.eo.legacy.h \ lib/edje/edje_edit.eo.legacy.h lib_edje_libedje_la_SOURCES = \ diff --git a/src/Makefile_Edje_Cxx.am b/src/Makefile_Edje_Cxx.am index e5a3df12c6..e57a8662c5 100644 --- a/src/Makefile_Edje_Cxx.am +++ b/src/Makefile_Edje_Cxx.am @@ -4,7 +4,7 @@ if HAVE_CXX11 ### Generated headers generated_edje_cxx_bindings = \ -lib/edje/edje.eo.hh \ +lib/edje/edje_object.eo.hh \ lib/edje/edje_edit.eo.hh installed_edjecxxmainheadersdir = $(includedir)/edje-cxx-@VMAJ@/ diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index acc85936c1..f054e399fb 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -37,9 +37,9 @@ BUILT_SOURCES += \ lib/evas/canvas/evas_object.eo.c \ lib/evas/canvas/evas_object.eo.h \ lib/evas/canvas/evas_object.eo.legacy.h \ - lib/evas/canvas/evas.eo.c \ - lib/evas/canvas/evas.eo.h \ - lib/evas/canvas/evas.eo.legacy.h \ + lib/evas/canvas/evas_canvas.eo.c \ + lib/evas/canvas/evas_canvas.eo.h \ + lib/evas/canvas/evas_canvas.eo.legacy.h \ lib/evas/canvas/evas_grid.eo.c \ lib/evas/canvas/evas_grid.eo.h \ lib/evas/canvas/evas_grid.eo.legacy.h \ @@ -93,7 +93,7 @@ evaseolianfiles_DATA = \ lib/evas/canvas/evas_smart_clipped.eo \ lib/evas/canvas/evas_table.eo \ lib/evas/canvas/evas_common_interface.eo \ - lib/evas/canvas/evas.eo \ + lib/evas/canvas/evas_canvas.eo \ lib/evas/canvas/evas_grid.eo \ lib/evas/canvas/evas_image.eo \ lib/evas/canvas/evas_out.eo \ @@ -141,7 +141,7 @@ nodist_installed_evascanvasheaders_DATA = \ lib/evas/canvas/evas_table.eo.h \ lib/evas/canvas/evas_common_interface.eo.h \ lib/evas/canvas/evas_object.eo.h \ - lib/evas/canvas/evas.eo.h \ + lib/evas/canvas/evas_canvas.eo.h \ lib/evas/canvas/evas_grid.eo.h \ lib/evas/canvas/evas_image.eo.h \ lib/evas/canvas/evas_out.eo.h \ @@ -166,7 +166,7 @@ nodist_installed_evascanvasheaders_DATA = \ lib/evas/canvas/evas_image.eo.legacy.h \ lib/evas/canvas/evas_out.eo.legacy.h \ lib/evas/canvas/evas_box.eo.legacy.h \ - lib/evas/canvas/evas.eo.legacy.h \ + lib/evas/canvas/evas_canvas.eo.legacy.h \ lib/evas/canvas/evas_3d_camera.eo.h \ lib/evas/canvas/evas_3d_light.eo.h \ lib/evas/canvas/evas_3d_material.eo.h \ diff --git a/src/Makefile_Evas_Cxx.am b/src/Makefile_Evas_Cxx.am index bcece50634..405d89aaf8 100644 --- a/src/Makefile_Evas_Cxx.am +++ b/src/Makefile_Evas_Cxx.am @@ -16,7 +16,7 @@ lib/evas/canvas/evas_smart_clipped.eo.hh \ lib/evas/canvas/evas_table.eo.hh \ lib/evas/canvas/evas_common_interface.eo.hh \ lib/evas/canvas/evas_object.eo.hh \ -lib/evas/canvas/evas.eo.hh \ +lib/evas/canvas/evas_canvas.eo.hh \ lib/evas/canvas/evas_grid.eo.hh \ lib/evas/canvas/evas_image.eo.hh \ lib/evas/canvas/evas_out.eo.hh \ diff --git a/src/examples/eolian_cxx/colourable.eo b/src/examples/eolian_cxx/colourable.eo index 22bd59e4dc..9a28aac27e 100644 --- a/src/examples/eolian_cxx/colourable.eo +++ b/src/examples/eolian_cxx/colourable.eo @@ -1,4 +1,4 @@ -class Colourable (Eo_Base) +class Colourable (Eo.Base) { /*@ Colourable class. */ legacy_prefix: legacy; diff --git a/src/lib/ecore/ecore_animator.eo b/src/lib/ecore/ecore_animator.eo index a50600b044..e9a3999dda 100644 --- a/src/lib/ecore/ecore_animator.eo +++ b/src/lib/ecore/ecore_animator.eo @@ -1,4 +1,4 @@ -class Ecore_Animator (Eo_Base) +class Ecore.Animator (Eo.Base) { eo_prefix: ecore_animator; constructors { @@ -19,9 +19,9 @@ class Ecore_Animator (Eo_Base) } } implements { - Eo_Base.constructor; - Eo_Base.destructor; - Eo_Base.event_freeze; - Eo_Base.event_thaw; + Eo.Base.constructor; + Eo.Base.destructor; + Eo.Base.event_freeze; + Eo.Base.event_thaw; } -} \ No newline at end of file +} diff --git a/src/lib/ecore/ecore_idle_enterer.eo b/src/lib/ecore/ecore_idle_enterer.eo index 80ea36dc1b..b7f2c1e477 100644 --- a/src/lib/ecore/ecore_idle_enterer.eo +++ b/src/lib/ecore/ecore_idle_enterer.eo @@ -1,4 +1,4 @@ -class Ecore_Idle_Enterer (Eo_Base) +class Ecore.Idle.Enterer (Eo.Base) { eo_prefix: ecore_idle_enterer; constructors { @@ -18,7 +18,7 @@ class Ecore_Idle_Enterer (Eo_Base) } } implements { - Eo_Base.constructor; - Eo_Base.destructor; + Eo.Base.constructor; + Eo.Base.destructor; } -} \ No newline at end of file +} diff --git a/src/lib/ecore/ecore_idle_exiter.eo b/src/lib/ecore/ecore_idle_exiter.eo index b463b7ea14..c9eaf39169 100644 --- a/src/lib/ecore/ecore_idle_exiter.eo +++ b/src/lib/ecore/ecore_idle_exiter.eo @@ -1,4 +1,4 @@ -class Ecore_Idle_Exiter (Eo_Base) +class Ecore.Idle.Exiter (Eo.Base) { eo_prefix: ecore_idle_exiter; constructors { @@ -11,7 +11,7 @@ class Ecore_Idle_Exiter (Eo_Base) } } implements { - Eo_Base.constructor; - Eo_Base.destructor; + Eo.Base.constructor; + Eo.Base.destructor; } -} \ No newline at end of file +} diff --git a/src/lib/ecore/ecore_idler.eo b/src/lib/ecore/ecore_idler.eo index 87f85a27d1..175cf1f5a6 100644 --- a/src/lib/ecore/ecore_idler.eo +++ b/src/lib/ecore/ecore_idler.eo @@ -1,4 +1,4 @@ -class Ecore_Idler (Eo_Base) +class Ecore.Idler (Eo.Base) { eo_prefix: ecore_idler; constructors { @@ -11,7 +11,7 @@ class Ecore_Idler (Eo_Base) } } implements { - Eo_Base.constructor; - Eo_Base.destructor; + Eo.Base.constructor; + Eo.Base.destructor; } -} \ No newline at end of file +} diff --git a/src/lib/ecore/ecore_job.eo b/src/lib/ecore/ecore_job.eo index cf4a120513..21ed646b1f 100644 --- a/src/lib/ecore/ecore_job.eo +++ b/src/lib/ecore/ecore_job.eo @@ -1,4 +1,4 @@ -class Ecore_Job (Eo_Base) +class Ecore.Job (Eo.Base) { eo_prefix: ecore_job; constructors { @@ -11,7 +11,7 @@ class Ecore_Job (Eo_Base) } } implements { - Eo_Base.constructor; - Eo_Base.destructor; + Eo.Base.constructor; + Eo.Base.destructor; } -} \ No newline at end of file +} diff --git a/src/lib/ecore/ecore_parent.eo b/src/lib/ecore/ecore_parent.eo index 0809b514ac..6ea1a76f93 100644 --- a/src/lib/ecore/ecore_parent.eo +++ b/src/lib/ecore/ecore_parent.eo @@ -1,4 +1,4 @@ -class Ecore_Parent (Eo_Base) +class Ecore.Parent (Eo.Base) { data: null; -} \ No newline at end of file +} diff --git a/src/lib/ecore/ecore_poll.eo b/src/lib/ecore/ecore_poll.eo index 003a0c0bea..266bd4e5d0 100644 --- a/src/lib/ecore/ecore_poll.eo +++ b/src/lib/ecore/ecore_poll.eo @@ -1,4 +1,4 @@ -class Ecore_Poller (Eo_Base) +class Ecore.Poller (Eo.Base) { eo_prefix: ecore_poller; constructors { @@ -38,7 +38,7 @@ class Ecore_Poller (Eo_Base) } } implements { - Eo_Base.constructor; - Eo_Base.destructor; + Eo.Base.constructor; + Eo.Base.destructor; } -} \ No newline at end of file +} diff --git a/src/lib/ecore/ecore_timer.eo b/src/lib/ecore/ecore_timer.eo index f55880aeb1..5e7f20aad1 100644 --- a/src/lib/ecore/ecore_timer.eo +++ b/src/lib/ecore/ecore_timer.eo @@ -1,4 +1,4 @@ -class Ecore_Timer (Eo_Base) +class Ecore.Timer (Eo.Base) { /*@ Timers are objects that will call a given callback at some point * in the future. They may also optionall repeat themselves if the @@ -58,10 +58,10 @@ class Ecore_Timer (Eo_Base) } } implements { - Eo_Base.constructor; - Eo_Base.destructor; - Eo_Base.event_freeze; - Eo_Base.event_freeze_count.get; - Eo_Base.event_thaw; + Eo.Base.constructor; + Eo.Base.destructor; + Eo.Base.event_freeze; + Eo.Base.event_freeze_count.get; + Eo.Base.event_thaw; } } diff --git a/src/lib/ecore_audio/ecore_audio.eo b/src/lib/ecore_audio/ecore_audio.eo index 3c00e9f0e9..fcc3289d50 100644 --- a/src/lib/ecore_audio/ecore_audio.eo +++ b/src/lib/ecore_audio/ecore_audio.eo @@ -1,4 +1,4 @@ -class Ecore_Audio (Eo_Base) +class Ecore_Audio (Eo.Base) { legacy_prefix: null; eo_prefix: ecore_audio_obj; @@ -115,7 +115,7 @@ class Ecore_Audio (Eo_Base) } } implements { - Eo_Base.constructor; + Eo.Base.constructor; virtual.source.get; virtual.source.set; virtual.format.get; diff --git a/src/lib/ecore_audio/ecore_audio_in.eo b/src/lib/ecore_audio/ecore_audio_in.eo index f5fe573925..71e774da1e 100644 --- a/src/lib/ecore_audio/ecore_audio_in.eo +++ b/src/lib/ecore_audio/ecore_audio_in.eo @@ -173,8 +173,8 @@ class Ecore_Audio_In (Ecore_Audio) } } implements { - Eo_Base.constructor; - Eo_Base.destructor; + Eo.Base.constructor; + Eo.Base.destructor; Ecore_Audio.vio_set; virtual.preloaded.get; virtual.preloaded.set; diff --git a/src/lib/ecore_audio/ecore_audio_in_sndfile.eo b/src/lib/ecore_audio/ecore_audio_in_sndfile.eo index db337b9271..e64237b457 100644 --- a/src/lib/ecore_audio/ecore_audio_in_sndfile.eo +++ b/src/lib/ecore_audio/ecore_audio_in_sndfile.eo @@ -2,8 +2,8 @@ class Ecore_Audio_In_Sndfile (Ecore_Audio_In) { eo_prefix: ecore_audio_obj_in_sndfile; implements { - Eo_Base.constructor; - Eo_Base.destructor; + Eo.Base.constructor; + Eo.Base.destructor; Ecore_Audio.source.set; Ecore_Audio.source.get; Ecore_Audio.format.set; diff --git a/src/lib/ecore_audio/ecore_audio_in_tone.eo b/src/lib/ecore_audio/ecore_audio_in_tone.eo index 496aef2a4a..e0cfebfb68 100644 --- a/src/lib/ecore_audio/ecore_audio_in_tone.eo +++ b/src/lib/ecore_audio/ecore_audio_in_tone.eo @@ -2,9 +2,9 @@ class Ecore_Audio_In_Tone (Ecore_Audio_In) { eo_prefix: ecore_audio_obj_in_tone; implements { - Eo_Base.constructor; - Eo_Base.key_data_set; - Eo_Base.key_data_get; + Eo.Base.constructor; + Eo.Base.key_data_set; + Eo.Base.key_data_get; Ecore_Audio_In.length.set; Ecore_Audio_In.seek; Ecore_Audio_In.read_internal; diff --git a/src/lib/ecore_audio/ecore_audio_out.eo b/src/lib/ecore_audio/ecore_audio_out.eo index bfb8045202..f8621e4903 100644 --- a/src/lib/ecore_audio/ecore_audio_out.eo +++ b/src/lib/ecore_audio/ecore_audio_out.eo @@ -33,8 +33,8 @@ class Ecore_Audio_Out (Ecore_Audio) } } implements { - Eo_Base.constructor; - Eo_Base.destructor; + Eo.Base.constructor; + Eo.Base.destructor; Ecore_Audio.vio_set; } } diff --git a/src/lib/ecore_audio/ecore_audio_out_pulse.eo b/src/lib/ecore_audio/ecore_audio_out_pulse.eo index a542d6143f..22375c9761 100644 --- a/src/lib/ecore_audio/ecore_audio_out_pulse.eo +++ b/src/lib/ecore_audio/ecore_audio_out_pulse.eo @@ -2,8 +2,8 @@ class Ecore_Audio_Out_Pulse (Ecore_Audio_Out) { eo_prefix: ecore_audio_obj_out_pulse; implements { - Eo_Base.constructor; - Eo_Base.destructor; + Eo.Base.constructor; + Eo.Base.destructor; Ecore_Audio.volume.set; Ecore_Audio_Out.input_attach; Ecore_Audio_Out.input_detach; diff --git a/src/lib/ecore_audio/ecore_audio_out_sndfile.eo b/src/lib/ecore_audio/ecore_audio_out_sndfile.eo index 9e7553d5f9..5f7efc52a6 100644 --- a/src/lib/ecore_audio/ecore_audio_out_sndfile.eo +++ b/src/lib/ecore_audio/ecore_audio_out_sndfile.eo @@ -2,8 +2,8 @@ class Ecore_Audio_Out_Sndfile (Ecore_Audio_Out) { eo_prefix: ecore_audio_obj_out_sndfile; implements { - Eo_Base.constructor; - Eo_Base.destructor; + Eo.Base.constructor; + Eo.Base.destructor; Ecore_Audio.source.get; Ecore_Audio.source.set; Ecore_Audio.format.get; diff --git a/src/lib/edje/Edje_Eo.h b/src/lib/edje/Edje_Eo.h index fec56d9e9a..cee58c6733 100644 --- a/src/lib/edje/Edje_Eo.h +++ b/src/lib/edje/Edje_Eo.h @@ -1,2 +1,2 @@ -#include "edje.eo.h" -#include "edje_edit.eo.h" \ No newline at end of file +#include "edje_object.eo.h" +#include "edje_edit.eo.h" diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h index aadb1d8489..cb8268f1f6 100644 --- a/src/lib/edje/Edje_Legacy.h +++ b/src/lib/edje/Edje_Legacy.h @@ -157,5 +157,5 @@ EAPI void edje_extern_object_max_size_set (Evas_Object *obj, Evas_Coord */ EAPI void edje_extern_object_aspect_set (Evas_Object *obj, Edje_Aspect_Control aspect, Evas_Coord aw, Evas_Coord ah); -#include "edje.eo.legacy.h" +#include "edje_object.eo.legacy.h" #include "edje_edit.eo.legacy.h" diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c index 244bb667e1..bac61270d7 100644 --- a/src/lib/edje/edje_edit.c +++ b/src/lib/edje/edje_edit.c @@ -39,9 +39,9 @@ EAPI Eina_Error EDJE_EDIT_ERROR_GROUP_DOES_NOT_EXIST = 0; /* Get ed(Edje*) from obj(Evas_Object*) */ #define GET_ED_OR_RETURN(RET) \ Edje *ed; \ - if (!eo_isa(obj, EDJE_CLASS)) \ + if (!eo_isa(obj, EDJE_OBJECT_CLASS)) \ return RET; \ - ed = eo_data_scope_get(obj, EDJE_CLASS); + ed = eo_data_scope_get(obj, EDJE_OBJECT_CLASS); /* Get rp(Edje_Real_Part*) from obj(Evas_Object*) and part(char*) */ #define GET_RP_OR_RETURN(RET) \ @@ -167,7 +167,7 @@ _edje_edit_program_script_free(Program_Script *ps) } EOLIAN static Eina_Bool -_edje_edit_edje_file_set(Eo *obj, Edje_Edit *eed, const char *file, const char *group) +_edje_edit_edje_object_file_set(Eo *obj, Edje_Edit *eed, const char *file, const char *group) { Eina_Bool ret; Eet_File *ef; @@ -239,7 +239,7 @@ edje_edit_object_add(Evas *evas) EOLIAN static void _edje_edit_eo_base_constructor(Eo *obj, Edje_Edit *eed) { - eed->base = eo_data_ref(obj, EDJE_CLASS); + eed->base = eo_data_ref(obj, EDJE_OBJECT_CLASS); eo_do_super(obj, MY_CLASS, eo_constructor()); } @@ -982,7 +982,7 @@ _delete_play_actions(Evas_Object *obj, const char* name, int action_type, Eet_Fi continue; eeo = edje_edit_object_add(ed->base->evas); - if (!eo_isa(eeo, EDJE_CLASS)) + if (!eo_isa(eeo, EDJE_OBJECT_CLASS)) return EINA_FALSE; if (!edje_object_file_set(eeo, ed->file->path, pce->entry)) @@ -998,7 +998,7 @@ _delete_play_actions(Evas_Object *obj, const char* name, int action_type, Eet_Fi continue; } - eed = eo_data_scope_get(eeo, EDJE_CLASS); + eed = eo_data_scope_get(eeo, EDJE_OBJECT_CLASS); for (i = 0; i < eed->collection->patterns.table_programs_size; i++) { Edje_Program *program; diff --git a/src/lib/edje/edje_edit.eo b/src/lib/edje/edje_edit.eo index 8dcdde0418..287d828401 100644 --- a/src/lib/edje/edje_edit.eo +++ b/src/lib/edje/edje_edit.eo @@ -1,10 +1,10 @@ -class Edje_Edit (Edje) +class Edje.Edit (Edje.Object) { data: Edje_Edit; implements { - Eo_Base.constructor; - Eo_Base.destructor; - Evas_Object_Smart.del; - Edje.file.set; + Eo.Base.constructor; + Eo.Base.destructor; + Evas.Object_Smart.del; + Edje.Object.file.set; } } diff --git a/src/lib/edje/edje_external.c b/src/lib/edje/edje_external.c index 3f7c243aab..a23444eb1a 100644 --- a/src/lib/edje/edje_external.c +++ b/src/lib/edje/edje_external.c @@ -24,7 +24,7 @@ edje_external_param_type_str(Edje_External_Param_Type type) } EOLIAN Evas_Object* -_edje_part_external_object_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_external_object_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Edje_Real_Part *rp; @@ -52,7 +52,7 @@ _edje_part_external_object_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) } EOLIAN Eina_Bool -_edje_part_external_param_set(Eo *obj, Edje *ed, const char *part, const Edje_External_Param *param) +_edje_object_part_external_param_set(Eo *obj, Edje *ed, const char *part, const Edje_External_Param *param) { Edje_Real_Part *rp; @@ -73,7 +73,7 @@ _edje_part_external_param_set(Eo *obj, Edje *ed, const char *part, const Edje_Ex } EOLIAN Eina_Bool -_edje_part_external_param_get(Eo *obj, Edje *ed, const char *part, Edje_External_Param *param) +_edje_object_part_external_param_get(Eo *obj, Edje *ed, const char *part, Edje_External_Param *param) { Edje_Real_Part *rp; @@ -92,7 +92,7 @@ _edje_part_external_param_get(Eo *obj, Edje *ed, const char *part, Edje_External } EOLIAN Evas_Object* -_edje_part_external_content_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, const char *content) +_edje_object_part_external_content_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, const char *content) { Edje_Real_Part *rp; @@ -113,7 +113,7 @@ _edje_part_external_content_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, } EOLIAN Edje_External_Param_Type -_edje_part_external_param_type_get(Eo *obj, Edje *ed, const char *part, const char *param) +_edje_object_part_external_param_type_get(Eo *obj, Edje *ed, const char *part, const char *param) { Edje_Real_Part *rp; Edje_External_Type *type; diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c index a39a91ad9f..5a96f966e0 100644 --- a/src/lib/edje/edje_load.c +++ b/src/lib/edje/edje_load.c @@ -73,14 +73,14 @@ static int _sort_defined_boxes(const void *a, const void *b); /************************** API Routines **************************/ EOLIAN void -_edje_file_get(Eo *obj EINA_UNUSED, Edje *ed, const char **file, const char **group) +_edje_object_file_get(Eo *obj EINA_UNUSED, Edje *ed, const char **file, const char **group) { if (file) *file = ed->path; if (group) *group = ed->group; } EOLIAN Edje_Load_Error -_edje_load_error_get(Eo *obj EINA_UNUSED, Edje *ed) +_edje_object_load_error_get(Eo *obj EINA_UNUSED, Edje *ed) { return ed->load_error; } diff --git a/src/lib/edje/edje_message_queue.c b/src/lib/edje/edje_message_queue.c index b90f12df73..524ed75f7a 100644 --- a/src/lib/edje/edje_message_queue.c +++ b/src/lib/edje/edje_message_queue.c @@ -32,19 +32,19 @@ _edje_object_message_popornot_send(Evas_Object *obj, Edje_Message_Type type, int } EOLIAN void -_edje_message_send(Eo *obj, Edje *_pd EINA_UNUSED, Edje_Message_Type type, int id, void *msg) +_edje_object_message_send(Eo *obj, Edje *_pd EINA_UNUSED, Edje_Message_Type type, int id, void *msg) { _edje_object_message_popornot_send(obj, type, id, msg, EINA_FALSE); } EOLIAN void -_edje_message_handler_set(Eo *obj EINA_UNUSED, Edje *ed, Edje_Message_Handler_Cb func, void *data) +_edje_object_message_handler_set(Eo *obj EINA_UNUSED, Edje *ed, Edje_Message_Handler_Cb func, void *data) { _edje_message_cb_set(ed, func, data); } EOLIAN void -_edje_message_signal_process(Eo *obj EINA_UNUSED, Edje *ed) +_edje_object_message_signal_process(Eo *obj EINA_UNUSED, Edje *ed) { Eina_List *l, *ln, *tmpq = NULL; Edje *lookup_ed; @@ -857,4 +857,4 @@ _edje_message_del(Edje *ed) } if (ed->message.num <= 0) return; } -} \ No newline at end of file +} diff --git a/src/lib/edje/edje.eo b/src/lib/edje/edje_object.eo similarity index 99% rename from src/lib/edje/edje.eo rename to src/lib/edje/edje_object.eo index b45b683cad..972c979eb0 100644 --- a/src/lib/edje/edje.eo +++ b/src/lib/edje/edje_object.eo @@ -1,4 +1,4 @@ -class Edje (Evas_Smart_Clipped) +class Edje.Object (Evas.Smart_Clipped) { legacy_prefix: edje_object; eo_prefix: edje_obj; @@ -2493,15 +2493,15 @@ class Edje (Evas_Smart_Clipped) } } implements { - Eo_Base.constructor; - Eo_Base.destructor; - Eo_Base.dbg_info_get; - Evas_Object_Smart.hide; - Evas_Object_Smart.calculate; - Evas_Object_Smart.show; - Evas_Object_Smart.move; - Evas_Object_Smart.add; - Evas_Object_Smart.del; - Evas_Object_Smart.resize; + Eo.Base.constructor; + Eo.Base.destructor; + Eo.Base.dbg_info_get; + Evas.Object_Smart.hide; + Evas.Object_Smart.calculate; + Evas.Object_Smart.show; + Evas.Object_Smart.move; + Evas.Object_Smart.add; + Evas.Object_Smart.del; + Evas.Object_Smart.resize; } } diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c index fbac564b7d..356666e76d 100644 --- a/src/lib/edje/edje_program.c +++ b/src/lib/edje/edje_program.c @@ -210,7 +210,7 @@ edje_object_propagate_callback_add(Evas_Object *obj, void (*func) (void *data, E } EOLIAN void -_edje_signal_callback_add(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source, Edje_Signal_Cb func, void *data) +_edje_object_signal_callback_add(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source, Edje_Signal_Cb func, void *data) { if ((!emission) || (!source) || (!func)) return; @@ -241,7 +241,7 @@ edje_object_signal_callback_del(Evas_Object *obj, const char *emission, const ch } EOLIAN void* -_edje_signal_callback_del(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source, Edje_Signal_Cb func, void *data) +_edje_object_signal_callback_del(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source, Edje_Signal_Cb func, void *data) { if ((!emission) || (!source) || (!func)) return NULL; if (!ed) return NULL; @@ -270,7 +270,7 @@ edje_object_signal_callback_del_full(Evas_Object *obj, const char *emission, con } EOLIAN void -_edje_signal_emit(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source) +_edje_object_signal_emit(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const char *source) { if ((!emission) || (!source)) return; if (!ed) return; @@ -280,7 +280,7 @@ _edje_signal_emit(Eo *obj EINA_UNUSED, Edje *ed, const char *emission, const cha /* FIXDOC: Verify/Expand */ EOLIAN void -_edje_play_set(Eo *obj EINA_UNUSED, Edje *ed, Eina_Bool play) +_edje_object_play_set(Eo *obj EINA_UNUSED, Edje *ed, Eina_Bool play) { double t; Eina_List *l; @@ -317,7 +317,7 @@ _edje_play_set(Eo *obj EINA_UNUSED, Edje *ed, Eina_Bool play) } EOLIAN Eina_Bool -_edje_play_get(Eo *obj EINA_UNUSED, Edje *ed) +_edje_object_play_get(Eo *obj EINA_UNUSED, Edje *ed) { if (!ed) return EINA_FALSE; if (ed->delete_me) return EINA_FALSE; @@ -328,7 +328,7 @@ _edje_play_get(Eo *obj EINA_UNUSED, Edje *ed) /* FIXDOC: Verify/Expand */ EOLIAN void -_edje_animation_set(Eo *obj, Edje *ed, Eina_Bool on) +_edje_object_animation_set(Eo *obj, Edje *ed, Eina_Bool on) { Eina_List *l; unsigned int i; @@ -386,7 +386,7 @@ break_prog: } EOLIAN Eina_Bool -_edje_animation_get(Eo *obj EINA_UNUSED, Edje *ed) +_edje_object_animation_get(Eo *obj EINA_UNUSED, Edje *ed) { if (!ed) return EINA_FALSE; if (ed->delete_me) return EINA_FALSE; diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c index 171be539a7..6be14de497 100644 --- a/src/lib/edje/edje_smart.c +++ b/src/lib/edje/edje_smart.c @@ -6,7 +6,7 @@ # undef MY_CLASS #endif -#define MY_CLASS EDJE_CLASS +#define MY_CLASS EDJE_OBJECT_CLASS #define MY_CLASS_NAME "Edje" #define MY_CLASS_NAME_LEGACY "edje" @@ -25,7 +25,7 @@ edje_object_add(Evas *evas) } EOLIAN static void -_edje_eo_base_constructor(Eo *obj, Edje *ed) +_edje_object_eo_base_constructor(Eo *obj, Edje *ed) { ed->base = eo_data_ref(obj, EVAS_SMART_CLIPPED_CLASS); @@ -35,14 +35,14 @@ _edje_eo_base_constructor(Eo *obj, Edje *ed) } EOLIAN static void -_edje_eo_base_destructor(Eo *obj, Edje *class_data EINA_UNUSED) +_edje_object_eo_base_destructor(Eo *obj, Edje *class_data EINA_UNUSED) { eo_do_super(obj, MY_CLASS, eo_destructor()); eo_data_unref(obj, class_data); } EOLIAN static void -_edje_eo_base_dbg_info_get(Eo *eo_obj, Edje *_pd EINA_UNUSED, Eo_Dbg_Info *root) +_edje_object_eo_base_dbg_info_get(Eo *eo_obj, Edje *_pd EINA_UNUSED, Eo_Dbg_Info *root) { eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root)); Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); @@ -73,7 +73,7 @@ _edje_color_class_free(void *data) /* Private Routines */ EOLIAN static void -_edje_evas_object_smart_add(Eo *obj, Edje *ed) +_edje_object_evas_object_smart_add(Eo *obj, Edje *ed) { Evas *tev = evas_object_evas_get(obj); @@ -115,7 +115,7 @@ _edje_evas_object_smart_add(Eo *obj, Edje *ed) } EOLIAN static void -_edje_evas_object_smart_del(Eo *obj, Edje *ed) +_edje_object_evas_object_smart_del(Eo *obj, Edje *ed) { _edje_block_violate(ed); ed->delete_me = 1; @@ -139,7 +139,7 @@ _edje_evas_object_smart_del(Eo *obj, Edje *ed) } EOLIAN static void -_edje_evas_object_smart_move(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord x, Evas_Coord y) +_edje_object_evas_object_smart_move(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord x, Evas_Coord y) { unsigned int i; @@ -234,7 +234,7 @@ _edje_limit_get(Edje *ed, Edje_Limit **limits, unsigned int length, Evas_Coord s } EOLIAN static void -_edje_evas_object_smart_resize(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord w, Evas_Coord h) +_edje_object_evas_object_smart_resize(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord w, Evas_Coord h) { if ((w == ed->w) && (h == ed->h)) return; if (ed->collection) @@ -270,7 +270,7 @@ _edje_evas_object_smart_resize(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord w, Evas } EOLIAN static void -_edje_evas_object_smart_show(Eo *obj, Edje *ed) +_edje_object_evas_object_smart_show(Eo *obj, Edje *ed) { Eina_List *l; Edje *edg; @@ -303,7 +303,7 @@ _edje_evas_object_smart_show(Eo *obj, Edje *ed) } EOLIAN static void -_edje_evas_object_smart_hide(Eo *obj, Edje *ed) +_edje_object_evas_object_smart_hide(Eo *obj, Edje *ed) { Eina_List *l; Edje *edg; @@ -326,13 +326,13 @@ _edje_evas_object_smart_hide(Eo *obj, Edje *ed) } EOLIAN static void -_edje_evas_object_smart_calculate(Eo *obj EINA_UNUSED, Edje *ed) +_edje_object_evas_object_smart_calculate(Eo *obj EINA_UNUSED, Edje *ed) { _edje_recalc_do(ed); } EOLIAN static Eina_Bool -_edje_file_set(Eo *obj, Edje *_pd EINA_UNUSED, const char *file, const char *group) +_edje_object_file_set(Eo *obj, Edje *_pd EINA_UNUSED, const char *file, const char *group) { Eina_Bool ret; Eina_File *f = NULL; @@ -365,7 +365,7 @@ _edje_file_set(Eo *obj, Edje *_pd EINA_UNUSED, const char *file, const char *gro } EOLIAN static Eina_Bool -_edje_mmap_set(Eo *obj, Edje *_pd EINA_UNUSED, const Eina_File *f, const char *group) +_edje_object_mmap_set(Eo *obj, Edje *_pd EINA_UNUSED, const Eina_File *f, const char *group) { Eina_Bool ret; Eina_Array *nested; @@ -383,4 +383,4 @@ _edje_mmap_set(Eo *obj, Edje *_pd EINA_UNUSED, const Eina_File *f, const char *g return ret; } -#include "edje.eo.c" +#include "edje_object.eo.c" diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c index d81dfa8775..450cdfa8c7 100644 --- a/src/lib/edje/edje_util.c +++ b/src/lib/edje/edje_util.c @@ -350,7 +350,7 @@ edje_password_show_last_timeout_set(double password_show_last_timeout) } EOLIAN Eina_Bool -_edje_scale_set(Eo *obj, Edje *ed, double scale) +_edje_object_scale_set(Eo *obj, Edje *ed, double scale) { Edje *ged; Evas_Object *o; @@ -378,13 +378,13 @@ _edje_scale_set(Eo *obj, Edje *ed, double scale) } EOLIAN double -_edje_scale_get(Eo *obj EINA_UNUSED, Edje *ed) +_edje_object_scale_get(Eo *obj EINA_UNUSED, Edje *ed) { return TO_DOUBLE(ed->scale); } EOLIAN Eina_Bool -_edje_mirrored_get(Eo *obj EINA_UNUSED, Edje *ed) +_edje_object_mirrored_get(Eo *obj EINA_UNUSED, Edje *ed) { return ed->is_rtl; } @@ -400,7 +400,7 @@ _edje_object_orientation_inform(Evas_Object *obj) } EOLIAN void -_edje_mirrored_set(Eo *obj, Edje *ed, Eina_Bool rtl) +_edje_object_mirrored_set(Eo *obj, Edje *ed, Eina_Bool rtl) { unsigned int i; @@ -428,7 +428,7 @@ _edje_mirrored_set(Eo *obj, Edje *ed, Eina_Bool rtl) } EOLIAN const char* -_edje_data_get(Eo *obj EINA_UNUSED, Edje *ed, const char *key) +_edje_object_data_get(Eo *obj EINA_UNUSED, Edje *ed, const char *key) { if ((!ed) || (!key)) return NULL; @@ -439,7 +439,7 @@ _edje_data_get(Eo *obj EINA_UNUSED, Edje *ed, const char *key) } EOLIAN int -_edje_freeze(Eo *obj EINA_UNUSED, Edje *ed) +_edje_object_freeze(Eo *obj EINA_UNUSED, Edje *ed) { unsigned int i; @@ -457,7 +457,7 @@ _edje_freeze(Eo *obj EINA_UNUSED, Edje *ed) } EOLIAN int -_edje_thaw(Eo *obj EINA_UNUSED, Edje *ed) +_edje_object_thaw(Eo *obj EINA_UNUSED, Edje *ed) { unsigned int i; @@ -635,7 +635,7 @@ _edje_color_class_list_foreach(const Eina_Hash *hash EINA_UNUSED, const void *ke } EOLIAN Eina_Bool -_edje_color_class_set(Eo *obj EINA_UNUSED, Edje *ed, const char *color_class, int r, int g, int b, int a, int r2, int g2, int b2, int a2, int r3, int g3, int b3, int a3) +_edje_object_color_class_set(Eo *obj EINA_UNUSED, Edje *ed, const char *color_class, int r, int g, int b, int a, int r2, int g2, int b2, int a2, int r3, int g3, int b3, int a3) { Edje_Color_Class *cc; unsigned int i; @@ -715,7 +715,7 @@ update_color_class: } EOLIAN Eina_Bool -_edje_color_class_get(Eo *obj EINA_UNUSED, Edje *ed, const char *color_class, int *r, int *g, int *b, int *a, int *r2, int *g2, int *b2, int *a2, int *r3, int *g3, int *b3, int *a3) +_edje_object_color_class_get(Eo *obj EINA_UNUSED, Edje *ed, const char *color_class, int *r, int *g, int *b, int *a, int *r2, int *g2, int *b2, int *a2, int *r3, int *g3, int *b3, int *a3) { Edje_Color_Class *cc = _edje_color_class_find(ed, color_class); @@ -894,7 +894,7 @@ _edje_text_class_list_foreach(const Eina_Hash *hash EINA_UNUSED, const void *key } EOLIAN Eina_Bool -_edje_text_class_set(Eo *obj EINA_UNUSED, Edje *ed, const char *text_class, const char *font, Evas_Font_Size size) +_edje_object_text_class_set(Eo *obj EINA_UNUSED, Edje *ed, const char *text_class, const char *font, Evas_Font_Size size) { Eina_List *l; Edje_Text_Class *tc = NULL; @@ -965,7 +965,7 @@ _edje_text_class_set(Eo *obj EINA_UNUSED, Edje *ed, const char *text_class, cons } EOLIAN Eina_Bool -_edje_part_exists(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_exists(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Edje_Real_Part *rp; @@ -977,7 +977,7 @@ _edje_part_exists(Eo *obj EINA_UNUSED, Edje *ed, const char *part) } EOLIAN const Evas_Object* -_edje_part_object_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_object_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Edje_Real_Part *rp; @@ -993,7 +993,7 @@ _edje_part_object_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) } EOLIAN Eina_Bool -_edje_part_geometry_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) +_edje_object_part_geometry_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) { Edje_Real_Part *rp; @@ -1027,7 +1027,7 @@ _edje_part_geometry_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Co } EOLIAN void -_edje_item_provider_set(Eo *obj EINA_UNUSED, Edje *ed, Edje_Item_Provider_Cb func, void *data) +_edje_object_item_provider_set(Eo *obj EINA_UNUSED, Edje *ed, Edje_Item_Provider_Cb func, void *data) { ed->item_provider.func = func; ed->item_provider.data = data; @@ -1035,7 +1035,7 @@ _edje_item_provider_set(Eo *obj EINA_UNUSED, Edje *ed, Edje_Item_Provider_Cb fun /* FIXDOC: New Function */ EOLIAN void -_edje_text_change_cb_set(Eo *obj EINA_UNUSED, Edje *ed, Edje_Text_Change_Cb func, void *data) +_edje_object_text_change_cb_set(Eo *obj EINA_UNUSED, Edje *ed, Edje_Text_Change_Cb func, void *data) { unsigned int i; @@ -1124,7 +1124,7 @@ _edje_object_part_text_raw_append(Edje *ed, Evas_Object *obj, Edje_Real_Part *rp } EOLIAN void -_edje_part_text_style_user_push(Eo *obj EINA_UNUSED, Edje *ed, const char *part, const char *style) +_edje_object_part_text_style_user_push(Eo *obj EINA_UNUSED, Edje *ed, const char *part, const char *style) { Edje_Real_Part *rp; Evas_Textblock_Style *ts; @@ -1146,7 +1146,7 @@ _edje_part_text_style_user_push(Eo *obj EINA_UNUSED, Edje *ed, const char *part, } EOLIAN void -_edje_part_text_style_user_pop(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_text_style_user_pop(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Edje_Real_Part *rp; @@ -1164,7 +1164,7 @@ _edje_part_text_style_user_pop(Eo *obj EINA_UNUSED, Edje *ed, const char *part) } EOLIAN const char* -_edje_part_text_style_user_peek(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_text_style_user_peek(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Edje_Real_Part *rp; const Evas_Textblock_Style *ts; @@ -1208,7 +1208,7 @@ _edje_user_define_string(Edje *ed, const char *part, const char *raw_text) } EOLIAN Eina_Bool -_edje_part_text_set(Eo *obj, Edje *ed, const char *part, const char *text) +_edje_object_part_text_set(Eo *obj, Edje *ed, const char *part, const char *text) { Edje_Real_Part *rp; @@ -1227,7 +1227,7 @@ _edje_part_text_set(Eo *obj, Edje *ed, const char *part, const char *text) } EOLIAN const char* -_edje_part_text_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_text_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Edje_Real_Part *rp; @@ -1260,7 +1260,7 @@ _edje_part_text_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) } EOLIAN Eina_Bool -_edje_part_text_escaped_set(Eo *obj, Edje *ed, const char *part, const char *text) +_edje_object_part_text_escaped_set(Eo *obj, Edje *ed, const char *part, const char *text) { Edje_Real_Part *rp; Eina_Bool int_ret; @@ -1443,7 +1443,7 @@ _edje_text_unescape(const char *text) } EOLIAN Eina_Bool -_edje_part_text_unescaped_set(Eo *obj, Edje *ed, const char *part, const char *text_to_escape) +_edje_object_part_text_unescaped_set(Eo *obj, Edje *ed, const char *part, const char *text_to_escape) { Edje_Real_Part *rp; Eina_Bool int_ret = EINA_FALSE; @@ -1468,7 +1468,7 @@ _edje_part_text_unescaped_set(Eo *obj, Edje *ed, const char *part, const char *t } EOLIAN char* -_edje_part_text_unescaped_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_text_unescaped_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Edje_Real_Part *rp; @@ -1503,7 +1503,7 @@ _edje_part_text_unescaped_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) } EOLIAN const char* -_edje_part_text_selection_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_text_selection_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Edje_Real_Part *rp; @@ -1517,7 +1517,7 @@ _edje_part_text_selection_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) } EOLIAN void -_edje_part_text_select_none(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_text_select_none(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Edje_Real_Part *rp; @@ -1529,7 +1529,7 @@ _edje_part_text_select_none(Eo *obj EINA_UNUSED, Edje *ed, const char *part) } EOLIAN void -_edje_part_text_select_all(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_text_select_all(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Edje_Real_Part *rp; @@ -1541,7 +1541,7 @@ _edje_part_text_select_all(Eo *obj EINA_UNUSED, Edje *ed, const char *part) } EOLIAN void -_edje_part_text_insert(Eo *obj, Edje *ed, const char *part, const char *text) +_edje_object_part_text_insert(Eo *obj, Edje *ed, const char *part, const char *text) { Edje_Real_Part *rp; @@ -1563,7 +1563,7 @@ _edje_part_text_insert(Eo *obj, Edje *ed, const char *part, const char *text) } EOLIAN void -_edje_part_text_append(Eo *obj, Edje *ed, const char *part, const char *text) +_edje_object_part_text_append(Eo *obj, Edje *ed, const char *part, const char *text) { Edje_Real_Part *rp; @@ -1584,7 +1584,7 @@ _edje_part_text_append(Eo *obj, Edje *ed, const char *part, const char *text) } EOLIAN const Eina_List* -_edje_part_text_anchor_list_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_text_anchor_list_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Edje_Real_Part *rp; @@ -1598,7 +1598,7 @@ _edje_part_text_anchor_list_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) } EOLIAN const Eina_List* -_edje_part_text_anchor_geometry_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, const char *anchor) +_edje_object_part_text_anchor_geometry_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, const char *anchor) { Edje_Real_Part *rp; @@ -1612,7 +1612,7 @@ _edje_part_text_anchor_geometry_get(Eo *obj EINA_UNUSED, Edje *ed, const char *p } EOLIAN const Eina_List* -_edje_part_text_item_list_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_text_item_list_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Edje_Real_Part *rp; @@ -1626,7 +1626,7 @@ _edje_part_text_item_list_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) } EOLIAN Eina_Bool -_edje_part_text_item_geometry_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, const char *item, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) +_edje_object_part_text_item_geometry_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, const char *item, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) { Edje_Real_Part *rp; @@ -1642,7 +1642,7 @@ _edje_part_text_item_geometry_get(Eo *obj EINA_UNUSED, Edje *ed, const char *par } EOLIAN void -_edje_part_text_cursor_geometry_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) +_edje_object_part_text_cursor_geometry_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) { Edje_Real_Part *rp; @@ -1662,7 +1662,7 @@ _edje_part_text_cursor_geometry_get(Eo *obj EINA_UNUSED, Edje *ed, const char *p } EOLIAN void -_edje_part_text_user_insert(Eo *obj EINA_UNUSED, Edje *ed, const char *part, const char *text) +_edje_object_part_text_user_insert(Eo *obj EINA_UNUSED, Edje *ed, const char *part, const char *text) { Edje_Real_Part *rp; @@ -1674,7 +1674,7 @@ _edje_part_text_user_insert(Eo *obj EINA_UNUSED, Edje *ed, const char *part, con } EOLIAN void -_edje_part_text_select_allow_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Eina_Bool allow) +_edje_object_part_text_select_allow_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Eina_Bool allow) { Edje_Real_Part *rp; @@ -1686,7 +1686,7 @@ _edje_part_text_select_allow_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part } EOLIAN void -_edje_part_text_select_abort(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_text_select_abort(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Edje_Real_Part *rp; @@ -1698,7 +1698,7 @@ _edje_part_text_select_abort(Eo *obj EINA_UNUSED, Edje *ed, const char *part) } EOLIAN void -_edje_part_text_select_begin(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_text_select_begin(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Edje_Real_Part *rp; @@ -1710,7 +1710,7 @@ _edje_part_text_select_begin(Eo *obj EINA_UNUSED, Edje *ed, const char *part) } EOLIAN void -_edje_part_text_select_extend(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_text_select_extend(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Edje_Real_Part *rp; @@ -1722,7 +1722,7 @@ _edje_part_text_select_extend(Eo *obj EINA_UNUSED, Edje *ed, const char *part) } EOLIAN void* -_edje_part_text_imf_context_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_text_imf_context_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Edje_Real_Part *rp; @@ -1738,7 +1738,7 @@ _edje_part_text_imf_context_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) } EOLIAN Eina_Bool -_edje_part_text_cursor_next(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) +_edje_object_part_text_cursor_next(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) { Edje_Real_Part *rp; @@ -1754,7 +1754,7 @@ _edje_part_text_cursor_next(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edj } EOLIAN Eina_Bool -_edje_part_text_cursor_prev(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) +_edje_object_part_text_cursor_prev(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) { Edje_Real_Part *rp; @@ -1770,7 +1770,7 @@ _edje_part_text_cursor_prev(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edj } EOLIAN Eina_Bool -_edje_part_text_cursor_up(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) +_edje_object_part_text_cursor_up(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) { Edje_Real_Part *rp; @@ -1786,7 +1786,7 @@ _edje_part_text_cursor_up(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_ } EOLIAN Eina_Bool -_edje_part_text_cursor_down(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) +_edje_object_part_text_cursor_down(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) { Edje_Real_Part *rp; @@ -1802,7 +1802,7 @@ _edje_part_text_cursor_down(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edj } EOLIAN void -_edje_part_text_cursor_begin_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) +_edje_object_part_text_cursor_begin_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) { Edje_Real_Part *rp; @@ -1816,7 +1816,7 @@ _edje_part_text_cursor_begin_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part } EOLIAN void -_edje_part_text_cursor_end_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) +_edje_object_part_text_cursor_end_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) { Edje_Real_Part *rp; @@ -1830,7 +1830,7 @@ _edje_part_text_cursor_end_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, } EOLIAN void -_edje_part_text_cursor_copy(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor src, Edje_Cursor dst) +_edje_object_part_text_cursor_copy(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor src, Edje_Cursor dst) { Edje_Real_Part *rp; @@ -1844,7 +1844,7 @@ _edje_part_text_cursor_copy(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edj } EOLIAN void -_edje_part_text_cursor_line_begin_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) +_edje_object_part_text_cursor_line_begin_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) { Edje_Real_Part *rp; @@ -1858,7 +1858,7 @@ _edje_part_text_cursor_line_begin_set(Eo *obj EINA_UNUSED, Edje *ed, const char } EOLIAN void -_edje_part_text_cursor_line_end_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) +_edje_object_part_text_cursor_line_end_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) { Edje_Real_Part *rp; @@ -1872,7 +1872,7 @@ _edje_part_text_cursor_line_end_set(Eo *obj EINA_UNUSED, Edje *ed, const char *p } EOLIAN Eina_Bool -_edje_part_text_cursor_coord_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur, Evas_Coord x, Evas_Coord y) +_edje_object_part_text_cursor_coord_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur, Evas_Coord x, Evas_Coord y) { Edje_Real_Part *rp; @@ -1888,7 +1888,7 @@ _edje_part_text_cursor_coord_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part } EOLIAN Eina_Bool -_edje_part_text_cursor_is_format_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) +_edje_object_part_text_cursor_is_format_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) { Edje_Real_Part *rp; @@ -1903,7 +1903,7 @@ _edje_part_text_cursor_is_format_get(Eo *obj EINA_UNUSED, Edje *ed, const char * } EOLIAN Eina_Bool -_edje_part_text_cursor_is_visible_format_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) +_edje_object_part_text_cursor_is_visible_format_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) { Edje_Real_Part *rp; @@ -1919,7 +1919,7 @@ _edje_part_text_cursor_is_visible_format_get(Eo *obj EINA_UNUSED, Edje *ed, cons } EOLIAN char* -_edje_part_text_cursor_content_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) +_edje_object_part_text_cursor_content_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) { Edje_Real_Part *rp; @@ -1935,7 +1935,7 @@ _edje_part_text_cursor_content_get(Eo *obj EINA_UNUSED, Edje *ed, const char *pa } EOLIAN void -_edje_part_text_cursor_pos_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur, int pos) +_edje_object_part_text_cursor_pos_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur, int pos) { Edje_Real_Part *rp; @@ -1949,7 +1949,7 @@ _edje_part_text_cursor_pos_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, } EOLIAN int -_edje_part_text_cursor_pos_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) +_edje_object_part_text_cursor_pos_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Cursor cur) { int ret; Edje_Real_Part *rp; @@ -1967,7 +1967,7 @@ _edje_part_text_cursor_pos_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, } EOLIAN void -_edje_part_text_imf_context_reset(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_text_imf_context_reset(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Edje_Real_Part *rp; @@ -1981,7 +1981,7 @@ _edje_part_text_imf_context_reset(Eo *obj EINA_UNUSED, Edje *ed, const char *par } EOLIAN void -_edje_part_text_input_panel_layout_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Input_Panel_Layout layout) +_edje_object_part_text_input_panel_layout_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Input_Panel_Layout layout) { Edje_Real_Part *rp; @@ -1995,7 +1995,7 @@ _edje_part_text_input_panel_layout_set(Eo *obj EINA_UNUSED, Edje *ed, const char } EOLIAN Edje_Input_Panel_Layout -_edje_part_text_input_panel_layout_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_text_input_panel_layout_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Edje_Input_Panel_Layout ret; Edje_Real_Part *rp; @@ -2013,7 +2013,7 @@ _edje_part_text_input_panel_layout_get(Eo *obj EINA_UNUSED, Edje *ed, const char } EOLIAN void -_edje_part_text_input_panel_layout_variation_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, int variation) +_edje_object_part_text_input_panel_layout_variation_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, int variation) { Edje_Real_Part *rp; @@ -2027,7 +2027,7 @@ _edje_part_text_input_panel_layout_variation_set(Eo *obj EINA_UNUSED, Edje *ed, } EOLIAN int -_edje_part_text_input_panel_layout_variation_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_text_input_panel_layout_variation_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { int r; @@ -2045,7 +2045,7 @@ _edje_part_text_input_panel_layout_variation_get(Eo *obj EINA_UNUSED, Edje *ed, } EOLIAN void -_edje_part_text_autocapital_type_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Text_Autocapital_Type autocapital_type) +_edje_object_part_text_autocapital_type_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Text_Autocapital_Type autocapital_type) { Edje_Real_Part *rp; @@ -2059,7 +2059,7 @@ _edje_part_text_autocapital_type_set(Eo *obj EINA_UNUSED, Edje *ed, const char * } EOLIAN Edje_Text_Autocapital_Type -_edje_part_text_autocapital_type_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_text_autocapital_type_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Edje_Text_Autocapital_Type ret; Edje_Real_Part *rp; @@ -2077,7 +2077,7 @@ _edje_part_text_autocapital_type_get(Eo *obj EINA_UNUSED, Edje *ed, const char * } EOLIAN void -_edje_part_text_prediction_allow_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Eina_Bool prediction) +_edje_object_part_text_prediction_allow_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Eina_Bool prediction) { Edje_Real_Part *rp; @@ -2091,7 +2091,7 @@ _edje_part_text_prediction_allow_set(Eo *obj EINA_UNUSED, Edje *ed, const char * } EOLIAN Eina_Bool -_edje_part_text_prediction_allow_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_text_prediction_allow_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Eina_Bool ret; Edje_Real_Part *rp; @@ -2109,7 +2109,7 @@ _edje_part_text_prediction_allow_get(Eo *obj EINA_UNUSED, Edje *ed, const char * } EOLIAN void -_edje_part_text_input_panel_enabled_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Eina_Bool enabled) +_edje_object_part_text_input_panel_enabled_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Eina_Bool enabled) { Edje_Real_Part *rp; @@ -2123,7 +2123,7 @@ _edje_part_text_input_panel_enabled_set(Eo *obj EINA_UNUSED, Edje *ed, const cha } EOLIAN Eina_Bool -_edje_part_text_input_panel_enabled_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_text_input_panel_enabled_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Eina_Bool ret; Edje_Real_Part *rp; @@ -2141,7 +2141,7 @@ _edje_part_text_input_panel_enabled_get(Eo *obj EINA_UNUSED, Edje *ed, const cha } EOLIAN void -_edje_part_text_input_panel_show(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_text_input_panel_show(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Edje_Real_Part *rp; @@ -2153,7 +2153,7 @@ _edje_part_text_input_panel_show(Eo *obj EINA_UNUSED, Edje *ed, const char *part } EOLIAN void -_edje_part_text_input_panel_hide(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_text_input_panel_hide(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Edje_Real_Part *rp; @@ -2165,7 +2165,7 @@ _edje_part_text_input_panel_hide(Eo *obj EINA_UNUSED, Edje *ed, const char *part } EOLIAN void -_edje_part_text_input_panel_language_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Input_Panel_Lang lang) +_edje_object_part_text_input_panel_language_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Input_Panel_Lang lang) { Edje_Real_Part *rp; @@ -2179,7 +2179,7 @@ _edje_part_text_input_panel_language_set(Eo *obj EINA_UNUSED, Edje *ed, const ch } EOLIAN Edje_Input_Panel_Lang -_edje_part_text_input_panel_language_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_text_input_panel_language_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Edje_Input_Panel_Lang ret; Edje_Real_Part *rp; @@ -2197,7 +2197,7 @@ _edje_part_text_input_panel_language_get(Eo *obj EINA_UNUSED, Edje *ed, const ch } EOLIAN void -_edje_part_text_input_panel_imdata_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, const void *data, int len) +_edje_object_part_text_input_panel_imdata_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, const void *data, int len) { Edje_Real_Part *rp; @@ -2211,7 +2211,7 @@ _edje_part_text_input_panel_imdata_set(Eo *obj EINA_UNUSED, Edje *ed, const char } EOLIAN void -_edje_part_text_input_panel_imdata_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, void *data, int *len) +_edje_object_part_text_input_panel_imdata_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, void *data, int *len) { Edje_Real_Part *rp; @@ -2225,7 +2225,7 @@ _edje_part_text_input_panel_imdata_get(Eo *obj EINA_UNUSED, Edje *ed, const char } EOLIAN void -_edje_part_text_input_panel_return_key_type_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Input_Panel_Return_Key_Type return_key_type) +_edje_object_part_text_input_panel_return_key_type_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Input_Panel_Return_Key_Type return_key_type) { Edje_Real_Part *rp; @@ -2239,7 +2239,7 @@ _edje_part_text_input_panel_return_key_type_set(Eo *obj EINA_UNUSED, Edje *ed, c } EOLIAN Edje_Input_Panel_Return_Key_Type -_edje_part_text_input_panel_return_key_type_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_text_input_panel_return_key_type_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Edje_Input_Panel_Return_Key_Type ret; Edje_Real_Part *rp; @@ -2257,7 +2257,7 @@ _edje_part_text_input_panel_return_key_type_get(Eo *obj EINA_UNUSED, Edje *ed, c } EOLIAN void -_edje_part_text_input_panel_return_key_disabled_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Eina_Bool disabled) +_edje_object_part_text_input_panel_return_key_disabled_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Eina_Bool disabled) { Edje_Real_Part *rp; @@ -2271,7 +2271,7 @@ _edje_part_text_input_panel_return_key_disabled_set(Eo *obj EINA_UNUSED, Edje *e } EOLIAN Eina_Bool -_edje_part_text_input_panel_return_key_disabled_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_text_input_panel_return_key_disabled_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Eina_Bool ret; Edje_Real_Part *rp; @@ -2289,7 +2289,7 @@ _edje_part_text_input_panel_return_key_disabled_get(Eo *obj EINA_UNUSED, Edje *e } EOLIAN void -_edje_part_text_input_panel_show_on_demand_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Eina_Bool ondemand) +_edje_object_part_text_input_panel_show_on_demand_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Eina_Bool ondemand) { Edje_Real_Part *rp; @@ -2303,7 +2303,7 @@ _edje_part_text_input_panel_show_on_demand_set(Eo *obj EINA_UNUSED, Edje *ed, co } EOLIAN Eina_Bool -_edje_part_text_input_panel_show_on_demand_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_text_input_panel_show_on_demand_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Eina_Bool ret; Edje_Real_Part *rp; @@ -2321,7 +2321,7 @@ _edje_part_text_input_panel_show_on_demand_get(Eo *obj EINA_UNUSED, Edje *ed, co } EOLIAN void -_edje_text_insert_filter_callback_add(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Text_Filter_Cb func, void *data) +_edje_object_text_insert_filter_callback_add(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Text_Filter_Cb func, void *data) { Edje_Text_Insert_Filter_Callback *cb; @@ -2335,7 +2335,7 @@ _edje_text_insert_filter_callback_add(Eo *obj EINA_UNUSED, Edje *ed, const char } EOLIAN void* -_edje_text_insert_filter_callback_del(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Text_Filter_Cb func) +_edje_object_text_insert_filter_callback_del(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Text_Filter_Cb func) { Edje_Text_Insert_Filter_Callback *cb; Eina_List *l; @@ -2358,7 +2358,7 @@ _edje_text_insert_filter_callback_del(Eo *obj EINA_UNUSED, Edje *ed, const char } EOLIAN void* -_edje_text_insert_filter_callback_del_full(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Text_Filter_Cb func, void *data) +_edje_object_text_insert_filter_callback_del_full(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Text_Filter_Cb func, void *data) { Edje_Text_Insert_Filter_Callback *cb; Eina_List *l; @@ -2382,7 +2382,7 @@ _edje_text_insert_filter_callback_del_full(Eo *obj EINA_UNUSED, Edje *ed, const } EOLIAN void -_edje_text_markup_filter_callback_add(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Markup_Filter_Cb func, void *data) +_edje_object_text_markup_filter_callback_add(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Markup_Filter_Cb func, void *data) { Edje_Markup_Filter_Callback *cb; @@ -2396,7 +2396,7 @@ _edje_text_markup_filter_callback_add(Eo *obj EINA_UNUSED, Edje *ed, const char } EOLIAN void* -_edje_text_markup_filter_callback_del(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Markup_Filter_Cb func) +_edje_object_text_markup_filter_callback_del(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Markup_Filter_Cb func) { Edje_Markup_Filter_Callback *cb; Eina_List *l; @@ -2419,7 +2419,7 @@ _edje_text_markup_filter_callback_del(Eo *obj EINA_UNUSED, Edje *ed, const char } EOLIAN void* -_edje_text_markup_filter_callback_del_full(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Markup_Filter_Cb func, void *data) +_edje_object_text_markup_filter_callback_del_full(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Edje_Markup_Filter_Cb func, void *data) { Edje_Markup_Filter_Callback *cb; Eina_List *l; @@ -2443,7 +2443,7 @@ _edje_text_markup_filter_callback_del_full(Eo *obj EINA_UNUSED, Edje *ed, const } EOLIAN Eina_Bool -_edje_part_swallow(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Object *obj_swallow) +_edje_object_part_swallow(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Object *obj_swallow) { Edje_Real_Part *rp, *rpcur; Edje_User_Defined *eud = NULL; @@ -2728,7 +2728,7 @@ edje_box_layout_register(const char *name, Evas_Object_Box_Layout func, void *(* } EOLIAN void -_edje_part_unswallow(Eo *obj EINA_UNUSED, Edje *ed, Evas_Object *obj_swallow) +_edje_object_part_unswallow(Eo *obj EINA_UNUSED, Edje *ed, Evas_Object *obj_swallow) { Edje_Real_Part *rp; @@ -2786,7 +2786,7 @@ _edje_part_unswallow(Eo *obj EINA_UNUSED, Edje *ed, Evas_Object *obj_swallow) } EOLIAN Evas_Object* -_edje_part_swallow_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_swallow_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Edje_Real_Part *rp; @@ -2804,7 +2804,7 @@ _edje_part_swallow_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) } EOLIAN void -_edje_size_min_get(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord *minw, Evas_Coord *minh) +_edje_object_size_min_get(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord *minw, Evas_Coord *minh) { if ((!ed) || (!ed->collection)) { @@ -2817,7 +2817,7 @@ _edje_size_min_get(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord *minw, Evas_Coord * } EOLIAN void -_edje_size_max_get(Eo *obj EINA_UNUSED, Edje *ed EINA_UNUSED, Evas_Coord *maxw, Evas_Coord *maxh) +_edje_object_size_max_get(Eo *obj EINA_UNUSED, Edje *ed EINA_UNUSED, Evas_Coord *maxw, Evas_Coord *maxh) { if ((!ed) || (!ed->collection)) { @@ -2850,7 +2850,7 @@ _edje_size_max_get(Eo *obj EINA_UNUSED, Edje *ed EINA_UNUSED, Evas_Coord *maxw, } EOLIAN void -_edje_calc_force(Eo *obj EINA_UNUSED, Edje *ed) +_edje_object_calc_force(Eo *obj EINA_UNUSED, Edje *ed) { int pf, pf2; @@ -2873,13 +2873,13 @@ _edje_calc_force(Eo *obj EINA_UNUSED, Edje *ed) } EOLIAN void -_edje_size_min_calc(Eo *obj, Edje *_pd EINA_UNUSED, Evas_Coord *minw, Evas_Coord *minh) +_edje_object_size_min_calc(Eo *obj, Edje *_pd EINA_UNUSED, Evas_Coord *minw, Evas_Coord *minh) { edje_object_size_min_restricted_calc(obj, minw, minh, 0, 0); } EOLIAN Eina_Bool -_edje_parts_extends_calc(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) +_edje_object_parts_extends_calc(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) { Evas_Coord xx1 = INT_MAX, yy1 = INT_MAX; Evas_Coord xx2 = 0, yy2 = 0; @@ -2930,7 +2930,7 @@ _edje_parts_extends_calc(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord *x, Evas_Coor } EOLIAN void -_edje_size_min_restricted_calc(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord *minw, Evas_Coord *minh, Evas_Coord restrictedw, Evas_Coord restrictedh) +_edje_object_size_min_restricted_calc(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord *minw, Evas_Coord *minh, Evas_Coord restrictedw, Evas_Coord restrictedh) { Evas_Coord pw, ph; int maxw, maxh; @@ -3080,7 +3080,7 @@ _edje_size_min_restricted_calc(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord *minw, /* FIXME: Correctly return other states */ EOLIAN const char* -_edje_part_state_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double *val_ret) +_edje_object_part_state_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double *val_ret) { const char *ret; @@ -3130,7 +3130,7 @@ _edje_part_state_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double *va } EOLIAN Edje_Drag_Dir -_edje_part_drag_dir_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) +_edje_object_part_drag_dir_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) { Edje_Drag_Dir ret; Edje_Real_Part *rp; @@ -3151,7 +3151,7 @@ _edje_part_drag_dir_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part) } EOLIAN Eina_Bool -_edje_part_drag_value_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double dx, double dy) +_edje_object_part_drag_value_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double dx, double dy) { Edje_Real_Part *rp; Edje_User_Defined *eud; @@ -3204,7 +3204,7 @@ _edje_part_drag_value_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, doubl /* FIXME: Should this be x and y instead of dx/dy? */ EOLIAN Eina_Bool -_edje_part_drag_value_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double *dx, double *dy) +_edje_object_part_drag_value_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double *dx, double *dy) { Edje_Real_Part *rp; double ddx, ddy; @@ -3237,7 +3237,7 @@ _edje_part_drag_value_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, doubl } EOLIAN Eina_Bool -_edje_part_drag_size_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double dw, double dh) +_edje_object_part_drag_size_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double dw, double dh) { Edje_Real_Part *rp; Edje_User_Defined *eud; @@ -3286,7 +3286,7 @@ _edje_part_drag_size_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double } EOLIAN Eina_Bool -_edje_part_drag_size_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double *dw, double *dh) +_edje_object_part_drag_size_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double *dw, double *dh) { Edje_Real_Part *rp; @@ -3314,7 +3314,7 @@ _edje_part_drag_size_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double } EOLIAN Eina_Bool -_edje_part_drag_step_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double dx, double dy) +_edje_object_part_drag_step_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double dx, double dy) { Edje_Real_Part *rp; Edje_User_Defined *eud; @@ -3356,7 +3356,7 @@ _edje_part_drag_step_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double } EOLIAN Eina_Bool -_edje_part_drag_step_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double *dx, double *dy) +_edje_object_part_drag_step_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double *dx, double *dy) { Edje_Real_Part *rp; @@ -3384,7 +3384,7 @@ _edje_part_drag_step_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double } EOLIAN Eina_Bool -_edje_part_drag_page_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double dx, double dy) +_edje_object_part_drag_page_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double dx, double dy) { Edje_Real_Part *rp; Edje_User_Defined *eud; @@ -3426,7 +3426,7 @@ _edje_part_drag_page_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double } EOLIAN Eina_Bool -_edje_part_drag_page_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double *dx, double *dy) +_edje_object_part_drag_page_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double *dx, double *dy) { Edje_Real_Part *rp; @@ -3454,7 +3454,7 @@ _edje_part_drag_page_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double } EOLIAN Eina_Bool -_edje_part_drag_step(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double dx, double dy) +_edje_object_part_drag_step(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double dx, double dy) { Edje_Real_Part *rp; FLOAT_T px, py; @@ -3506,7 +3506,7 @@ _edje_part_drag_step(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double dx, } EOLIAN Eina_Bool -_edje_part_drag_page(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double dx, double dy) +_edje_object_part_drag_page(Eo *obj EINA_UNUSED, Edje *ed, const char *part, double dx, double dy) { Edje_Real_Part *rp; FLOAT_T px, py; @@ -3573,7 +3573,7 @@ _edje_box_shutdown(void) } EOLIAN Eina_Bool -_edje_part_box_append(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Object *child) +_edje_object_part_box_append(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Object *child) { Eina_Bool ret; Edje_Real_Part *rp; @@ -3602,7 +3602,7 @@ _edje_part_box_append(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Obje } EOLIAN Eina_Bool -_edje_part_box_prepend(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Object *child) +_edje_object_part_box_prepend(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Object *child) { Eina_Bool ret; Edje_Real_Part *rp; @@ -3630,7 +3630,7 @@ _edje_part_box_prepend(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Obj } EOLIAN Eina_Bool -_edje_part_box_insert_before(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Object *child, const Evas_Object *reference) +_edje_object_part_box_insert_before(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Object *child, const Evas_Object *reference) { Eina_Bool ret; Edje_Real_Part *rp; @@ -3658,7 +3658,7 @@ _edje_part_box_insert_before(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Ev } EOLIAN Eina_Bool -_edje_part_box_insert_at(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Object *child, unsigned int pos) +_edje_object_part_box_insert_at(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Object *child, unsigned int pos) { Eina_Bool ret; Edje_Real_Part *rp; @@ -3686,7 +3686,7 @@ _edje_part_box_insert_at(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_O } EOLIAN Evas_Object* -_edje_part_box_remove(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Object *child) +_edje_object_part_box_remove(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Object *child) { Edje_Real_Part *rp; Evas_Object *r; @@ -3715,7 +3715,7 @@ _edje_part_box_remove(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Obje } EOLIAN Evas_Object* -_edje_part_box_remove_at(Eo *obj EINA_UNUSED, Edje *ed, const char *part, unsigned int pos) +_edje_object_part_box_remove_at(Eo *obj EINA_UNUSED, Edje *ed, const char *part, unsigned int pos) { Edje_Real_Part *rp; Evas_Object *r; @@ -3744,7 +3744,7 @@ _edje_part_box_remove_at(Eo *obj EINA_UNUSED, Edje *ed, const char *part, unsign } EOLIAN Eina_Bool -_edje_part_box_remove_all(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Eina_Bool clear) +_edje_object_part_box_remove_all(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Eina_Bool clear) { Eina_Bool ret; Edje_Real_Part *rp; @@ -3774,7 +3774,7 @@ _edje_part_box_remove_all(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Eina_ } EOLIAN Eina_List* -_edje_access_part_list_get(Eo *obj EINA_UNUSED, Edje *ed) +_edje_object_access_part_list_get(Eo *obj EINA_UNUSED, Edje *ed) { Eina_List *access_parts = NULL; @@ -3990,7 +3990,7 @@ _edje_real_part_box_remove_all(Edje *ed, Edje_Real_Part *rp, Eina_Bool clear) } EOLIAN Evas_Object* -_edje_part_table_child_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, unsigned int col, unsigned int row) +_edje_object_part_table_child_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, unsigned int col, unsigned int row) { Edje_Real_Part *rp; @@ -4004,7 +4004,7 @@ _edje_part_table_child_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, unsi } EOLIAN Eina_Bool -_edje_part_table_pack(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Object *child_obj, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan) +_edje_object_part_table_pack(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Object *child_obj, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan) { Eina_Bool ret; Edje_Real_Part *rp; @@ -4036,7 +4036,7 @@ _edje_part_table_pack(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Obje } EOLIAN Eina_Bool -_edje_part_table_unpack(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Object *child_obj) +_edje_object_part_table_unpack(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Object *child_obj) { Eina_Bool ret; Edje_Real_Part *rp; @@ -4068,7 +4068,7 @@ _edje_part_table_unpack(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Evas_Ob } EOLIAN Eina_Bool -_edje_part_table_col_row_size_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, int *cols, int *rows) +_edje_object_part_table_col_row_size_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part, int *cols, int *rows) { Edje_Real_Part *rp; @@ -4084,7 +4084,7 @@ _edje_part_table_col_row_size_get(Eo *obj EINA_UNUSED, Edje *ed, const char *par } EOLIAN Eina_Bool -_edje_part_table_clear(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Eina_Bool clear) +_edje_object_part_table_clear(Eo *obj EINA_UNUSED, Edje *ed, const char *part, Eina_Bool clear) { Edje_Real_Part *rp; @@ -4109,7 +4109,7 @@ _edje_perspective_obj_del(void *data, EINA_UNUSED Evas *e, EINA_UNUSED Evas_Obje { Edje *ed; - ed = eo_data_scope_get(o, EDJE_CLASS); + ed = eo_data_scope_get(o, EDJE_OBJECT_CLASS); if (!ed) continue; ed->persp = NULL; ed->dirty = EINA_TRUE; @@ -4162,7 +4162,7 @@ edje_perspective_set(Edje_Perspective *ps, Evas_Coord px, Evas_Coord py, Evas_Co { Edje *ed; - ed = eo_data_scope_get(o, EDJE_CLASS); + ed = eo_data_scope_get(o, EDJE_OBJECT_CLASS); if (!ed) continue; if (!ed->persp) { @@ -4177,7 +4177,7 @@ edje_perspective_set(Edje_Perspective *ps, Evas_Coord px, Evas_Coord py, Evas_Co { Edje *ed; - ed = eo_data_scope_get(o, EDJE_CLASS); + ed = eo_data_scope_get(o, EDJE_OBJECT_CLASS); if (!ed) continue; if (!ed->persp) { @@ -4211,7 +4211,7 @@ edje_perspective_global_set(Edje_Perspective *ps, Eina_Bool global) { Edje *ed; - ed = eo_data_scope_get(o, EDJE_CLASS); + ed = eo_data_scope_get(o, EDJE_OBJECT_CLASS); if (!ed) continue; if (!ed->persp) { @@ -4241,7 +4241,7 @@ edje_evas_global_perspective_get(const Evas *e) } EOLIAN void -_edje_perspective_set(Eo *obj, Edje *ed, Edje_Perspective *ps) +_edje_object_perspective_set(Eo *obj, Edje *ed, Edje_Perspective *ps) { if (!ed) return; if (ed->persp == ps) return; @@ -4258,7 +4258,7 @@ _edje_perspective_set(Eo *obj, Edje *ed, Edje_Perspective *ps) } EOLIAN const Edje_Perspective* -_edje_perspective_get(Eo *obj EINA_UNUSED, Edje *ed) +_edje_object_perspective_get(Eo *obj EINA_UNUSED, Edje *ed) { return ed->persp; } @@ -4267,7 +4267,7 @@ _edje_perspective_get(Eo *obj EINA_UNUSED, Edje *ed) #define EDJE_PRELOAD_SOURCE NULL EOLIAN Eina_Bool -_edje_preload(Eo *obj, Edje *ed, Eina_Bool cancel) +_edje_object_preload(Eo *obj, Edje *ed, Eina_Bool cancel) { int count; unsigned int i; @@ -4358,7 +4358,7 @@ _edje_preload(Eo *obj, Edje *ed, Eina_Bool cancel) } EOLIAN void -_edje_update_hints_set(Eo *obj EINA_UNUSED, Edje *ed, Eina_Bool update) +_edje_object_update_hints_set(Eo *obj EINA_UNUSED, Edje *ed, Eina_Bool update) { if (!ed) return; if (ed->update_hints == !!update) return; @@ -4372,7 +4372,7 @@ _edje_update_hints_set(Eo *obj EINA_UNUSED, Edje *ed, Eina_Bool update) } EOLIAN Eina_Bool -_edje_update_hints_get(Eo *obj EINA_UNUSED, Edje *ed) +_edje_object_update_hints_get(Eo *obj EINA_UNUSED, Edje *ed) { return ed->update_hints; } @@ -4798,9 +4798,9 @@ _edje_fetch(const Evas_Object *obj) { Edje *ed; - if (!obj || !eo_isa(obj, EDJE_CLASS)) + if (!obj || !eo_isa(obj, EDJE_OBJECT_CLASS)) return NULL; - ed = eo_data_scope_get(obj, EDJE_CLASS); + ed = eo_data_scope_get(obj, EDJE_OBJECT_CLASS); if ((ed) && (ed->delete_me)) return NULL; return ed; } @@ -4898,7 +4898,7 @@ _edje_real_part_swallow_hints_update(Edje_Real_Part *rp) rp->typedata.swallow->swallow_params.min.h = 0; rp->typedata.swallow->swallow_params.max.w = -1; rp->typedata.swallow->swallow_params.max.h = -1; - if (eo_isa(rp->typedata.swallow->swallowed_object, EDJE_CLASS)) + if (eo_isa(rp->typedata.swallow->swallowed_object, EDJE_OBJECT_CLASS)) { Evas_Coord w, h; @@ -5120,7 +5120,7 @@ _edje_real_part_swallow_clear(Edje *ed, Edje_Real_Part *rp) } static void -_edje_object_preload(Edje *ed) +_edje_object_preload_helper(Edje *ed) { ed->preload_count--; if (!ed->preload_count) @@ -5133,7 +5133,7 @@ _edje_object_image_preload_cb(void *data, EINA_UNUSED Evas *e, Evas_Object *obj, Edje *ed = data; evas_object_event_callback_del_full(obj, EVAS_CALLBACK_IMAGE_PRELOADED, _edje_object_image_preload_cb, ed); - _edje_object_preload(ed); + _edje_object_preload_helper(ed); } static void @@ -5142,7 +5142,7 @@ _edje_object_signal_preload_cb(void *data, Evas_Object *obj, EINA_UNUSED const c Edje *ed = data; edje_object_signal_callback_del(obj, EDJE_PRELOAD_EMISSION, EDJE_PRELOAD_SOURCE, _edje_object_signal_preload_cb); - _edje_object_preload(ed); + _edje_object_preload_helper(ed); } /** diff --git a/src/lib/eo/eo_abstract_class.eo b/src/lib/eo/eo_abstract_class.eo index 27a52e394a..86b2f7f38a 100644 --- a/src/lib/eo/eo_abstract_class.eo +++ b/src/lib/eo/eo_abstract_class.eo @@ -1,4 +1,4 @@ -abstract Eo_Abstract_Class () +abstract Eo.Abstract_Class () { data: null; } diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo index a7849a1789..bbeaa05812 100644 --- a/src/lib/eo/eo_base.eo +++ b/src/lib/eo/eo_base.eo @@ -1,4 +1,4 @@ -abstract Eo_Base () +abstract Eo.Base () { eo_prefix: eo; legacy_prefix: null; diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h index f10370d4e5..a4c28c8668 100644 --- a/src/lib/evas/Evas_Eo.h +++ b/src/lib/evas/Evas_Eo.h @@ -38,7 +38,7 @@ EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_POST; #define EVAS_SMART_SELECTABLE_INTERFACE EVAS_SELECTABLE_INTERFACE_CLASS #define EVAS_SMART_ZOOMABLE_INTERFACE EVAS_ZOOMABLE_INTERFACE_CLASS -#include "canvas/evas.eo.h" +#include "canvas/evas_canvas.eo.h" /** * @ingroup Evas_Object_Rectangle diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h index 1cecd24a6f..012c4d108c 100644 --- a/src/lib/evas/Evas_Legacy.h +++ b/src/lib/evas/Evas_Legacy.h @@ -44,7 +44,7 @@ EAPI Evas *evas_new(void) EINA_WARN_UNUSED_RESULT EINA_MALLOC; */ EAPI void evas_free(Evas *e) EINA_ARG_NONNULL(1); -#include "canvas/evas.eo.legacy.h" +#include "canvas/evas_canvas.eo.legacy.h" /** * @} diff --git a/src/lib/evas/canvas/evas_3d_camera.eo b/src/lib/evas/canvas/evas_3d_camera.eo index ad3db0e75c..7a035675d0 100644 --- a/src/lib/evas/canvas/evas_3d_camera.eo +++ b/src/lib/evas/canvas/evas_3d_camera.eo @@ -1,4 +1,4 @@ -class Evas_3D_Camera (Evas_3D_Object, Evas_Common_Interface) +class Evas_3D_Camera (Evas_3D_Object, Evas.Common_Interface) { legacy_prefix: null; data: Evas_3D_Camera_Data; @@ -100,8 +100,8 @@ class Evas_3D_Camera (Evas_3D_Object, Evas_Common_Interface) } implements { - Eo_Base.constructor; - Eo_Base.destructor; + Eo.Base.constructor; + Eo.Base.destructor; Evas_3D_Object.update_notify; Evas_3D_Object.change_notify; } diff --git a/src/lib/evas/canvas/evas_3d_light.eo b/src/lib/evas/canvas/evas_3d_light.eo index 1eaa682af6..9d7bb4b26e 100644 --- a/src/lib/evas/canvas/evas_3d_light.eo +++ b/src/lib/evas/canvas/evas_3d_light.eo @@ -1,4 +1,4 @@ -class Evas_3D_Light (Evas_3D_Object, Evas_Common_Interface) +class Evas_3D_Light (Evas_3D_Object, Evas.Common_Interface) { legacy_prefix: null; data: Evas_3D_Light_Data; @@ -256,8 +256,8 @@ class Evas_3D_Light (Evas_3D_Object, Evas_Common_Interface) } implements { - Eo_Base.constructor; - Eo_Base.destructor; + Eo.Base.constructor; + Eo.Base.destructor; Evas_3D_Object.update_notify; Evas_3D_Object.change_notify; } diff --git a/src/lib/evas/canvas/evas_3d_material.eo b/src/lib/evas/canvas/evas_3d_material.eo index 232cc315ac..9b6872087d 100644 --- a/src/lib/evas/canvas/evas_3d_material.eo +++ b/src/lib/evas/canvas/evas_3d_material.eo @@ -1,4 +1,4 @@ -class Evas_3D_Material (Evas_3D_Object, Evas_Common_Interface) +class Evas_3D_Material (Evas_3D_Object, Evas.Common_Interface) { legacy_prefix: null; data: Evas_3D_Material_Data; @@ -148,8 +148,8 @@ class Evas_3D_Material (Evas_3D_Object, Evas_Common_Interface) } } implements { - Eo_Base.constructor; - Eo_Base.destructor; + Eo.Base.constructor; + Eo.Base.destructor; Evas_3D_Object.update_notify; Evas_3D_Object.change_notify; } diff --git a/src/lib/evas/canvas/evas_3d_mesh.eo b/src/lib/evas/canvas/evas_3d_mesh.eo index 923d93a4ec..43ce023af8 100644 --- a/src/lib/evas/canvas/evas_3d_mesh.eo +++ b/src/lib/evas/canvas/evas_3d_mesh.eo @@ -1,4 +1,4 @@ -class Evas_3D_Mesh (Evas_3D_Object, Evas_Common_Interface) +class Evas_3D_Mesh (Evas_3D_Object, Evas.Common_Interface) { legacy_prefix: null; data: Evas_3D_Mesh_Data; @@ -396,8 +396,8 @@ class Evas_3D_Mesh (Evas_3D_Object, Evas_Common_Interface) } implements { - Eo_Base.constructor; - Eo_Base.destructor; + Eo.Base.constructor; + Eo.Base.destructor; Evas_3D_Object.update_notify; Evas_3D_Object.change_notify; } diff --git a/src/lib/evas/canvas/evas_3d_node.eo b/src/lib/evas/canvas/evas_3d_node.eo index a02186bd9a..0c47e4261a 100644 --- a/src/lib/evas/canvas/evas_3d_node.eo +++ b/src/lib/evas/canvas/evas_3d_node.eo @@ -1,4 +1,4 @@ -class Evas_3D_Node (Evas_3D_Object, Evas_Common_Interface) +class Evas_3D_Node (Evas_3D_Object, Evas.Common_Interface) { legacy_prefix: null; data: Evas_3D_Node_Data; @@ -585,8 +585,8 @@ class Evas_3D_Node (Evas_3D_Object, Evas_Common_Interface) } } implements { - Eo_Base.constructor; - Eo_Base.destructor; + Eo.Base.constructor; + Eo.Base.destructor; Evas_3D_Object.update_notify; Evas_3D_Object.change_notify; } diff --git a/src/lib/evas/canvas/evas_3d_object.eo b/src/lib/evas/canvas/evas_3d_object.eo index 4a2d30bac4..e77d3f1d5f 100644 --- a/src/lib/evas/canvas/evas_3d_object.eo +++ b/src/lib/evas/canvas/evas_3d_object.eo @@ -1,4 +1,4 @@ -class Evas_3D_Object (Eo_Base, Evas_Common_Interface) +class Evas_3D_Object (Eo.Base, Evas.Common_Interface) { legacy_prefix: null; data: Evas_3D_Object_Data; @@ -65,8 +65,8 @@ class Evas_3D_Object (Eo_Base, Evas_Common_Interface) } implements { - Eo_Base.constructor; - Evas_Common_Interface.evas.get; + Eo.Base.constructor; + Evas.Common_Interface.evas.get; virtual.update_notify; virtual.change_notify; } diff --git a/src/lib/evas/canvas/evas_3d_scene.eo b/src/lib/evas/canvas/evas_3d_scene.eo index 05f5dd9626..cea8e5ed7f 100644 --- a/src/lib/evas/canvas/evas_3d_scene.eo +++ b/src/lib/evas/canvas/evas_3d_scene.eo @@ -1,4 +1,4 @@ -class Evas_3D_Scene (Evas_3D_Object, Evas_Common_Interface) +class Evas_3D_Scene (Evas_3D_Object, Evas.Common_Interface) { legacy_prefix: null; data: Evas_3D_Scene_Data; @@ -165,8 +165,8 @@ class Evas_3D_Scene (Evas_3D_Object, Evas_Common_Interface) } } implements { - Eo_Base.constructor; - Eo_Base.destructor; + Eo.Base.constructor; + Eo.Base.destructor; Evas_3D_Object.update_notify; Evas_3D_Object.change_notify; } diff --git a/src/lib/evas/canvas/evas_3d_texture.c b/src/lib/evas/canvas/evas_3d_texture.c index b2531c479b..94e537b7c9 100644 --- a/src/lib/evas/canvas/evas_3d_texture.c +++ b/src/lib/evas/canvas/evas_3d_texture.c @@ -56,7 +56,7 @@ _texture_proxy_subrender(Evas_3D_Texture *obj) /* Code taken from _proxy_subrender() in file evas_object_image.c */ Eo *evas = NULL; eo_do(obj, evas = evas_common_evas_get()); - Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); Evas_3D_Texture_Data *pd = eo_data_scope_get(obj, MY_CLASS); Evas_Object_Protected_Data *source; void *ctx; @@ -167,7 +167,7 @@ _texture_fini(Evas_3D_Texture *obj) Evas_3D_Texture_Data *pd = eo_data_scope_get(obj, MY_CLASS); if (pd->engine_data) { - Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); if (e->engine.func->texture_free) e->engine.func->texture_free(e->engine.data.output, pd->engine_data); pd->engine_data = NULL; @@ -209,7 +209,7 @@ _evas_3d_texture_evas_3d_object_update_notify(Eo *obj, Evas_3D_Texture_Data *pd) { Eo *evas = NULL; eo_do(obj, evas = evas_common_evas_get()); - Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); Evas_Object_Protected_Data *src = eo_data_scope_get(pd->source, EVAS_OBJECT_CLASS); if (pd->engine_data == NULL) @@ -324,7 +324,7 @@ _evas_3d_texture_data_set(Eo *obj EINA_UNUSED, Evas_3D_Texture_Data *pd, Evas_3D { Eo *evas = NULL; eo_do(obj, evas = evas_common_evas_get()); - Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); if (!pd->engine_data && e->engine.func->texture_new) pd->engine_data = e->engine.func->texture_new(e->engine.data.output); @@ -341,7 +341,7 @@ _evas_3d_texture_file_set(Eo *obj, Evas_3D_Texture_Data *pd, const char *file, c { Eo *evas = NULL; eo_do(obj, evas = evas_common_evas_get()); - Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); if (!pd->engine_data && e->engine.func->texture_new) pd->engine_data = e->engine.func->texture_new(e->engine.data.output); @@ -433,7 +433,7 @@ _evas_3d_texture_color_format_get(Eo *obj EINA_UNUSED, Evas_3D_Texture_Data *pd) Evas_3D_Color_Format format = -1; Eo *evas = NULL; eo_do(obj, evas = evas_common_evas_get()); - Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); if (e->engine.func->texture_color_format_get) { @@ -449,7 +449,7 @@ _evas_3d_texture_size_get(Eo *obj, Evas_3D_Texture_Data *pd, int *w, int *h) { Eo *evas = NULL; eo_do(obj, evas = evas_common_evas_get()); - Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); if (e->engine.func->texture_size_get) { e->engine.func->texture_size_get(e->engine.data.output, @@ -462,7 +462,7 @@ _evas_3d_texture_wrap_set(Eo *obj, Evas_3D_Texture_Data *pd, Evas_3D_Wrap_Mode s { Eo *evas = NULL; eo_do(obj, evas = evas_common_evas_get()); - Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); if (e->engine.func->texture_wrap_set) { e->engine.func->texture_wrap_set(e->engine.data.output, @@ -476,7 +476,7 @@ _evas_3d_texture_wrap_get(Eo *obj, Evas_3D_Texture_Data *pd, Evas_3D_Wrap_Mode * { Eo *evas = NULL; eo_do(obj, evas = evas_common_evas_get()); - Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); if (e->engine.func->texture_wrap_set) { e->engine.func->texture_wrap_get(e->engine.data.output, @@ -489,7 +489,7 @@ _evas_3d_texture_filter_set(Eo *obj, Evas_3D_Texture_Data *pd, Evas_3D_Texture_F { Eo *evas = NULL; eo_do(obj, evas = evas_common_evas_get()); - Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); if (e->engine.func->texture_filter_set) { e->engine.func->texture_filter_set(e->engine.data.output, @@ -503,7 +503,7 @@ _evas_3d_texture_filter_get(Eo *obj EINA_UNUSED, Evas_3D_Texture_Data *pd, Evas_ { Eo *evas = NULL; eo_do(obj, evas = evas_common_evas_get()); - Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); if (e->engine.func->texture_filter_get) { e->engine.func->texture_filter_get(e->engine.data.output, diff --git a/src/lib/evas/canvas/evas_3d_texture.eo b/src/lib/evas/canvas/evas_3d_texture.eo index 7b82722d4b..dccea4feb6 100644 --- a/src/lib/evas/canvas/evas_3d_texture.eo +++ b/src/lib/evas/canvas/evas_3d_texture.eo @@ -1,4 +1,4 @@ -class Evas_3D_Texture (Evas_3D_Object, Evas_Common_Interface) +class Evas_3D_Texture (Evas_3D_Object, Evas.Common_Interface) { legacy_prefix: null; data : Evas_3D_Texture_Data; @@ -191,8 +191,8 @@ class Evas_3D_Texture (Evas_3D_Object, Evas_Common_Interface) } implements { - Eo_Base.constructor; - Eo_Base.destructor; + Eo.Base.constructor; + Eo.Base.destructor; Evas_3D_Object.update_notify; Evas_3D_Object.change_notify; } diff --git a/src/lib/evas/canvas/evas_box.eo b/src/lib/evas/canvas/evas_box.eo index 04cae39e9a..d0a1e3107c 100644 --- a/src/lib/evas/canvas/evas_box.eo +++ b/src/lib/evas/canvas/evas_box.eo @@ -1,4 +1,4 @@ -class Evas_Box (Evas_Smart_Clipped) +class Evas.Box (Evas.Smart_Clipped) { legacy_prefix: evas_object_box; eo_prefix: evas_obj_box; @@ -726,12 +726,12 @@ class Evas_Box (Evas_Smart_Clipped) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object.smart_data.get; - Evas_Object_Smart.calculate; - Evas_Object_Smart.add; - Evas_Object_Smart.del; - Evas_Object_Smart.resize; + Eo.Base.constructor; + Evas.Object.smart_data.get; + Evas.Object_Smart.calculate; + Evas.Object_Smart.add; + Evas.Object_Smart.del; + Evas.Object_Smart.resize; } events { child,added; diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c index 8de0824a96..863c81faf5 100644 --- a/src/lib/evas/canvas/evas_callbacks.c +++ b/src/lib/evas/canvas/evas_callbacks.c @@ -123,7 +123,7 @@ _evas_post_event_callback_call(Evas *eo_e, Evas_Public_Data *e) void _evas_post_event_callback_free(Evas *eo_e) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Post_Callback *pc; EINA_LIST_FREE(e->post_events, pc) @@ -163,7 +163,7 @@ evas_event_callback_all_del(Evas *eo_e) { _eo_evas_object_cb_info *info; Eina_Inlist *itr; - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); if (!e) return; if (!e->callbacks) return; @@ -379,7 +379,7 @@ evas_event_callback_add(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func, EAPI void evas_event_callback_priority_add(Evas *eo_e, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Event_Cb func, const void *data) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); return; @@ -401,7 +401,7 @@ evas_event_callback_priority_add(Evas *eo_e, Evas_Callback_Type type, Evas_Callb EAPI void * evas_event_callback_del(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); _eo_evas_cb_info *info; MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); @@ -438,7 +438,7 @@ evas_event_callback_del_full(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); if (!e) return NULL; if (!func) return NULL; @@ -471,7 +471,7 @@ evas_post_event_callback_push(Evas *eo_e, Evas_Object_Event_Post_Cb func, const return; MAGIC_CHECK_END(); - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); if (!e) return; EVAS_MEMPOOL_INIT(_mp_pc, "evas_post_callback", Evas_Post_Callback, 64, ); pc = EVAS_MEMPOOL_ALLOC(_mp_pc, Evas_Post_Callback); @@ -494,7 +494,7 @@ evas_post_event_callback_remove(Evas *eo_e, Evas_Object_Event_Post_Cb func) return; MAGIC_CHECK_END(); - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); if (!e) return; EINA_LIST_FOREACH(e->post_events, l, pc) { @@ -516,7 +516,7 @@ evas_post_event_callback_remove_full(Evas *eo_e, Evas_Object_Event_Post_Cb func, return; MAGIC_CHECK_END(); - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); if (!e) return; EINA_LIST_FOREACH(e->post_events, l, pc) { diff --git a/src/lib/evas/canvas/evas.eo b/src/lib/evas/canvas/evas_canvas.eo similarity index 99% rename from src/lib/evas/canvas/evas.eo rename to src/lib/evas/canvas/evas_canvas.eo index 8335a6e918..f593602a85 100644 --- a/src/lib/evas/canvas/evas.eo +++ b/src/lib/evas/canvas/evas_canvas.eo @@ -1,6 +1,6 @@ -class Evas (Eo_Base, Evas_Common_Interface) +class Evas.Canvas (Eo.Base, Evas.Common_Interface) { - eo_prefix: evas_canvas; + legacy_prefix: evas; data: Evas_Public_Data; properties { output_framespace { @@ -1772,9 +1772,9 @@ class Evas (Eo_Base, Evas_Common_Interface) } } implements { - Eo_Base.constructor; - Eo_Base.destructor; - Evas_Common_Interface.evas.get; + Eo.Base.constructor; + Eo.Base.destructor; + Evas.Common_Interface.evas.get; } } diff --git a/src/lib/evas/canvas/evas_clickable_interface.eo b/src/lib/evas/canvas/evas_clickable_interface.eo index da811d69e9..d3de7ee16f 100644 --- a/src/lib/evas/canvas/evas_clickable_interface.eo +++ b/src/lib/evas/canvas/evas_clickable_interface.eo @@ -1,4 +1,4 @@ -interface Evas_Clickable_Interface (Evas_Signal_Interface) +interface Evas.Clickable_Interface (Evas.Signal_Interface) { data: null; events { diff --git a/src/lib/evas/canvas/evas_common_interface.eo b/src/lib/evas/canvas/evas_common_interface.eo index 3cd736809c..392f8ec3c2 100644 --- a/src/lib/evas/canvas/evas_common_interface.eo +++ b/src/lib/evas/canvas/evas_common_interface.eo @@ -1,4 +1,4 @@ -interface Evas_Common_Interface () +interface Evas.Common_Interface () { eo_prefix: evas_common; data: null; @@ -13,4 +13,4 @@ interface Evas_Common_Interface () } } } -} \ No newline at end of file +} diff --git a/src/lib/evas/canvas/evas_device.c b/src/lib/evas/canvas/evas_device.c index a896bb7ddc..b57a587b7c 100644 --- a/src/lib/evas/canvas/evas_device.c +++ b/src/lib/evas/canvas/evas_device.c @@ -14,7 +14,7 @@ evas_device_add(Evas *eo_e) dev->magic = MAGIC_DEV; dev->evas = eo_e; dev->ref = 1; - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); e->devices = eina_list_append(e->devices, dev); evas_event_callback_call(eo_e, EVAS_CALLBACK_DEVICE_CHANGED, dev); return dev; @@ -54,7 +54,7 @@ evas_device_push(Evas *eo_e, Evas_Device *dev) MAGIC_CHECK(dev, Evas_Device, MAGIC_DEV); return; MAGIC_CHECK_END(); - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); if (!e->cur_device) { e->cur_device = eina_array_new(4); @@ -72,7 +72,7 @@ evas_device_pop(Evas *eo_e) MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); return; MAGIC_CHECK_END(); - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); dev = eina_array_pop(e->cur_device); if (dev) _evas_device_unref(dev); } @@ -90,7 +90,7 @@ evas_device_list(Evas *eo_e, const Evas_Device *dev) MAGIC_CHECK_END(); } if (dev) return dev->children; - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); return e->devices; } @@ -138,7 +138,7 @@ evas_device_parent_set(Evas_Device *dev, Evas_Device *parent) MAGIC_CHECK(dev, Evas_Device, MAGIC_DEV); return; MAGIC_CHECK_END(); - Evas_Public_Data *e = eo_data_scope_get(dev->evas, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(dev->evas, EVAS_CANVAS_CLASS); if (parent) { MAGIC_CHECK(parent, Evas_Device, MAGIC_DEV); @@ -239,7 +239,7 @@ _evas_device_cleanup(Evas *eo_e) { Evas_Device *dev; - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); if (e->cur_device) { while ((dev = eina_array_pop(e->cur_device))) @@ -258,7 +258,7 @@ _evas_device_top_get(const Evas *eo_e) { int num; - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); if (!e->cur_device) return NULL; num = eina_array_count(e->cur_device); if (num < 1) return NULL; diff --git a/src/lib/evas/canvas/evas_draggable_interface.eo b/src/lib/evas/canvas/evas_draggable_interface.eo index 54148e7b8f..628f32fcd6 100644 --- a/src/lib/evas/canvas/evas_draggable_interface.eo +++ b/src/lib/evas/canvas/evas_draggable_interface.eo @@ -1,4 +1,4 @@ -interface Evas_Draggable_Interface (Evas_Signal_Interface) +interface Evas.Draggable_Interface (Evas.Signal_Interface) { data: null; events { @@ -11,4 +11,4 @@ interface Evas_Draggable_Interface (Evas_Signal_Interface) drag,start,right; drag,start,left; } -} \ No newline at end of file +} diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c index 14115c441f..d18245d5e1 100644 --- a/src/lib/evas/canvas/evas_events.c +++ b/src/lib/evas/canvas/evas_events.c @@ -183,7 +183,7 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS); - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Coord_Point canvas = ev->canvas; Evas_Object_Protected_Data *child; Evas_Object *eo_child; @@ -261,7 +261,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS); - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Coord_Point canvas = ev->cur.canvas; if (obj->delete_me || src->delete_me || e->is_frozen) return; @@ -436,7 +436,7 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_M Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS); - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Coord_Point canvas = ev->canvas; if (obj->delete_me || src->delete_me || e->is_frozen) return; @@ -510,7 +510,7 @@ _evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mous Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS); - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Coord_Point canvas = ev->canvas; if (obj->delete_me || src->delete_me || obj->layer->evas->is_frozen) return; @@ -546,7 +546,7 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS); - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Coord_Precision_Point canvas = ev->canvas; if (obj->delete_me || src->delete_me || obj->layer->evas->is_frozen) return; @@ -597,7 +597,7 @@ _evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_M Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS); - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Coord_Precision_Point canvas = ev->canvas; if (obj->delete_me || src->delete_me || obj->layer->evas->is_frozen) return; @@ -641,7 +641,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS); - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Coord_Precision_Point canvas = ev->cur.canvas; if (obj->delete_me || src->delete_me || e->is_frozen) return; @@ -748,7 +748,7 @@ _evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_ Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS); - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Coord_Point canvas = ev->canvas; Evas_Object *eo_child; Eina_List *ins = NULL; @@ -808,7 +808,7 @@ _evas_event_source_mouse_out_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_ Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS); - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Coord_Point canvas = ev->canvas; Evas_Object *eo_child; Eina_List *l; @@ -864,7 +864,7 @@ _evas_event_object_list_in_get(Evas *eo_e, Eina_List *in, static Eina_List * _evas_event_objects_event_list_no_frozen_check(Evas *eo_e, Evas_Object *stop, int x, int y) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Layer *lay; Eina_List *in = NULL; @@ -882,7 +882,7 @@ _evas_event_objects_event_list_no_frozen_check(Evas *eo_e, Evas_Object *stop, in } EOLIAN Eina_List* -_evas_tree_objects_at_xy_get(Eo *eo_e, Evas_Public_Data *e EINA_UNUSED, Evas_Object *stop, int x, int y) +_evas_canvas_tree_objects_at_xy_get(Eo *eo_e, Evas_Public_Data *e EINA_UNUSED, Evas_Object *stop, int x, int y) { return _evas_event_objects_event_list_no_frozen_check(eo_e, stop, x, y); } @@ -890,7 +890,7 @@ _evas_tree_objects_at_xy_get(Eo *eo_e, Evas_Public_Data *e EINA_UNUSED, Evas_Obj Eina_List * evas_event_objects_event_list(Evas *eo_e, Evas_Object *stop, int x, int y) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); if ((!e->layers) || (e->is_frozen)) return NULL; return _evas_event_objects_event_list_no_frozen_check(eo_e, stop, x, y); @@ -909,13 +909,13 @@ evas_event_list_copy(Eina_List *list) /* public functions */ EOLIAN void -_evas_event_default_flags_set(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Event_Flags flags) +_evas_canvas_event_default_flags_set(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Event_Flags flags) { e->default_event_flags = flags; } EOLIAN Evas_Event_Flags -_evas_event_default_flags_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +_evas_canvas_event_default_flags_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { return e->default_event_flags; } @@ -948,7 +948,7 @@ evas_event_thaw(Evas *eo_e) void _canvas_event_freeze(Eo *eo_e, void *_pd, va_list *list EINA_UNUSED) { - eo_do_super(eo_e, EVAS_CLASS, eo_event_freeze()); + eo_do_super(eo_e, EVAS_CANVAS_CLASS, eo_event_freeze()); Evas_Public_Data *e = _pd; e->is_frozen = EINA_TRUE; } @@ -957,9 +957,9 @@ void _canvas_event_thaw(Eo *eo_e, void *_pd, va_list *list EINA_UNUSED) { int fcount = -1; - eo_do_super(eo_e, EVAS_CLASS, + eo_do_super(eo_e, EVAS_CANVAS_CLASS, eo_event_thaw()); - eo_do_super(eo_e, EVAS_CLASS, + eo_do_super(eo_e, EVAS_CANVAS_CLASS, fcount = eo_event_freeze_count_get()); if (0 == fcount) { @@ -999,7 +999,7 @@ evas_event_thaw_eval(Evas *eo_e) MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); return; MAGIC_CHECK_END(); - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); if (0 == evas_event_freeze_get(eo_e)) { _canvas_event_thaw_eval_internal(eo_e, e); @@ -1007,7 +1007,7 @@ evas_event_thaw_eval(Evas *eo_e) } EOLIAN void -_evas_event_feed_mouse_down(Eo *eo_e, Evas_Public_Data *e, int b, Evas_Button_Flags flags, unsigned int timestamp, const void *data) +_evas_canvas_event_feed_mouse_down(Eo *eo_e, Evas_Public_Data *e, int b, Evas_Button_Flags flags, unsigned int timestamp, const void *data) { Eina_List *l, *copy; Evas_Event_Mouse_Down ev; @@ -1106,7 +1106,7 @@ _evas_event_feed_mouse_down(Eo *eo_e, Evas_Public_Data *e, int b, Evas_Button_Fl static int _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Eina_List *l, *copy, *ins, *ll; Evas_Event_Mouse_Out ev; Evas_Object *eo_obj; @@ -1229,7 +1229,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data) } EOLIAN void -_evas_event_feed_mouse_up(Eo *eo_e, Evas_Public_Data *e, int b, Evas_Button_Flags flags, unsigned int timestamp, const void *data) +_evas_canvas_event_feed_mouse_up(Eo *eo_e, Evas_Public_Data *e, int b, Evas_Button_Flags flags, unsigned int timestamp, const void *data) { Eina_List *l, *copy; @@ -1326,7 +1326,7 @@ _evas_event_feed_mouse_up(Eo *eo_e, Evas_Public_Data *e, int b, Evas_Button_Flag } EOLIAN void -_evas_event_feed_mouse_cancel(Eo *eo_e, Evas_Public_Data *e, unsigned int timestamp, const void *data) +_evas_canvas_event_feed_mouse_cancel(Eo *eo_e, Evas_Public_Data *e, unsigned int timestamp, const void *data) { Evas_Coord_Touch_Point *point; Eina_List *l, *ll; @@ -1351,7 +1351,7 @@ _evas_event_feed_mouse_cancel(Eo *eo_e, Evas_Public_Data *e, unsigned int timest } EOLIAN void -_evas_event_feed_mouse_wheel(Eo *eo_e, Evas_Public_Data *e, int direction, int z, unsigned int timestamp, const void *data) +_evas_canvas_event_feed_mouse_wheel(Eo *eo_e, Evas_Public_Data *e, int direction, int z, unsigned int timestamp, const void *data) { Eina_List *l, *copy; Evas_Event_Mouse_Wheel ev; @@ -1901,19 +1901,19 @@ nogrep: } EOLIAN void -_evas_event_input_mouse_move(Eo *eo_e, Evas_Public_Data *e, int x, int y, unsigned int timestamp, const void *data) +_evas_canvas_event_input_mouse_move(Eo *eo_e, Evas_Public_Data *e, int x, int y, unsigned int timestamp, const void *data) { _canvas_event_feed_mouse_move_internal(eo_e, e, x - e->framespace.x, y - e->framespace.y, timestamp, data); } EOLIAN void -_evas_event_feed_mouse_move(Eo *eo_e, Evas_Public_Data *e, int x, int y, unsigned int timestamp, const void *data) +_evas_canvas_event_feed_mouse_move(Eo *eo_e, Evas_Public_Data *e, int x, int y, unsigned int timestamp, const void *data) { _canvas_event_feed_mouse_move_internal(eo_e, e, x, y, timestamp, data); } EOLIAN void -_evas_event_feed_mouse_in(Eo *eo_e, Evas_Public_Data *e, unsigned int timestamp, const void *data) +_evas_canvas_event_feed_mouse_in(Eo *eo_e, Evas_Public_Data *e, unsigned int timestamp, const void *data) { Eina_List *ins; @@ -1978,7 +1978,7 @@ _evas_event_feed_mouse_in(Eo *eo_e, Evas_Public_Data *e, unsigned int timestamp, } EOLIAN void -_evas_event_feed_mouse_out(Eo *eo_e, Evas_Public_Data *e, unsigned int timestamp, const void *data) +_evas_canvas_event_feed_mouse_out(Eo *eo_e, Evas_Public_Data *e, unsigned int timestamp, const void *data) { Evas_Event_Mouse_Out ev; @@ -2133,7 +2133,7 @@ _canvas_event_feed_multi_down_internal(Evas *eo_e, void *_pd, } EOLIAN void -_evas_event_input_multi_down(Eo *eo_e, Evas_Public_Data *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data) +_evas_canvas_event_input_multi_down(Eo *eo_e, Evas_Public_Data *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data) { _canvas_event_feed_multi_down_internal(eo_e, e, d, @@ -2144,7 +2144,7 @@ _evas_event_input_multi_down(Eo *eo_e, Evas_Public_Data *e, int d, int x, int y, } EOLIAN void -_evas_event_feed_multi_down(Eo *eo_e, Evas_Public_Data *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data) +_evas_canvas_event_feed_multi_down(Eo *eo_e, Evas_Public_Data *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data) { _canvas_event_feed_multi_down_internal(eo_e, e, @@ -2236,7 +2236,7 @@ _canvas_event_feed_multi_up_internal(Evas *eo_e, void *_pd, } EOLIAN void -_evas_event_input_multi_up(Eo *eo_e, Evas_Public_Data *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data) +_evas_canvas_event_input_multi_up(Eo *eo_e, Evas_Public_Data *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data) { _canvas_event_feed_multi_up_internal(eo_e, e, d, @@ -2248,7 +2248,7 @@ _evas_event_input_multi_up(Eo *eo_e, Evas_Public_Data *e, int d, int x, int y, d } EOLIAN void -_evas_event_feed_multi_up(Eo *eo_e, Evas_Public_Data *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data) +_evas_canvas_event_feed_multi_up(Eo *eo_e, Evas_Public_Data *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data) { _canvas_event_feed_multi_up_internal(eo_e, e, d, x, y, rad, radx, rady, @@ -2428,7 +2428,7 @@ _canvas_event_feed_multi_move_internal(Eo *eo_e, void *_pd, int d, int x, } EOLIAN void -_evas_event_input_multi_move(Eo *eo_e, Evas_Public_Data *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, unsigned int timestamp, const void *data) +_evas_canvas_event_input_multi_move(Eo *eo_e, Evas_Public_Data *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, unsigned int timestamp, const void *data) { _canvas_event_feed_multi_move_internal(eo_e, e, d, @@ -2438,7 +2438,7 @@ _evas_event_input_multi_move(Eo *eo_e, Evas_Public_Data *e, int d, int x, int y, } EOLIAN void -_evas_event_feed_multi_move(Eo *eo_e, Evas_Public_Data *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, unsigned int timestamp, const void *data) +_evas_canvas_event_feed_multi_move(Eo *eo_e, Evas_Public_Data *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, unsigned int timestamp, const void *data) { _canvas_event_feed_multi_move_internal(eo_e, e, d, x, y, rad, radx, rady, @@ -2658,35 +2658,35 @@ _canvas_event_feed_key_up_internal(Eo *eo_e, } EOLIAN void -_evas_event_feed_key_down(Eo *eo_e, Evas_Public_Data *e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data) +_evas_canvas_event_feed_key_down(Eo *eo_e, Evas_Public_Data *e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data) { _canvas_event_feed_key_down_internal(eo_e, e, keyname, key, string, compose, timestamp, data, 0); } EOLIAN void -_evas_event_feed_key_up(Eo *eo_e, Evas_Public_Data *e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data) +_evas_canvas_event_feed_key_up(Eo *eo_e, Evas_Public_Data *e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data) { _canvas_event_feed_key_up_internal(eo_e, e, keyname, key, string, compose, timestamp, data, 0); } EOLIAN void -_evas_event_feed_key_down_with_keycode(Eo *eo_e, Evas_Public_Data *e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data, unsigned int keycode) +_evas_canvas_event_feed_key_down_with_keycode(Eo *eo_e, Evas_Public_Data *e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data, unsigned int keycode) { _canvas_event_feed_key_down_internal(eo_e, e, keyname, key, string, compose, timestamp, data, keycode); } EOLIAN void -_evas_event_feed_key_up_with_keycode(Eo *eo_e, Evas_Public_Data *e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data, unsigned int keycode) +_evas_canvas_event_feed_key_up_with_keycode(Eo *eo_e, Evas_Public_Data *e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data, unsigned int keycode) { _canvas_event_feed_key_up_internal(eo_e, e, keyname, key, string, compose, timestamp, data, keycode); } EOLIAN void -_evas_event_feed_hold(Eo *eo_e, Evas_Public_Data *e, int hold, unsigned int timestamp, const void *data) +_evas_canvas_event_feed_hold(Eo *eo_e, Evas_Public_Data *e, int hold, unsigned int timestamp, const void *data) { Eina_List *l, *copy; @@ -2820,7 +2820,7 @@ _evas_object_pointer_mode_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data } EOLIAN void -_evas_event_refeed_event(Eo *eo_e, Evas_Public_Data *e EINA_UNUSED, void *event_copy, Evas_Callback_Type event_type) +_evas_canvas_event_refeed_event(Eo *eo_e, Evas_Public_Data *e EINA_UNUSED, void *event_copy, Evas_Callback_Type event_type) { if (!event_copy) return; @@ -2899,7 +2899,7 @@ _evas_event_refeed_event(Eo *eo_e, Evas_Public_Data *e EINA_UNUSED, void *event_ } EOLIAN int -_evas_event_down_count_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +_evas_canvas_event_down_count_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { return e->pointer.downs; } diff --git a/src/lib/evas/canvas/evas_focus.c b/src/lib/evas/canvas/evas_focus.c index 4f529b3909..880791bdd2 100644 --- a/src/lib/evas/canvas/evas_focus.c +++ b/src/lib/evas/canvas/evas_focus.c @@ -53,7 +53,7 @@ _evas_object_focus_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) } EOLIAN Evas_Object* -_evas_focus_get(Eo *eo_obj EINA_UNUSED, Evas_Public_Data *e) +_evas_canvas_focus_get(Eo *eo_obj EINA_UNUSED, Evas_Public_Data *e) { return e->focused; } diff --git a/src/lib/evas/canvas/evas_font_dir.c b/src/lib/evas/canvas/evas_font_dir.c index 4ddac241ba..a8b604859a 100644 --- a/src/lib/evas/canvas/evas_font_dir.c +++ b/src/lib/evas/canvas/evas_font_dir.c @@ -142,7 +142,7 @@ void evas_fonts_zero_free(Evas *eo_evas) { Fndat *fd; - Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CLASS); + Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CANVAS_CLASS); EINA_LIST_FREE(fonts_zero, fd) { @@ -161,7 +161,7 @@ void evas_fonts_zero_pressure(Evas *eo_evas) { Fndat *fd; - Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CLASS); + Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CANVAS_CLASS); while (fonts_zero && eina_list_count(fonts_zero) > 4) /* 4 is arbitrary */ @@ -189,7 +189,7 @@ evas_font_free(Evas *eo_evas, void *font) { Eina_List *l; Fndat *fd; - Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CLASS); + Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CANVAS_CLASS); EINA_LIST_FOREACH(fonts_cache, l, fd) { @@ -230,7 +230,7 @@ static Evas_Font_Set * _evas_load_fontconfig(Evas_Font_Set *font, Evas *eo_evas, FcFontSet *set, int size, Font_Rend_Flags wanted_rend) { - Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CLASS); + Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CANVAS_CLASS); int i; /* Do loading for all in family */ @@ -521,7 +521,7 @@ evas_font_name_parse(Evas_Font_Description *fdesc, const char *name) void * evas_font_load(Evas *eo_evas, Evas_Font_Description *fdesc, const char *source, Evas_Font_Size size) { - Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CLASS); + Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CANVAS_CLASS); #ifdef HAVE_FONTCONFIG FcPattern *p_nm = NULL; FcFontSet *set = NULL; @@ -883,7 +883,7 @@ evas_font_load(Evas *eo_evas, Evas_Font_Description *fdesc, const char *source, void evas_font_load_hinting_set(Evas *eo_evas, void *font, int hinting) { - Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CLASS); + Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CANVAS_CLASS); evas->engine.func->font_hinting_set(evas->engine.data.output, font, hinting); } @@ -891,7 +891,7 @@ evas_font_load_hinting_set(Evas *eo_evas, void *font, int hinting) Eina_List * evas_font_dir_available_list(const Evas *eo_evas) { - const Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CLASS); + const Evas_Public_Data *evas = eo_data_scope_get(eo_evas, EVAS_CANVAS_CLASS); Eina_List *l; Eina_List *ll; Eina_List *available = NULL; @@ -1324,7 +1324,7 @@ evas_object_text_font_string_parse(char *buffer, char dest[14][256]) } EOLIAN void -_evas_font_path_clear(Eo *eo_e EINA_UNUSED, Evas_Public_Data *evas) +_evas_canvas_font_path_clear(Eo *eo_e EINA_UNUSED, Evas_Public_Data *evas) { while (evas->font_path) { @@ -1334,7 +1334,7 @@ _evas_font_path_clear(Eo *eo_e EINA_UNUSED, Evas_Public_Data *evas) } EOLIAN void -_evas_font_path_append(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *path) +_evas_canvas_font_path_append(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *path) { if (!path) return; e->font_path = eina_list_append(e->font_path, eina_stringshare_add(path)); @@ -1343,7 +1343,7 @@ _evas_font_path_append(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *pa } EOLIAN void -_evas_font_path_prepend(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *path) +_evas_canvas_font_path_prepend(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *path) { if (!path) return; e->font_path = eina_list_prepend(e->font_path, eina_stringshare_add(path)); @@ -1352,7 +1352,7 @@ _evas_font_path_prepend(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *p } EOLIAN const Eina_List* -_evas_font_path_list(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +_evas_canvas_font_path_list(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { return e->font_path; } @@ -1418,7 +1418,7 @@ evas_font_object_rehint(Evas_Object *eo_obj) } EOLIAN void -_evas_font_hinting_set(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Font_Hinting_Flags hinting) +_evas_canvas_font_hinting_set(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Font_Hinting_Flags hinting) { Evas_Layer *lay; @@ -1435,13 +1435,13 @@ _evas_font_hinting_set(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Font_Hint } EOLIAN Evas_Font_Hinting_Flags -_evas_font_hinting_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +_evas_canvas_font_hinting_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { return e->hinting; } EOLIAN Eina_Bool -_evas_font_hinting_can_hint(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Font_Hinting_Flags hinting) +_evas_canvas_font_hinting_can_hint(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Font_Hinting_Flags hinting) { if (e->engine.func->font_hinting_can_hint) return e->engine.func->font_hinting_can_hint(e->engine.data.output, @@ -1450,14 +1450,14 @@ _evas_font_hinting_can_hint(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Font } EOLIAN void -_evas_font_cache_flush(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +_evas_canvas_font_cache_flush(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { evas_render_rendering_wait(e); e->engine.func->font_cache_flush(e->engine.data.output); } EOLIAN void -_evas_font_cache_set(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int size) +_evas_canvas_font_cache_set(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int size) { if (size < 0) size = 0; evas_render_rendering_wait(e); @@ -1465,14 +1465,14 @@ _evas_font_cache_set(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int size) } EOLIAN int -_evas_font_cache_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +_evas_canvas_font_cache_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { return e->engine.func->font_cache_get(e->engine.data.output); } EOLIAN Eina_List* -_evas_font_available_list(Eo *eo_e, Evas_Public_Data *_pd EINA_UNUSED) +_evas_canvas_font_available_list(Eo *eo_e, Evas_Public_Data *_pd EINA_UNUSED) { return evas_font_dir_available_list(eo_e); } diff --git a/src/lib/evas/canvas/evas_gl.c b/src/lib/evas/canvas/evas_gl.c index 5e22d73272..ab0423793d 100644 --- a/src/lib/evas/canvas/evas_gl.c +++ b/src/lib/evas/canvas/evas_gl.c @@ -35,7 +35,7 @@ evas_gl_new(Evas *e) if (!evas_gl) return NULL; evas_gl->magic = MAGIC_EVAS_GL; - evas_gl->evas = eo_data_ref(e, EVAS_CLASS); + evas_gl->evas = eo_data_ref(e, EVAS_CANVAS_CLASS); if (!evas_gl->evas->engine.func->gl_context_create) { diff --git a/src/lib/evas/canvas/evas_grid.eo b/src/lib/evas/canvas/evas_grid.eo index 507cc3c21a..8bcd65af67 100644 --- a/src/lib/evas/canvas/evas_grid.eo +++ b/src/lib/evas/canvas/evas_grid.eo @@ -1,4 +1,4 @@ -class Evas_Grid (Evas_Smart_Clipped) +class Evas.Grid (Evas.Smart_Clipped) { legacy_prefix: evas_object_grid; eo_prefix: evas_obj_grid; @@ -150,6 +150,6 @@ class Evas_Grid (Evas_Smart_Clipped) } } implements { - Eo_Base.constructor; + Eo.Base.constructor; } } diff --git a/src/lib/evas/canvas/evas_image.eo b/src/lib/evas/canvas/evas_image.eo index a689cbd047..2671e9ea19 100644 --- a/src/lib/evas/canvas/evas_image.eo +++ b/src/lib/evas/canvas/evas_image.eo @@ -1,4 +1,4 @@ -class Evas_Image (Evas_Object) +class Evas.Image (Evas.Object) { legacy_prefix: evas_object_image; eo_prefix: evas_obj_image; @@ -1244,8 +1244,8 @@ class Evas_Image (Evas_Object) } } implements { - Eo_Base.constructor; - Eo_Base.destructor; - Eo_Base.dbg_info_get; + Eo.Base.constructor; + Eo.Base.destructor; + Eo.Base.dbg_info_get; } } diff --git a/src/lib/evas/canvas/evas_key.c b/src/lib/evas/canvas/evas_key.c index 188870c297..d8e6d67fdc 100644 --- a/src/lib/evas/canvas/evas_key.c +++ b/src/lib/evas/canvas/evas_key.c @@ -32,13 +32,13 @@ evas_key_lock_number(const Evas_Lock *l, const char *keyname) /* public calls */ EOLIAN const Evas_Modifier* -_evas_key_modifier_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +_evas_canvas_key_modifier_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { return &(e->modifiers); } EOLIAN const Evas_Lock* -_evas_key_lock_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +_evas_canvas_key_lock_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { return &(e->locks); } @@ -76,7 +76,7 @@ evas_key_lock_is_set(const Evas_Lock *l, const char *keyname) } EOLIAN void -_evas_key_modifier_add(Eo *eo_e, Evas_Public_Data *e, const char *keyname) +_evas_canvas_key_modifier_add(Eo *eo_e, Evas_Public_Data *e, const char *keyname) { if (!keyname) return; if (e->modifiers.mod.count >= 64) return; @@ -88,7 +88,7 @@ _evas_key_modifier_add(Eo *eo_e, Evas_Public_Data *e, const char *keyname) } EOLIAN void -_evas_key_modifier_del(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *keyname) +_evas_canvas_key_modifier_del(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *keyname) { int i; @@ -110,7 +110,7 @@ _evas_key_modifier_del(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *ke } EOLIAN void -_evas_key_lock_add(Eo *eo_e, Evas_Public_Data *e, const char *keyname) +_evas_canvas_key_lock_add(Eo *eo_e, Evas_Public_Data *e, const char *keyname) { if (!keyname) return; if (e->locks.lock.count >= 64) return; @@ -122,7 +122,7 @@ _evas_key_lock_add(Eo *eo_e, Evas_Public_Data *e, const char *keyname) } EOLIAN void -_evas_key_lock_del(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *keyname) +_evas_canvas_key_lock_del(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *keyname) { int i; if (!keyname) return; @@ -144,7 +144,7 @@ _evas_key_lock_del(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *keynam } EOLIAN void -_evas_key_modifier_on(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *keyname) +_evas_canvas_key_modifier_on(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *keyname) { Evas_Modifier_Mask num; int n; @@ -157,7 +157,7 @@ _evas_key_modifier_on(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *key } EOLIAN void -_evas_key_modifier_off(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *keyname) +_evas_canvas_key_modifier_off(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *keyname) { Evas_Modifier_Mask num; int n; @@ -170,7 +170,7 @@ _evas_key_modifier_off(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *ke } EOLIAN void -_evas_key_lock_on(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *keyname) +_evas_canvas_key_lock_on(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *keyname) { Evas_Modifier_Mask num; int n; @@ -183,7 +183,7 @@ _evas_key_lock_on(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *keyname } EOLIAN void -_evas_key_lock_off(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *keyname) +_evas_canvas_key_lock_off(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *keyname) { Evas_Modifier_Mask num; int n; @@ -198,7 +198,7 @@ _evas_key_lock_off(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *keynam /* errr need to add key grabbing/ungrabbing calls - missing modifier stuff. */ EOLIAN Evas_Modifier_Mask -_evas_key_modifier_mask_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *keyname) +_evas_canvas_key_modifier_mask_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *keyname) { Evas_Modifier_Mask num; diff --git a/src/lib/evas/canvas/evas_layer.c b/src/lib/evas/canvas/evas_layer.c index 98f8755dd7..62b1c54c93 100644 --- a/src/lib/evas/canvas/evas_layer.c +++ b/src/lib/evas/canvas/evas_layer.c @@ -47,7 +47,7 @@ evas_object_release(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, int cl Evas_Layer * evas_layer_new(Evas *eo_e) { - Evas_Public_Data *e = eo_data_ref(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_ref(eo_e, EVAS_CANVAS_CLASS); Evas_Layer *lay; lay = calloc(1, sizeof(Evas_Layer)); @@ -88,7 +88,7 @@ evas_layer_free_objects(Evas_Layer *lay) void evas_layer_clean(Evas *eo_e) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Layer *tmp; while (e->layers) @@ -102,7 +102,7 @@ evas_layer_clean(Evas *eo_e) Evas_Layer * evas_layer_find(Evas *eo_e, short layer_num) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Layer *layer; EINA_INLIST_FOREACH(e->layers, layer) diff --git a/src/lib/evas/canvas/evas_line.eo b/src/lib/evas/canvas/evas_line.eo index 77482dd8dd..e9283cf6fa 100644 --- a/src/lib/evas/canvas/evas_line.eo +++ b/src/lib/evas/canvas/evas_line.eo @@ -1,4 +1,4 @@ -class Evas_Line (Evas_Object) +class Evas.Line (Evas.Object) { legacy_prefix: evas_object_line; eo_prefix: evas_obj_line; @@ -24,7 +24,7 @@ class Evas_Line (Evas_Object) } } implements { - Eo_Base.constructor; + Eo.Base.constructor; } } diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c index ed135d4d94..5c09adc8a0 100644 --- a/src/lib/evas/canvas/evas_main.c +++ b/src/lib/evas/canvas/evas_main.c @@ -5,7 +5,7 @@ #include "evas_cs2_private.h" #endif -#define MY_CLASS EVAS_CLASS +#define MY_CLASS EVAS_CANVAS_CLASS #ifdef LKDEBUG EAPI Eina_Bool lockdebug = EINA_FALSE; @@ -145,12 +145,12 @@ evas_shutdown(void) EAPI Evas * evas_new(void) { - Evas_Object *eo_obj = eo_add(EVAS_CLASS, NULL); + Evas_Object *eo_obj = eo_add(EVAS_CANVAS_CLASS, NULL); return eo_obj; } EOLIAN static void -_evas_eo_base_constructor(Eo *eo_obj, Evas_Public_Data *e) +_evas_canvas_eo_base_constructor(Eo *eo_obj, Evas_Public_Data *e) { eo_do_super(eo_obj, MY_CLASS, eo_constructor()); @@ -199,7 +199,7 @@ evas_free(Evas *eo_e) } EOLIAN static void -_evas_eo_base_destructor(Eo *eo_e, Evas_Public_Data *e) +_evas_canvas_eo_base_destructor(Eo *eo_e, Evas_Public_Data *e) { Eina_Rectangle *r; Evas_Coord_Touch_Point *touch_point; @@ -307,7 +307,7 @@ _evas_eo_base_destructor(Eo *eo_e, Evas_Public_Data *e) } EOLIAN static void -_evas_output_method_set(Eo *eo_e, Evas_Public_Data *e, int render_method) +_evas_canvas_output_method_set(Eo *eo_e, Evas_Public_Data *e, int render_method) { Evas_Module *em; @@ -334,13 +334,13 @@ _evas_output_method_set(Eo *eo_e, Evas_Public_Data *e, int render_method) } EOLIAN static int -_evas_output_method_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +_evas_canvas_output_method_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { return e->output.render_method; } EOLIAN static Evas_Engine_Info* -_evas_engine_info_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +_evas_canvas_engine_info_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { Evas_Engine_Info *info; @@ -353,7 +353,7 @@ _evas_engine_info_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) } EOLIAN static Eina_Bool -_evas_engine_info_set(Eo *eo_e, Evas_Public_Data *e, Evas_Engine_Info *info) +_evas_canvas_engine_info_set(Eo *eo_e, Evas_Public_Data *e, Evas_Engine_Info *info) { if (!info) return EINA_FALSE; if (info != e->engine.info) return EINA_FALSE; @@ -363,7 +363,7 @@ _evas_engine_info_set(Eo *eo_e, Evas_Public_Data *e, Evas_Engine_Info *info) } EOLIAN static void -_evas_output_size_set(Eo *eo_e, Evas_Public_Data *e, int w, int h) +_evas_canvas_output_size_set(Eo *eo_e, Evas_Public_Data *e, int w, int h) { if ((w == e->output.w) && (h == e->output.h)) return; if (w < 1) w = 1; @@ -378,14 +378,14 @@ _evas_output_size_set(Eo *eo_e, Evas_Public_Data *e, int w, int h) } EOLIAN static void -_evas_output_size_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int *w, int *h) +_evas_canvas_output_size_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int *w, int *h) { if (w) *w = e->output.w; if (h) *h = e->output.h; } EOLIAN static void -_evas_output_viewport_set(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) +_evas_canvas_output_viewport_set(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) { if ((x == e->viewport.x) && (y == e->viewport.y) && (w == e->viewport.w) && (h == e->viewport.h)) return; @@ -407,7 +407,7 @@ _evas_output_viewport_set(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord } EOLIAN static void -_evas_output_viewport_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) +_evas_canvas_output_viewport_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) { if (x) *x = e->viewport.x; if (y) *y = e->viewport.y; @@ -416,7 +416,7 @@ _evas_output_viewport_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord } EOLIAN static void -_evas_output_framespace_set(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) +_evas_canvas_output_framespace_set(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) { if ((x == e->framespace.x) && (y == e->framespace.y) && (w == e->framespace.w) && (h == e->framespace.h)) return; @@ -430,7 +430,7 @@ _evas_output_framespace_set(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coor } EOLIAN static void -_evas_output_framespace_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) +_evas_canvas_output_framespace_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) { if (x) *x = e->framespace.x; if (y) *y = e->framespace.y; @@ -439,28 +439,28 @@ _evas_output_framespace_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coor } EOLIAN static Evas_Coord -_evas_coord_screen_x_to_world(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int x) +_evas_canvas_coord_screen_x_to_world(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int x) { if (e->output.w == e->viewport.w) return e->viewport.x + x; else return (long long)e->viewport.x + (((long long)x * (long long)e->viewport.w) / (long long)e->output.w); } EOLIAN static Evas_Coord -_evas_coord_screen_y_to_world(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int y) +_evas_canvas_coord_screen_y_to_world(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int y) { if (e->output.h == e->viewport.h) return e->viewport.y + y; else return (long long)e->viewport.y + (((long long)y * (long long)e->viewport.h) / (long long)e->output.h); } EOLIAN static int -_evas_coord_world_x_to_screen(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord x) +_evas_canvas_coord_world_x_to_screen(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord x) { if (e->output.w == e->viewport.w) return x - e->viewport.x; else return (int)((((long long)x - (long long)e->viewport.x) * (long long)e->output.w) / (long long)e->viewport.w); } EOLIAN static int -_evas_coord_world_y_to_screen(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord y) +_evas_canvas_coord_world_y_to_screen(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord y) { if (e->output.h == e->viewport.h) return y - e->viewport.y; else return (int)((((long long)y - (long long)e->viewport.y) * (long long)e->output.h) / (long long)e->viewport.h); @@ -513,45 +513,45 @@ evas_object_image_extension_can_load_fast_get(const char *file) } EOLIAN static void -_evas_pointer_output_xy_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int *x, int *y) +_evas_canvas_pointer_output_xy_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int *x, int *y) { if (x) *x = e->pointer.x; if (y) *y = e->pointer.y; } EOLIAN static void -_evas_pointer_canvas_xy_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord *x, Evas_Coord *y) +_evas_canvas_pointer_canvas_xy_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord *x, Evas_Coord *y) { if (x) *x = e->pointer.x; if (y) *y = e->pointer.y; } EOLIAN static int -_evas_pointer_button_down_mask_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +_evas_canvas_pointer_button_down_mask_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { return (int)e->pointer.button; } EOLIAN static Eina_Bool -_evas_pointer_inside_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +_evas_canvas_pointer_inside_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { return e->pointer.inside; } EOLIAN static void -_evas_data_attach_set(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, void *data) +_evas_canvas_data_attach_set(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, void *data) { e->attach_data = data; } EOLIAN static void* -_evas_data_attach_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +_evas_canvas_data_attach_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { return e->attach_data; } EOLIAN static void -_evas_focus_in(Eo *eo_e, Evas_Public_Data *e) +_evas_canvas_focus_in(Eo *eo_e, Evas_Public_Data *e) { if (e->focus) return; e->focus = 1; @@ -559,7 +559,7 @@ _evas_focus_in(Eo *eo_e, Evas_Public_Data *e) } EOLIAN static void -_evas_focus_out(Eo *eo_e, Evas_Public_Data *e) +_evas_canvas_focus_out(Eo *eo_e, Evas_Public_Data *e) { if (!e->focus) return; e->focus = 0; @@ -567,19 +567,19 @@ _evas_focus_out(Eo *eo_e, Evas_Public_Data *e) } EOLIAN static Eina_Bool -_evas_focus_state_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +_evas_canvas_focus_state_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { return e->focus; } EOLIAN static void -_evas_nochange_push(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +_evas_canvas_nochange_push(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { e->nochange++; } EOLIAN static void -_evas_nochange_pop(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +_evas_canvas_nochange_pop(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { e->nochange--; } @@ -660,9 +660,9 @@ evas_data_argb_unpremul(unsigned int *data, unsigned int len) } EOLIAN static Evas * -_evas_evas_common_interface_evas_get(Eo *eo_e, Evas_Public_Data *e EINA_UNUSED) +_evas_canvas_evas_common_interface_evas_get(Eo *eo_e, Evas_Public_Data *e EINA_UNUSED) { return (Evas *)eo_e; } -#include "canvas/evas.eo.c" +#include "canvas/evas_canvas.eo.c" diff --git a/src/lib/evas/canvas/evas_name.c b/src/lib/evas/canvas/evas_name.c index f7efdb06aa..55ca83f486 100644 --- a/src/lib/evas/canvas/evas_name.c +++ b/src/lib/evas/canvas/evas_name.c @@ -26,7 +26,7 @@ _evas_object_name_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) } EOLIAN Evas_Object* -_evas_object_name_find(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *name) +_evas_canvas_object_name_find(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *name) { if (!name) return NULL; else return (Evas_Object *)eina_hash_find(e->name_hash, name); diff --git a/src/lib/evas/canvas/evas_object.eo b/src/lib/evas/canvas/evas_object.eo index 8cdeb24c49..d67d1750c4 100644 --- a/src/lib/evas/canvas/evas_object.eo +++ b/src/lib/evas/canvas/evas_object.eo @@ -1,4 +1,4 @@ -abstract Evas_Object (Eo_Base, Evas_Common_Interface) +abstract Evas.Object (Eo.Base, Evas.Common_Interface) { eo_prefix: evas_obj; data: Evas_Object_Protected_Data; @@ -1511,10 +1511,10 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface) } } implements { - Eo_Base.constructor; - Eo_Base.destructor; - Eo_Base.dbg_info_get; - Evas_Common_Interface.evas.get; + Eo.Base.constructor; + Eo.Base.destructor; + Eo.Base.dbg_info_get; + Evas.Common_Interface.evas.get; } events { mouse,in; /*@ Mouse In Event */ diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c index 0598ce073b..7788d70fd8 100644 --- a/src/lib/evas/canvas/evas_object_image.c +++ b/src/lib/evas/canvas/evas_object_image.c @@ -376,7 +376,7 @@ evas_object_image_add(Evas *eo_e) MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); EINA_SAFETY_ON_NULL_RETURN_VAL(e, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(e->engine.func, NULL); Evas_Object *eo_obj = eo_add(EVAS_IMAGE_CLASS, eo_e); @@ -2168,14 +2168,14 @@ _evas_image_animated_frame_set(Eo *eo_obj, Evas_Image_Data *o, int frame_index) } EOLIAN void -_evas_image_cache_flush(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +_evas_canvas_image_cache_flush(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { evas_render_rendering_wait(e); e->engine.func->image_cache_flush(e->engine.data.output); } EOLIAN void -_evas_image_cache_reload(Eo *eo_e, Evas_Public_Data *e) +_evas_canvas_image_cache_reload(Eo *eo_e, Evas_Public_Data *e) { Evas_Layer *layer; @@ -2213,7 +2213,7 @@ _evas_image_cache_reload(Eo *eo_e, Evas_Public_Data *e) } EOLIAN void -_evas_image_cache_set(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int size) +_evas_canvas_image_cache_set(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int size) { if (size < 0) size = 0; evas_render_rendering_wait(e); @@ -2221,13 +2221,13 @@ _evas_image_cache_set(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int size) } EOLIAN int -_evas_image_cache_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +_evas_canvas_image_cache_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { return e->engine.func->image_cache_get(e->engine.data.output); } EOLIAN Eina_Bool -_evas_image_max_size_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int *maxw, int *maxh) +_evas_canvas_image_max_size_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int *maxw, int *maxh) { int w = 0, h = 0; @@ -2360,7 +2360,7 @@ _proxy_error(Evas_Object *eo_proxy, void *context, void *output, void *surface, static void _proxy_subrender(Evas *eo_e, Evas_Object *eo_source, Evas_Object *eo_proxy, Evas_Object_Protected_Data *proxy_obj, Eina_Bool do_async) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Object_Protected_Data *source; void *ctx; int w, h; @@ -2523,7 +2523,7 @@ _3d_render(Evas *eo_e, Evas_Object *eo_obj EINA_UNUSED, return; } - e = eo_data_scope_get(eo_e, EVAS_CLASS); + e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); if (pd_scene->surface) { diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c index fab722fe10..a908bfff9c 100644 --- a/src/lib/evas/canvas/evas_object_main.c +++ b/src/lib/evas/canvas/evas_object_main.c @@ -1592,7 +1592,7 @@ _evas_object_evas_common_interface_evas_get(Eo *eo_obj EINA_UNUSED, Evas_Object_ } EOLIAN Evas_Object* -_evas_object_top_at_xy_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord x, Evas_Coord y, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) +_evas_canvas_object_top_at_xy_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord x, Evas_Coord y, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) { Evas_Layer *lay; int xx, yy; @@ -1623,9 +1623,9 @@ _evas_object_top_at_xy_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord } EAPI Evas_Object * -evas_object_top_at_pointer_get(const Evas *eo_e) +evas_canvas_object_top_at_pointer_get(const Evas *eo_e) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Object *ret = NULL; if (!e) return NULL; eo_do((Eo *)eo_e, ret = evas_canvas_object_top_at_xy_get(e->pointer.x, e->pointer.y, EINA_TRUE, @@ -1634,7 +1634,7 @@ evas_object_top_at_pointer_get(const Evas *eo_e) } EOLIAN Evas_Object* -_evas_object_top_in_rectangle_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) +_evas_canvas_object_top_in_rectangle_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) { Evas_Layer *lay; int xx, yy, ww, hh; @@ -1671,7 +1671,7 @@ _evas_object_top_in_rectangle_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Eva } EOLIAN Eina_List* -_evas_objects_at_xy_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord x, Evas_Coord y, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) +_evas_canvas_objects_at_xy_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord x, Evas_Coord y, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) { Eina_List *in = NULL; Evas_Layer *lay; @@ -1717,7 +1717,7 @@ _evas_objects_at_xy_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord x, * */ EOLIAN Eina_List* -_evas_objects_in_rectangle_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) +_evas_canvas_objects_in_rectangle_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) { Eina_List *in = NULL; Evas_Layer *lay; diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c index d6adf65187..0b93a81215 100644 --- a/src/lib/evas/canvas/evas_object_smart.c +++ b/src/lib/evas/canvas/evas_object_smart.c @@ -899,13 +899,13 @@ _evas_object_smart_calculate(Eo *eo_obj, Evas_Smart_Data *o) } EOLIAN void -_evas_smart_objects_calculate(Eo *eo_e, Evas_Public_Data *o EINA_UNUSED) +_evas_canvas_smart_objects_calculate(Eo *eo_e, Evas_Public_Data *o EINA_UNUSED) { evas_call_smarts_calculate(eo_e); } EOLIAN int -_evas_smart_objects_calculate_count_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +_evas_canvas_smart_objects_calculate_count_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { return e->smart_calc_count; } @@ -920,7 +920,7 @@ evas_call_smarts_calculate(Evas *eo_e) { Evas_Smart_Data *o; Eina_Clist *elem; - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); evas_event_freeze(eo_e); e->in_smart_calc++; diff --git a/src/lib/evas/canvas/evas_object_smart.eo b/src/lib/evas/canvas/evas_object_smart.eo index 8ca9ef9f6a..b33c8600e6 100644 --- a/src/lib/evas/canvas/evas_object_smart.eo +++ b/src/lib/evas/canvas/evas_object_smart.eo @@ -1,4 +1,4 @@ -class Evas_Object_Smart (Evas_Object, Evas_Signal_Interface) +class Evas.Object_Smart (Evas.Object, Evas.Signal_Interface) { eo_prefix: evas_obj_smart; data: Evas_Smart_Data; @@ -353,9 +353,9 @@ class Evas_Object_Smart (Evas_Object, Evas_Signal_Interface) implements { class.constructor; class.destructor; - Eo_Base.constructor; - Evas_Object.smart_type_check_ptr; - Evas_Object.smart_type_check; - Evas_Object.smart_data.get; + Eo.Base.constructor; + Evas.Object.smart_type_check_ptr; + Evas.Object.smart_type_check; + Evas.Object.smart_data.get; } } diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index df668e5f06..fa4118bb6e 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -9736,7 +9736,7 @@ evas_textblock_cursor_visible_range_get(Evas_Textblock_Cursor *start, Evas_Textb Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); TB_HEAD_RETURN(EINA_FALSE); eo_e = evas_object_evas_get(eo_obj); - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); cy = 0 - obj->cur->geometry.y; ch = e->viewport.h; evas_textblock_cursor_line_coord_set(start, cy); diff --git a/src/lib/evas/canvas/evas_out.c b/src/lib/evas/canvas/evas_out.c index 9ef82cf59c..48a87557d6 100644 --- a/src/lib/evas/canvas/evas_out.c +++ b/src/lib/evas/canvas/evas_out.c @@ -31,7 +31,7 @@ _evas_out_eo_base_constructor(Eo *eo_obj, Evas_Out_Data *eo_dat) Evas_Public_Data *e; eo_do(eo_obj, eo_parent = eo_parent_get()); - e = eo_data_scope_get(eo_parent, EVAS_CLASS); + e = eo_data_scope_get(eo_parent, EVAS_CANVAS_CLASS); eo_do_super(eo_obj, MY_CLASS, eo_constructor()); @@ -56,7 +56,7 @@ _evas_out_eo_base_destructor(Eo *eo_obj, Evas_Out_Data *eo_dat) Evas_Public_Data *e; eo_do(eo_obj, eo_parent = eo_parent_get()); - e = eo_data_scope_get(eo_parent, EVAS_CLASS); + e = eo_data_scope_get(eo_parent, EVAS_CANVAS_CLASS); if (!e) return ; // XXX: need to free output and context one they get allocated one day // e->engine.func->context_free(eo_dat->output, eo_dat->context); diff --git a/src/lib/evas/canvas/evas_out.eo b/src/lib/evas/canvas/evas_out.eo index a1e6d8f88f..a8fad0496a 100644 --- a/src/lib/evas/canvas/evas_out.eo +++ b/src/lib/evas/canvas/evas_out.eo @@ -1,4 +1,4 @@ -class Evas_Out (Eo_Base) +class Evas.Out (Eo.Base) { eo_prefix: evas_out; legacy_prefix: evas_output; @@ -31,8 +31,8 @@ class Evas_Out (Eo_Base) } } implements { - Eo_Base.constructor; - Eo_Base.destructor; + Eo.Base.constructor; + Eo.Base.destructor; } -} \ No newline at end of file +} diff --git a/src/lib/evas/canvas/evas_polygon.eo b/src/lib/evas/canvas/evas_polygon.eo index d841857628..13e4a81630 100644 --- a/src/lib/evas/canvas/evas_polygon.eo +++ b/src/lib/evas/canvas/evas_polygon.eo @@ -1,4 +1,4 @@ -class Evas_Polygon (Evas_Object) +class Evas.Polygon (Evas.Object) { legacy_prefix: evas_object_polygon; eo_prefix: evas_obj_polygon; @@ -18,8 +18,8 @@ class Evas_Polygon (Evas_Object) } } implements { - Eo_Base.constructor; - Eo_Base.destructor; + Eo.Base.constructor; + Eo.Base.destructor; } } diff --git a/src/lib/evas/canvas/evas_rectangle.eo b/src/lib/evas/canvas/evas_rectangle.eo index 3999b850b4..382772c914 100644 --- a/src/lib/evas/canvas/evas_rectangle.eo +++ b/src/lib/evas/canvas/evas_rectangle.eo @@ -1,8 +1,8 @@ -class Evas_Rectangle (Evas_Object) +class Evas.Rectangle (Evas.Object) { legacy_prefix: evas_object_rectangle; eo_prefix: evas_obj_rectangle; implements { - Eo_Base.constructor; + Eo.Base.constructor; } } diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c index 5cb349d8f7..afed312301 100644 --- a/src/lib/evas/canvas/evas_render.c +++ b/src/lib/evas/canvas/evas_render.c @@ -155,7 +155,7 @@ _accumulate_time(double before, struct accumulator *acc) #endif EOLIAN void -_evas_damage_rectangle_add(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int x, int y, int w, int h) +_evas_canvas_damage_rectangle_add(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int x, int y, int w, int h) { Eina_Rectangle *r; @@ -166,7 +166,7 @@ _evas_damage_rectangle_add(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int x, int } EOLIAN void -_evas_obscured_rectangle_add(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int x, int y, int w, int h) +_evas_canvas_obscured_rectangle_add(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int x, int y, int w, int h) { Eina_Rectangle *r; @@ -176,7 +176,7 @@ _evas_obscured_rectangle_add(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int x, i } EOLIAN void -_evas_obscured_clear(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +_evas_canvas_obscured_clear(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { Eina_Rectangle *r; @@ -1645,7 +1645,7 @@ evas_render_updates_internal(Evas *eo_e, return EINA_FALSE; MAGIC_CHECK_END(); - e = eo_data_scope_get(eo_e, EVAS_CLASS); + e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); if (!e->changed) return EINA_FALSE; if (e->rendering) @@ -2188,7 +2188,7 @@ evas_render_wakeup(Evas *eo_e) Render_Updates *ru; Eina_Bool haveup = EINA_FALSE; Eina_List *ret_updates = NULL; - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); EINA_LIST_FREE(e->render.updates, ru) { @@ -2271,7 +2271,7 @@ evas_render_updates_free(Eina_List *updates) } EOLIAN Eina_Bool -_evas_render_async(Eo *eo_e, Evas_Public_Data *e) +_evas_canvas_render_async(Eo *eo_e, Evas_Public_Data *e) { static int render_2 = -1; @@ -2293,7 +2293,7 @@ evas_render_updates_internal_wait(Evas *eo_e, unsigned char do_draw) { Eina_List *ret = NULL; - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); static int render_2 = -1; if (render_2 == -1) @@ -2319,28 +2319,28 @@ evas_render_updates_internal_wait(Evas *eo_e, return ret; } EOLIAN Eina_List* -_evas_render_updates(Eo *eo_e, Evas_Public_Data *e) +_evas_canvas_render_updates(Eo *eo_e, Evas_Public_Data *e) { if (!e->changed) return NULL; return evas_render_updates_internal_wait(eo_e, 1, 1); } EOLIAN void -_evas_render(Eo *eo_e, Evas_Public_Data *e) +_evas_canvas_render(Eo *eo_e, Evas_Public_Data *e) { if (!e->changed) return; evas_render_updates_internal_wait(eo_e, 0, 1); } EOLIAN void -_evas_norender(Eo *eo_e, Evas_Public_Data *_pd EINA_UNUSED) +_evas_canvas_norender(Eo *eo_e, Evas_Public_Data *_pd EINA_UNUSED) { // if (!e->changed) return; evas_render_updates_internal_wait(eo_e, 0, 0); } EOLIAN void -_evas_render_idle_flush(Eo *eo_e, Evas_Public_Data *e) +_evas_canvas_render_idle_flush(Eo *eo_e, Evas_Public_Data *e) { static int render_2 = -1; @@ -2378,7 +2378,7 @@ _evas_render_idle_flush(Eo *eo_e, Evas_Public_Data *e) } EOLIAN void -_evas_sync(Eo *eo_e, Evas_Public_Data *e) +_evas_canvas_sync(Eo *eo_e, Evas_Public_Data *e) { static int render_2 = -1; @@ -2416,7 +2416,7 @@ _evas_render_dump_map_surfaces(Evas_Object *eo_obj) } EOLIAN void -_evas_render_dump(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +_evas_canvas_render_dump(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { static int render_2 = -1; @@ -2501,7 +2501,7 @@ evas_render_invalidate(Evas *eo_e) MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); return; MAGIC_CHECK_END(); - e = eo_data_scope_get(eo_e, EVAS_CLASS); + e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); OBJS_ARRAY_CLEAN(&e->active_objects); OBJS_ARRAY_CLEAN(&e->render_objects); diff --git a/src/lib/evas/canvas/evas_render2.c b/src/lib/evas/canvas/evas_render2.c index 230fee2d1b..7957b97abc 100644 --- a/src/lib/evas/canvas/evas_render2.c +++ b/src/lib/evas/canvas/evas_render2.c @@ -143,7 +143,7 @@ _evas_render2_updates_clean(Evas_Public_Data *e) static void _evas_render2_stage_last(Eo *eo_e, Eina_Bool make_updates) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); // XXX: // XXX: actually update screen from mainloop here if needed - eg software @@ -309,7 +309,7 @@ Eina_Bool _evas_render2_begin(Eo *eo_e, Eina_Bool make_updates, Eina_Bool do_draw, Eina_Bool do_async) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); // if nothing changed at all since last render - skip this frame if (!e->changed) return EINA_FALSE; @@ -376,7 +376,7 @@ _evas_render2_end(Eo *eo_e) void _evas_render2_idle_flush(Eo *eo_e) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); // wait for rendering to finish so we don't mess up shared resources _evas_render2_wait(eo_e); @@ -400,7 +400,7 @@ _evas_render2_idle_flush(Eo *eo_e) void _evas_render2_dump(Eo *eo_e) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); // freeze core cache system async work evas_cache_async_freeze(); @@ -424,6 +424,6 @@ _evas_render2_dump(Eo *eo_e) void _evas_render2_wait(Eo *eo_e) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); while (e->rendering) evas_async_events_process_blocking(); } diff --git a/src/lib/evas/canvas/evas_scrollable_interface.eo b/src/lib/evas/canvas/evas_scrollable_interface.eo index 4de50f6051..370435cb06 100644 --- a/src/lib/evas/canvas/evas_scrollable_interface.eo +++ b/src/lib/evas/canvas/evas_scrollable_interface.eo @@ -1,4 +1,4 @@ -interface Evas_Scrollable_Interface (Evas_Signal_Interface) +interface Evas.Scrollable_Interface (Evas.Signal_Interface) { data: null; events { diff --git a/src/lib/evas/canvas/evas_selectable_interface.eo b/src/lib/evas/canvas/evas_selectable_interface.eo index e9254bb921..4ee2685fad 100644 --- a/src/lib/evas/canvas/evas_selectable_interface.eo +++ b/src/lib/evas/canvas/evas_selectable_interface.eo @@ -1,4 +1,4 @@ -interface Evas_Selectable_Interface (Evas_Signal_Interface) +interface Evas.Selectable_Interface (Evas.Signal_Interface) { data: null; events { diff --git a/src/lib/evas/canvas/evas_signal_interface.eo b/src/lib/evas/canvas/evas_signal_interface.eo index ed385f1429..733e020fcb 100644 --- a/src/lib/evas/canvas/evas_signal_interface.eo +++ b/src/lib/evas/canvas/evas_signal_interface.eo @@ -1,4 +1,4 @@ -interface Evas_Signal_Interface () +interface Evas.Signal_Interface () { data: null; implements { diff --git a/src/lib/evas/canvas/evas_smart_clipped.eo b/src/lib/evas/canvas/evas_smart_clipped.eo index 51a53497c5..b01872cb51 100644 --- a/src/lib/evas/canvas/evas_smart_clipped.eo +++ b/src/lib/evas/canvas/evas_smart_clipped.eo @@ -1,20 +1,20 @@ -class Evas_Smart_Clipped (Evas_Object_Smart) +class Evas.Smart_Clipped (Evas.Object_Smart) { legacy_prefix: evas_object_smart_clipped; eo_prefix: evas_obj_smart_clipped; data: Evas_Object_Smart_Clipped_Data; implements { - Eo_Base.constructor; - Evas_Object_Smart.hide; - Evas_Object_Smart.clip.set; - Evas_Object_Smart.clip_unset; - Evas_Object_Smart.show; - Evas_Object_Smart.color.set; - Evas_Object_Smart.move; - Evas_Object_Smart.member_del; - Evas_Object_Smart.add; - Evas_Object_Smart.del; - Evas_Object_Smart.member_add; + Eo.Base.constructor; + Evas.Object_Smart.hide; + Evas.Object_Smart.clip.set; + Evas.Object_Smart.clip_unset; + Evas.Object_Smart.show; + Evas.Object_Smart.color.set; + Evas.Object_Smart.move; + Evas.Object_Smart.member_del; + Evas.Object_Smart.add; + Evas.Object_Smart.del; + Evas.Object_Smart.member_add; } } diff --git a/src/lib/evas/canvas/evas_stack.c b/src/lib/evas/canvas/evas_stack.c index 9eb5606b8d..5335acfb2e 100644 --- a/src/lib/evas/canvas/evas_stack.c +++ b/src/lib/evas/canvas/evas_stack.c @@ -325,7 +325,7 @@ _evas_object_below_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) } EOLIAN Evas_Object* -_evas_object_bottom_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +_evas_canvas_object_bottom_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { if (e->layers) { @@ -342,7 +342,7 @@ _evas_object_bottom_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) } EOLIAN Evas_Object* -_evas_object_top_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +_evas_canvas_object_top_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { Evas_Object_Protected_Data *obj = NULL; Eina_Inlist *list; diff --git a/src/lib/evas/canvas/evas_table.eo b/src/lib/evas/canvas/evas_table.eo index 183e535025..883ef4a086 100644 --- a/src/lib/evas/canvas/evas_table.eo +++ b/src/lib/evas/canvas/evas_table.eo @@ -1,4 +1,4 @@ -class Evas_Table (Evas_Smart_Clipped) +class Evas.Table (Evas.Smart_Clipped) { legacy_prefix: evas_object_table; eo_prefix: evas_obj_table; @@ -240,10 +240,10 @@ class Evas_Table (Evas_Smart_Clipped) } implements { class.constructor; - Eo_Base.constructor; - Evas_Object_Smart.add; - Evas_Object_Smart.del; - Evas_Object_Smart.calculate; - Evas_Object_Smart.resize; + Eo.Base.constructor; + Evas.Object_Smart.add; + Evas.Object_Smart.del; + Evas.Object_Smart.calculate; + Evas.Object_Smart.resize; } } diff --git a/src/lib/evas/canvas/evas_text.eo b/src/lib/evas/canvas/evas_text.eo index bb31f1a7ca..372bbeb9ca 100644 --- a/src/lib/evas/canvas/evas_text.eo +++ b/src/lib/evas/canvas/evas_text.eo @@ -1,4 +1,4 @@ -class Evas_Text (Evas_Object) +class Evas.Text (Evas.Object) { legacy_prefix: evas_object_text; eo_prefix: evas_obj_text; @@ -439,9 +439,9 @@ class Evas_Text (Evas_Object) } } implements { - Eo_Base.constructor; - Eo_Base.destructor; - Eo_Base.dbg_info_get; - Evas_Object.size.set; + Eo.Base.constructor; + Eo.Base.destructor; + Eo.Base.dbg_info_get; + Evas.Object.size.set; } } diff --git a/src/lib/evas/canvas/evas_textblock.eo b/src/lib/evas/canvas/evas_textblock.eo index b7882985b5..e3cc3d3f65 100644 --- a/src/lib/evas/canvas/evas_textblock.eo +++ b/src/lib/evas/canvas/evas_textblock.eo @@ -1,4 +1,4 @@ -class Evas_Textblock (Evas_Object) +class Evas.Textblock (Evas.Object) { legacy_prefix: evas_object_textblock; eo_prefix: evas_obj_textblock; @@ -304,8 +304,8 @@ class Evas_Textblock (Evas_Object) } } implements { - Eo_Base.constructor; - Eo_Base.destructor; - Eo_Base.dbg_info_get; + Eo.Base.constructor; + Eo.Base.destructor; + Eo.Base.dbg_info_get; } } diff --git a/src/lib/evas/canvas/evas_textgrid.eo b/src/lib/evas/canvas/evas_textgrid.eo index d436400a84..8c5c5ffb1e 100644 --- a/src/lib/evas/canvas/evas_textgrid.eo +++ b/src/lib/evas/canvas/evas_textgrid.eo @@ -1,4 +1,4 @@ -class Evas_Textgrid (Evas_Object) +class Evas.Textgrid (Evas.Object) { legacy_prefix: evas_object_textgrid; eo_prefix: evas_obj_textgrid; @@ -276,9 +276,9 @@ class Evas_Textgrid (Evas_Object) } } implements { - Eo_Base.constructor; - Eo_Base.destructor; - Eo_Base.dbg_info_get; + Eo.Base.constructor; + Eo.Base.destructor; + Eo.Base.dbg_info_get; } } diff --git a/src/lib/evas/canvas/evas_touch_point.c b/src/lib/evas/canvas/evas_touch_point.c index 9b500c4d1c..f706b70d4a 100644 --- a/src/lib/evas/canvas/evas_touch_point.c +++ b/src/lib/evas/canvas/evas_touch_point.c @@ -4,7 +4,7 @@ void _evas_touch_point_append(Evas *eo_e, int id, Evas_Coord x, Evas_Coord y) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Coord_Touch_Point *point; /* create new Evas_Coord_Touch_Point */ @@ -19,7 +19,7 @@ _evas_touch_point_append(Evas *eo_e, int id, Evas_Coord x, Evas_Coord y) void _evas_touch_point_update(Evas *eo_e, int id, Evas_Coord x, Evas_Coord y, Evas_Touch_Point_State state) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Eina_List *l; Evas_Coord_Touch_Point *point = NULL; @@ -38,7 +38,7 @@ _evas_touch_point_update(Evas *eo_e, int id, Evas_Coord x, Evas_Coord y, Evas_To void _evas_touch_point_remove(Evas *eo_e, int id) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Eina_List *l; Evas_Coord_Touch_Point *point = NULL; @@ -54,13 +54,13 @@ _evas_touch_point_remove(Evas *eo_e, int id) } EOLIAN unsigned int -_evas_touch_point_list_count(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +_evas_canvas_touch_point_list_count(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { return eina_list_count(e->touch_points); } EOLIAN void -_evas_touch_point_list_nth_xy_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, unsigned int n, Evas_Coord *x, Evas_Coord *y) +_evas_canvas_touch_point_list_nth_xy_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, unsigned int n, Evas_Coord *x, Evas_Coord *y) { Evas_Coord_Touch_Point *point = NULL; @@ -76,7 +76,7 @@ _evas_touch_point_list_nth_xy_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, uns } EOLIAN int -_evas_touch_point_list_nth_id_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, unsigned int n) +_evas_canvas_touch_point_list_nth_id_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, unsigned int n) { Evas_Coord_Touch_Point *point = NULL; @@ -86,7 +86,7 @@ _evas_touch_point_list_nth_id_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, uns } EOLIAN Evas_Touch_Point_State -_evas_touch_point_list_nth_state_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, unsigned int n) +_evas_canvas_touch_point_list_nth_state_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, unsigned int n) { Evas_Coord_Touch_Point *point = NULL; diff --git a/src/lib/evas/canvas/evas_zoomable_interface.eo b/src/lib/evas/canvas/evas_zoomable_interface.eo index cbcd88073c..ce39aba77d 100644 --- a/src/lib/evas/canvas/evas_zoomable_interface.eo +++ b/src/lib/evas/canvas/evas_zoomable_interface.eo @@ -1,4 +1,4 @@ -interface Evas_Zoomable_Interface (Evas_Signal_Interface) +interface Evas.Zoomable_Interface (Evas.Signal_Interface) { data: null; events { diff --git a/src/lib/evas/filters/evas_filter.c b/src/lib/evas/filters/evas_filter.c index 93a001be62..57882ce482 100644 --- a/src/lib/evas/filters/evas_filter.c +++ b/src/lib/evas/filters/evas_filter.c @@ -200,7 +200,7 @@ static void _proxy_subrender(Evas *eo_e, Evas_Object *eo_source, Evas_Object *eo_proxy, Evas_Object_Protected_Data *proxy_obj, Eina_Bool do_async) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Object_Protected_Data *source; Eina_Bool source_clip = EINA_FALSE; void *ctx; diff --git a/src/modules/evas/engines/buffer/evas_engine.c b/src/modules/evas/engines/buffer/evas_engine.c index ff99913a8b..516e055f9b 100644 --- a/src/modules/evas/engines/buffer/evas_engine.c +++ b/src/modules/evas/engines/buffer/evas_engine.c @@ -146,7 +146,7 @@ eng_info_free(Evas *eo_e EINA_UNUSED, void *info) static int eng_setup(Evas *eo_e, void *in) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Render_Engine *re; Evas_Engine_Info_Buffer *info; diff --git a/src/modules/evas/engines/drm/evas_engine.c b/src/modules/evas/engines/drm/evas_engine.c index a868ac798d..4bed29a623 100644 --- a/src/modules/evas/engines/drm/evas_engine.c +++ b/src/modules/evas/engines/drm/evas_engine.c @@ -122,7 +122,7 @@ eng_setup(Evas *evas, void *einfo) if (!(info = (Evas_Engine_Info_Drm *)einfo)) return 0; /* try to get the evas public data */ - if (!(epd = eo_data_scope_get(evas, EVAS_CLASS))) return 0; + if (!(epd = eo_data_scope_get(evas, EVAS_CANVAS_CLASS))) return 0; /* set canvas reference * diff --git a/src/modules/evas/engines/fb/evas_engine.c b/src/modules/evas/engines/fb/evas_engine.c index c28e93a5d7..215bee4582 100644 --- a/src/modules/evas/engines/fb/evas_engine.c +++ b/src/modules/evas/engines/fb/evas_engine.c @@ -102,7 +102,7 @@ eng_info_free(Evas *eo_e EINA_UNUSED, void *info) static int eng_setup(Evas *eo_e, void *in) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Render_Engine *re; Evas_Engine_Info_FB *info; diff --git a/src/modules/evas/engines/gl_cocoa/evas_engine.c b/src/modules/evas/engines/gl_cocoa/evas_engine.c index b6a8abbb21..1a1eb9b7e8 100644 --- a/src/modules/evas/engines/gl_cocoa/evas_engine.c +++ b/src/modules/evas/engines/gl_cocoa/evas_engine.c @@ -85,7 +85,7 @@ eng_info_free(Evas *e EINA_UNUSED, void *info) static int eng_setup(Evas *eo_e, void *in) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Render_Engine *re; Evas_Engine_Info_GL_Cocoa *info; diff --git a/src/modules/evas/engines/gl_sdl/evas_engine.c b/src/modules/evas/engines/gl_sdl/evas_engine.c index c57d770b12..cfe6ade2ea 100644 --- a/src/modules/evas/engines/gl_sdl/evas_engine.c +++ b/src/modules/evas/engines/gl_sdl/evas_engine.c @@ -30,7 +30,7 @@ eng_info_free(Evas *e EINA_UNUSED, void *info) static int eng_setup(Evas *eo_e, void *in) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Render_Engine *re; Evas_Engine_Info_GL_SDL *info; diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c index a4391b5dfa..4e8d595fb0 100644 --- a/src/modules/evas/engines/gl_x11/evas_engine.c +++ b/src/modules/evas/engines/gl_x11/evas_engine.c @@ -866,7 +866,7 @@ evgl_init(Render_Engine *re) static int eng_setup(Evas *eo_e, void *in) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Render_Engine *re; Evas_Engine_Info_GL_X11 *info; const char *s; diff --git a/src/modules/evas/engines/psl1ght/evas_engine.c b/src/modules/evas/engines/psl1ght/evas_engine.c index 0f5bcc7665..3fbf45ac3f 100644 --- a/src/modules/evas/engines/psl1ght/evas_engine.c +++ b/src/modules/evas/engines/psl1ght/evas_engine.c @@ -165,7 +165,7 @@ eng_info_free(Evas *e EINA_UNUSED, void *info) static int eng_setup(Evas *eo_e, void *in) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Engine_Info_PSL1GHT *info; printf ("eng_setup called\n"); diff --git a/src/modules/evas/engines/software_ddraw/evas_engine.c b/src/modules/evas/engines/software_ddraw/evas_engine.c index adc9b9d032..0e6d96b49e 100644 --- a/src/modules/evas/engines/software_ddraw/evas_engine.c +++ b/src/modules/evas/engines/software_ddraw/evas_engine.c @@ -111,7 +111,7 @@ eng_info_free(Evas *e, void *info) static int eng_setup(Evas *eo_e, void *in) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Render_Engine *re; Evas_Engine_Info_Software_DDraw *info; diff --git a/src/modules/evas/engines/software_gdi/evas_engine.c b/src/modules/evas/engines/software_gdi/evas_engine.c index e9f8a943a6..a1cc27f6e4 100644 --- a/src/modules/evas/engines/software_gdi/evas_engine.c +++ b/src/modules/evas/engines/software_gdi/evas_engine.c @@ -113,7 +113,7 @@ eng_info_free(Evas *e EINA_UNUSED, void *info) static int eng_setup(Evas *eo_e, void *in) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Render_Engine *re; Evas_Engine_Info_Software_Gdi *info; diff --git a/src/modules/evas/engines/software_x11/evas_engine.c b/src/modules/evas/engines/software_x11/evas_engine.c index 597c25b8d0..80036d8e9f 100644 --- a/src/modules/evas/engines/software_x11/evas_engine.c +++ b/src/modules/evas/engines/software_x11/evas_engine.c @@ -419,7 +419,7 @@ eng_info_free(Evas *eo_e EINA_UNUSED, void *info) static int eng_setup(Evas *eo_e, void *in) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Engine_Info_Software_X11 *info; Render_Engine *re = NULL; diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c index eb4e862753..bce7453a15 100644 --- a/src/modules/evas/engines/wayland_egl/evas_engine.c +++ b/src/modules/evas/engines/wayland_egl/evas_engine.c @@ -643,7 +643,7 @@ eng_setup(Evas *evas, void *info) const char *s; inf = (Evas_Engine_Info_Wayland_Egl *)info; - epd = eo_data_scope_get(evas, EVAS_CLASS); + epd = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); /* check for existing engine output */ if (!epd->engine.data.output) diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.c b/src/modules/evas/engines/wayland_shm/evas_engine.c index fabdb55dc0..415b40eb13 100644 --- a/src/modules/evas/engines/wayland_shm/evas_engine.c +++ b/src/modules/evas/engines/wayland_shm/evas_engine.c @@ -205,7 +205,7 @@ eng_setup(Evas *eo_evas, void *einfo) return 0; /* try to get evas public data from the canvas */ - if (!(epd = eo_data_scope_get(eo_evas, EVAS_CLASS))) + if (!(epd = eo_data_scope_get(eo_evas, EVAS_CANVAS_CLASS))) return 0; /* test for valid engine output */