From 0fc3279db966a5329b80c84794f9bff97e7a7ef0 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Mon, 2 Jun 2014 14:47:59 +0100 Subject: [PATCH] Efl: Update code to use the new class names generated by eolian. --- src/Makefile_Evas.am | 12 +- src/Makefile_Evas_Cxx.am | 2 +- src/lib/ecore/ecore_timer.c | 4 +- src/lib/ecore_audio/ecore_audio_obj.c | 2 +- src/lib/ecore_audio/ecore_audio_obj_in.c | 8 +- .../ecore_audio/ecore_audio_obj_in_sndfile.c | 18 +-- src/lib/ecore_audio/ecore_audio_obj_in_tone.c | 10 +- src/lib/ecore_audio/ecore_audio_obj_out.c | 14 +- .../ecore_audio/ecore_audio_obj_out_pulse.c | 8 +- .../ecore_audio/ecore_audio_obj_out_sndfile.c | 24 +-- src/lib/ecore_audio/ecore_audio_sndfile_vio.c | 10 +- src/lib/edje/edje.eo | 14 +- src/lib/edje/edje_box_layout.c | 2 +- src/lib/edje/edje_calc.c | 2 +- src/lib/edje/edje_edit.c | 8 +- src/lib/edje/edje_edit.eo | 4 +- src/lib/edje/edje_multisense.c | 8 +- src/lib/edje/edje_smart.c | 18 +-- src/lib/edje/edje_util.c | 26 +-- src/lib/evas/Evas_Eo.h | 3 +- src/lib/evas/Evas_Legacy.h | 2 +- src/lib/evas/canvas/evas_3d_scene.c | 2 +- src/lib/evas/canvas/evas_3d_texture.c | 14 +- src/lib/evas/canvas/evas_box.eo | 8 +- src/lib/evas/canvas/evas_callbacks.c | 10 +- src/lib/evas/canvas/evas_clip.c | 4 +- src/lib/evas/canvas/evas_events.c | 132 ++++++++-------- src/lib/evas/canvas/evas_font_dir.c | 2 +- src/lib/evas/canvas/evas_key_grab.c | 4 +- src/lib/evas/canvas/evas_layer.c | 6 +- src/lib/evas/canvas/evas_map.c | 16 +- src/lib/evas/canvas/evas_name.c | 2 +- src/lib/evas/canvas/evas_object_box.c | 10 +- src/lib/evas/canvas/evas_object_grid.c | 2 +- src/lib/evas/canvas/evas_object_image.c | 148 +++++++++--------- src/lib/evas/canvas/evas_object_inform.c | 16 +- src/lib/evas/canvas/evas_object_intercept.c | 10 +- src/lib/evas/canvas/evas_object_line.c | 12 +- src/lib/evas/canvas/evas_object_main.c | 6 +- src/lib/evas/canvas/evas_object_polygon.c | 14 +- src/lib/evas/canvas/evas_object_rectangle.c | 8 +- src/lib/evas/canvas/evas_object_smart.c | 142 ++++++++--------- .../{evas_smart.eo => evas_object_smart.eo} | 4 +- .../evas/canvas/evas_object_smart_clipped.c | 22 +-- src/lib/evas/canvas/evas_object_table.c | 10 +- src/lib/evas/canvas/evas_object_text.c | 60 +++---- src/lib/evas/canvas/evas_object_textblock.c | 56 +++---- src/lib/evas/canvas/evas_object_textgrid.c | 24 +-- src/lib/evas/canvas/evas_render.c | 20 +-- src/lib/evas/canvas/evas_smart_clipped.eo | 23 +-- src/lib/evas/canvas/evas_stack.c | 4 +- src/lib/evas/canvas/evas_table.eo | 8 +- src/lib/evas/filters/evas_filter.c | 8 +- src/lib/evas/include/evas_inline.x | 6 +- src/tests/ecore/ecore_test_ecore_audio.c | 32 ++-- 55 files changed, 522 insertions(+), 522 deletions(-) rename src/lib/evas/canvas/{evas_smart.eo => evas_object_smart.eo} (99%) diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 32a1a65e37..e9785ffa4d 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -22,9 +22,9 @@ BUILT_SOURCES += \ lib/evas/canvas/evas_textgrid.eo.legacy.h \ lib/evas/canvas/evas_signal_interface.eo.c \ lib/evas/canvas/evas_signal_interface.eo.h \ - lib/evas/canvas/evas_smart.eo.c \ - lib/evas/canvas/evas_smart.eo.h \ - lib/evas/canvas/evas_smart.eo.legacy.h \ + lib/evas/canvas/evas_object_smart.eo.c \ + lib/evas/canvas/evas_object_smart.eo.h \ + lib/evas/canvas/evas_object_smart.eo.legacy.h \ lib/evas/canvas/evas_smart_clipped.eo.c \ lib/evas/canvas/evas_smart_clipped.eo.h \ lib/evas/canvas/evas_smart_clipped.eo.legacy.h \ @@ -89,7 +89,7 @@ evaseolianfiles_DATA = \ lib/evas/canvas/evas_textblock.eo \ lib/evas/canvas/evas_textgrid.eo \ lib/evas/canvas/evas_signal_interface.eo \ - lib/evas/canvas/evas_smart.eo \ + lib/evas/canvas/evas_object_smart.eo \ lib/evas/canvas/evas_smart_clipped.eo \ lib/evas/canvas/evas_table.eo \ lib/evas/canvas/evas_common_interface.eo \ @@ -136,7 +136,7 @@ nodist_installed_evascanvasheaders_DATA = \ lib/evas/canvas/evas_textblock.eo.h \ lib/evas/canvas/evas_textgrid.eo.h \ lib/evas/canvas/evas_signal_interface.eo.h \ - lib/evas/canvas/evas_smart.eo.h \ + lib/evas/canvas/evas_object_smart.eo.h \ lib/evas/canvas/evas_smart_clipped.eo.h \ lib/evas/canvas/evas_table.eo.h \ lib/evas/canvas/evas_common_interface.eo.h \ @@ -158,7 +158,7 @@ nodist_installed_evascanvasheaders_DATA = \ lib/evas/canvas/evas_textblock.eo.legacy.h \ lib/evas/canvas/evas_textgrid.eo.legacy.h \ lib/evas/canvas/evas_table.eo.legacy.h \ - lib/evas/canvas/evas_smart.eo.legacy.h \ + lib/evas/canvas/evas_object_smart.eo.legacy.h \ lib/evas/canvas/evas_smart_clipped.eo.legacy.h \ lib/evas/canvas/evas_common_interface.eo.legacy.h \ lib/evas/canvas/evas_object.eo.legacy.h \ diff --git a/src/Makefile_Evas_Cxx.am b/src/Makefile_Evas_Cxx.am index 0ee8589ff2..dcca14be57 100644 --- a/src/Makefile_Evas_Cxx.am +++ b/src/Makefile_Evas_Cxx.am @@ -11,7 +11,7 @@ lib/evas/canvas/evas_text.eo.hh \ lib/evas/canvas/evas_textblock.eo.hh \ lib/evas/canvas/evas_textgrid.eo.hh \ lib/evas/canvas/evas_signal_interface.eo.hh \ -lib/evas/canvas/evas_smart.eo.hh \ +lib/evas/canvas/evas_object_smart.eo.hh \ lib/evas/canvas/evas_smart_clipped.eo.hh \ lib/evas/canvas/evas_table.eo.hh \ lib/evas/canvas/evas_common_interface.eo.hh \ diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c index 13bb4a0061..0bcd97b28a 100644 --- a/src/lib/ecore/ecore_timer.c +++ b/src/lib/ecore/ecore_timer.c @@ -10,11 +10,11 @@ #include "Ecore.h" #include "ecore_private.h" -#define MY_CLASS ECORE_OBJ_TIMER_CLASS +#define MY_CLASS ECORE_TIMER_CLASS #define MY_CLASS_NAME "Ecore_Timer" #define ECORE_TIMER_CHECK(obj) \ - if (!eo_isa((obj), ECORE_OBJ_TIMER_CLASS)) \ + if (!eo_isa((obj), ECORE_TIMER_CLASS)) \ return #ifdef WANT_ECORE_TIMER_DUMP diff --git a/src/lib/ecore_audio/ecore_audio_obj.c b/src/lib/ecore_audio/ecore_audio_obj.c index 98468a0f74..43fc821aaa 100644 --- a/src/lib/ecore_audio/ecore_audio_obj.c +++ b/src/lib/ecore_audio/ecore_audio_obj.c @@ -15,7 +15,7 @@ #include #include "ecore_audio_private.h" -#define MY_CLASS ECORE_AUDIO_OBJ_CLASS +#define MY_CLASS ECORE_AUDIO_CLASS #define MY_CLASS_NAME "Ecore_Audio" EOLIAN static void diff --git a/src/lib/ecore_audio/ecore_audio_obj_in.c b/src/lib/ecore_audio/ecore_audio_obj_in.c index 970e2adba3..ece944059b 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_in.c +++ b/src/lib/ecore_audio/ecore_audio_obj_in.c @@ -14,7 +14,7 @@ #include "ecore_audio_private.h" -#define MY_CLASS ECORE_AUDIO_OBJ_IN_CLASS +#define MY_CLASS ECORE_AUDIO_IN_CLASS #define MY_CLASS_NAME "Ecore_Audio_In" EOLIAN static void @@ -98,7 +98,7 @@ EOLIAN static ssize_t _ecore_audio_in_read(Eo *eo_obj, Ecore_Audio_Input *obj, void *buf, size_t len) { ssize_t len_read = 0; - const Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); + const Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (ea_obj->paused) { memset(buf, 0, len); @@ -124,7 +124,7 @@ EOLIAN static ssize_t _ecore_audio_in_read_internal(Eo *eo_obj, Ecore_Audio_Input *_pd EINA_UNUSED, void *buf, size_t len) { ssize_t len_read = 0; - const Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); + const Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (ea_obj->vio && ea_obj->vio->vio->read) { len_read = ea_obj->vio->vio->read(ea_obj->vio->data, eo_obj, buf, len); @@ -151,7 +151,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj) EOLIAN static void _ecore_audio_in_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Input *obj, Ecore_Audio_Vio *vio, void *data, eo_key_data_free_func free_func) { - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); + Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (ea_obj->vio) _free_vio(ea_obj); diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c index 6860f9dd5a..f6c725ea18 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c +++ b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c @@ -14,7 +14,7 @@ #include "ecore_audio_private.h" #include -#define MY_CLASS ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS +#define MY_CLASS ECORE_AUDIO_IN_SNDFILE_CLASS #define MY_CLASS_NAME "Ecore_Audio_In_Sndfile" extern SF_VIRTUAL_IO vio_wrapper; @@ -47,8 +47,8 @@ _ecore_audio_in_sndfile_ecore_audio_in_seek(Eo *eo_obj EINA_UNUSED, Ecore_Audio_ EOLIAN static Eina_Bool _ecore_audio_in_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, const char *source) { - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); - Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS); + Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); if (obj->handle) { sf_close(obj->handle); @@ -89,14 +89,14 @@ _ecore_audio_in_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_In_Sndfil EOLIAN static const char* _ecore_audio_in_sndfile_ecore_audio_source_get(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *_pd EINA_UNUSED) { - Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); + Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); return obj->source; } EOLIAN static Eina_Bool _ecore_audio_in_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, Ecore_Audio_Format format) { - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); + Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (ea_obj->source) { ERR("Input is already open - cannot change format"); @@ -128,7 +128,7 @@ _ecore_audio_in_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_In_Sndfil EOLIAN static Ecore_Audio_Format _ecore_audio_in_sndfile_ecore_audio_format_get(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *_pd EINA_UNUSED) { - Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); + Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); return obj->format;; } @@ -144,8 +144,8 @@ static void _free_vio(Ecore_Audio_Object *ea_obj) EOLIAN static void _ecore_audio_in_sndfile_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, Ecore_Audio_Vio *vio, void *data, eo_key_data_free_func free_func) { - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); - Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS); + Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); if (obj->handle) { sf_close(obj->handle); @@ -204,7 +204,7 @@ _ecore_audio_in_sndfile_eo_base_constructor(Eo *eo_obj, Ecore_Audio_In_Sndfile_D EOLIAN static void _ecore_audio_in_sndfile_eo_base_destructor(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj) { - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); + Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (obj->handle) sf_close(obj->handle); diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c index 749772f401..bdecc21860 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c +++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c @@ -14,7 +14,7 @@ #include "ecore_audio_private.h" #include -#define MY_CLASS ECORE_AUDIO_OBJ_IN_TONE_CLASS +#define MY_CLASS ECORE_AUDIO_IN_TONE_CLASS #define MY_CLASS_NAME "Ecore_Audio_In_Tone" struct _Ecore_Audio_In_Tone_Data @@ -29,7 +29,7 @@ EOLIAN static ssize_t _ecore_audio_in_tone_ecore_audio_in_read_internal(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, void *data, size_t len) { size_t i, remain; - Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS); + Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); float *val = data; @@ -50,7 +50,7 @@ EOLIAN static double _ecore_audio_in_tone_ecore_audio_in_seek(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, double offs, int mode) { int tmp; - Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS); + Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); switch (mode) { case SEEK_SET: @@ -78,7 +78,7 @@ err: EOLIAN static void _ecore_audio_in_tone_ecore_audio_in_length_set(Eo *eo_obj, Ecore_Audio_In_Tone_Data *_pd EINA_UNUSED, double length) { - Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS); + Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); in_obj->length = length; } @@ -110,7 +110,7 @@ _ecore_audio_in_tone_eo_base_key_data_get(Eo *eo_obj, Ecore_Audio_In_Tone_Data * EOLIAN static void _ecore_audio_in_tone_eo_base_constructor(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj) { - Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS); + Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_IN_CLASS); eo_do_super(eo_obj, MY_CLASS, eo_constructor()); diff --git a/src/lib/ecore_audio/ecore_audio_obj_out.c b/src/lib/ecore_audio/ecore_audio_obj_out.c index 495e05c701..2d8522b58e 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_out.c +++ b/src/lib/ecore_audio/ecore_audio_obj_out.c @@ -14,7 +14,7 @@ #include "ecore_audio_private.h" -#define MY_CLASS ECORE_AUDIO_OBJ_OUT_CLASS +#define MY_CLASS ECORE_AUDIO_OUT_CLASS #define MY_CLASS_NAME "Ecore_Audio_Out" static Eina_Bool _write_cb(void *data) @@ -22,8 +22,8 @@ static Eina_Bool _write_cb(void *data) Eo *eo_obj = data; Eo *in; - Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS); - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); + Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); + Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); ssize_t written, bread = 0; float buf[1024]; @@ -54,9 +54,9 @@ _ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Output *obj, Eo *input) { Ecore_Audio_Input *in; - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); + Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); - in = eo_data_scope_get(input, ECORE_AUDIO_OBJ_IN_CLASS); + in = eo_data_scope_get(input, ECORE_AUDIO_IN_CLASS); if (in->output == eo_obj) return EINA_FALSE; @@ -81,7 +81,7 @@ _ecore_audio_out_input_detach(Eo *eo_obj, Ecore_Audio_Output *obj, Eo *input) { Ecore_Audio_Input *in; - in = eo_data_scope_get(input, ECORE_AUDIO_OBJ_IN_CLASS); + in = eo_data_scope_get(input, ECORE_AUDIO_IN_CLASS); if (in->output != eo_obj) return EINA_FALSE; @@ -115,7 +115,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj) EOLIAN static void _ecore_audio_out_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Output *_pd EINA_UNUSED, Ecore_Audio_Vio *vio, void *data, eo_key_data_free_func free_func) { - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); + Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (ea_obj->vio) _free_vio(ea_obj); diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c index d958d2153b..4b5986f7d8 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c +++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c @@ -20,7 +20,7 @@ extern pa_mainloop_api functable; -#define MY_CLASS ECORE_AUDIO_OBJ_OUT_PULSE_CLASS +#define MY_CLASS ECORE_AUDIO_OUT_PULSE_CLASS #define MY_CLASS_NAME "Ecore_Audio_Out_Pulse" struct _Ecore_Audio_Pulse_Class { @@ -50,7 +50,7 @@ _ecore_audio_out_pulse_ecore_audio_volume_set(Eo *eo_obj, Ecore_Audio_Out_Pulse_ Eina_List *input; uint32_t idx; pa_cvolume pa_volume; - Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS); + Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); if (volume < 0) volume = 0; @@ -109,7 +109,7 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in) double speed = 0; pa_stream *stream; Eina_Bool ret = EINA_FALSE; - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); + Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); eo_do_super(eo_obj, MY_CLASS, ret = ecore_audio_obj_out_input_attach(in)); if (!ret) @@ -256,7 +256,7 @@ _ecore_audio_out_pulse_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Pulse_Dat { int argc; char **argv; - Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS); + Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); eo_do_super(eo_obj, MY_CLASS, eo_constructor()); diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c index 5e0e02f061..fc552b8257 100644 --- a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c +++ b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c @@ -14,7 +14,7 @@ #include "ecore_audio_private.h" #include -#define MY_CLASS ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS +#define MY_CLASS ECORE_AUDIO_OUT_SNDFILE_CLASS #define MY_CLASS_NAME "Ecore_Audio_Out_Sndfile" extern SF_VIRTUAL_IO vio_wrapper; @@ -33,9 +33,9 @@ static Eina_Bool _write_cb(void *data) Eo *eo_obj = data; Eo *in; - Ecore_Audio_Out_Sndfile_Data *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS); - Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS); - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); + Ecore_Audio_Out_Sndfile_Data *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_SNDFILE_CLASS); + Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); + Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); ssize_t written, bread = 0; float buf[1024]; @@ -62,8 +62,8 @@ static Eina_Bool _write_cb(void *data) EOLIAN static Eina_Bool _ecore_audio_out_sndfile_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, Eo *in) { - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); - Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS); + Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); + Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); Eina_Bool ret2 = EINA_FALSE; eo_do_super(eo_obj, MY_CLASS, ret2 = ecore_audio_obj_out_input_attach(in)); @@ -95,7 +95,7 @@ _ecore_audio_out_sndfile_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Ou EOLIAN static Eina_Bool _ecore_audio_out_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, const char *source) { - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); + Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (obj->handle) { sf_close(obj->handle); @@ -115,14 +115,14 @@ _ecore_audio_out_sndfile_ecore_audio_source_set(Eo *eo_obj, Ecore_Audio_Out_Sndf EOLIAN static const char* _ecore_audio_out_sndfile_ecore_audio_source_get(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED) { - Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); + Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); return obj->source; } EOLIAN static Eina_Bool _ecore_audio_out_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj, Ecore_Audio_Format format) { - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); + Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (ea_obj->source) { ERR("Input is already open - cannot change format"); @@ -154,14 +154,14 @@ _ecore_audio_out_sndfile_ecore_audio_format_set(Eo *eo_obj, Ecore_Audio_Out_Sndf EOLIAN static Ecore_Audio_Format _ecore_audio_out_sndfile_ecore_audio_format_get(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED) { - Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); + Ecore_Audio_Object *obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); return obj->format; } EOLIAN static void _ecore_audio_out_sndfile_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *_pd EINA_UNUSED) { - Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS); + Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); eo_do_super(eo_obj, MY_CLASS, eo_constructor()); @@ -174,7 +174,7 @@ _ecore_audio_out_sndfile_eo_base_constructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile EOLIAN static void _ecore_audio_out_sndfile_eo_base_destructor(Eo *eo_obj, Ecore_Audio_Out_Sndfile_Data *obj) { - Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_OUT_CLASS); + Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OUT_CLASS); if (obj->handle) sf_close(obj->handle); diff --git a/src/lib/ecore_audio/ecore_audio_sndfile_vio.c b/src/lib/ecore_audio/ecore_audio_sndfile_vio.c index 7fc595677c..4a629c8acf 100644 --- a/src/lib/ecore_audio/ecore_audio_sndfile_vio.c +++ b/src/lib/ecore_audio/ecore_audio_sndfile_vio.c @@ -16,7 +16,7 @@ static sf_count_t _wrap_get_filelen(void *data) { Eo *eo_obj = data; - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); + Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (!ea_obj->vio->vio) goto error; @@ -31,7 +31,7 @@ error: static sf_count_t _wrap_seek(sf_count_t offset, int whence, void *data) { Eo *eo_obj = data; - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); + Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (!ea_obj->vio->vio) goto error; @@ -46,7 +46,7 @@ error: static sf_count_t _wrap_read(void *buffer, sf_count_t count, void *data) { Eo *eo_obj = data; - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); + Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (!ea_obj->vio->vio) goto error; @@ -61,7 +61,7 @@ error: static sf_count_t _wrap_write(const void *buffer, sf_count_t count, void *data) { Eo *eo_obj = data; - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); + Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (!ea_obj->vio->vio) goto error; @@ -76,7 +76,7 @@ error: static sf_count_t _wrap_tell(void *data) { Eo *eo_obj = data; - Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); + Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_CLASS); if (!ea_obj->vio->vio) goto error; diff --git a/src/lib/edje/edje.eo b/src/lib/edje/edje.eo index b77fc21e7d..733e99d647 100644 --- a/src/lib/edje/edje.eo +++ b/src/lib/edje/edje.eo @@ -2496,12 +2496,12 @@ class Edje (Evas_Smart_Clipped) Eo_Base::constructor; Eo_Base::destructor; Eo_Base::dbg_info_get; - Evas_Smart::hide; - Evas_Smart::calculate; - Evas_Smart::show; - Evas_Smart::move; - Evas_Smart::add; - Evas_Smart::del; - Evas_Smart::resize; + 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_box_layout.c b/src/lib/edje/edje_box_layout.c index 66bba4f42e..791e6fb2bb 100644 --- a/src/lib/edje/edje_box_layout.c +++ b/src/lib/edje/edje_box_layout.c @@ -175,7 +175,7 @@ _edje_box_recalc_apply(Edje *ed EINA_UNUSED, Edje_Real_Part *ep, Edje_Calc_Param ep->typedata.container->anim->end.align.x = param2_desc->box.align.x; ep->typedata.container->anim->end.align.y = param2_desc->box.align.y; - priv = eo_data_scope_get(ep->object, EVAS_OBJ_BOX_CLASS); + priv = eo_data_scope_get(ep->object, EVAS_BOX_CLASS); if (priv == NULL) return; diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c index bb144d1bac..3c252b863a 100644 --- a/src/lib/edje/edje_calc.c +++ b/src/lib/edje/edje_calc.c @@ -2992,7 +2992,7 @@ _edje_map_prop_set(Evas_Map *map, const Edje_Calc_Params *pf, if (ep->part->type == EDJE_PART_TYPE_IMAGE || ((ep->part->type == EDJE_PART_TYPE_SWALLOW) && - (eo_isa(mo, EVAS_OBJ_IMAGE_CLASS) && + (eo_isa(mo, EVAS_IMAGE_CLASS) && (!evas_object_image_source_get(mo)))) ) { diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c index 2ccd44c127..5e97bb7e52 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_OBJ_CLASS)) \ + if (!eo_isa(obj, EDJE_CLASS)) \ return RET; \ - ed = eo_data_scope_get(obj, EDJE_OBJ_CLASS); + ed = eo_data_scope_get(obj, EDJE_CLASS); /* Get rp(Edje_Real_Part*) from obj(Evas_Object*) and part(char*) */ #define GET_RP_OR_RETURN(RET) \ @@ -151,7 +151,7 @@ _edje_edit_data_clean(Edje_Edit *eed) } EOLIAN static void -_edje_edit_evas_smart_del(Eo *obj, Edje_Edit *eed) +_edje_edit_evas_object_smart_del(Eo *obj, Edje_Edit *eed) { _edje_edit_data_clean(eed); @@ -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_OBJ_CLASS); + eed->base = eo_data_ref(obj, EDJE_CLASS); eo_do_super(obj, MY_CLASS, eo_constructor()); } diff --git a/src/lib/edje/edje_edit.eo b/src/lib/edje/edje_edit.eo index 7dece71cec..403d30eb10 100644 --- a/src/lib/edje/edje_edit.eo +++ b/src/lib/edje/edje_edit.eo @@ -4,7 +4,7 @@ class Edje_Edit (Edje) implements { Eo_Base::constructor; Eo_Base::destructor; - Evas_Smart::del; + Evas_Object_Smart::del; Edje::file::set; } -} \ No newline at end of file +} diff --git a/src/lib/edje/edje_multisense.c b/src/lib/edje/edje_multisense.c index d446c0534f..6537798ee6 100644 --- a/src/lib/edje/edje_multisense.c +++ b/src/lib/edje/edje_multisense.c @@ -198,14 +198,14 @@ _edje_multisense_internal_sound_sample_play(Edje *ed, const char *sample_name, c eet_data->vio.tell = eet_snd_file_tell; eet_data->offset = 0; - in = eo_add(ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, NULL, + in = eo_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL, ecore_audio_obj_name_set(snd_id_str), ecore_audio_obj_in_speed_set(speed), ecore_audio_obj_vio_set(&eet_data->vio, eet_data, _free), eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL)); if (!out) { - out = eo_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL, + out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, eo_event_callback_add(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL)); if (out) outs++; } @@ -262,7 +262,7 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const char *tone_name, const tone = &ed->file->sound_dir->tones[i]; if (!strcmp(tone->name, tone_name)) { - in = eo_add(ECORE_AUDIO_OBJ_IN_TONE_CLASS, NULL); + in = eo_add(ECORE_AUDIO_IN_TONE_CLASS, NULL); eo_do(in, ecore_audio_obj_name_set("tone")); eo_do(in, eo_key_data_set(ECORE_AUDIO_ATTR_TONE_FREQ, &tone->value, NULL)); eo_do(in, ecore_audio_obj_in_length_set(duration)); @@ -270,7 +270,7 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const char *tone_name, const if (!out) { - out = eo_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL, + out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, eo_event_callback_add(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL)); if (out) outs++; } diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c index 626fdd15bd..171be539a7 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_OBJ_CLASS +#define MY_CLASS EDJE_CLASS #define MY_CLASS_NAME "Edje" #define MY_CLASS_NAME_LEGACY "edje" @@ -27,7 +27,7 @@ edje_object_add(Evas *evas) EOLIAN static void _edje_eo_base_constructor(Eo *obj, Edje *ed) { - ed->base = eo_data_ref(obj, EVAS_OBJ_SMART_CLIPPED_CLASS); + ed->base = eo_data_ref(obj, EVAS_SMART_CLIPPED_CLASS); eo_do_super(obj, MY_CLASS, eo_constructor()); eo_do(obj, evas_obj_type_set(MY_CLASS_NAME_LEGACY)); @@ -73,7 +73,7 @@ _edje_color_class_free(void *data) /* Private Routines */ EOLIAN static void -_edje_evas_smart_add(Eo *obj, Edje *ed) +_edje_evas_object_smart_add(Eo *obj, Edje *ed) { Evas *tev = evas_object_evas_get(obj); @@ -115,7 +115,7 @@ _edje_evas_smart_add(Eo *obj, Edje *ed) } EOLIAN static void -_edje_evas_smart_del(Eo *obj, Edje *ed) +_edje_evas_object_smart_del(Eo *obj, Edje *ed) { _edje_block_violate(ed); ed->delete_me = 1; @@ -139,7 +139,7 @@ _edje_evas_smart_del(Eo *obj, Edje *ed) } EOLIAN static void -_edje_evas_smart_move(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord x, Evas_Coord y) +_edje_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_smart_resize(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord w, Evas_Coord h) +_edje_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_smart_resize(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord w, Evas_Coord } EOLIAN static void -_edje_evas_smart_show(Eo *obj, Edje *ed) +_edje_evas_object_smart_show(Eo *obj, Edje *ed) { Eina_List *l; Edje *edg; @@ -303,7 +303,7 @@ _edje_evas_smart_show(Eo *obj, Edje *ed) } EOLIAN static void -_edje_evas_smart_hide(Eo *obj, Edje *ed) +_edje_evas_object_smart_hide(Eo *obj, Edje *ed) { Eina_List *l; Edje *edg; @@ -326,7 +326,7 @@ _edje_evas_smart_hide(Eo *obj, Edje *ed) } EOLIAN static void -_edje_evas_smart_calculate(Eo *obj EINA_UNUSED, Edje *ed) +_edje_evas_object_smart_calculate(Eo *obj EINA_UNUSED, Edje *ed) { _edje_recalc_do(ed); } diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c index f8f6dee63c..38b61050b0 100644 --- a/src/lib/edje/edje_util.c +++ b/src/lib/edje/edje_util.c @@ -3999,7 +3999,7 @@ _edje_real_part_box_remove_at(Edje *ed, Edje_Real_Part *rp, unsigned int pos) Evas_Object_Box_Data *priv; Evas_Object *child_obj; - priv = eo_data_scope_get(rp->object, EVAS_OBJ_BOX_CLASS); + priv = eo_data_scope_get(rp->object, EVAS_BOX_CLASS); opt = eina_list_nth(priv->children, pos); if (!opt) return NULL; child_obj = opt->obj; @@ -4156,7 +4156,7 @@ _edje_perspective_obj_del(void *data, EINA_UNUSED Evas *e, EINA_UNUSED Evas_Obje { Edje *ed; - ed = eo_data_scope_get(o, EDJE_OBJ_CLASS); + ed = eo_data_scope_get(o, EDJE_CLASS); if (!ed) continue; ed->persp = NULL; ed->dirty = EINA_TRUE; @@ -4209,7 +4209,7 @@ edje_perspective_set(Edje_Perspective *ps, Evas_Coord px, Evas_Coord py, Evas_Co { Edje *ed; - ed = eo_data_scope_get(o, EDJE_OBJ_CLASS); + ed = eo_data_scope_get(o, EDJE_CLASS); if (!ed) continue; if (!ed->persp) { @@ -4224,7 +4224,7 @@ edje_perspective_set(Edje_Perspective *ps, Evas_Coord px, Evas_Coord py, Evas_Co { Edje *ed; - ed = eo_data_scope_get(o, EDJE_OBJ_CLASS); + ed = eo_data_scope_get(o, EDJE_CLASS); if (!ed) continue; if (!ed->persp) { @@ -4258,7 +4258,7 @@ edje_perspective_global_set(Edje_Perspective *ps, Eina_Bool global) { Edje *ed; - ed = eo_data_scope_get(o, EDJE_OBJ_CLASS); + ed = eo_data_scope_get(o, EDJE_CLASS); if (!ed) continue; if (!ed->persp) { @@ -4845,9 +4845,9 @@ _edje_fetch(const Evas_Object *obj) { Edje *ed; - if (!obj || !eo_isa(obj, EDJE_OBJ_CLASS)) + if (!obj || !eo_isa(obj, EDJE_CLASS)) return NULL; - ed = eo_data_scope_get(obj, EDJE_OBJ_CLASS); + ed = eo_data_scope_get(obj, EDJE_CLASS); if ((ed) && (ed->delete_me)) return NULL; return ed; } @@ -4945,7 +4945,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_OBJ_CLASS)) + if (eo_isa(rp->typedata.swallow->swallowed_object, EDJE_CLASS)) { Evas_Coord w, h; @@ -4958,9 +4958,9 @@ _edje_real_part_swallow_hints_update(Edje_Real_Part *rp) rp->typedata.swallow->swallow_params.max.w = w; rp->typedata.swallow->swallow_params.max.h = h; } - else if (eo_isa(rp->typedata.swallow->swallowed_object, EVAS_OBJ_TEXT_CLASS) || - eo_isa(rp->typedata.swallow->swallowed_object, EVAS_OBJ_POLYGON_CLASS) || - eo_isa(rp->typedata.swallow->swallowed_object, EVAS_OBJ_LINE_CLASS)) + else if (eo_isa(rp->typedata.swallow->swallowed_object, EVAS_TEXT_CLASS) || + eo_isa(rp->typedata.swallow->swallowed_object, EVAS_POLYGON_CLASS) || + eo_isa(rp->typedata.swallow->swallowed_object, EVAS_LINE_CLASS)) { Evas_Coord w, h; @@ -5109,7 +5109,7 @@ _edje_real_part_swallow(Edje *ed, evas_object_data_set(rp->typedata.swallow->swallowed_object, ".edje", ed); //If the map is enabled, uv should be updated when image size is changed. - if (eo_isa(rp->typedata.swallow->swallowed_object, EVAS_OBJ_IMAGE_CLASS)) + if (eo_isa(rp->typedata.swallow->swallowed_object, EVAS_IMAGE_CLASS)) evas_object_event_callback_add(obj_swallow, EVAS_CALLBACK_IMAGE_RESIZE, _edje_object_part_swallow_image_resize_cb, rp); @@ -5154,7 +5154,7 @@ _edje_real_part_swallow_clear(Edje *ed, Edje_Real_Part *rp) EVAS_CALLBACK_CHANGED_SIZE_HINTS, _edje_object_part_swallow_changed_hints_cb, rp); - if (eo_isa(rp->typedata.swallow->swallowed_object, EVAS_OBJ_IMAGE_CLASS)) + if (eo_isa(rp->typedata.swallow->swallowed_object, EVAS_IMAGE_CLASS)) evas_object_event_callback_del_full(rp->typedata.swallow->swallowed_object, EVAS_CALLBACK_IMAGE_RESIZE, _edje_object_part_swallow_image_resize_cb, diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h index 3b53aedf21..00c8289618 100644 --- a/src/lib/evas/Evas_Eo.h +++ b/src/lib/evas/Evas_Eo.h @@ -92,7 +92,6 @@ EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_POST; #define EVAS_SMART_ZOOMABLE_INTERFACE EVAS_ZOOMABLE_INTERFACE_CLASS #include "canvas/evas.eo.h" -#define EVAS_CLASS EVAS_CANVAS_CLASS /** * @ingroup Evas_Object_Rectangle @@ -159,7 +158,7 @@ EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_POST; * * @{ */ -#include "canvas/evas_smart.eo.h" +#include "canvas/evas_object_smart.eo.h" /** * @} */ diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h index f10fb07162..1cecd24a6f 100644 --- a/src/lib/evas/Evas_Legacy.h +++ b/src/lib/evas/Evas_Legacy.h @@ -1648,7 +1648,7 @@ EAPI void *evas_object_smart_interface_data_get(const Evas_Object *o */ EAPI int evas_smart_objects_calculate_count_get(const Evas *e); -#include "canvas/evas_smart.eo.legacy.h" +#include "canvas/evas_object_smart.eo.legacy.h" /** * @} diff --git a/src/lib/evas/canvas/evas_3d_scene.c b/src/lib/evas/canvas/evas_3d_scene.c index ec96baab8d..13b797fba4 100644 --- a/src/lib/evas/canvas/evas_3d_scene.c +++ b/src/lib/evas/canvas/evas_3d_scene.c @@ -29,7 +29,7 @@ _evas_3d_scene_evas_3d_object_change_notify(Eo *eo_obj EINA_UNUSED, Evas_3D_Scen EINA_LIST_FOREACH(pd->images, l, eo) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo, EVAS_OBJECT_CLASS); evas_object_change(eo, obj); } } diff --git a/src/lib/evas/canvas/evas_3d_texture.c b/src/lib/evas/canvas/evas_3d_texture.c index ad90c5d554..b2531c479b 100644 --- a/src/lib/evas/canvas/evas_3d_texture.c +++ b/src/lib/evas/canvas/evas_3d_texture.c @@ -20,7 +20,7 @@ _texture_proxy_set(Evas_3D_Texture *texture, Evas_Object *eo_src, Evas_Object_Pr static inline void _texture_proxy_unset(Evas_3D_Texture_Data *texture) { - Evas_Object_Protected_Data *src = eo_data_scope_get(texture->source, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(texture->source, EVAS_OBJECT_CLASS); EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, src->proxy, Evas_Object_Proxy_Data, proxy_src); { @@ -66,9 +66,9 @@ _texture_proxy_subrender(Evas_3D_Texture *obj) if (!pd->source) return; - source = eo_data_scope_get(pd->source, EVAS_OBJ_CLASS); + source = eo_data_scope_get(pd->source, EVAS_OBJECT_CLASS); - is_image = eo_isa(pd->source, EVAS_OBJ_IMAGE_CLASS); + is_image = eo_isa(pd->source, EVAS_IMAGE_CLASS); EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, source->proxy, Evas_Object_Proxy_Data, proxy_write) { @@ -210,7 +210,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_Object_Protected_Data *src = eo_data_scope_get(pd->source, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(pd->source, EVAS_OBJECT_CLASS); if (pd->engine_data == NULL) { @@ -374,7 +374,7 @@ _evas_3d_texture_source_set(Eo *obj , Evas_3D_Texture_Data *pd, Evas_Object *sou return; } - src = eo_data_scope_get(source, EVAS_OBJ_CLASS); + src = eo_data_scope_get(source, EVAS_OBJECT_CLASS); if (src->delete_me) { @@ -400,7 +400,7 @@ _evas_3d_texture_source_visible_set(Eo *obj EINA_UNUSED, Evas_3D_Texture_Data *p if (pd->source == NULL) return; - src_obj = eo_data_scope_get(pd->source, EVAS_OBJ_CLASS); + src_obj = eo_data_scope_get(pd->source, EVAS_OBJECT_CLASS); if (src_obj->proxy->src_invisible == !visible) return; @@ -422,7 +422,7 @@ _evas_3d_texture_source_visible_get(Eo *obj EINA_UNUSED, Evas_3D_Texture_Data *p if (pd->source == NULL) return EINA_FALSE; - src_obj = eo_data_scope_get(pd->source, EVAS_OBJ_CLASS); + src_obj = eo_data_scope_get(pd->source, EVAS_OBJECT_CLASS); return !src_obj->proxy->src_invisible; } diff --git a/src/lib/evas/canvas/evas_box.eo b/src/lib/evas/canvas/evas_box.eo index cd4e8ccf42..45f3a8fcf7 100644 --- a/src/lib/evas/canvas/evas_box.eo +++ b/src/lib/evas/canvas/evas_box.eo @@ -728,10 +728,10 @@ class Evas_Box (Evas_Smart_Clipped) class::constructor; Eo_Base::constructor; Evas_Object::smart_data::get; - Evas_Smart::calculate; - Evas_Smart::add; - Evas_Smart::del; - Evas_Smart::resize; + 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 5aa362f3a1..3a98453b0f 100644 --- a/src/lib/evas/canvas/evas_callbacks.c +++ b/src/lib/evas/canvas/evas_callbacks.c @@ -187,7 +187,7 @@ evas_object_event_callback_all_del(Evas_Object *eo_obj) { _eo_evas_object_cb_info *info; Eina_Inlist *itr; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (!obj) return; if (!obj->callbacks) return; @@ -318,7 +318,7 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data if ((obj->smart.parent) && (type != EVAS_CALLBACK_FREE) && (type <= EVAS_CALLBACK_KEY_UP)) { - Evas_Object_Protected_Data *smart_parent = eo_data_scope_get(obj->smart.parent, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *smart_parent = eo_data_scope_get(obj->smart.parent, EVAS_OBJECT_CLASS); evas_object_event_callback_call(obj->smart.parent, smart_parent, type, event_info, event_id); } } @@ -335,7 +335,7 @@ evas_object_event_callback_add(Evas_Object *eo_obj, Evas_Callback_Type type, Eva EAPI void evas_object_event_callback_priority_add(Evas_Object *eo_obj, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Object_Event_Cb func, const void *data) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); return; @@ -363,7 +363,7 @@ evas_object_event_callback_del(Evas_Object *eo_obj, Evas_Callback_Type type, Eva MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); return NULL; MAGIC_CHECK_END(); - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (!obj) return NULL; if (!func) return NULL; @@ -395,7 +395,7 @@ evas_object_event_callback_del_full(Evas_Object *eo_obj, Evas_Callback_Type type MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); return NULL; MAGIC_CHECK_END(); - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (!obj) return NULL; if (!func) return NULL; diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c index 20c302c097..1947f0f457 100644 --- a/src/lib/evas/canvas/evas_clip.c +++ b/src/lib/evas/canvas/evas_clip.c @@ -178,7 +178,7 @@ evas_object_mapped_clip_across_mark(Evas_Object *eo_obj, Evas_Object_Protected_D if (obj->smart.parent) { Evas_Object_Protected_Data *smart_parent_obj = - eo_data_scope_get(obj->smart.parent, EVAS_OBJ_CLASS); + eo_data_scope_get(obj->smart.parent, EVAS_OBJECT_CLASS); evas_object_child_map_across_mark (eo_obj, obj, smart_parent_obj->map->cur.map_parent, 0, NULL); } @@ -207,7 +207,7 @@ _evas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object * return; MAGIC_CHECK_END(); - clip = eo_data_scope_get(eo_clip, EVAS_OBJ_CLASS); + clip = eo_data_scope_get(eo_clip, EVAS_OBJECT_CLASS); if (obj->cur->clipper && obj->cur->clipper->object == eo_clip) return; if (eo_obj == eo_clip) { diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c index 4ed196b1f3..14115c441f 100644 --- a/src/lib/evas/canvas/evas_events.c +++ b/src/lib/evas/canvas/evas_events.c @@ -15,7 +15,7 @@ _evas_event_havemap_adjust(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protecte { if (obj->smart.parent) { - Evas_Object_Protected_Data *smart_parent_obj = eo_data_scope_get(obj->smart.parent, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *smart_parent_obj = eo_data_scope_get(obj->smart.parent, EVAS_OBJECT_CLASS); _evas_event_havemap_adjust(obj->smart.parent, smart_parent_obj, x, y, mouse_grabbed); } @@ -180,9 +180,9 @@ _transform_to_src_space(Evas_Object_Protected_Data *obj, Evas_Object_Protected_D static void _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Down *ev, int event_id) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + 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_OBJ_CLASS); + 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_Coord_Point canvas = ev->canvas; Evas_Object_Protected_Data *child; @@ -220,7 +220,7 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child) { - child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); if ((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) || (child->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) { @@ -239,7 +239,7 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event copy = evas_event_list_copy(src->proxy->src_event_in); EINA_LIST_FOREACH(copy, l, eo_child) { - child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); ev->canvas = point; _evas_event_havemap_adjust(eo_child, child, &ev->canvas.x, &ev->canvas.y, @@ -258,9 +258,9 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event static void _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Move *ev, int event_id) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + 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_OBJ_CLASS); + 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_Coord_Point canvas = ev->cur.canvas; @@ -282,7 +282,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in); EINA_LIST_FOREACH(copy, l, eo_child) { - child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); if ((evas_object_clippers_is_visible(eo_child, child) || child->mouse_grabbed) && @@ -311,7 +311,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event { eo_child = outs->data; outs = eina_list_remove(outs, eo_child); - child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); if ((child->mouse_grabbed == 0) && (!e->delete_me)) { if (child->mouse_in) continue; @@ -346,7 +346,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event EINA_LIST_FOREACH(copy, l, eo_child) { - child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); ev->cur.canvas = point; @@ -394,7 +394,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event int event_id2 = _evas_event_counter; EINA_LIST_FOREACH(ins, l, eo_child) { - child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); if (!eina_list_data_find(src->proxy->src_event_in, eo_child)) { if (!child->mouse_in) @@ -433,9 +433,9 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event static void _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Up *ev, int event_id) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + 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_OBJ_CLASS); + 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_Coord_Point canvas = ev->canvas; @@ -454,7 +454,7 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_M EINA_LIST_FOREACH(copy, l, eo_child) { if (src->delete_me) return; - child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); if ((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) && (child->mouse_grabbed > 0)) { @@ -485,9 +485,9 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_M static void _evas_event_source_hold_events(Evas_Object *eo_obj, Evas *eo_e EINA_UNUSED, void *ev, int event_id) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + 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_OBJ_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS); if (obj->layer->evas->is_frozen) return; @@ -497,7 +497,7 @@ _evas_event_source_hold_events(Evas_Object *eo_obj, Evas *eo_e EINA_UNUSED, void EINA_LIST_FOREACH(src->proxy->src_event_in, l, child_eo) { if (src->delete_me) return; - child = eo_data_scope_get(child_eo, EVAS_OBJ_CLASS); + child = eo_data_scope_get(child_eo, EVAS_OBJECT_CLASS); evas_object_event_callback_call(child_eo, child, EVAS_CALLBACK_HOLD, ev, event_id); if (src->layer->evas->delete_me) break; @@ -507,9 +507,9 @@ _evas_event_source_hold_events(Evas_Object *eo_obj, Evas *eo_e EINA_UNUSED, void static void _evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Wheel *ev, int event_id) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + 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_OBJ_CLASS); + 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_Coord_Point canvas = ev->canvas; @@ -526,7 +526,7 @@ _evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mous EINA_LIST_FOREACH(copy, l, eo_child) { if (src->delete_me) return; - child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); ev->canvas = point; _evas_event_havemap_adjust(eo_child, child, &ev->canvas.x, @@ -543,9 +543,9 @@ _evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mous static void _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Multi_Down *ev, int event_id) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + 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_OBJ_CLASS); + 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_Coord_Precision_Point canvas = ev->canvas; @@ -563,7 +563,7 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child) { - child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); if (child->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) { child->mouse_grabbed += (addgrab + 1); @@ -581,7 +581,7 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event &ev->canvas.x, &ev->canvas.y, child->mouse_grabbed); - child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); evas_object_event_callback_call(eo_child, child, EVAS_CALLBACK_MULTI_DOWN, ev, event_id); if (e->delete_me) break; @@ -594,9 +594,9 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event static void _evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Multi_Up *ev, int event_id) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + 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_OBJ_CLASS); + 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_Coord_Precision_Point canvas = ev->canvas; @@ -615,7 +615,7 @@ _evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_M EINA_LIST_FOREACH(copy, l, eo_child) { ev->canvas = point; - child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); if ((child->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) && (child->mouse_grabbed > 0)) { @@ -638,9 +638,9 @@ _evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_M static void _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Multi_Move *ev, int event_id) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + 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_OBJ_CLASS); + 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_Coord_Precision_Point canvas = ev->cur.canvas; @@ -663,7 +663,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in); EINA_LIST_FOREACH(copy, l, eo_child) { - child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); if (((evas_object_clippers_is_visible(eo_child, child)) || ((child->mouse_grabbed) && (!evas_event_passes_through(eo_child, child)) && @@ -675,7 +675,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event &ev->cur.canvas.x, &ev->cur.canvas.y, child->mouse_grabbed); - child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); evas_object_event_callback_call(eo_child, child, EVAS_CALLBACK_MULTI_MOVE, ev, event_id); @@ -698,7 +698,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in); EINA_LIST_FOREACH(copy, l, eo_child) { - child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); ev->cur.canvas = point; if (evas_object_is_in_output_rect(eo_child, child, @@ -718,7 +718,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event &ev->cur.canvas.x, &ev->cur.canvas.y, child->mouse_grabbed); - child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); evas_object_event_callback_call(eo_child, child, EVAS_CALLBACK_MULTI_MOVE, ev, event_id); @@ -745,9 +745,9 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event static void _evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_In *ev, int event_id) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + 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_OBJ_CLASS); + 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_Coord_Point canvas = ev->canvas; Evas_Object *eo_child; @@ -774,7 +774,7 @@ _evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_ EINA_LIST_FOREACH(ins, l, eo_child) { Evas_Object_Protected_Data *child = eo_data_scope_get(eo_child, - EVAS_OBJ_CLASS); + EVAS_OBJECT_CLASS); if (!eina_list_data_find(src->proxy->src_event_in, eo_child)) { if(child->mouse_in) continue; @@ -805,9 +805,9 @@ _evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_ static void _evas_event_source_mouse_out_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Out *ev, int event_id) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + 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_OBJ_CLASS); + 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_Coord_Point canvas = ev->canvas; Evas_Object *eo_child; @@ -827,7 +827,7 @@ _evas_event_source_mouse_out_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_ EINA_LIST_FOREACH(copy, l, eo_child) { Evas_Object_Protected_Data *child = eo_data_scope_get(eo_child, - EVAS_OBJ_CLASS); + EVAS_OBJECT_CLASS); if (!child->mouse_in) continue; child->mouse_in = 0; @@ -1063,7 +1063,7 @@ _evas_event_feed_mouse_down(Eo *eo_e, Evas_Public_Data *e, int b, Evas_Button_Fl copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if ((obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) || (obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) { @@ -1078,7 +1078,7 @@ _evas_event_feed_mouse_down(Eo *eo_e, Evas_Public_Data *e, int b, Evas_Button_Fl } EINA_LIST_FOREACH(copy, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (obj->delete_me) continue; ev.canvas.x = e->pointer.x; ev.canvas.y = e->pointer.y; @@ -1135,7 +1135,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data) copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, ll, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if ((!eina_list_data_find(ins, eo_obj)) || (!e->pointer.inside)) { if (!obj->mouse_in) continue; @@ -1181,7 +1181,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data) EINA_LIST_FOREACH(ins, l, eo_obj_itr) { - Evas_Object_Protected_Data *obj_itr = eo_data_scope_get(eo_obj_itr, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj_itr = eo_data_scope_get(eo_obj_itr, EVAS_OBJECT_CLASS); if (!eina_list_data_find(e->pointer.object.in, eo_obj_itr)) { if (obj_itr->mouse_in) continue; @@ -1271,7 +1271,7 @@ _evas_event_feed_mouse_up(Eo *eo_e, Evas_Public_Data *e, int b, Evas_Button_Flag copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if ((obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) && (obj->mouse_grabbed > 0)) { @@ -1383,7 +1383,7 @@ _evas_event_feed_mouse_wheel(Eo *eo_e, Evas_Public_Data *e, int direction, int z EINA_LIST_FOREACH(copy, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (!evas_event_freezes_through(eo_obj, obj)) { ev.canvas.x = e->pointer.x; @@ -1466,7 +1466,7 @@ _canvas_event_feed_mouse_move_internal(Eo *eo_e, void *_pd, int x, int y, unsign copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if ((!e->is_frozen) && (evas_object_clippers_is_visible(eo_obj, obj) || obj->mouse_grabbed) && @@ -1534,7 +1534,7 @@ _canvas_event_feed_mouse_move_internal(Eo *eo_e, void *_pd, int x, int y, unsign Evas_Object *eo_obj; eo_obj = outs->data; outs = eina_list_remove(outs, eo_obj); - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if ((obj->mouse_grabbed == 0) && (!e->delete_me)) { if (!obj->mouse_in) continue; @@ -1619,7 +1619,7 @@ _canvas_event_feed_mouse_move_internal(Eo *eo_e, void *_pd, int x, int y, unsign copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); /* if its under the pointer and its visible and its in the new */ /* in list */ // FIXME: i don't think we need this @@ -1680,7 +1680,7 @@ _canvas_event_feed_mouse_move_internal(Eo *eo_e, void *_pd, int x, int y, unsign /* go thru our current list of ins */ EINA_LIST_FOREACH(ins, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); /* if its not in the old list of ins send an enter event */ if (!eina_list_data_find(e->pointer.object.in, eo_obj)) { @@ -1793,7 +1793,7 @@ nogrep: eo_below_obj = evas_object_below_get(nogrep_obj); if (eo_below_obj) { - Evas_Object_Protected_Data *below_obj = eo_data_scope_get(eo_below_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *below_obj = eo_data_scope_get(eo_below_obj, EVAS_OBJECT_CLASS); ins = _evas_event_object_list_raw_in_get(eo_e, NULL, EINA_INLIST_GET(below_obj), NULL, e->pointer.x, e->pointer.y, @@ -1811,7 +1811,7 @@ nogrep: EINA_LIST_FOREACH(lst, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); /* if its under the pointer and its visible and its in the new */ /* in list */ // FIXME: i don't think we need this @@ -1869,7 +1869,7 @@ nogrep: /* go thru our current list of ins */ EINA_LIST_FOREACH(newin, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); /* if its not in the old list of ins send an enter event */ if (!eina_list_data_find(e->pointer.object.in, eo_obj)) { @@ -1950,7 +1950,7 @@ _evas_event_feed_mouse_in(Eo *eo_e, Evas_Public_Data *e, unsigned int timestamp, ins = evas_event_objects_event_list(eo_e, NULL, e->pointer.x, e->pointer.y); EINA_LIST_FOREACH(ins, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (!eina_list_data_find(e->pointer.object.in, eo_obj)) { if (obj->mouse_in) continue; @@ -2014,7 +2014,7 @@ _evas_event_feed_mouse_out(Eo *eo_e, Evas_Public_Data *e, unsigned int timestamp copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (!obj->mouse_in) continue; obj->mouse_in = 0; if (!obj->delete_me) @@ -2097,7 +2097,7 @@ _canvas_event_feed_multi_down_internal(Evas *eo_e, void *_pd, copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (obj->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) { obj->mouse_grabbed += addgrab + 1; @@ -2106,7 +2106,7 @@ _canvas_event_feed_multi_down_internal(Evas *eo_e, void *_pd, } EINA_LIST_FOREACH(copy, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); ev.canvas.x = x; ev.canvas.y = y; ev.canvas.xsub = fx; @@ -2204,7 +2204,7 @@ _canvas_event_feed_multi_up_internal(Evas *eo_e, void *_pd, copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); ev.canvas.x = x; ev.canvas.y = y; ev.canvas.xsub = fx; @@ -2308,7 +2308,7 @@ _canvas_event_feed_multi_move_internal(Eo *eo_e, void *_pd, int d, int x, copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if ((evas_object_clippers_is_visible(eo_obj, obj) || obj->mouse_grabbed) && (!evas_event_passes_through(eo_obj, obj)) && @@ -2375,7 +2375,7 @@ _canvas_event_feed_multi_move_internal(Eo *eo_e, void *_pd, int d, int x, copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); /* if its under the pointer and its visible and its in the new */ /* in list */ // FIXME: i don't think we need this @@ -2505,7 +2505,7 @@ _canvas_event_feed_key_down_internal(Eo *eo_e, { if (!(e->modifiers.mask & g->not_modifiers)) { - Evas_Object_Protected_Data *object_obj = eo_data_scope_get(g->object, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *object_obj = eo_data_scope_get(g->object, EVAS_OBJECT_CLASS); if (!e->is_frozen && !evas_event_freezes_through(g->object, object_obj)) { @@ -2530,7 +2530,7 @@ _canvas_event_feed_key_down_internal(Eo *eo_e, l = eina_list_next(l); if (g->delete_me) { - Evas_Object_Protected_Data *g_object_obj = eo_data_scope_get(g->object, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *g_object_obj = eo_data_scope_get(g->object, EVAS_OBJECT_CLASS); evas_key_grab_free(g->object, g_object_obj, g->keyname, g->modifiers, g->not_modifiers); } @@ -2540,7 +2540,7 @@ _canvas_event_feed_key_down_internal(Eo *eo_e, } if ((e->focused) && (!exclusive)) { - Evas_Object_Protected_Data *focused_obj = eo_data_scope_get(e->focused, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *focused_obj = eo_data_scope_get(e->focused, EVAS_OBJECT_CLASS); if (!e->is_frozen && !evas_event_freezes_through(e->focused, focused_obj)) evas_object_event_callback_call(e->focused, focused_obj, EVAS_CALLBACK_KEY_DOWN, @@ -2610,7 +2610,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e, (g->not_modifiers == ~e->modifiers.mask))) && (!strcmp(keyname, g->keyname))) { - Evas_Object_Protected_Data *object_obj = eo_data_scope_get(g->object, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *object_obj = eo_data_scope_get(g->object, EVAS_OBJECT_CLASS); if (!e->is_frozen && !evas_event_freezes_through(g->object, object_obj)) { @@ -2636,7 +2636,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e, if (gr->delete_me) { Evas_Object_Protected_Data *gr_object_obj = - eo_data_scope_get(gr->object, EVAS_OBJ_CLASS); + eo_data_scope_get(gr->object, EVAS_OBJECT_CLASS); evas_key_grab_free(gr->object, gr_object_obj, gr->keyname, gr->modifiers, gr->not_modifiers); } @@ -2646,7 +2646,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e, } if ((e->focused) && (!exclusive)) { - Evas_Object_Protected_Data *focused_obj = eo_data_scope_get(e->focused, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *focused_obj = eo_data_scope_get(e->focused, EVAS_OBJECT_CLASS); if (!e->is_frozen && !evas_event_freezes_through(e->focused, focused_obj)) evas_object_event_callback_call(e->focused, focused_obj, EVAS_CALLBACK_KEY_UP, @@ -2711,7 +2711,7 @@ _evas_event_feed_hold(Eo *eo_e, Evas_Public_Data *e, int hold, unsigned int time copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if ( !evas_event_freezes_through(eo_obj, obj)) { evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_HOLD, diff --git a/src/lib/evas/canvas/evas_font_dir.c b/src/lib/evas/canvas/evas_font_dir.c index 2628305c54..5bb13adc7e 100644 --- a/src/lib/evas/canvas/evas_font_dir.c +++ b/src/lib/evas/canvas/evas_font_dir.c @@ -1396,7 +1396,7 @@ evas_font_path_global_list(void) void evas_font_object_rehint(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (obj->is_smart) { EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(eo_obj), obj) diff --git a/src/lib/evas/canvas/evas_key_grab.c b/src/lib/evas/canvas/evas_key_grab.c index b7c0d96a46..d14a06f603 100644 --- a/src/lib/evas/canvas/evas_key_grab.c +++ b/src/lib/evas/canvas/evas_key_grab.c @@ -98,7 +98,7 @@ evas_key_grab_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, const c g = evas_key_grab_find(eo_obj, obj, keyname, modifiers, not_modifiers, 0); if (!g) return; - Evas_Object_Protected_Data *g_object = eo_data_scope_get(g->object, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *g_object = eo_data_scope_get(g->object, EVAS_OBJECT_CLASS); g_object->grabs = eina_list_remove(g_object->grabs, g); obj->layer->evas->grabs = eina_list_remove(obj->layer->evas->grabs, g); if (g->keyname) free(g->keyname); @@ -133,7 +133,7 @@ _evas_object_key_ungrab(Eo *eo_obj, Evas_Object_Protected_Data *obj, const char if (!keyname) return; g = evas_key_grab_find(eo_obj, obj, keyname, modifiers, not_modifiers, 0); if (!g) return; - Evas_Object_Protected_Data *g_object = eo_data_scope_get(g->object, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *g_object = eo_data_scope_get(g->object, EVAS_OBJECT_CLASS); if (g_object->layer->evas->walking_grabs) { if (!g->delete_me) diff --git a/src/lib/evas/canvas/evas_layer.c b/src/lib/evas/canvas/evas_layer.c index 036f2e069f..98f8755dd7 100644 --- a/src/lib/evas/canvas/evas_layer.c +++ b/src/lib/evas/canvas/evas_layer.c @@ -145,8 +145,8 @@ evas_layer_del(Evas_Layer *lay) static void _evas_object_layer_set_child(Evas_Object *eo_obj, Evas_Object *par, short l) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); - Evas_Object_Protected_Data *par_obj = eo_data_scope_get(par, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *par_obj = eo_data_scope_get(par, EVAS_OBJECT_CLASS); if (obj->delete_me) return; if (obj->cur->layer == l) return; @@ -236,7 +236,7 @@ _evas_object_layer_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { if (obj->smart.parent) { - Evas_Object_Protected_Data *smart_parent_obj = eo_data_scope_get(obj->smart.parent, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *smart_parent_obj = eo_data_scope_get(obj->smart.parent, EVAS_OBJECT_CLASS); return smart_parent_obj->cur->layer; } return obj->cur->layer; diff --git a/src/lib/evas/canvas/evas_map.c b/src/lib/evas/canvas/evas_map.c index 142f6f04f4..9d41cf31da 100644 --- a/src/lib/evas/canvas/evas_map.c +++ b/src/lib/evas/canvas/evas_map.c @@ -6,7 +6,7 @@ static void _evas_map_calc_geom_change(Evas_Object *eo_obj) { int is, was = 0; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (!obj) return; evas_object_change(eo_obj, obj); evas_object_clip_dirty(eo_obj, obj); @@ -37,7 +37,7 @@ _evas_map_calc_map_geometry(Evas_Object *eo_obj) const Evas_Map_Point *p, *p_end; Eina_Bool ch = EINA_FALSE; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (!obj) return; if (!obj->map->cur.map) return; // WARN: Do not merge below code to SLP until it is fixed. @@ -173,7 +173,7 @@ _evas_map_free(Evas_Object *eo_obj, Evas_Map *m) { if (eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if ((obj) && (obj->map->spans)) { obj->layer->evas->engine.func->image_map_clean(obj->layer->evas->engine.data.output, obj->map->spans); @@ -416,7 +416,7 @@ _evas_object_map_parent_check(Evas_Object *eo_parent) const Evas_Object_Protected_Data *o; if (!eo_parent) return EINA_FALSE; - Evas_Object_Protected_Data *parent = eo_data_scope_get(eo_parent, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *parent = eo_data_scope_get(eo_parent, EVAS_OBJECT_CLASS); if (!parent) return EINA_FALSE; list = evas_object_smart_members_get_direct(parent->smart.parent); EINA_INLIST_FOREACH(list, o) @@ -483,7 +483,7 @@ _evas_object_map_enable_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bo Evas_Object_Protected_Data *parents = NULL; for (eo_parents = obj->smart.parent; eo_parents; eo_parents = parents->smart.parent) { - parents = eo_data_scope_get(eo_parents, EVAS_OBJ_CLASS); + parents = eo_data_scope_get(eo_parents, EVAS_OBJECT_CLASS); if (!parents) break; parents->child_has_map = EINA_TRUE; } @@ -795,7 +795,7 @@ evas_map_util_points_populate_from_object_full(Evas_Map *m, const Evas_Object *e MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); return; MAGIC_CHECK_END(); - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (!obj) return; if (m->count != 4) @@ -817,7 +817,7 @@ evas_map_util_points_populate_from_object(Evas_Map *m, const Evas_Object *eo_obj MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); return; MAGIC_CHECK_END(); - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (!obj) return; if (m->count != 4) @@ -1178,7 +1178,7 @@ evas_object_map_update(Evas_Object *eo_obj, int imagew, int imageh, int uvw, int uvh) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); const Evas_Map_Point *p, *p_end; RGBA_Map_Point *pts, *pt; diff --git a/src/lib/evas/canvas/evas_name.c b/src/lib/evas/canvas/evas_name.c index 1d686ebfb9..f7efdb06aa 100644 --- a/src/lib/evas/canvas/evas_name.c +++ b/src/lib/evas/canvas/evas_name.c @@ -38,7 +38,7 @@ _priv_evas_object_name_child_find(const Evas_Object *eo_obj, const char *name, i const Eina_Inlist *lst; Evas_Object_Protected_Data *child; - if (!eo_isa(eo_obj, EVAS_OBJ_SMART_CLASS)) return NULL; + if (!eo_isa(eo_obj, EVAS_OBJECT_SMART_CLASS)) return NULL; lst = evas_object_smart_members_get_direct(eo_obj); EINA_INLIST_FOREACH(lst, child) { diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c index f4d99e1bcc..00e7c4afdf 100644 --- a/src/lib/evas/canvas/evas_object_box.c +++ b/src/lib/evas/canvas/evas_object_box.c @@ -8,7 +8,7 @@ #define MY_CLASS_NAME "Evas_Box" #define MY_CLASS_NAME_LEGACY "Evas_Object_Box" -#define MY_CLASS EVAS_OBJ_BOX_CLASS +#define MY_CLASS EVAS_BOX_CLASS typedef struct _Evas_Object_Box_Iterator Evas_Object_Box_Iterator; typedef struct _Evas_Object_Box_Accessor Evas_Object_Box_Accessor; @@ -389,7 +389,7 @@ _evas_box_internal_remove_at(Eo *o, Evas_Object_Box_Data *priv, unsigned int pos } EOLIAN static void -_evas_box_evas_smart_add(Eo *o, Evas_Object_Box_Data *priv) +_evas_box_evas_object_smart_add(Eo *o, Evas_Object_Box_Data *priv) { eo_do_super(o, MY_CLASS, evas_obj_smart_add()); @@ -406,7 +406,7 @@ _evas_box_evas_smart_add(Eo *o, Evas_Object_Box_Data *priv) } EOLIAN static void -_evas_box_evas_smart_del(Eo *o, Evas_Object_Box_Data *priv) +_evas_box_evas_object_smart_del(Eo *o, Evas_Object_Box_Data *priv) { Eina_List *l; @@ -427,7 +427,7 @@ _evas_box_evas_smart_del(Eo *o, Evas_Object_Box_Data *priv) } EOLIAN static void -_evas_box_evas_smart_resize(Eo *o, Evas_Object_Box_Data *_pd EINA_UNUSED, Evas_Coord w, Evas_Coord h) +_evas_box_evas_object_smart_resize(Eo *o, Evas_Object_Box_Data *_pd EINA_UNUSED, Evas_Coord w, Evas_Coord h) { Evas_Coord ow, oh; evas_object_geometry_get(o, NULL, NULL, &ow, &oh); @@ -436,7 +436,7 @@ _evas_box_evas_smart_resize(Eo *o, Evas_Object_Box_Data *_pd EINA_UNUSED, Evas_C } EOLIAN static void -_evas_box_evas_smart_calculate(Eo *o, Evas_Object_Box_Data *priv) +_evas_box_evas_object_smart_calculate(Eo *o, Evas_Object_Box_Data *priv) { if (priv->layout.cb) { diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c index 7af3ad9994..a866c42780 100644 --- a/src/lib/evas/canvas/evas_object_grid.c +++ b/src/lib/evas/canvas/evas_object_grid.c @@ -2,7 +2,7 @@ #include "evas_private.h" #include -#define MY_CLASS EVAS_OBJ_GRID_CLASS +#define MY_CLASS EVAS_GRID_CLASS typedef struct _Evas_Grid_Data Evas_Grid_Data; typedef struct _Evas_Object_Grid_Option Evas_Object_Grid_Option; diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c index f4b7eb1324..3dc74f0401 100644 --- a/src/lib/evas/canvas/evas_object_image.c +++ b/src/lib/evas/canvas/evas_object_image.c @@ -15,7 +15,7 @@ #include "../common/evas_convert_yuv.h" #include "evas_filter.h" -#define MY_CLASS EVAS_OBJ_IMAGE_CLASS +#define MY_CLASS EVAS_IMAGE_CLASS #define MY_CLASS_NAME "Evas_Image" @@ -337,7 +337,7 @@ _init_cow(Eo *eo_obj) EOLIAN static void _evas_image_eo_base_constructor(Eo *eo_obj, Evas_Image_Data *o) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas *eo_e; Eo *parent = NULL; Evas_Colorspace cspace; @@ -379,7 +379,7 @@ evas_object_image_add(Evas *eo_e) Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_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_OBJ_IMAGE_CLASS, eo_e); + Evas_Object *eo_obj = eo_add(EVAS_IMAGE_CLASS, eo_e); eo_unref(eo_obj); return eo_obj; } @@ -539,7 +539,7 @@ _image_done_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Image_Data *o) EOLIAN static void _evas_image_mmap_set(Eo *eo_obj, Evas_Image_Data *o, const Eina_File *f, const char *key) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Image_Load_Opts lo; if (o->cur->u.f == f) @@ -571,7 +571,7 @@ _evas_image_mmap_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o, const Eina_File EOLIAN static void _evas_image_file_set(Eo *eo_obj, Evas_Image_Data *o, const char *file, const char *key) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Image_Load_Opts lo; if ((o->cur->u.file) && (file) && (!strcmp(o->cur->u.file, file))) @@ -607,7 +607,7 @@ _evas_image_file_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o, const char **fi EOLIAN static Eina_Bool _evas_image_source_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Object *eo_src) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (obj->delete_me && eo_src) { @@ -616,7 +616,7 @@ _evas_image_source_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Object *eo_src) } if (eo_src) { - Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS); if (src->delete_me) { WRN("Setting object %p to deleted image source %p", eo_src, eo_obj); @@ -682,7 +682,7 @@ _evas_image_source_clip_set(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o, Eina_Boo if (!o->cur->source) return; - src_obj = eo_data_scope_get(o->cur->source, EVAS_OBJ_CLASS); + src_obj = eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS); evas_object_change(o->cur->source, src_obj); } @@ -695,7 +695,7 @@ _evas_image_source_clip_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) EOLIAN static void _evas_image_source_events_set(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o, Eina_Bool source_events) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); source_events = !!source_events; if (obj->proxy->src_events == source_events) return; @@ -712,7 +712,7 @@ _evas_image_source_events_set(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o, Eina_B EOLIAN static Eina_Bool _evas_image_source_events_get(Eo *eo_obj, Evas_Image_Data *_pd EINA_UNUSED) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); return obj->proxy->src_events; } @@ -751,7 +751,7 @@ _evas_image_source_visible_set(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o, Eina_ if (!o->cur->source) return; visible = !!visible; - src_obj = eo_data_scope_get(o->cur->source, EVAS_OBJ_CLASS); + src_obj = eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS); if (src_obj->proxy->src_invisible == !visible) return; EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, src_obj->proxy, Evas_Object_Proxy_Data, proxy_write) @@ -773,7 +773,7 @@ _evas_image_source_visible_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) Eina_Bool visible; if (!o->cur->source) visible = EINA_FALSE; - src_obj = eo_data_scope_get(o->cur->source, EVAS_OBJ_CLASS); + src_obj = eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS); if (src_obj) visible = !src_obj->proxy->src_invisible; else visible = EINA_FALSE; @@ -784,7 +784,7 @@ _evas_image_source_visible_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) EOLIAN static void _evas_image_scene_set(Eo *eo_obj, Evas_Image_Data *o, Evas_3D_Scene *scene) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Image_Load_Opts lo; if (o->cur->scene == scene) return; @@ -810,7 +810,7 @@ _evas_image_scene_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) EOLIAN static void _evas_image_border_set(Eo *eo_obj, Evas_Image_Data *o, int l, int r, int t, int b) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (l < 0) l = 0; if (r < 0) r = 0; @@ -851,7 +851,7 @@ _evas_image_border_center_fill_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Border_F EINA_COW_IMAGE_STATE_WRITE_END(o, state_write); o->changed = EINA_TRUE; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_change(eo_obj, obj); } @@ -901,7 +901,7 @@ _evas_image_border_scale_set(Eo *eo_obj, Evas_Image_Data *o, double scale) EINA_COW_IMAGE_STATE_WRITE_END(o, state_write); o->changed = EINA_TRUE; - obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_change(eo_obj, obj); } @@ -937,7 +937,7 @@ _evas_image_fill_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Coord x, Evas_Coord y, EINA_COW_IMAGE_STATE_WRITE_END(o, state_write); o->changed = EINA_TRUE; - obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_change(eo_obj, obj); } @@ -962,7 +962,7 @@ _evas_image_fill_spread_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Fill_Spread spr EINA_COW_IMAGE_STATE_WRITE_END(o, state_write); o->changed = EINA_TRUE; - obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_change(eo_obj, obj); } @@ -975,7 +975,7 @@ _evas_image_fill_spread_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) EOLIAN static void _evas_image_size_set(Eo *eo_obj, Evas_Image_Data *o, int w, int h) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); int stride = 0; @@ -1066,7 +1066,7 @@ _evas_image_load_error_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) EOLIAN static void* _evas_image_data_convert(Eo *eo_obj, Evas_Image_Data *o, Evas_Colorspace to_cspace) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); DATA32 *data; void* result = NULL; @@ -1093,7 +1093,7 @@ _evas_image_data_convert(Eo *eo_obj, Evas_Image_Data *o, Evas_Colorspace to_cspa EOLIAN static void _evas_image_data_set(Eo *eo_obj, Evas_Image_Data *o, void *data) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); void *p_data; Eina_Bool resize_call = EINA_FALSE; @@ -1190,7 +1190,7 @@ _evas_image_data_get(Eo *eo_obj, Evas_Image_Data *_pd EINA_UNUSED, Eina_Bool for if (!o->engine_data) return NULL; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (for_writing) evas_render_rendering_wait(obj->layer->evas); @@ -1261,7 +1261,7 @@ _image_preload_internal(Eo *eo_obj, void *_pd, Eina_Bool cancel) } // FIXME: if already busy preloading, then dont request again until // preload done - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (cancel) { if (o->preloading) @@ -1299,7 +1299,7 @@ _evas_image_preload_cancel(Eo *eo_obj, Evas_Image_Data *_pd EINA_UNUSED) EOLIAN static void _evas_image_data_copy_set(Eo *eo_obj, Evas_Image_Data *o, void *data) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (!data) return; _evas_object_image_cleanup(eo_obj, obj, o); @@ -1387,14 +1387,14 @@ _evas_image_data_update_add(Eo *eo_obj, Evas_Image_Data *o, int x, int y, int w, } o->changed = EINA_TRUE; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_change(eo_obj, obj); } EOLIAN static void _evas_image_alpha_set(Eo *eo_obj, Evas_Image_Data *o, Eina_Bool has_alpha) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if ((o->preloading) && (o->engine_data)) { @@ -1465,7 +1465,7 @@ _evas_image_smooth_scale_set(Eo *eo_obj, Evas_Image_Data *o, Eina_Bool smooth_sc EINA_COW_IMAGE_STATE_WRITE_END(o, state_write); o->changed = EINA_TRUE; - obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_change(eo_obj, obj); } @@ -1478,7 +1478,7 @@ _evas_image_smooth_scale_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) EOLIAN static void _evas_image_reload(Eo *eo_obj, Evas_Image_Data *o) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if ((o->preloading) && (o->engine_data)) { @@ -1514,7 +1514,7 @@ _evas_image_save(Eo *eo_obj, Evas_Image_Data *o, const char *file, const char *k int quality = 80, compress = 9, ok = 0; RGBA_Image *im; if (!o->engine_data) return 0; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); o->engine_data = obj->layer->evas->engine.func->image_data_get(obj->layer->evas->engine.data.output, o->engine_data, 0, &data, &o->load_error); if (flags) { @@ -1567,7 +1567,7 @@ _evas_image_save(Eo *eo_obj, Evas_Image_Data *o, const char *file, const char *k EOLIAN static Eina_Bool _evas_image_pixels_import(Eo *eo_obj, Evas_Image_Data *o, Evas_Pixel_Import_Source *pixels) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); _evas_object_image_cleanup(eo_obj, obj, o); if ((pixels->w != o->cur->image.w) || (pixels->h != o->cur->image.h)) return 0; @@ -1647,7 +1647,7 @@ _evas_image_pixels_get_callback_set(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o, EOLIAN static void _evas_image_pixels_dirty_set(Eo *eo_obj, Evas_Image_Data *o, Eina_Bool dirty) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (dirty) o->dirty_pixels = EINA_TRUE; else o->dirty_pixels = EINA_FALSE; @@ -1672,7 +1672,7 @@ _evas_image_load_dpi_set(Eo *eo_obj, Evas_Image_Data *o, double dpi) if (o->cur->u.file) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_image_unload(eo_obj, 0); evas_object_inform_call_image_unloaded(eo_obj); evas_object_image_load(eo_obj, obj, o); @@ -1701,7 +1701,7 @@ _evas_image_load_size_set(Eo *eo_obj, Evas_Image_Data *o, int w, int h) if (o->cur->u.file) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_image_unload(eo_obj, 0); evas_object_inform_call_image_unloaded(eo_obj); evas_object_image_load(eo_obj, obj, o); @@ -1728,7 +1728,7 @@ _evas_image_load_scale_down_set(Eo *eo_obj, Evas_Image_Data *o, int scale_down) if (o->cur->u.file) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_image_unload(eo_obj, 0); evas_object_inform_call_image_unloaded(eo_obj); evas_object_image_load(eo_obj, obj, o); @@ -1760,7 +1760,7 @@ _evas_image_load_region_set(Eo *eo_obj, Evas_Image_Data *o, int x, int y, int w, if (o->cur->u.file) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_image_unload(eo_obj, 0); evas_object_inform_call_image_unloaded(eo_obj); evas_object_image_load(eo_obj, obj, o); @@ -1797,7 +1797,7 @@ _evas_image_load_orientation_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) EOLIAN static void _evas_image_colorspace_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Colorspace cspace) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); _evas_object_image_cleanup(eo_obj, obj, o); @@ -1818,7 +1818,7 @@ _evas_image_colorspace_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) EOLIAN static void _evas_image_video_surface_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Video_Surface *surf) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); _evas_object_image_cleanup(eo_obj, obj, o); if (o->video_surface) @@ -1881,7 +1881,7 @@ _evas_image_video_surface_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) EOLIAN static void _evas_image_video_surface_caps_set(Eo *eo_obj, Evas_Image_Data *o, unsigned int caps) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); _evas_object_image_cleanup(eo_obj, obj, o); @@ -1922,7 +1922,7 @@ evas_object_image_native_surface_set(Evas_Object *eo_obj, Evas_Native_Surface *s EOLIAN static void _evas_image_native_surface_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Native_Surface *surf) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_render_rendering_wait(obj->layer->evas); @@ -1939,7 +1939,7 @@ _evas_image_native_surface_get(Eo *eo_obj, Evas_Image_Data *o) { Evas_Native_Surface *surf; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); surf = (!obj->layer->evas->engine.func->image_native_get ? NULL : @@ -1951,7 +1951,7 @@ _evas_image_native_surface_get(Eo *eo_obj, Evas_Image_Data *o) EOLIAN static void _evas_image_scale_hint_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Image_Scale_Hint hint) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (o->scale_hint == hint) return; o->scale_hint = hint; if (o->engine_data) @@ -1987,7 +1987,7 @@ _evas_image_scale_hint_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) EOLIAN static void _evas_image_content_hint_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Image_Content_Hint hint) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (o->content_hint == hint) return; o->content_hint = hint; if (o->engine_data) @@ -2037,7 +2037,7 @@ _evas_image_content_hint_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) EOLIAN static Eina_Bool _evas_image_region_support_get(Eo *eo_obj, Evas_Image_Data *o) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Eina_Bool region; region = obj->layer->evas->engine.func->image_can_region_get( @@ -2052,7 +2052,7 @@ EOLIAN static Eina_Bool _evas_image_animated_get(Eo *eo_obj, Evas_Image_Data *o) { Eina_Bool animated; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); animated = obj->layer->evas->engine.func->image_animated_get ? @@ -2069,7 +2069,7 @@ _evas_image_animated_frame_count_get(Eo *eo_obj, Evas_Image_Data *o) frame_count = -1; if (!evas_object_image_animated_get(eo_obj)) return frame_count; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (obj->layer->evas->engine.func->image_animated_frame_count_get) frame_count = obj->layer->evas->engine.func->image_animated_frame_count_get(obj->layer->evas->engine.data.output, o->engine_data); @@ -2080,7 +2080,7 @@ _evas_image_animated_frame_count_get(Eo *eo_obj, Evas_Image_Data *o) EOLIAN static Evas_Image_Animated_Loop_Hint _evas_image_animated_loop_type_get(Eo *eo_obj, Evas_Image_Data *o) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Image_Animated_Loop_Hint hint; hint = EVAS_IMAGE_ANIMATED_HINT_NONE; @@ -2095,7 +2095,7 @@ _evas_image_animated_loop_type_get(Eo *eo_obj, Evas_Image_Data *o) EOLIAN static int _evas_image_animated_loop_count_get(Eo *eo_obj, Evas_Image_Data *o) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); int loop_count; loop_count = -1; @@ -2112,7 +2112,7 @@ _evas_image_animated_loop_count_get(Eo *eo_obj, Evas_Image_Data *o) EOLIAN static double _evas_image_animated_frame_duration_get(Eo *eo_obj, Evas_Image_Data *o, int start_frame, int frame_num) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); int frame_count = 0; double frame_duration; @@ -2132,7 +2132,7 @@ _evas_image_animated_frame_duration_get(Eo *eo_obj, Evas_Image_Data *o, int star EOLIAN static void _evas_image_animated_frame_set(Eo *eo_obj, Evas_Image_Data *o, int frame_index) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); int frame_count = 0; if (!o->cur->u.file) return; @@ -2244,7 +2244,7 @@ _proxy_unset(Evas_Object *proxy, Evas_Object_Protected_Data *cur_proxy, Evas_Ima if (!o->cur->source) return; - cur_source = eo_data_scope_get(o->cur->source, EVAS_OBJ_CLASS); + cur_source = eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS); EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, cur_source->proxy, Evas_Object_Proxy_Data, proxy_source_write) { @@ -2295,8 +2295,8 @@ _proxy_unset(Evas_Object *proxy, Evas_Object_Protected_Data *cur_proxy, Evas_Ima static void _proxy_set(Evas_Object *eo_proxy, Evas_Object *eo_src) { - Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); - Evas_Object_Protected_Data *proxy = eo_data_scope_get(eo_proxy, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *proxy = eo_data_scope_get(eo_proxy, EVAS_OBJECT_CLASS); Evas_Image_Data *o = eo_data_scope_get(eo_proxy, MY_CLASS); evas_object_image_file_set(eo_proxy, NULL, NULL); @@ -2334,7 +2334,7 @@ _proxy_error(Evas_Object *eo_proxy, void *context, void *output, void *surface, if (!o->proxyerror) printf("Err: Argh! Recursive proxies.\n"); o->proxyerror = 1; - Evas_Object_Protected_Data *proxy = eo_data_scope_get(eo_proxy, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *proxy = eo_data_scope_get(eo_proxy, EVAS_OBJECT_CLASS); func = proxy->layer->evas->engine.func; func->context_color_set(output, context, 0, 0, 0, 255); func->context_multiplier_unset(output, context); @@ -2362,7 +2362,7 @@ _proxy_subrender(Evas *eo_e, Evas_Object *eo_source, Evas_Object *eo_proxy, Evas int w, h; if (!eo_source) return; - source = eo_data_scope_get(eo_source, EVAS_OBJ_CLASS); + source = eo_data_scope_get(eo_source, EVAS_OBJECT_CLASS); w = source->cur->geometry.w; h = source->cur->geometry.h; @@ -2433,7 +2433,7 @@ _proxy_subrender(Evas *eo_e, Evas_Object *eo_source, Evas_Object *eo_proxy, Evas static void _3d_set(Evas_Object *eo_obj, Evas_3D_Scene *scene) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); Evas_3D_Scene_Data *pd_scene = eo_data_scope_get(scene, EVAS_3D_SCENE_CLASS); @@ -2610,7 +2610,7 @@ evas_object_image_unload(Evas_Object *eo_obj, Eina_Bool dirty) if ((!o->cur->u.file) || (o->pixels_checked_out > 0)) return; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (dirty) { if (o->engine_data) @@ -2774,7 +2774,7 @@ evas_object_image_figure_y_fill(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Pro static void evas_object_image_init(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); /* set up methods (compulsory) */ obj->func = &object_func; obj->private_data = eo_data_ref(eo_obj, MY_CLASS); @@ -2784,7 +2784,7 @@ evas_object_image_init(Evas_Object *eo_obj) EOLIAN static void _evas_image_eo_base_destructor(Eo *eo_obj, Evas_Image_Data *_pd EINA_UNUSED) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_image_video_surface_set(eo_obj, NULL); evas_object_image_free(eo_obj, obj); @@ -3011,7 +3011,7 @@ _filter_cb(Evas_Filter_Context *ctx, void *data, Eina_Bool success) // Redraw image normally if (!success) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Image_Data *o = (Evas_Image_Data *) obj->private_data; ERR("Filter failed at runtime!"); @@ -3020,7 +3020,7 @@ _filter_cb(Evas_Filter_Context *ctx, void *data, Eina_Bool success) EINA_COW_IMAGE_STATE_WRITE_END(o, state_write) // Update object - obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); o->changed = EINA_TRUE; evas_object_change(eo_obj, obj); evas_object_clip_dirty(eo_obj, obj); @@ -3101,7 +3101,7 @@ evas_object_image_render(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, v Evas_Object_Protected_Data *source = (o->cur->source ? - eo_data_scope_get(o->cur->source, EVAS_OBJ_CLASS): + eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS): NULL); if (o->cur->scene) @@ -3235,7 +3235,7 @@ start_draw: iter = eina_hash_iterator_data_new(o->cur->filter.sources); EINA_ITERATOR_FOREACH(iter, pb) { - prxsource = eo_data_scope_get(pb->eo_source, EVAS_OBJ_CLASS); + prxsource = eo_data_scope_get(pb->eo_source, EVAS_OBJECT_CLASS); if (prxsource->changed) { redraw = EINA_TRUE; @@ -3650,7 +3650,7 @@ evas_object_image_render_pre(Evas_Object *eo_obj, /* Proxy: Do it early */ if (o->cur->source) { - Evas_Object_Protected_Data *source = eo_data_scope_get(o->cur->source, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *source = eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS); if (source->proxy->redraw || source->changed) { /* XXX: Do I need to sort out the map here? */ @@ -3980,7 +3980,7 @@ evas_object_image_is_opaque(Evas_Object *eo_obj EINA_UNUSED, // FIXME: use proxy if (o->cur->source) { - Evas_Object_Protected_Data *cur_source = eo_data_scope_get(o->cur->source, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *cur_source = eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS); EINA_COW_IMAGE_STATE_WRITE_BEGIN(o, state_write) { state_write->opaque = evas_object_is_opaque(o->cur->source, cur_source); @@ -4170,7 +4170,7 @@ evas_object_image_is_inside(Evas_Object *eo_obj, */ Evas_Object_Protected_Data *source = (o->cur->source ? - eo_data_scope_get(o->cur->source, EVAS_OBJ_CLASS): + eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS): NULL); if (o->cur->scene) @@ -4665,7 +4665,7 @@ _evas_object_image_preloading_set(Evas_Object *eo_obj, Eina_Bool preloading) void _evas_object_image_preloading_check(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); if (obj->layer->evas->engine.func->image_load_error_get) o->load_error = obj->layer->evas->engine.func->image_load_error_get @@ -4682,7 +4682,7 @@ _evas_object_image_video_parent_get(Evas_Object *eo_obj) void _evas_object_image_video_overlay_show(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); if (obj->cur->cache.clip.x != obj->prev->cache.clip.x || @@ -4721,7 +4721,7 @@ _evas_object_image_video_overlay_show(Evas_Object *eo_obj) void _evas_object_image_video_overlay_hide(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); if (o->video_visible || o->created) @@ -4738,7 +4738,7 @@ _evas_object_image_video_overlay_hide(Evas_Object *eo_obj) void _evas_object_image_video_overlay_do(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); Evas_Public_Data *e = obj->layer->evas; @@ -4800,7 +4800,7 @@ _evas_image_filter_program_set(Eo *eo_obj, Evas_Image_Data *o, const char *arg) EINA_COW_IMAGE_STATE_WRITE_END(o, state_write); // Update object - obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); o->changed = EINA_TRUE; evas_object_change(eo_obj, obj); } @@ -4812,8 +4812,8 @@ _filter_source_hash_free_cb(void *data) Evas_Object_Protected_Data *proxy, *source; Evas_Image_Data *o; - proxy = eo_data_scope_get(pb->eo_proxy, EVAS_OBJ_CLASS); - source = eo_data_scope_get(pb->eo_source, EVAS_OBJ_CLASS); + proxy = eo_data_scope_get(pb->eo_proxy, EVAS_OBJECT_CLASS); + source = eo_data_scope_get(pb->eo_source, EVAS_OBJECT_CLASS); if (source) { @@ -4856,8 +4856,8 @@ _evas_image_filter_source_set(Eo *eo_obj, Evas_Image_Data *o, const char *name, Eina_Hash *sources = o->cur->filter.sources; int sources_count = o->cur->filter.sources_count; - obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); - if (eo_source) source = eo_data_scope_get(eo_source, EVAS_OBJ_CLASS); + obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); + if (eo_source) source = eo_data_scope_get(eo_source, EVAS_OBJECT_CLASS); if (!name) { diff --git a/src/lib/evas/canvas/evas_object_inform.c b/src/lib/evas/canvas/evas_object_inform.c index 28ff355598..d6689a3b69 100644 --- a/src/lib/evas/canvas/evas_object_inform.c +++ b/src/lib/evas/canvas/evas_object_inform.c @@ -6,7 +6,7 @@ void evas_object_inform_call_show(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); _evas_object_event_new(); evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_SHOW, NULL, _evas_event_counter); @@ -16,7 +16,7 @@ evas_object_inform_call_show(Evas_Object *eo_obj) void evas_object_inform_call_hide(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); _evas_object_event_new(); evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_HIDE, NULL, _evas_event_counter); @@ -35,7 +35,7 @@ evas_object_inform_call_move(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob void evas_object_inform_call_resize(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); _evas_object_event_new(); evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESIZE, NULL, _evas_event_counter); @@ -45,7 +45,7 @@ evas_object_inform_call_resize(Evas_Object *eo_obj) void evas_object_inform_call_restack(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); _evas_object_event_new(); evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESTACK, NULL, _evas_event_counter); @@ -55,7 +55,7 @@ evas_object_inform_call_restack(Evas_Object *eo_obj) void evas_object_inform_call_changed_size_hints(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); _evas_object_event_new(); evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, NULL, _evas_event_counter); @@ -65,7 +65,7 @@ evas_object_inform_call_changed_size_hints(Evas_Object *eo_obj) void evas_object_inform_call_image_preloaded(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); EINA_SAFETY_ON_NULL_RETURN(obj); if (!_evas_object_image_preloading_get(eo_obj)) return; @@ -80,7 +80,7 @@ evas_object_inform_call_image_preloaded(Evas_Object *eo_obj) void evas_object_inform_call_image_unloaded(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); _evas_object_event_new(); evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_UNLOADED, NULL, _evas_event_counter); @@ -90,7 +90,7 @@ evas_object_inform_call_image_unloaded(Evas_Object *eo_obj) void evas_object_inform_call_image_resize(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); _evas_object_event_new(); evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_RESIZE, NULL, _evas_event_counter); _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas); diff --git a/src/lib/evas/canvas/evas_object_intercept.c b/src/lib/evas/canvas/evas_object_intercept.c index 1f84983906..a1c331dd30 100644 --- a/src/lib/evas/canvas/evas_object_intercept.c +++ b/src/lib/evas/canvas/evas_object_intercept.c @@ -9,7 +9,7 @@ static void evas_object_intercept_deinit(Evas_Object *eo_obj); static void evas_object_intercept_init(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (!obj->interceptors) obj->interceptors = evas_mem_calloc(sizeof(Evas_Intercept_Func)); } @@ -17,7 +17,7 @@ evas_object_intercept_init(Evas_Object *eo_obj) static void evas_object_intercept_deinit(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (!obj->interceptors) return; if ((obj->interceptors->show.func) || (obj->interceptors->hide.func) || @@ -41,7 +41,7 @@ evas_object_intercept_deinit(Evas_Object *eo_obj) void evas_object_intercept_cleanup(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (obj->interceptors) free(obj->interceptors); } @@ -203,7 +203,7 @@ evas_object_intercept_call_clip_unset(Evas_Object *eo_obj, Evas_Object_Protected MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); \ return; \ MAGIC_CHECK_END(); \ - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); \ + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); \ if (!func) return; \ evas_object_intercept_init(eo_obj); \ if (!obj->interceptors) return; \ @@ -220,7 +220,7 @@ evas_object_intercept_call_clip_unset(Evas_Object *eo_obj, Evas_Object_Protected MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); \ return NULL; \ MAGIC_CHECK_END(); \ - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); \ + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); \ if (!func) return NULL; \ if (!obj->interceptors) return NULL; \ obj->interceptors->Lower_Type.func = NULL; \ diff --git a/src/lib/evas/canvas/evas_object_line.c b/src/lib/evas/canvas/evas_object_line.c index 247777a775..48db646952 100644 --- a/src/lib/evas/canvas/evas_object_line.c +++ b/src/lib/evas/canvas/evas_object_line.c @@ -1,7 +1,7 @@ #include "evas_common_private.h" #include "evas_private.h" -#define MY_CLASS EVAS_OBJ_LINE_CLASS +#define MY_CLASS EVAS_LINE_CLASS /* private magic number for line objects */ static const char o_type[] = "line"; @@ -96,7 +96,7 @@ evas_object_line_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Object *eo_obj = eo_add(EVAS_OBJ_LINE_CLASS, e); + Evas_Object *eo_obj = eo_add(EVAS_LINE_CLASS, e); eo_unref(eo_obj); return eo_obj; } @@ -113,7 +113,7 @@ _evas_line_xy_set(Eo *eo_obj, Evas_Line_Data *_pd, Evas_Coord x1, Evas_Coord y1, return; MAGIC_CHECK_END(); - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if ((x1 == (obj->cur->geometry.x + o->cur.x1)) && (y1 == (obj->cur->geometry.y + o->cur.y1)) && @@ -196,7 +196,7 @@ _evas_line_xy_get(Eo *eo_obj, Evas_Line_Data *_pd, Evas_Coord *x1, Evas_Coord *y const Evas_Line_Data *o = _pd; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (x1) *x1 = obj->cur->geometry.x + o->cur.x1; if (y1) *y1 = obj->cur->geometry.y + o->cur.y1; if (x2) *x2 = obj->cur->geometry.x + o->cur.x2; @@ -207,7 +207,7 @@ _evas_line_xy_get(Eo *eo_obj, Evas_Line_Data *_pd, Evas_Coord *x1, Evas_Coord *y static void evas_object_line_init(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); /* set up methods (compulsory) */ obj->func = &object_func; obj->private_data = eo_data_ref(eo_obj, MY_CLASS); @@ -223,7 +223,7 @@ _evas_line_eo_base_constructor(Eo *eo_obj, Evas_Line_Data *class_data EINA_UNUSE eo_do_super(eo_obj, MY_CLASS, eo_constructor()); - obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_line_init(eo_obj); eo_do(eo_obj, parent = eo_parent_get()); evas_object_inject(eo_obj, obj, evas_object_evas_get(parent)); diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c index c4a47f3d7b..fab722fe10 100644 --- a/src/lib/evas/canvas/evas_object_main.c +++ b/src/lib/evas/canvas/evas_object_main.c @@ -3,7 +3,7 @@ EVAS_MEMPOOL(_mp_sh); -#define MY_CLASS EVAS_OBJ_CLASS +#define MY_CLASS EVAS_OBJECT_CLASS #define MY_CLASS_NAME "Evas_Object" @@ -671,9 +671,9 @@ _evas_object_eo_base_destructor(Eo *eo_obj, Evas_Object_Protected_Data *obj) } EINA_LIST_FOREACH_SAFE(obj->proxy->proxies, l, l2, proxy) { - if (eo_isa(proxy, EVAS_OBJ_IMAGE_CLASS)) + if (eo_isa(proxy, EVAS_IMAGE_CLASS)) evas_object_image_source_unset(proxy); - else if (eo_isa(proxy, EVAS_OBJ_TEXT_CLASS)) + else if (eo_isa(proxy, EVAS_TEXT_CLASS)) eo_do(proxy, evas_obj_text_filter_source_set(NULL, eo_obj)); } diff --git a/src/lib/evas/canvas/evas_object_polygon.c b/src/lib/evas/canvas/evas_object_polygon.c index 576de20554..53d8316201 100644 --- a/src/lib/evas/canvas/evas_object_polygon.c +++ b/src/lib/evas/canvas/evas_object_polygon.c @@ -1,7 +1,7 @@ #include "evas_common_private.h" #include "evas_private.h" -#define MY_CLASS EVAS_OBJ_POLYGON_CLASS +#define MY_CLASS EVAS_POLYGON_CLASS /* private magic number for polygon objects */ static const char o_type[] = "polygon"; @@ -97,7 +97,7 @@ evas_object_polygon_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Object *eo_obj = eo_add(EVAS_OBJ_POLYGON_CLASS, e); + Evas_Object *eo_obj = eo_add(EVAS_POLYGON_CLASS, e); eo_unref(eo_obj); return eo_obj; } @@ -110,7 +110,7 @@ _evas_polygon_eo_base_constructor(Eo *eo_obj, Evas_Polygon_Data *class_data EINA eo_do_super(eo_obj, MY_CLASS, eo_constructor()); - obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_polygon_init(eo_obj); eo_do(eo_obj, parent = eo_parent_get()); evas_object_inject(eo_obj, obj, evas_object_evas_get(parent)); @@ -119,7 +119,7 @@ _evas_polygon_eo_base_constructor(Eo *eo_obj, Evas_Polygon_Data *class_data EINA EOLIAN static void _evas_polygon_point_add(Eo *eo_obj, Evas_Polygon_Data *_pd, Evas_Coord x, Evas_Coord y) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Polygon_Data *o = _pd; Evas_Polygon_Point *p; Evas_Coord min_x, max_x, min_y, max_y; @@ -226,7 +226,7 @@ _evas_polygon_point_add(Eo *eo_obj, Evas_Polygon_Data *_pd, Evas_Coord x, Evas_C EOLIAN static void _evas_polygon_points_clear(Eo *eo_obj, Evas_Polygon_Data *_pd) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Polygon_Data *o = _pd; void *list_data; int is, was; @@ -270,7 +270,7 @@ _evas_polygon_points_clear(Eo *eo_obj, Evas_Polygon_Data *_pd) static void evas_object_polygon_init(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); /* set up methods (compulsory) */ obj->func = &object_func; obj->private_data = eo_data_ref(eo_obj, MY_CLASS); @@ -280,7 +280,7 @@ evas_object_polygon_init(Evas_Object *eo_obj) EOLIAN static void _evas_polygon_eo_base_destructor(Eo *eo_obj, Evas_Polygon_Data *_pd EINA_UNUSED) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_polygon_free(eo_obj, obj, obj->private_data); eo_do_super(eo_obj, MY_CLASS, eo_destructor()); diff --git a/src/lib/evas/canvas/evas_object_rectangle.c b/src/lib/evas/canvas/evas_object_rectangle.c index 4859f82932..aa114258ab 100644 --- a/src/lib/evas/canvas/evas_object_rectangle.c +++ b/src/lib/evas/canvas/evas_object_rectangle.c @@ -1,7 +1,7 @@ #include "evas_common_private.h" #include "evas_private.h" -#define MY_CLASS EVAS_OBJ_RECTANGLE_CLASS +#define MY_CLASS EVAS_RECTANGLE_CLASS /* private magic number for rectangle objects */ static const char o_type[] = "rectangle"; @@ -85,7 +85,7 @@ evas_object_rectangle_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Object *eo_obj = eo_add(EVAS_OBJ_RECTANGLE_CLASS, e); + Evas_Object *eo_obj = eo_add(EVAS_RECTANGLE_CLASS, e); eo_unref(eo_obj); return eo_obj; } @@ -97,7 +97,7 @@ _evas_rectangle_eo_base_constructor(Eo *eo_obj, Evas_Rectangle_Data *class_data eo_do_super(eo_obj, MY_CLASS, eo_constructor()); - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_rectangle_init(eo_obj); eo_do(eo_obj, parent = eo_parent_get()); @@ -108,7 +108,7 @@ _evas_rectangle_eo_base_constructor(Eo *eo_obj, Evas_Rectangle_Data *class_data static void evas_object_rectangle_init(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); /* set up methods (compulsory) */ obj->func = &object_func; obj->private_data = eo_data_ref(eo_obj, MY_CLASS); diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c index 0c0005d847..d6adf65187 100644 --- a/src/lib/evas/canvas/evas_object_smart.c +++ b/src/lib/evas/canvas/evas_object_smart.c @@ -1,7 +1,7 @@ #include "evas_common_private.h" #include "evas_private.h" -#define MY_CLASS EVAS_OBJ_SMART_CLASS +#define MY_CLASS EVAS_OBJECT_SMART_CLASS #define MY_CLASS_NAME "Evas_Smart" #define MY_CLASS_NAME_LEGACY "Evas_Object_Smart" @@ -113,7 +113,7 @@ static const Evas_Object_Func object_func = /* public funcs */ EOLIAN static void -_evas_smart_data_set(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o, void *data) +_evas_object_smart_data_set(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o, void *data) { if (o->data) eo_data_unref(eo_obj, o->data); o->data = data; @@ -121,7 +121,7 @@ _evas_smart_data_set(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o, void *data) } EOLIAN static void * -_evas_smart_evas_object_smart_data_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o) +_evas_object_smart_evas_object_smart_data_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o) { return o->data; } @@ -137,7 +137,7 @@ evas_object_smart_interface_get(const Evas_Object *eo_obj, return NULL; MAGIC_CHECK_END(); - if (!eo_isa(eo_obj, EVAS_OBJ_SMART_CLASS)) return NULL; + if (!eo_isa(eo_obj, EVAS_OBJECT_SMART_CLASS)) return NULL; s = evas_object_smart_smart_get(eo_obj); if (!s) return NULL; @@ -187,9 +187,9 @@ evas_object_smart_interface_data_get(const Evas_Object *eo_obj, } EOLIAN static Evas_Smart* -_evas_smart_smart_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o EINA_UNUSED) +_evas_object_smart_smart_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o EINA_UNUSED) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); return obj->smart.smart; } @@ -203,11 +203,11 @@ evas_object_smart_member_add(Evas_Object *eo_obj, Evas_Object *smart_obj) } EOLIAN static void -_evas_smart_member_add(Eo *smart_obj, Evas_Smart_Data *o, Evas_Object *eo_obj) +_evas_object_smart_member_add(Eo *smart_obj, Evas_Smart_Data *o, Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); - Evas_Object_Protected_Data *smart = eo_data_scope_get(smart_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *smart = eo_data_scope_get(smart_obj, EVAS_OBJECT_CLASS); if (obj->delete_me) { @@ -268,7 +268,7 @@ evas_object_smart_member_del(Evas_Object *eo_obj) MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); return; MAGIC_CHECK_END(); - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (!obj) return; if (!obj->smart.parent) return; Evas_Object *smart_obj = obj->smart.parent; @@ -277,13 +277,13 @@ evas_object_smart_member_del(Evas_Object *eo_obj) } EOLIAN static void -_evas_smart_member_del(Eo *smart_obj, Evas_Smart_Data *_pd EINA_UNUSED, Evas_Object *eo_obj) +_evas_object_smart_member_del(Eo *smart_obj, Evas_Smart_Data *_pd EINA_UNUSED, Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (!obj->smart.parent) return; - Evas_Object_Protected_Data *smart = eo_data_scope_get(smart_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *smart = eo_data_scope_get(smart_obj, EVAS_OBJECT_CLASS); if (smart->smart.smart && smart->smart.smart->smart_class->member_del) smart->smart.smart->smart_class->member_del(smart_obj, eo_obj); @@ -308,13 +308,13 @@ _evas_smart_member_del(Eo *smart_obj, Evas_Smart_Data *_pd EINA_UNUSED, Evas_Obj } EOLIAN static Eina_Bool -_evas_smart_evas_object_smart_type_check(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, const char *type) +_evas_object_smart_evas_object_smart_type_check(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, const char *type) { const Evas_Smart_Class *sc; Eo_Class *klass; Eina_Bool type_check = EINA_FALSE; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (!obj) return EINA_FALSE; klass = eina_hash_find(_evas_smart_class_names_hash_table, type); @@ -338,13 +338,13 @@ _evas_smart_evas_object_smart_type_check(Eo *eo_obj, Evas_Smart_Data *o EINA_UNU } EOLIAN static Eina_Bool -_evas_smart_evas_object_smart_type_check_ptr(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, const char* type) +_evas_object_smart_evas_object_smart_type_check_ptr(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, const char* type) { Eo_Class *klass; const Evas_Smart_Class *sc; Eina_Bool type_check = EINA_FALSE; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (!obj) return EINA_FALSE; klass = eina_hash_find(_evas_smart_class_names_hash_table, type); @@ -403,7 +403,7 @@ _evas_object_smart_iterator_free(Evas_Object_Smart_Iterator *it) // Should we have an eo_children_iterator_new API and just inherit from it ? EOLIAN static Eina_Iterator* -_evas_smart_iterator_new(Eo *o, Evas_Smart_Data *priv) +_evas_object_smart_iterator_new(Eo *o, Evas_Smart_Data *priv) { Evas_Object_Smart_Iterator *it; @@ -424,7 +424,7 @@ _evas_smart_iterator_new(Eo *o, Evas_Smart_Data *priv) } EOLIAN static Eina_List* -_evas_smart_members_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o) +_evas_object_smart_members_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o) { Eina_List *members; @@ -534,14 +534,14 @@ evas_object_smart_add(Evas *eo_e, Evas_Smart *s) MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - eo_obj = eo_add(EVAS_OBJ_SMART_CLASS, eo_e); + eo_obj = eo_add(EVAS_OBJECT_SMART_CLASS, eo_e); eo_do(eo_obj, evas_obj_smart_attach(s)); eo_unref(eo_obj); return eo_obj; } EOLIAN static void -_evas_smart_eo_base_constructor(Eo *eo_obj, Evas_Smart_Data *class_data EINA_UNUSED) +_evas_object_smart_eo_base_constructor(Eo *eo_obj, Evas_Smart_Data *class_data EINA_UNUSED) { Evas_Object_Protected_Data *obj; Evas_Smart_Data *smart; @@ -553,7 +553,7 @@ _evas_smart_eo_base_constructor(Eo *eo_obj, Evas_Smart_Data *class_data EINA_UNU eo_do_super(eo_obj, MY_CLASS, eo_constructor()); evas_object_smart_init(eo_obj); - obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); eo_do(eo_obj, parent = eo_parent_get()); evas_object_inject(eo_obj, obj, evas_object_evas_get(parent)); eo_do(eo_obj, @@ -562,98 +562,98 @@ _evas_smart_eo_base_constructor(Eo *eo_obj, Evas_Smart_Data *class_data EINA_UNU } EOLIAN static void -_evas_smart_add(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED) +_evas_object_smart_add(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED) { // If this function is reached, so we do nothing except trying to call // the function of the legacy smart class. - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Smart *s = obj->smart.smart; if (s && s->smart_class->add) s->smart_class->add(eo_obj); } EOLIAN static void -_evas_smart_del(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o EINA_UNUSED) +_evas_object_smart_del(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o EINA_UNUSED) { } EOLIAN static void -_evas_smart_resize(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Evas_Coord w, Evas_Coord h) +_evas_object_smart_resize(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Evas_Coord w, Evas_Coord h) { // If this function is reached, so we do nothing except trying to call // the function of the legacy smart class. - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Smart *s = obj->smart.smart; if (s && s->smart_class->resize) s->smart_class->resize(eo_obj, w, h); } EOLIAN static void -_evas_smart_move(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Evas_Coord x, Evas_Coord y) +_evas_object_smart_move(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Evas_Coord x, Evas_Coord y) { // If this function is reached, so we do nothing except trying to call // the function of the legacy smart class. - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Smart *s = obj->smart.smart; if (s && s->smart_class->move) s->smart_class->move(eo_obj, x, y); } EOLIAN static void -_evas_smart_show(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED) +_evas_object_smart_show(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED) { // If this function is reached, so we do nothing except trying to call // the function of the legacy smart class. - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Smart *s = obj->smart.smart; if (s && s->smart_class->show) s->smart_class->show(eo_obj); } EOLIAN static void -_evas_smart_hide(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED) +_evas_object_smart_hide(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED) { // If this function is reached, so we do nothing except trying to call // the function of the legacy smart class. - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Smart *s = obj->smart.smart; if (s && s->smart_class->hide) s->smart_class->hide(eo_obj); } EOLIAN static void -_evas_smart_color_set(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, int r, int g, int b, int a) +_evas_object_smart_color_set(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, int r, int g, int b, int a) { // If this function is reached, so we do nothing except trying to call // the function of the legacy smart class. - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Smart *s = obj->smart.smart; if (s && s->smart_class->color_set) s->smart_class->color_set(eo_obj, r, g, b, a); } EOLIAN static void -_evas_smart_clip_set(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Evas_Object *clip) +_evas_object_smart_clip_set(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Evas_Object *clip) { // If this function is reached, so we do nothing except trying to call // the function of the legacy smart class. - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Smart *s = obj->smart.smart; if (s && s->smart_class->clip_set) s->smart_class->clip_set(eo_obj, clip); } EOLIAN static void -_evas_smart_clip_unset(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED) +_evas_object_smart_clip_unset(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED) { // If this function is reached, so we do nothing except trying to call // the function of the legacy smart class. - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Smart *s = obj->smart.smart; if (s && s->smart_class->clip_unset) s->smart_class->clip_unset(eo_obj); } -static void -_evas_smart_attach(Eo *eo_obj, Evas_Smart_Data *_pd EINA_UNUSED, Evas_Smart *s) +EOLIAN static void +_evas_object_smart_attach(Eo *eo_obj, Evas_Smart_Data *_pd EINA_UNUSED, Evas_Smart *s) { MAGIC_CHECK(s, Evas_Smart, MAGIC_SMART); return; MAGIC_CHECK_END(); unsigned int i; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); obj->smart.smart = s; obj->type = s->smart_class->name; evas_object_smart_use(s); @@ -787,7 +787,7 @@ evas_object_smart_callback_call(Evas_Object *eo_obj, const char *event, void *ev } EOLIAN static Eina_Bool -_evas_smart_callbacks_descriptions_set(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o, const Evas_Smart_Cb_Description *descriptions) +_evas_object_smart_callbacks_descriptions_set(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o, const Evas_Smart_Cb_Description *descriptions) { const Evas_Smart_Cb_Description *d; unsigned int i, count = 0; @@ -813,12 +813,12 @@ _evas_smart_callbacks_descriptions_set(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data * } EOLIAN static void -_evas_smart_callbacks_descriptions_get(Eo *eo_obj, Evas_Smart_Data *o, const Evas_Smart_Cb_Description ***class_descriptions, unsigned int *class_count, const Evas_Smart_Cb_Description ***instance_descriptions, unsigned int *instance_count) +_evas_object_smart_callbacks_descriptions_get(Eo *eo_obj, Evas_Smart_Data *o, const Evas_Smart_Cb_Description ***class_descriptions, unsigned int *class_count, const Evas_Smart_Cb_Description ***instance_descriptions, unsigned int *instance_count) { if (class_descriptions) *class_descriptions = NULL; if (class_count) *class_count = 0; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (obj->smart.smart && class_descriptions) *class_descriptions = obj->smart.smart->callbacks.array; if (obj->smart.smart && class_count) @@ -831,7 +831,7 @@ _evas_smart_callbacks_descriptions_get(Eo *eo_obj, Evas_Smart_Data *o, const Eva } EOLIAN static void -_evas_smart_callback_description_find(Eo *eo_obj, Evas_Smart_Data *o, const char *name, const Evas_Smart_Cb_Description **class_description, const Evas_Smart_Cb_Description **instance_description) +_evas_object_smart_callback_description_find(Eo *eo_obj, Evas_Smart_Data *o, const char *name, const Evas_Smart_Cb_Description **class_description, const Evas_Smart_Cb_Description **instance_description) { if (!name) @@ -841,7 +841,7 @@ _evas_smart_callback_description_find(Eo *eo_obj, Evas_Smart_Data *o, const char return; } - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (class_description) *class_description = evas_smart_cb_description_find (&obj->smart.smart->callbacks, name); @@ -852,9 +852,9 @@ _evas_smart_callback_description_find(Eo *eo_obj, Evas_Smart_Data *o, const char } EOLIAN static void -_evas_smart_need_recalculate_set(Eo *eo_obj, Evas_Smart_Data *o, Eina_Bool value) +_evas_object_smart_need_recalculate_set(Eo *eo_obj, Evas_Smart_Data *o, Eina_Bool value) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); // XXX: do i need this? if (obj->delete_me) return; @@ -881,15 +881,15 @@ _evas_smart_need_recalculate_set(Eo *eo_obj, Evas_Smart_Data *o, Eina_Bool value } EOLIAN static Eina_Bool -_evas_smart_need_recalculate_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o) +_evas_object_smart_need_recalculate_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o) { return o->need_recalculate; } EOLIAN static void -_evas_smart_calculate(Eo *eo_obj, Evas_Smart_Data *o) +_evas_object_smart_calculate(Eo *eo_obj, Evas_Smart_Data *o) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (!obj->smart.smart || !obj->smart.smart->smart_class->calculate) return; @@ -932,7 +932,7 @@ evas_call_smarts_calculate(Evas *eo_e) /* move the item to the processed list */ o = EINA_CLIST_ENTRY(elem, Evas_Smart_Data, calc_entry); eina_clist_remove(&o->calc_entry); - obj = eo_data_scope_get(o->object, EVAS_OBJ_CLASS); + obj = eo_data_scope_get(o->object, EVAS_OBJECT_CLASS); if (obj->delete_me) continue; eina_clist_add_tail(&e->calc_done, &o->calc_entry); @@ -961,9 +961,9 @@ evas_call_smarts_calculate(Evas *eo_e) } EOLIAN static void -_evas_smart_changed(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED) +_evas_object_smart_changed(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_change(eo_obj, obj); eo_do(eo_obj, evas_obj_smart_need_recalculate_set(1)); } @@ -971,7 +971,7 @@ _evas_smart_changed(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED) Eina_Bool evas_object_smart_changed_get(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Object_Protected_Data *o2; if (!evas_object_is_visible(eo_obj, obj) && @@ -997,7 +997,7 @@ evas_object_smart_changed_get(Evas_Object *eo_obj) void evas_object_smart_del(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Smart_Data *sobj; Evas_Smart *s; unsigned int i; @@ -1073,7 +1073,7 @@ evas_object_update_bounding_box(Evas_Object *eo_obj, Evas_Object_Protected_Data /* We are not yet trying to find the smallest bounding box, but we want to find a good approximation quickly. * That's why we initialiaze min and max search to geometry of the parent object. */ - Evas_Object_Protected_Data *smart_obj = eo_data_scope_get(obj->smart.parent, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *smart_obj = eo_data_scope_get(obj->smart.parent, EVAS_OBJECT_CLASS); Evas_Smart_Data *smart_parent = eo_data_scope_get(obj->smart.parent, MY_CLASS); if (!smart_parent || !smart_obj) return; @@ -1181,7 +1181,7 @@ evas_object_smart_bounding_box_get(Evas_Object *eo_obj, void evas_object_smart_cleanup(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (obj->smart.parent) evas_object_smart_member_del(eo_obj); @@ -1225,7 +1225,7 @@ evas_object_smart_member_cache_invalidate(Evas_Object *eo_obj, return; MAGIC_CHECK_END(); - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Object_Protected_Data *member; if (pass_events) @@ -1250,7 +1250,7 @@ void evas_object_smart_member_raise(Evas_Object *eo_member) { Evas_Smart_Data *o; - Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EVAS_OBJECT_CLASS); o = eo_data_scope_get(member->smart.parent, MY_CLASS); o->contained = eina_inlist_demote(o->contained, EINA_INLIST_GET(member)); } @@ -1259,7 +1259,7 @@ void evas_object_smart_member_lower(Evas_Object *eo_member) { Evas_Smart_Data *o; - Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EVAS_OBJECT_CLASS); o = eo_data_scope_get(member->smart.parent, MY_CLASS); o->contained = eina_inlist_promote(o->contained, EINA_INLIST_GET(member)); } @@ -1268,8 +1268,8 @@ void evas_object_smart_member_stack_above(Evas_Object *eo_member, Evas_Object *eo_other) { Evas_Smart_Data *o; - Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EVAS_OBJ_CLASS); - Evas_Object_Protected_Data *other = eo_data_scope_get(eo_other, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *other = eo_data_scope_get(eo_other, EVAS_OBJECT_CLASS); o = eo_data_scope_get(member->smart.parent, MY_CLASS); o->contained = eina_inlist_remove(o->contained, EINA_INLIST_GET(member)); o->contained = eina_inlist_append_relative(o->contained, EINA_INLIST_GET(member), EINA_INLIST_GET(other)); @@ -1279,8 +1279,8 @@ void evas_object_smart_member_stack_below(Evas_Object *eo_member, Evas_Object *eo_other) { Evas_Smart_Data *o; - Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EVAS_OBJ_CLASS); - Evas_Object_Protected_Data *other = eo_data_scope_get(eo_other, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *other = eo_data_scope_get(eo_other, EVAS_OBJECT_CLASS); o = eo_data_scope_get(member->smart.parent, MY_CLASS); o->contained = eina_inlist_remove(o->contained, EINA_INLIST_GET(member)); o->contained = eina_inlist_prepend_relative(o->contained, EINA_INLIST_GET(member), EINA_INLIST_GET(other)); @@ -1292,7 +1292,7 @@ evas_object_smart_need_bounding_box_update(Evas_Object *eo_obj) MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); return; MAGIC_CHECK_END(); - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Smart_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); if (o->update_boundingbox_needed) return; @@ -1387,7 +1387,7 @@ evas_object_smart_bounding_box_update(Evas_Object *eo_obj, Evas_Object_Protected static void evas_object_smart_init(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); obj->is_smart = EINA_TRUE; /* set up methods (compulsory) */ obj->func = &object_func; @@ -1516,16 +1516,16 @@ static void *evas_object_smart_engine_data_get(Evas_Object *eo_obj) } static void -_evas_smart_class_constructor(Eo_Class *klass EINA_UNUSED) +_evas_object_smart_class_constructor(Eo_Class *klass EINA_UNUSED) { _evas_smart_class_names_hash_table = eina_hash_string_small_new(NULL); evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } static void -_evas_smart_class_destructor(Eo_Class *klass EINA_UNUSED) +_evas_object_smart_class_destructor(Eo_Class *klass EINA_UNUSED) { eina_hash_free(_evas_smart_class_names_hash_table); } -#include "canvas/evas_smart.eo.c" +#include "canvas/evas_object_smart.eo.c" diff --git a/src/lib/evas/canvas/evas_smart.eo b/src/lib/evas/canvas/evas_object_smart.eo similarity index 99% rename from src/lib/evas/canvas/evas_smart.eo rename to src/lib/evas/canvas/evas_object_smart.eo index b0e8e51a04..d594f0b51e 100644 --- a/src/lib/evas/canvas/evas_smart.eo +++ b/src/lib/evas/canvas/evas_object_smart.eo @@ -1,7 +1,7 @@ -class Evas_Smart (Evas_Object, Evas_Signal_Interface) +class Evas_Object_Smart (Evas_Object, Evas_Signal_Interface) { - legacy_prefix: evas_object_smart; eo_prefix: evas_obj_smart; + data: Evas_Smart_Data; properties { need_recalculate { set { diff --git a/src/lib/evas/canvas/evas_object_smart_clipped.c b/src/lib/evas/canvas/evas_object_smart_clipped.c index 7b828e903a..38382f20fe 100644 --- a/src/lib/evas/canvas/evas_object_smart_clipped.c +++ b/src/lib/evas/canvas/evas_object_smart_clipped.c @@ -1,7 +1,7 @@ #include "evas_common_private.h" #include "evas_private.h" -#define MY_CLASS EVAS_OBJ_SMART_CLIPPED_CLASS +#define MY_CLASS EVAS_SMART_CLIPPED_CLASS #define CSO_DATA_GET(eo_obj, ptr) \ Evas_Object_Smart_Clipped_Data *ptr = (eo_isa(eo_obj, MY_CLASS) ? \ @@ -68,7 +68,7 @@ evas_object_smart_clipped_smart_add(Evas_Object *eo_obj) } EOLIAN static void -_evas_smart_clipped_evas_smart_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED) +_evas_smart_clipped_evas_object_smart_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED) { evas_object_smart_clipped_smart_add(eo_obj); } @@ -95,7 +95,7 @@ evas_object_smart_clipped_smart_del(Evas_Object *eo_obj) } EOLIAN static void -_evas_smart_clipped_evas_smart_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED) +_evas_smart_clipped_evas_object_smart_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED) { evas_object_smart_clipped_smart_del(eo_obj); } @@ -110,7 +110,7 @@ evas_object_smart_clipped_smart_move(Evas_Object *eo_obj, Evas_Coord x, Evas_Coo } EOLIAN static void -_evas_smart_clipped_evas_smart_move(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Coord x, Evas_Coord y) +_evas_smart_clipped_evas_object_smart_move(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Coord x, Evas_Coord y) { evas_object_smart_clipped_smart_move(eo_obj, x, y); } @@ -124,7 +124,7 @@ evas_object_smart_clipped_smart_show(Evas_Object *eo_obj) } EOLIAN static void -_evas_smart_clipped_evas_smart_show(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED) +_evas_smart_clipped_evas_object_smart_show(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED) { evas_object_smart_clipped_smart_show(eo_obj); } @@ -137,7 +137,7 @@ evas_object_smart_clipped_smart_hide(Evas_Object *eo_obj) } EOLIAN static void -_evas_smart_clipped_evas_smart_hide(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED) +_evas_smart_clipped_evas_object_smart_hide(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED) { evas_object_smart_clipped_smart_hide(eo_obj); } @@ -150,7 +150,7 @@ evas_object_smart_clipped_smart_color_set(Evas_Object *eo_obj, int r, int g, int } EOLIAN static void -_evas_smart_clipped_evas_smart_color_set(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, int r, int g, int b, int a) +_evas_smart_clipped_evas_object_smart_color_set(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, int r, int g, int b, int a) { evas_object_smart_clipped_smart_color_set(eo_obj, r, g, b, a); } @@ -163,7 +163,7 @@ evas_object_smart_clipped_smart_clip_set(Evas_Object *eo_obj, Evas_Object *clip) } EOLIAN static void -_evas_smart_clipped_evas_smart_clip_set(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *clip) +_evas_smart_clipped_evas_object_smart_clip_set(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *clip) { evas_object_smart_clipped_smart_clip_set(eo_obj, clip); } @@ -176,7 +176,7 @@ evas_object_smart_clipped_smart_clip_unset(Evas_Object *eo_obj) } EOLIAN static void -_evas_smart_clipped_evas_smart_clip_unset(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED) +_evas_smart_clipped_evas_object_smart_clip_unset(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED) { evas_object_smart_clipped_smart_clip_unset(eo_obj); } @@ -193,7 +193,7 @@ evas_object_smart_clipped_smart_member_add(Evas_Object *eo_obj, Evas_Object *mem } EOLIAN static void -_evas_smart_clipped_evas_smart_member_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *member) +_evas_smart_clipped_evas_object_smart_member_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *member) { eo_do_super(eo_obj, MY_CLASS, evas_obj_smart_member_add(member)); evas_object_smart_clipped_smart_member_add(eo_obj, member); @@ -211,7 +211,7 @@ evas_object_smart_clipped_smart_member_del(Evas_Object *eo_obj, Evas_Object *mem } EOLIAN static void -_evas_smart_clipped_evas_smart_member_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *member) +_evas_smart_clipped_evas_object_smart_member_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *member) { evas_object_smart_clipped_smart_member_del(eo_obj, member); eo_do_super(eo_obj, MY_CLASS, evas_obj_smart_member_del(member)); diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c index 969a5ebe24..826cc5be6d 100644 --- a/src/lib/evas/canvas/evas_object_table.c +++ b/src/lib/evas/canvas/evas_object_table.c @@ -2,7 +2,7 @@ #include "evas_private.h" #include -#define MY_CLASS EVAS_OBJ_TABLE_CLASS +#define MY_CLASS EVAS_TABLE_CLASS #define MY_CLASS_NAME "Evas_Table" #define MY_CLASS_NAME_LEGACY "Evas_Object_Table" @@ -881,7 +881,7 @@ _evas_object_table_smart_calculate_regular(Evas_Object *o, Evas_Table_Data *priv } EOLIAN static void -_evas_table_evas_smart_add(Eo *obj, Evas_Table_Data *priv) +_evas_table_evas_object_smart_add(Eo *obj, Evas_Table_Data *priv) { priv->pad.h = 0; priv->pad.v = 0; @@ -899,7 +899,7 @@ _evas_table_evas_smart_add(Eo *obj, Evas_Table_Data *priv) } EOLIAN static void -_evas_table_evas_smart_del(Eo *obj, Evas_Table_Data *priv) +_evas_table_evas_object_smart_del(Eo *obj, Evas_Table_Data *priv) { Eina_List *l; @@ -923,7 +923,7 @@ _evas_table_evas_smart_del(Eo *obj, Evas_Table_Data *priv) } EOLIAN static void -_evas_table_evas_smart_resize(Eo *obj, Evas_Table_Data *_pd EINA_UNUSED, Evas_Coord w, Evas_Coord h) +_evas_table_evas_object_smart_resize(Eo *obj, Evas_Table_Data *_pd EINA_UNUSED, Evas_Coord w, Evas_Coord h) { Evas_Coord ow, oh; evas_object_geometry_get(obj, NULL, NULL, &ow, &oh); @@ -932,7 +932,7 @@ _evas_table_evas_smart_resize(Eo *obj, Evas_Table_Data *_pd EINA_UNUSED, Evas_Co } EOLIAN static void -_evas_table_evas_smart_calculate(Eo *o, Evas_Table_Data *priv) +_evas_table_evas_object_smart_calculate(Eo *o, Evas_Table_Data *priv) { if ((priv->size.cols < 1) || (priv->size.rows < 1)) { diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c index 8ddfdd9b07..4c1fea10d8 100644 --- a/src/lib/evas/canvas/evas_object_text.c +++ b/src/lib/evas/canvas/evas_object_text.c @@ -2,7 +2,7 @@ #include "evas_private.h" #include "evas_filter.h" -#define MY_CLASS EVAS_OBJ_TEXT_CLASS +#define MY_CLASS EVAS_TEXT_CLASS #define MY_CLASS_NAME "Evas_Text" @@ -150,7 +150,7 @@ _evas_object_text_char_coords_get(const Evas_Object *eo_obj, const Evas_Text_Data *o, size_t pos, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Object_Text_Item *it; EINA_INLIST_FOREACH(EINA_INLIST_GET(o->items), it) @@ -271,7 +271,7 @@ static int _evas_object_text_last_up_to_pos(const Evas_Object *eo_obj, const Evas_Text_Data *o, Evas_Coord cx, Evas_Coord cy) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Object_Text_Item *it; #ifdef BIDI_SUPPORT @@ -326,7 +326,7 @@ _evas_object_text_char_at_coords(const Evas_Object *eo_obj, const Evas_Text_Data *o, Evas_Coord cx, Evas_Coord cy, Evas_Coord *rx, Evas_Coord *ry, Evas_Coord *rw, Evas_Coord *rh) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Object_Text_Item *it; EINA_INLIST_FOREACH(EINA_INLIST_GET(o->items), it) @@ -370,7 +370,7 @@ evas_object_text_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Object *eo_obj = eo_add(EVAS_OBJ_TEXT_CLASS, e); + Evas_Object *eo_obj = eo_add(EVAS_TEXT_CLASS, e); eo_unref(eo_obj); return eo_obj; } @@ -380,7 +380,7 @@ _evas_text_eo_base_constructor(Eo *eo_obj, Evas_Text_Data *class_data EINA_UNUSE { eo_do_super(eo_obj, MY_CLASS, eo_constructor()); evas_object_text_init(eo_obj); - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Eo *parent = NULL; eo_do(eo_obj, parent = eo_parent_get()); @@ -443,7 +443,7 @@ _evas_text_font_set(Eo *eo_obj, Evas_Text_Data *o, const char *font, Evas_Font_S eina_stringshare_replace(&o->cur.font, font); o->prev.font = NULL; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (!(obj->layer->evas->is_frozen)) { pass = evas_event_passes_through(eo_obj, obj); @@ -670,7 +670,7 @@ _layout_text_item_trim(Evas_Object_Protected_Data *obj, Evas_Text_Data *o, Evas_ static void _evas_object_text_layout(Evas_Object *eo_obj, Evas_Text_Data *o, Eina_Unicode *text) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); EvasBiDiStrIndex *v_to_l = NULL; Evas_Coord advance = 0; size_t pos, visual_pos; @@ -915,7 +915,7 @@ _evas_object_text_layout(Evas_Object *eo_obj, Evas_Text_Data *o, Eina_Unicode *t EOLIAN static void _evas_text_evas_object_size_set(Eo *eo_obj, Evas_Text_Data *o, Evas_Coord w, Evas_Coord h) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); EINA_COW_STATE_WRITE_BEGIN(obj, state_write, cur) { @@ -930,7 +930,7 @@ _evas_text_evas_object_size_set(Eo *eo_obj, Evas_Text_Data *o, Evas_Coord w, Eva EOLIAN static void _evas_text_ellipsis_set(Eo *eo_obj, Evas_Text_Data *o, double ellipsis) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (o->cur.ellipsis == ellipsis) return; @@ -977,7 +977,7 @@ _evas_text_text_set(Eo *eo_obj, Evas_Text_Data *o, const char *_text) text = eina_unicode_utf8_to_unicode(_text, &len); if (!text) text = eina_unicode_strdup(EINA_UNICODE_EMPTY_STRING); - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); was = evas_object_is_in_output_rect(eo_obj, obj, obj->layer->evas->pointer.x, obj->layer->evas->pointer.y, 1, 1); @@ -1060,7 +1060,7 @@ _evas_text_max_descent_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o) EOLIAN static Evas_Coord _evas_text_inset_get(Eo *eo_obj, Evas_Text_Data *o) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Coord inset = 0; if (!o->font) return inset; if (!o->items) return inset; @@ -1108,7 +1108,7 @@ _evas_text_char_pos_get(Eo *eo_obj, Evas_Text_Data *o, int pos, Evas_Coord *cx, if (!o->font) return ret; if (!o->items || (pos < 0)) return ret; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Eina_Bool int_ret = _evas_object_text_char_coords_get(eo_obj, o, (size_t) pos, &x, &y, &w, &h); @@ -1180,7 +1180,7 @@ _evas_text_char_coords_get(Eo *eo_obj, Evas_Text_Data *o, Evas_Coord x, Evas_Coo rw += rx; rx = 0; } - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if ((rx + rw) > obj->cur->geometry.w) rw = obj->cur->geometry.w - rx; if (rw < 0) rw = 0; if (ry < 0) @@ -1206,7 +1206,7 @@ _evas_text_style_set(Eo *eo_obj, Evas_Text_Data *o, Evas_Text_Style_Type style) int w = 0, h = 0; if (o->cur.style == style) return; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_text_style_pad_get(o->cur.style, &pl, &pr, &pt, &pb); o->cur.style = style; @@ -1236,7 +1236,7 @@ _evas_text_shadow_color_set(Eo *eo_obj, Evas_Text_Data *o, int r, int g, int b, o->cur.shadow.b = b; o->cur.shadow.a = a; o->changed = 1; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_change(eo_obj, obj); } @@ -1260,7 +1260,7 @@ _evas_text_glow_color_set(Eo *eo_obj, Evas_Text_Data *o, int r, int g, int b, in o->cur.glow.b = b; o->cur.glow.a = a; o->changed = 1; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_change(eo_obj, obj); } @@ -1284,7 +1284,7 @@ _evas_text_glow2_color_set(Eo *eo_obj, Evas_Text_Data *o, int r, int g, int b, i o->cur.glow2.b = b; o->cur.glow2.a = a; o->changed = 1; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_change(eo_obj, obj); } @@ -1308,7 +1308,7 @@ _evas_text_outline_color_set(Eo *eo_obj, Evas_Text_Data *o, int r, int g, int b, o->cur.outline.b = b; o->cur.outline.a = a; o->changed = 1; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_change(eo_obj, obj); } @@ -1503,7 +1503,7 @@ evas_text_style_pad_get(Evas_Text_Style_Type style, int *l, int *r, int *t, int static void evas_object_text_init(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); /* set up methods (compulsory) */ obj->func = &object_func; obj->private_data = eo_data_ref(eo_obj, MY_CLASS); @@ -1521,7 +1521,7 @@ evas_object_text_init(Evas_Object *eo_obj) EOLIAN static void _evas_text_eo_base_destructor(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_text_free(eo_obj, obj); eo_do_super(eo_obj, MY_CLASS, eo_destructor()); } @@ -1588,7 +1588,7 @@ _filter_cb(Evas_Filter_Context *ctx, void *data, Eina_Bool success) // Redraw text with normal styles in case of failure if (!success) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Text_Data *o = (Evas_Text_Data *) obj->private_data; ERR("Filter failed at runtime!"); @@ -1764,7 +1764,7 @@ evas_object_text_render(Evas_Object *eo_obj, iter = eina_hash_iterator_data_new(o->cur.filter.sources); EINA_ITERATOR_FOREACH(iter, pb) { - source = eo_data_scope_get(pb->eo_source, EVAS_OBJ_CLASS); + source = eo_data_scope_get(pb->eo_source, EVAS_OBJECT_CLASS); if (source->changed) { redraw = EINA_TRUE; @@ -2181,7 +2181,7 @@ evas_object_text_scale_update(Evas_Object *eo_obj, void _evas_object_text_rehint(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); int is, was; @@ -2213,7 +2213,7 @@ _evas_object_text_rehint(Evas_Object *eo_obj) static void _evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); if (!text) text = eina_unicode_strdup(EINA_UNICODE_EMPTY_STRING); @@ -2328,7 +2328,7 @@ _evas_text_filter_program_set(Eo *eo_obj, Evas_Text_Data *o, const char *arg) eina_stringshare_replace(&o->cur.filter.code, arg); // Update object - obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); _evas_object_text_items_clear(o); o->changed = 1; _evas_object_text_recalc(eo_obj, o->cur.text); @@ -2345,8 +2345,8 @@ _filter_source_hash_free_cb(void *data) Evas_Object_Protected_Data *proxy, *source; Evas_Text_Data *o; - proxy = eo_data_scope_get(pb->eo_proxy, EVAS_OBJ_CLASS); - source = eo_data_scope_get(pb->eo_source, EVAS_OBJ_CLASS); + proxy = eo_data_scope_get(pb->eo_proxy, EVAS_OBJECT_CLASS); + source = eo_data_scope_get(pb->eo_source, EVAS_OBJECT_CLASS); if (source) { @@ -2382,8 +2382,8 @@ _evas_text_filter_source_set(Eo *eo_obj, Evas_Text_Data *o, const char *name, Ev Evas_Filter_Proxy_Binding *pb, *pb_old = NULL; Evas_Object_Protected_Data *source = NULL; - obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); - if (eo_source) source = eo_data_scope_get(eo_source, EVAS_OBJ_CLASS); + obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); + if (eo_source) source = eo_data_scope_get(eo_source, EVAS_OBJECT_CLASS); if (!name) { diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index c6d9770db5..b01a55471b 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -67,7 +67,7 @@ //#define LYDBG(f, args...) printf(f, ##args) #define LYDBG(f, args...) -#define MY_CLASS EVAS_OBJ_TEXTBLOCK_CLASS +#define MY_CLASS EVAS_TEXTBLOCK_CLASS #define MY_CLASS_NAME "Evas_Textblock" @@ -715,7 +715,7 @@ _nodes_clear(const Evas_Object *eo_obj) static void _format_unref_free(const Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); fmt->ref--; if (fmt->ref > 0) return; if (fmt->font.fdesc) evas_font_desc_unref(fmt->font.fdesc); @@ -2399,7 +2399,7 @@ _format_fill(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const char static Evas_Object_Textblock_Format * _format_dup(Evas_Object *eo_obj, const Evas_Object_Textblock_Format *fmt) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Object_Textblock_Format *fmt2; fmt2 = calloc(1, sizeof(Evas_Object_Textblock_Format)); @@ -2481,7 +2481,7 @@ _layout_format_ascent_descent_adjust(const Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt) { int ascent, descent; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (fmt->font.font) { @@ -2546,7 +2546,7 @@ _layout_item_max_ascent_descent_calc(const Evas_Object *eo_obj, else { Evas_Object_Protected_Data *obj = - eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); asc = ENFN->font_max_ascent_get(ENDT, it->format->font.font); } @@ -2568,7 +2568,7 @@ _layout_item_max_ascent_descent_calc(const Evas_Object *eo_obj, else { Evas_Object_Protected_Data *obj = - eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); desc = ENFN->font_max_descent_get(ENDT, it->format->font.font); } @@ -2619,7 +2619,7 @@ _layout_item_ascent_descent_adjust(const Evas_Object *eo_obj, else { Evas_Object_Protected_Data *obj = - eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); asc = ENFN->font_ascent_get(ENDT, fmt->font.font); desc = @@ -3159,7 +3159,7 @@ _layout_calculate_format_item_size(const Evas_Object *eo_obj, Evas_Coord *maxascent, Evas_Coord *maxdescent, Evas_Coord *_y, Evas_Coord *_w, Evas_Coord *_h) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); /* Adjust sizes according to current line height/scale */ Evas_Coord w, h; const char *p, *s; @@ -3472,7 +3472,7 @@ _layout_text_cutoff_get(Ctxt *c, Evas_Object_Textblock_Format *fmt, c->marginr - c->x - ti->x_adjustment; if (x < 0) x = 0; - Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EVAS_OBJECT_CLASS); return ENFN->font_last_up_to_pos(ENDT, fmt->font.font, &ti->text_props, x, 0); } @@ -3580,7 +3580,7 @@ _text_item_update_sizes(Ctxt *c, Evas_Object_Textblock_Text_Item *ti) int dx = 0, minx = 0, maxx = 0, shx1, shx2; tw = th = 0; - Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EVAS_OBJECT_CLASS); if (fmt->font.font) ENFN->font_string_size_get(ENDT, fmt->font.font, &ti->text_props, &tw, &th); @@ -3813,7 +3813,7 @@ skip: script = evas_common_language_script_type_get(str, script_len); - Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EVAS_OBJECT_CLASS); while (script_len > 0) { Evas_Font_Instance *cur_fi = NULL; @@ -3921,7 +3921,7 @@ _layout_format_item_add(Ctxt *c, Evas_Object_Textblock_Node_Format *n, const cha static void _format_finalize(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); void *of; of = fmt->font.font; @@ -4346,7 +4346,7 @@ _layout_ellipsis_item_new(Ctxt *c, const Evas_Object_Textblock_Item *cur_it) if (ellip_ti->parent.format->font.font) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EVAS_OBJECT_CLASS); /* It's only 1 char anyway, we don't need the run end. */ (void) ENFN->font_run_end_get(ENDT, ellip_ti->parent.format->font.font, &script_fi, &cur_fi, @@ -4501,7 +4501,7 @@ _item_get_cutoff(Ctxt *c, Evas_Object_Textblock_Item *it, Evas_Coord x) { int pos = -1; Evas_Object_Textblock_Text_Item *ti; - Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EVAS_OBJECT_CLASS); ti = (it->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? _ITEM_TEXT(it) : NULL; if (ti && ti->parent.format->font.font) @@ -5326,7 +5326,7 @@ _layout_pre(Ctxt *c, int *style_pad_l, int *style_pad_r, int *style_pad_t, static void _layout(const Evas_Object *eo_obj, int w, int h, int *w_ret, int *h_ret) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Textblock_Data *o = eo_data_ref(eo_obj, MY_CLASS); Ctxt ctxt, *c; int style_pad_l = 0, style_pad_r = 0, style_pad_t = 0, style_pad_b = 0; @@ -5511,7 +5511,7 @@ _layout(const Evas_Object *eo_obj, int w, int h, int *w_ret, int *h_ret) static void _relayout(const Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Textblock_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); _layout(eo_obj, obj->cur->geometry.w, obj->cur->geometry.h, &o->formatted.w, &o->formatted.h); @@ -5542,7 +5542,7 @@ _relayout(const Evas_Object *eo_obj) static inline void _relayout_if_needed(Evas_Object *eo_obj, const Evas_Textblock_Data *o) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_textblock_coords_recalc(eo_obj, obj, obj->private_data); if (!o->formatted.valid) @@ -5646,7 +5646,7 @@ evas_object_textblock_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Object *eo_obj = eo_add(EVAS_OBJ_TEXTBLOCK_CLASS, e); + Evas_Object *eo_obj = eo_add(EVAS_TEXTBLOCK_CLASS, e); eo_unref(eo_obj); return eo_obj; } @@ -5654,7 +5654,7 @@ evas_object_textblock_add(Evas *e) EOLIAN static void _evas_textblock_eo_base_constructor(Eo *eo_obj, Evas_Textblock_Data *class_data EINA_UNUSED) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Textblock_Data *o; Eo *eo_parent = NULL; @@ -8335,7 +8335,7 @@ _evas_textblock_cursors_update_offset(const Evas_Textblock_Cursor *cur, static void _evas_textblock_changed(Evas_Textblock_Data *o, Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); LYDBG("ZZ: invalidate 1 %p\n", eo_obj); o->formatted.valid = 0; o->native.valid = 0; @@ -9599,7 +9599,7 @@ _evas_textblock_cursor_char_pen_geometry_common_get(int (*query_func) (void *dat if (pos < 0) pos = 0; if (ti->parent.format->font.font) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); query_func(ENDT, ti->parent.format->font.font, &ti->text_props, @@ -9665,7 +9665,7 @@ EAPI int evas_textblock_cursor_char_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) { if (!cur) return -1; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); return _evas_textblock_cursor_char_pen_geometry_common_get( ENFN->font_char_coords_get, cur, cx, cy, cw, ch); } @@ -9674,7 +9674,7 @@ EAPI int evas_textblock_cursor_pen_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) { if (!cur) return -1; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); return _evas_textblock_cursor_char_pen_geometry_common_get( ENFN->font_pen_coords_get, cur, cx, cy, cw, ch); } @@ -9717,7 +9717,7 @@ evas_textblock_cursor_visible_range_get(Evas_Textblock_Cursor *start, Evas_Textb Evas *eo_e; Evas_Coord cy, ch; Evas_Object *eo_obj = start->obj; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + 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); @@ -9785,7 +9785,7 @@ evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, E return EINA_TRUE; } - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); EINA_INLIST_FOREACH(ln->items, it) { if (((it->x + ln->x) <= x) && (((it->x + ln->x) + it->adv) > x)) @@ -9986,7 +9986,7 @@ _evas_textblock_cursor_range_in_line_geometry_get( cur = (cur1) ? cur1 : cur2; if (!cur) return NULL; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); /* Find the first and last items */ it1 = it2 = NULL; @@ -10662,7 +10662,7 @@ _evas_textblock_eo_base_dbg_info_get(Eo *eo_obj, Evas_Textblock_Data *o EINA_UNU static void evas_object_textblock_init(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Textblock_Data *o; static Eina_Bool linebreak_init = EINA_FALSE; @@ -11415,7 +11415,7 @@ evas_object_textblock_scale_update(Evas_Object *eo_obj EINA_UNUSED, void _evas_object_textblock_rehint(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Textblock_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); Evas_Object_Textblock_Paragraph *par; Evas_Object_Textblock_Line *ln; diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c index 5eeb8fcd3c..30784127ad 100644 --- a/src/lib/evas/canvas/evas_object_textgrid.c +++ b/src/lib/evas/canvas/evas_object_textgrid.c @@ -1,7 +1,7 @@ #include "evas_common_private.h" /* Includes evas_bidi_utils stuff. */ #include "evas_private.h" -#define MY_CLASS EVAS_OBJ_TEXTGRID_CLASS +#define MY_CLASS EVAS_TEXTGRID_CLASS #define MY_CLASS_NAME "Evas_Textgrid" @@ -182,7 +182,7 @@ evas_object_textgrid_textprop_get(Evas_Object *eo_obj, Evas_Textgrid_Data *o, Ei Evas_Script_Type script; script = evas_common_language_script_type_get(&codepoint, 1); - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); ENFN->font_run_end_get(ENDT, o->font, &script_fi, &cur_fi, script, &codepoint, 1); memset(&(glyph->props[idx]), 0, sizeof(Evas_Text_Props)); evas_common_text_props_script_set(&(glyph->props[idx]), script); @@ -358,7 +358,7 @@ evas_object_textgrid_textprop_int_to(Evas_Textgrid_Data *o, int props) static void evas_object_textgrid_init(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); /* set up methods (compulsory) */ obj->func = &object_func; obj->private_data = eo_data_ref(eo_obj, MY_CLASS); @@ -474,7 +474,7 @@ evas_object_textgrid_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) EOLIAN static void _evas_textgrid_eo_base_destructor(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UNUSED) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_textgrid_free(eo_obj, obj); eo_data_unref(eo_obj, obj->private_data); eo_do_super(eo_obj, MY_CLASS, eo_destructor()); @@ -1055,7 +1055,7 @@ evas_object_textgrid_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Object *eo_obj = eo_add(EVAS_OBJ_TEXTGRID_CLASS, e); + Evas_Object *eo_obj = eo_add(EVAS_TEXTGRID_CLASS, e); eo_unref(eo_obj); return eo_obj; } @@ -1067,7 +1067,7 @@ _evas_textgrid_eo_base_constructor(Eo *eo_obj, Evas_Textgrid_Data *class_data EI eo_do_super(eo_obj, MY_CLASS, eo_constructor()); - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_textgrid_init(eo_obj); eo_do(eo_obj, eo_parent = eo_parent_get()); @@ -1112,7 +1112,7 @@ _evas_textgrid_size_set(Eo *eo_obj, Evas_Textgrid_Data *o, int w, int h) o->cur.h = h; o->changed = 1; o->core_change = 1; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_change(eo_obj, obj); } @@ -1136,7 +1136,7 @@ _evas_textgrid_font_source_set(Eo *eo_obj, Evas_Textgrid_Data *o, const char *fo eina_stringshare_replace(&o->cur.font_source, font_source); o->changed = 1; o->core_change = 1; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_change(eo_obj, obj); } @@ -1149,7 +1149,7 @@ _evas_textgrid_font_source_get(Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o) EOLIAN static void _evas_textgrid_font_set(Eo *eo_obj, Evas_Textgrid_Data *o, const char *font_name, Evas_Font_Size font_size) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Eina_Bool is, was = EINA_FALSE; Eina_Bool pass = EINA_FALSE, freeze = EINA_FALSE; Eina_Bool source_invisible = EINA_FALSE; @@ -1379,7 +1379,7 @@ _evas_textgrid_palette_set(Eo *eo_obj, Evas_Textgrid_Data *o, Evas_Textgrid_Pale o->changed = 1; o->pal_change = 1; evas_object_textgrid_rows_clear(eo_obj); - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_change(eo_obj, obj); } @@ -1419,7 +1419,7 @@ _evas_textgrid_supported_font_styles_set(Eo *eo_obj, Evas_Textgrid_Data *o, Evas /* FIXME: to do */ if (styles) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); o->changed = 1; evas_object_change(eo_obj, obj); } @@ -1478,7 +1478,7 @@ _evas_textgrid_update_add(Eo *eo_obj, Evas_Textgrid_Data *o, int x, int y, int w } o->row_change = 1; o->changed = 1; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); evas_object_change(eo_obj, obj); } diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c index e8bfb219f3..5cb349d8f7 100644 --- a/src/lib/evas/canvas/evas_render.c +++ b/src/lib/evas/canvas/evas_render.c @@ -203,7 +203,7 @@ _evas_render_had_map(Evas_Object_Protected_Data *obj) static Eina_Bool _evas_render_is_relevant(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); return ((evas_object_is_visible(eo_obj, obj) && (!obj->cur->have_clipees)) || (evas_object_was_visible(eo_obj, obj) && (!obj->prev->have_clipees))); } @@ -261,7 +261,7 @@ _evas_proxy_redraw_set(Evas_Public_Data *e, Evas_Object_Protected_Data *obj, EINA_LIST_FOREACH(obj->proxy->proxies, l, eo_proxy) { - proxy = eo_data_scope_get(eo_proxy, EVAS_OBJ_CLASS); + proxy = eo_data_scope_get(eo_proxy, EVAS_OBJECT_CLASS); /* Flag need redraw on proxy too */ EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, proxy->proxy, @@ -400,7 +400,7 @@ _evas_render_phase1_object_process(Evas_Public_Data *e, Evas_Object *eo_obj, int is_active; Eina_Bool map, hmap; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); //Need pre render for the children of mapped object. //But only when they have changed. if (mapped_parent && (!obj->changed)) return EINA_FALSE; @@ -827,7 +827,7 @@ _evas_render_can_use_overlay(Evas_Public_Data *e, Evas_Object *eo_obj) Evas_Coord xc1, yc1, xc2, yc2; unsigned int i; Eina_Bool nooverlay; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); Evas_Object_Protected_Data *tmp = NULL; Evas_Coord imgw, imgh; unsigned int caps; @@ -840,7 +840,7 @@ _evas_render_can_use_overlay(Evas_Public_Data *e, Evas_Object *eo_obj) eo_tmp = eo_obj; while (tmp && !_evas_render_has_map(eo_tmp, tmp)) { - tmp = eo_data_scope_get(eo_tmp, EVAS_OBJ_CLASS); + tmp = eo_data_scope_get(eo_tmp, EVAS_OBJECT_CLASS); eo_tmp = tmp->smart.parent; } @@ -953,7 +953,7 @@ _evas_render_can_use_overlay(Evas_Public_Data *e, Evas_Object *eo_obj) (current->cur->visible) && (!current->delete_me) && (current->cur->cache.clip.visible) && - (!eo_isa(eo_current, EVAS_OBJ_SMART_CLASS))) + (!eo_isa(eo_current, EVAS_OBJECT_SMART_CLASS))) { Eina_Bool included = EINA_FALSE; @@ -1517,7 +1517,7 @@ _evas_render_cutout_add(Evas_Public_Data *e, Evas_Object_Protected_Data *obj, in Evas_Object_Protected_Data *oo; eo_oo = obj->object; - oo = eo_data_scope_get(eo_oo, EVAS_OBJ_CLASS); + oo = eo_data_scope_get(eo_oo, EVAS_OBJECT_CLASS); while (oo->cur->clipper) { if ((oo->cur->clipper->map->cur.map_parent @@ -2066,7 +2066,7 @@ evas_render_updates_internal(Evas *eo_e, Evas_Object_Protected_Data *smart_parent; smart_parent = eo_data_scope_get(obj->smart.parent, - EVAS_OBJ_CLASS); + EVAS_OBJECT_CLASS); evas_object_change(obj->smart.parent, smart_parent); } } @@ -2396,7 +2396,7 @@ _evas_sync(Eo *eo_e, Evas_Public_Data *e) void _evas_render_dump_map_surfaces(Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if ((obj->map->cur.map) && obj->map->surface) { obj->layer->evas->engine.func->image_map_surface_free @@ -2521,7 +2521,7 @@ evas_render_object_recalc(Evas_Object *eo_obj) return; MAGIC_CHECK_END(); - obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if ((!obj->changed) && (obj->delete_me < 2)) { Evas_Public_Data *e; diff --git a/src/lib/evas/canvas/evas_smart_clipped.eo b/src/lib/evas/canvas/evas_smart_clipped.eo index 26852475df..625a347749 100644 --- a/src/lib/evas/canvas/evas_smart_clipped.eo +++ b/src/lib/evas/canvas/evas_smart_clipped.eo @@ -1,19 +1,20 @@ -class Evas_Smart_Clipped (Evas_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_Smart::hide; - Evas_Smart::clip::set; - Evas_Smart::clip_unset; - Evas_Smart::show; - Evas_Smart::color::set; - Evas_Smart::move; - Evas_Smart::member_del; - Evas_Smart::add; - Evas_Smart::del; - Evas_Smart::member_add; + 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 aaca427d0b..9eb5606b8d 100644 --- a/src/lib/evas/canvas/evas_stack.c +++ b/src/lib/evas/canvas/evas_stack.c @@ -140,7 +140,7 @@ _evas_object_stack_above(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Objec } if (eo_obj == eo_above) return; if (evas_object_intercept_call_stack_above(eo_obj, obj, eo_above)) return; - Evas_Object_Protected_Data *above = eo_data_scope_get(eo_above, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *above = eo_data_scope_get(eo_above, EVAS_OBJECT_CLASS); if ((EINA_INLIST_GET(obj))->prev == EINA_INLIST_GET(above)) { evas_object_inform_call_restack(eo_obj); @@ -215,7 +215,7 @@ _evas_object_stack_below(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Objec } if (eo_obj == eo_below) return; if (evas_object_intercept_call_stack_below(eo_obj, obj, eo_below)) return; - Evas_Object_Protected_Data *below = eo_data_scope_get(eo_below, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *below = eo_data_scope_get(eo_below, EVAS_OBJECT_CLASS); if ((EINA_INLIST_GET(obj))->next == EINA_INLIST_GET(below)) { evas_object_inform_call_restack(eo_obj); diff --git a/src/lib/evas/canvas/evas_table.eo b/src/lib/evas/canvas/evas_table.eo index 630f09ce26..b28b5ecb37 100644 --- a/src/lib/evas/canvas/evas_table.eo +++ b/src/lib/evas/canvas/evas_table.eo @@ -241,9 +241,9 @@ class Evas_Table (Evas_Smart_Clipped) implements { class::constructor; Eo_Base::constructor; - Evas_Smart::add; - Evas_Smart::del; - Evas_Smart::calculate; - Evas_Smart::resize; + Evas_Object_Smart::add; + Evas_Object_Smart::del; + Evas_Object_Smart::calculate; + Evas_Object_Smart::resize; } } diff --git a/src/lib/evas/filters/evas_filter.c b/src/lib/evas/filters/evas_filter.c index b8ae8316d8..e141ddf1ef 100644 --- a/src/lib/evas/filters/evas_filter.c +++ b/src/lib/evas/filters/evas_filter.c @@ -207,7 +207,7 @@ _proxy_subrender(Evas *eo_e, Evas_Object *eo_source, Evas_Object *eo_proxy, int w, h; if (!eo_source) return; - source = eo_data_scope_get(eo_source, EVAS_OBJ_CLASS); + source = eo_data_scope_get(eo_source, EVAS_OBJECT_CLASS); w = source->cur->geometry.w; h = source->cur->geometry.h; @@ -249,7 +249,7 @@ _proxy_subrender(Evas *eo_e, Evas_Object *eo_source, Evas_Object *eo_proxy, ctx = e->engine.func->context_new(e->engine.data.output); - if (eo_isa(eo_proxy, EVAS_OBJ_IMAGE_CLASS)) + if (eo_isa(eo_proxy, EVAS_IMAGE_CLASS)) eo_do(eo_proxy, source_clip = evas_obj_image_source_clip_get()); Evas_Proxy_Render_Data proxy_render_data = { @@ -286,14 +286,14 @@ evas_filter_context_proxy_render_all(Evas_Filter_Context *ctx, Eo *eo_obj, Evas_Filter_Buffer *fb; Eina_List *li; - obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); + obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); if (!ctx->has_proxies) return; EINA_LIST_FOREACH(ctx->buffers, li, fb) if (fb->source) { // TODO: Lock current object as proxyrendering (see image obj) - source = eo_data_scope_get(fb->source, EVAS_OBJ_CLASS); + source = eo_data_scope_get(fb->source, EVAS_OBJECT_CLASS); if (source->proxy->surface && !source->proxy->redraw) { DBG("Source already rendered: '%s' of type '%s'", diff --git a/src/lib/evas/include/evas_inline.x b/src/lib/evas/include/evas_inline.x index a234d27b43..756a60f0ba 100644 --- a/src/lib/evas/include/evas_inline.x +++ b/src/lib/evas/include/evas_inline.x @@ -84,7 +84,7 @@ evas_event_freezes_through(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protecte if (obj->parent_cache.freeze_events_valid) return obj->parent_cache.freeze_events; if (!obj->smart.parent) return 0; - Evas_Object_Protected_Data *smart_parent_pd = eo_data_scope_get(obj->smart.parent, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *smart_parent_pd = eo_data_scope_get(obj->smart.parent, EVAS_OBJECT_CLASS); obj->parent_cache.freeze_events = evas_event_freezes_through(obj->smart.parent, smart_parent_pd); obj->parent_cache.freeze_events_valid = EINA_TRUE; @@ -98,7 +98,7 @@ evas_event_passes_through(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected if (obj->parent_cache.pass_events_valid) return obj->parent_cache.pass_events; if (!obj->smart.parent) return 0; - Evas_Object_Protected_Data *smart_parent_pd = eo_data_scope_get(obj->smart.parent, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *smart_parent_pd = eo_data_scope_get(obj->smart.parent, EVAS_OBJECT_CLASS); obj->parent_cache.pass_events = evas_event_passes_through(obj->smart.parent, smart_parent_pd); obj->parent_cache.pass_events_valid = EINA_TRUE; @@ -113,7 +113,7 @@ evas_object_is_source_invisible(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Pro if ((obj->proxy->proxies || obj->proxy->proxy_textures) && obj->proxy->src_invisible) return 1; if (!obj->smart.parent) return 0; Evas_Object_Protected_Data *smart_parent_pd = - eo_data_scope_get(obj->smart.parent, EVAS_OBJ_CLASS); + eo_data_scope_get(obj->smart.parent, EVAS_OBJECT_CLASS); obj->parent_cache.src_invisible = evas_object_is_source_invisible(obj->smart.parent, smart_parent_pd); obj->parent_cache.src_invisible_valid = EINA_TRUE; diff --git a/src/tests/ecore/ecore_test_ecore_audio.c b/src/tests/ecore/ecore_test_ecore_audio.c index ea51c8013c..0dc8f1aed4 100644 --- a/src/tests/ecore/ecore_test_ecore_audio.c +++ b/src/tests/ecore/ecore_test_ecore_audio.c @@ -64,14 +64,14 @@ START_TEST(ecore_test_ecore_audio_obj_pulse) Eina_Bool ret = EINA_FALSE; Eina_Bool pulse_context_failed = EINA_FALSE; - in = eo_add(ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, NULL); + in = eo_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL); fail_if(!in); eo_do(in, ecore_audio_obj_name_set("modem.wav")); eo_do(in, ret = ecore_audio_obj_source_set(TESTS_SRC_DIR"/modem.wav")); fail_if(!ret); - out = eo_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL); + out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL); fail_if(!out); ecore_timer_add(0.3, _seek_vol, in); @@ -114,12 +114,12 @@ START_TEST(ecore_test_ecore_audio_cleanup) int freq = 1000; Eina_Bool ret = EINA_FALSE; - in = eo_add(ECORE_AUDIO_OBJ_IN_TONE_CLASS, NULL); + in = eo_add(ECORE_AUDIO_IN_TONE_CLASS, NULL); fail_if(!in); eo_do(in, eo_key_data_set(ECORE_AUDIO_ATTR_TONE_FREQ, &freq, NULL)); eo_do(in, ecore_audio_obj_in_length_set(2)); - out = eo_add(ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS, NULL); + out = eo_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL); fail_if(!out); eo_do(out, ret = ecore_audio_obj_format_set(ECORE_AUDIO_FORMAT_OGG)); fail_if(!ret); @@ -145,7 +145,7 @@ START_TEST(ecore_test_ecore_audio_obj_tone) Eina_Bool ret; char *tmp; - in = eo_add(ECORE_AUDIO_OBJ_IN_TONE_CLASS, NULL); + in = eo_add(ECORE_AUDIO_IN_TONE_CLASS, NULL); fail_if(!in); eo_do(in, ecore_audio_obj_name_set("tone")); @@ -203,7 +203,7 @@ START_TEST(ecore_test_ecore_audio_obj_tone) eo_do(in, len = ecore_audio_obj_in_remaining_get()); fail_if(len != 1.0); - out = eo_add(ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS, NULL); + out = eo_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL); fail_if(!out); eo_do(out, ecore_audio_obj_name_set("tmp.wav")); @@ -237,7 +237,7 @@ START_TEST(ecore_test_ecore_audio_obj_sndfile) Ecore_Audio_Format fmt; const char *src; - in = eo_add(ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, NULL); + in = eo_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL); fail_if(!in); eo_do(in, fmt = ecore_audio_obj_format_get()); @@ -283,7 +283,7 @@ START_TEST(ecore_test_ecore_audio_obj_sndfile) eo_do(in, len = ecore_audio_obj_in_seek(-1.0, SEEK_END)); fail_if(fabs(rem - 1 - len) > 0.1); - out = eo_add(ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS, NULL); + out = eo_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL); fail_if(!out); eo_do(out, ecore_audio_obj_name_set("tmp.wav")); @@ -324,9 +324,9 @@ START_TEST(ecore_test_ecore_audio_obj_in_out) Eina_List *in3; Eina_Bool attached; - Eo *in = eo_add(ECORE_AUDIO_OBJ_IN_CLASS, NULL); - Eo *in2 = eo_add(ECORE_AUDIO_OBJ_IN_CLASS, NULL); - Eo *out = eo_add(ECORE_AUDIO_OBJ_OUT_CLASS, NULL); + Eo *in = eo_add(ECORE_AUDIO_IN_CLASS, NULL); + Eo *in2 = eo_add(ECORE_AUDIO_IN_CLASS, NULL); + Eo *out = eo_add(ECORE_AUDIO_OUT_CLASS, NULL); fail_if(!in); fail_if(!in2); @@ -422,10 +422,10 @@ START_TEST(ecore_test_ecore_audio_obj_vio) { Eo *in, *out; - in = eo_add(ECORE_AUDIO_OBJ_IN_CLASS, NULL); + in = eo_add(ECORE_AUDIO_IN_CLASS, NULL); fail_if(!in); - out = eo_add(ECORE_AUDIO_OBJ_OUT_CLASS, NULL); + out = eo_add(ECORE_AUDIO_OUT_CLASS, NULL); fail_if(!out); eo_do(in, ecore_audio_obj_vio_set(&in_vio, NULL, NULL)); @@ -460,7 +460,7 @@ START_TEST(ecore_test_ecore_audio_obj_in) Ecore_Audio_Vio vio; Eina_Bool freed = EINA_FALSE; - Eo *in = eo_add(ECORE_AUDIO_OBJ_IN_CLASS, NULL); + Eo *in = eo_add(ECORE_AUDIO_IN_CLASS, NULL); fail_if(!in); @@ -549,10 +549,10 @@ START_TEST(ecore_test_ecore_audio_obj) double volume; Eo *objs[2], *obj; - objs[0] = eo_add(ECORE_AUDIO_OBJ_IN_CLASS, NULL); + objs[0] = eo_add(ECORE_AUDIO_IN_CLASS, NULL); fail_if(!objs[0]); - objs[1] = eo_add(ECORE_AUDIO_OBJ_OUT_CLASS, NULL); + objs[1] = eo_add(ECORE_AUDIO_OUT_CLASS, NULL); fail_if(!objs[1]); for (i=0; i<2; i++) {