summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2014-04-02 12:01:16 +0100
committerTom Hacohen <tom@stosb.com>2014-04-10 04:20:21 +0100
commit92cc33c46ff04db9a4a3a88e563a66a52f22cbe0 (patch)
tree15b8d4d5924fb2d4580ad19de72baafaa6380649
parent374af9b9cad96e499cfd9d3de99b30d2096d8cab (diff)
Eo: EO_BASE_CLASS->EO_CLASS.
Diffstat (limited to '')
-rw-r--r--src/benchmarks/eo/class_simple.c2
-rw-r--r--src/examples/eo/evas/evas_evas_obj.c2
-rw-r--r--src/examples/eo/isa/eo_isa_simple.c2
-rw-r--r--src/examples/eo/simple/simple_simple.c2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj.h2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in.c2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in_tone.c8
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_in_tone.h2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out.c2
-rw-r--r--src/lib/ecore_audio/ecore_audio_obj_out_pulse.c8
-rw-r--r--src/lib/ecore_audio/ecore_audio_private.h2
-rw-r--r--src/lib/eo/Eo.h6
-rw-r--r--src/lib/eo/eo2_base_class.c8
-rw-r--r--src/tests/eo/access/access_simple.c2
-rw-r--r--src/tests/eo/composite_objects/composite_objects_comp.c2
-rw-r--r--src/tests/eo/composite_objects/composite_objects_simple.c2
-rw-r--r--src/tests/eo/constructors/constructors_mixin.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple2.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple3.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple5.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple6.c2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_simple.c2
-rw-r--r--src/tests/eo/interface/interface_simple.c2
-rw-r--r--src/tests/eo/mixin/mixin_mixin.c2
-rw-r--r--src/tests/eo/mixin/mixin_simple.c2
-rw-r--r--src/tests/eo/signals/signals_main.c30
-rw-r--r--src/tests/eo/signals/signals_simple.c2
-rw-r--r--src/tests/eo/suite/eo_test_class_errors.c8
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.c2
-rw-r--r--src/tests/eo/suite/eo_test_general.c20
-rw-r--r--src/tests/eo/suite/eo_test_threaded_calls.c2
33 files changed, 70 insertions, 70 deletions
diff --git a/src/benchmarks/eo/class_simple.c b/src/benchmarks/eo/class_simple.c
index 2e8dc3f621..05d025ec97 100644
--- a/src/benchmarks/eo/class_simple.c
+++ b/src/benchmarks/eo/class_simple.c
@@ -46,5 +46,5 @@ static const Eo_Class_Description class_desc = {
46 NULL 46 NULL
47}; 47};
48 48
49EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, NULL) 49EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL)
50 50
diff --git a/src/examples/eo/evas/evas_evas_obj.c b/src/examples/eo/evas/evas_evas_obj.c
index 01f48a544b..768d3d4ea6 100644
--- a/src/examples/eo/evas/evas_evas_obj.c
+++ b/src/examples/eo/evas/evas_evas_obj.c
@@ -143,4 +143,4 @@ static const Eo_Class_Description class_desc = {
143 NULL 143 NULL
144}; 144};
145 145
146EO_DEFINE_CLASS(evas_object_class_get, &class_desc, EO_BASE_CLASS, NULL) 146EO_DEFINE_CLASS(evas_object_class_get, &class_desc, EO_CLASS, NULL)
diff --git a/src/examples/eo/isa/eo_isa_simple.c b/src/examples/eo/isa/eo_isa_simple.c
index 789c5f4711..67f47fd5f9 100644
--- a/src/examples/eo/isa/eo_isa_simple.c
+++ b/src/examples/eo/isa/eo_isa_simple.c
@@ -75,4 +75,4 @@ static const Eo_Class_Description class_desc = {
75 NULL 75 NULL
76}; 76};
77 77
78EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, INTERFACE_CLASS, MIXIN_CLASS, NULL); 78EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, INTERFACE_CLASS, MIXIN_CLASS, NULL);
diff --git a/src/examples/eo/simple/simple_simple.c b/src/examples/eo/simple/simple_simple.c
index a172bce3fc..42eb1f75b2 100644
--- a/src/examples/eo/simple/simple_simple.c
+++ b/src/examples/eo/simple/simple_simple.c
@@ -75,4 +75,4 @@ static const Eo_Class_Description class_desc = {
75 NULL 75 NULL
76}; 76};
77 77
78EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, INTERFACE_CLASS, MIXIN_CLASS, NULL); 78EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, INTERFACE_CLASS, MIXIN_CLASS, NULL);
diff --git a/src/lib/ecore_audio/ecore_audio_obj.h b/src/lib/ecore_audio/ecore_audio_obj.h
index b473a55f11..153a638292 100644
--- a/src/lib/ecore_audio/ecore_audio_obj.h
+++ b/src/lib/ecore_audio/ecore_audio_obj.h
@@ -175,7 +175,7 @@ enum Ecore_Audio_Obj_Sub_Ids
175 * @param[in] free_func This function takes care to clean up @ref data when 175 * @param[in] free_func This function takes care to clean up @ref data when
176 * the VIO is destroyed. NULL means do nothing. 176 * the VIO is destroyed. NULL means do nothing.
177 */ 177 */
178#define ecore_audio_obj_vio_set(vio, data, free_func) ECORE_AUDIO_OBJ_ID(ECORE_AUDIO_OBJ_SUB_ID_VIO_SET), EO_TYPECHECK(Ecore_Audio_Vio *, vio), EO_TYPECHECK(void *, data), EO_TYPECHECK(eo_base_data_free_func, free_func) 178#define ecore_audio_obj_vio_set(vio, data, free_func) ECORE_AUDIO_OBJ_ID(ECORE_AUDIO_OBJ_SUB_ID_VIO_SET), EO_TYPECHECK(Ecore_Audio_Vio *, vio), EO_TYPECHECK(void *, data), EO_TYPECHECK(eo_key_data_free_func, free_func)
179 179
180#endif 180#endif
181/** 181/**
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in.c b/src/lib/ecore_audio/ecore_audio_obj_in.c
index f77374f551..db88b03e64 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in.c
@@ -149,7 +149,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
149} 149}
150 150
151EOLIAN static void 151EOLIAN static void
152_ecore_audio_in_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Input *obj, Ecore_Audio_Vio *vio, void *data, eo_base_data_free_func free_func) 152_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)
153{ 153{
154 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 154 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
155 155
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 d18908da79..6860f9dd5a 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
@@ -142,7 +142,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
142} 142}
143 143
144EOLIAN static void 144EOLIAN static void
145_ecore_audio_in_sndfile_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_In_Sndfile_Data *obj, Ecore_Audio_Vio *vio, void *data, eo_base_data_free_func free_func) 145_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)
146{ 146{
147 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 147 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
148 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS); 148 Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_IN_CLASS);
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 60f634881f..1be57a426b 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
@@ -83,26 +83,26 @@ _ecore_audio_in_tone_ecore_audio_in_length_set(Eo *eo_obj, Ecore_Audio_In_Tone_D
83} 83}
84 84
85EOLIAN static void 85EOLIAN static void
86_ecore_audio_in_tone_eo_base_data_set(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key, const void *val, eo_base_data_free_func func) 86_ecore_audio_in_tone_eo_key_data_set(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key, const void *val, eo_key_data_free_func func)
87{ 87{
88 if (!key) return; 88 if (!key) return;
89 89
90 if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) { 90 if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) {
91 obj->freq = *(int *)val; 91 obj->freq = *(int *)val;
92 } else { 92 } else {
93 eo_do_super(eo_obj, MY_CLASS, eo_base_data_set(key, val, func)); 93 eo_do_super(eo_obj, MY_CLASS, eo_key_data_set(key, val, func));
94 } 94 }
95 95
96} 96}
97 97
98EOLIAN static void* 98EOLIAN static void*
99_ecore_audio_in_tone_eo_base_data_get(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key) 99_ecore_audio_in_tone_eo_key_data_get(Eo *eo_obj, Ecore_Audio_In_Tone_Data *obj, const char *key)
100{ 100{
101 if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) { 101 if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) {
102 return (void *) (intptr_t) obj->freq; 102 return (void *) (intptr_t) obj->freq;
103 } else { 103 } else {
104 void *ret = NULL; 104 void *ret = NULL;
105 eo_do_super(eo_obj, MY_CLASS, eo_base_data_get(key, &ret)); 105 eo_do_super(eo_obj, MY_CLASS, eo_key_data_get(key, &ret));
106 return ret; 106 return ret;
107 } 107 }
108} 108}
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_tone.h b/src/lib/ecore_audio/ecore_audio_obj_in_tone.h
index 6bfd505a28..738f49a55a 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.h
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.h
@@ -37,7 +37,7 @@ extern "C"
37/** 37/**
38 * @brief The frequency of the tone in Hz 38 * @brief The frequency of the tone in Hz
39 * 39 *
40 * Set with @ref eo_base_data_set() 40 * Set with @ref eo_key_data_set()
41 */ 41 */
42#define ECORE_AUDIO_ATTR_TONE_FREQ "ecore_audio_freq" 42#define ECORE_AUDIO_ATTR_TONE_FREQ "ecore_audio_freq"
43 43
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out.c b/src/lib/ecore_audio/ecore_audio_obj_out.c
index 40d16004e9..52e379fa3b 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out.c
@@ -113,7 +113,7 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
113} 113}
114 114
115EOLIAN static void 115EOLIAN static void
116_ecore_audio_out_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Output *_pd EINA_UNUSED, Ecore_Audio_Vio *vio, void *data, eo_base_data_free_func free_func) 116_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)
117{ 117{
118 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS); 118 Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj, ECORE_AUDIO_OBJ_CLASS);
119 119
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 8e7fc6d900..4da2d0b77f 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
@@ -60,7 +60,7 @@ _ecore_audio_out_pulse_ecore_audio_volume_set(Eo *eo_obj, Ecore_Audio_Out_Pulse_
60 eo_do_super(eo_obj, MY_CLASS, ecore_audio_obj_volume_set(volume)); 60 eo_do_super(eo_obj, MY_CLASS, ecore_audio_obj_volume_set(volume));
61 61
62 EINA_LIST_FOREACH(out_obj->inputs, input, in) { 62 EINA_LIST_FOREACH(out_obj->inputs, input, in) {
63 eo_do(in, eo_base_data_get("pulse_data", (void **)&stream)); 63 eo_do(in, eo_key_data_get("pulse_data", (void **)&stream));
64 idx = pa_stream_get_index(stream); 64 idx = pa_stream_get_index(stream);
65 pa_operation_unref(pa_context_set_sink_input_volume(class_vars.context, idx, &pa_volume, NULL, NULL)); 65 pa_operation_unref(pa_context_set_sink_input_volume(class_vars.context, idx, &pa_volume, NULL, NULL));
66 } 66 }
@@ -95,7 +95,7 @@ static Eina_Bool _update_samplerate_cb(void *data EINA_UNUSED, Eo *eo_obj, const
95 eo_do(eo_obj, ecore_audio_obj_in_samplerate_get(&samplerate)); 95 eo_do(eo_obj, ecore_audio_obj_in_samplerate_get(&samplerate));
96 eo_do(eo_obj, ecore_audio_obj_in_speed_get(&speed)); 96 eo_do(eo_obj, ecore_audio_obj_in_speed_get(&speed));
97 97
98 eo_do(eo_obj, eo_base_data_get("pulse_data", (void **)&stream)); 98 eo_do(eo_obj, eo_key_data_get("pulse_data", (void **)&stream));
99 99
100 pa_operation_unref(pa_stream_update_sample_rate(stream, samplerate * speed, NULL, NULL)); 100 pa_operation_unref(pa_stream_update_sample_rate(stream, samplerate * speed, NULL, NULL));
101 101
@@ -132,7 +132,7 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo *in)
132 132
133 eo_do(in, eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, _update_samplerate_cb, eo_obj)); 133 eo_do(in, eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_SAMPLERATE_CHANGED, _update_samplerate_cb, eo_obj));
134 134
135 eo_do(in, eo_base_data_set("pulse_data", stream, NULL)); 135 eo_do(in, eo_key_data_set("pulse_data", stream, NULL));
136 136
137 137
138 pa_stream_set_write_callback(stream, _write_cb, in); 138 pa_stream_set_write_callback(stream, _write_cb, in);
@@ -185,7 +185,7 @@ _ecore_audio_out_pulse_ecore_audio_out_input_detach(Eo *eo_obj, Ecore_Audio_Out_
185 if (!ret2) 185 if (!ret2)
186 return EINA_FALSE; 186 return EINA_FALSE;
187 187
188 eo_do(in, eo_base_data_get("pulse_data", (void **)&stream)); 188 eo_do(in, eo_key_data_get("pulse_data", (void **)&stream));
189 189
190 pa_stream_set_write_callback(stream, NULL, NULL); 190 pa_stream_set_write_callback(stream, NULL, NULL);
191 pa_operation_unref(pa_stream_drain(stream, _drain_cb, NULL)); 191 pa_operation_unref(pa_stream_drain(stream, _drain_cb, NULL));
diff --git a/src/lib/ecore_audio/ecore_audio_private.h b/src/lib/ecore_audio/ecore_audio_private.h
index b997ea8e03..36a06f5f4c 100644
--- a/src/lib/ecore_audio/ecore_audio_private.h
+++ b/src/lib/ecore_audio/ecore_audio_private.h
@@ -94,7 +94,7 @@ struct _Ecore_Audio_Module
94struct _Ecore_Audio_Vio_Internal { 94struct _Ecore_Audio_Vio_Internal {
95 Ecore_Audio_Vio *vio; 95 Ecore_Audio_Vio *vio;
96 void *data; 96 void *data;
97 eo_base_data_free_func free_func; 97 eo_key_data_free_func free_func;
98}; 98};
99typedef struct _Ecore_Audio_Vio_Internal Ecore_Audio_Vio_Internal; 99typedef struct _Ecore_Audio_Vio_Internal Ecore_Audio_Vio_Internal;
100 100
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index 57dca7e1ce..6e6979942d 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -931,12 +931,12 @@ EAPI const Eo_Class *eo_class_class_get(void);
931 */ 931 */
932 932
933/** 933/**
934 * @def EO_BASE_CLASS 934 * @def EO_CLASS
935 * The class type for the Eo base class. 935 * The class type for the Eo base class.
936 */ 936 */
937#define EO_BASE_CLASS eo_base_class_get() 937#define EO_CLASS eo_base_class_get()
938/** 938/**
939 * @brief Use #EO_BASE_CLASS 939 * @brief Use #EO_CLASS
940 * @internal 940 * @internal
941 * */ 941 * */
942EAPI const Eo_Class *eo_base_class_get(void); 942EAPI const Eo_Class *eo_base_class_get(void);
diff --git a/src/lib/eo/eo2_base_class.c b/src/lib/eo/eo2_base_class.c
index 2ed01fcecd..d11d073c14 100644
--- a/src/lib/eo/eo2_base_class.c
+++ b/src/lib/eo/eo2_base_class.c
@@ -121,7 +121,7 @@ _parent_set(Eo *obj, void *class_data, Eo *parent_id)
121 { 121 {
122 Private_Data *old_parent_pd; 122 Private_Data *old_parent_pd;
123 123
124 old_parent_pd = eo_data_scope_get(pd->parent, EO_BASE_CLASS); 124 old_parent_pd = eo_data_scope_get(pd->parent, EO_CLASS);
125 if (old_parent_pd) 125 if (old_parent_pd)
126 { 126 {
127 old_parent_pd->children = eina_list_remove(old_parent_pd->children, 127 old_parent_pd->children = eina_list_remove(old_parent_pd->children,
@@ -140,7 +140,7 @@ _parent_set(Eo *obj, void *class_data, Eo *parent_id)
140 if (parent_id) 140 if (parent_id)
141 { 141 {
142 Private_Data *parent_pd = NULL; 142 Private_Data *parent_pd = NULL;
143 parent_pd = eo_data_scope_get(parent_id, EO_BASE_CLASS); 143 parent_pd = eo_data_scope_get(parent_id, EO_CLASS);
144 144
145 if (EINA_LIKELY(parent_pd != NULL)) 145 if (EINA_LIKELY(parent_pd != NULL))
146 { 146 {
@@ -909,8 +909,8 @@ EAPI const Eina_Value_Type *EO_DBG_INFO_TYPE = &_EO_DBG_INFO_TYPE;
909/* EOF event callbacks */ 909/* EOF event callbacks */
910 910
911 911
912/* EO_BASE_CLASS stuff */ 912/* EO_CLASS stuff */
913#define MY_CLASS EO_BASE_CLASS 913#define MY_CLASS EO_CLASS
914 914
915/* FIXME: Set proper type descriptions. */ 915/* FIXME: Set proper type descriptions. */
916// FIXME: eo multiple definition 916// FIXME: eo multiple definition
diff --git a/src/tests/eo/access/access_simple.c b/src/tests/eo/access/access_simple.c
index 2eeb8cc570..6bf44ded70 100644
--- a/src/tests/eo/access/access_simple.c
+++ b/src/tests/eo/access/access_simple.c
@@ -53,5 +53,5 @@ static const Eo_Class_Description class_desc = {
53 NULL 53 NULL
54}; 54};
55 55
56EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, NULL) 56EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL)
57 57
diff --git a/src/tests/eo/composite_objects/composite_objects_comp.c b/src/tests/eo/composite_objects/composite_objects_comp.c
index 8d4756be5b..d880c9823e 100644
--- a/src/tests/eo/composite_objects/composite_objects_comp.c
+++ b/src/tests/eo/composite_objects/composite_objects_comp.c
@@ -53,6 +53,6 @@ static const Eo_Class_Description class_desc = {
53 NULL 53 NULL
54}; 54};
55 55
56EO_DEFINE_CLASS(comp_class_get, &class_desc, EO_BASE_CLASS, 56EO_DEFINE_CLASS(comp_class_get, &class_desc, EO_CLASS,
57 SIMPLE_CLASS, NULL); 57 SIMPLE_CLASS, NULL);
58 58
diff --git a/src/tests/eo/composite_objects/composite_objects_simple.c b/src/tests/eo/composite_objects/composite_objects_simple.c
index c4490da8c0..a1dfd4dbd8 100644
--- a/src/tests/eo/composite_objects/composite_objects_simple.c
+++ b/src/tests/eo/composite_objects/composite_objects_simple.c
@@ -52,5 +52,5 @@ static const Eo_Class_Description class_desc = {
52 NULL 52 NULL
53}; 53};
54 54
55EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, NULL); 55EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL);
56 56
diff --git a/src/tests/eo/constructors/constructors_mixin.c b/src/tests/eo/constructors/constructors_mixin.c
index 3076802143..ca7343ffe0 100644
--- a/src/tests/eo/constructors/constructors_mixin.c
+++ b/src/tests/eo/constructors/constructors_mixin.c
@@ -54,5 +54,5 @@ static const Eo_Class_Description class_desc = {
54 NULL 54 NULL
55}; 55};
56 56
57EO_DEFINE_CLASS(mixin_class_get, &class_desc, NULL, EO_BASE_CLASS, NULL); 57EO_DEFINE_CLASS(mixin_class_get, &class_desc, NULL, EO_CLASS, NULL);
58 58
diff --git a/src/tests/eo/constructors/constructors_simple.c b/src/tests/eo/constructors/constructors_simple.c
index 3441d44451..fa6b3fd820 100644
--- a/src/tests/eo/constructors/constructors_simple.c
+++ b/src/tests/eo/constructors/constructors_simple.c
@@ -104,6 +104,6 @@ static const Eo_Class_Description class_desc = {
104 _class_destructor 104 _class_destructor
105}; 105};
106 106
107EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, 107EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS,
108 MIXIN_CLASS, NULL); 108 MIXIN_CLASS, NULL);
109 109
diff --git a/src/tests/eo/constructors/constructors_simple2.c b/src/tests/eo/constructors/constructors_simple2.c
index 06c9e1d87a..0318a9ff09 100644
--- a/src/tests/eo/constructors/constructors_simple2.c
+++ b/src/tests/eo/constructors/constructors_simple2.c
@@ -32,5 +32,5 @@ static const Eo_Class_Description class_desc = {
32 NULL 32 NULL
33}; 33};
34 34
35EO_DEFINE_CLASS(simple2_class_get, &class_desc, EO_BASE_CLASS, NULL); 35EO_DEFINE_CLASS(simple2_class_get, &class_desc, EO_CLASS, NULL);
36 36
diff --git a/src/tests/eo/constructors/constructors_simple3.c b/src/tests/eo/constructors/constructors_simple3.c
index 79ef940c8c..9c720b51eb 100644
--- a/src/tests/eo/constructors/constructors_simple3.c
+++ b/src/tests/eo/constructors/constructors_simple3.c
@@ -30,5 +30,5 @@ static const Eo_Class_Description class_desc = {
30 NULL 30 NULL
31}; 31};
32 32
33EO_DEFINE_CLASS(simple3_class_get, &class_desc, EO_BASE_CLASS, NULL); 33EO_DEFINE_CLASS(simple3_class_get, &class_desc, EO_CLASS, NULL);
34 34
diff --git a/src/tests/eo/constructors/constructors_simple5.c b/src/tests/eo/constructors/constructors_simple5.c
index bbfbafd00e..df51e4ae87 100644
--- a/src/tests/eo/constructors/constructors_simple5.c
+++ b/src/tests/eo/constructors/constructors_simple5.c
@@ -30,5 +30,5 @@ static const Eo_Class_Description class_desc = {
30 NULL 30 NULL
31}; 31};
32 32
33EO_DEFINE_CLASS(simple5_class_get, &class_desc, EO_BASE_CLASS, NULL); 33EO_DEFINE_CLASS(simple5_class_get, &class_desc, EO_CLASS, NULL);
34 34
diff --git a/src/tests/eo/constructors/constructors_simple6.c b/src/tests/eo/constructors/constructors_simple6.c
index 71e29953f4..3f4c70e480 100644
--- a/src/tests/eo/constructors/constructors_simple6.c
+++ b/src/tests/eo/constructors/constructors_simple6.c
@@ -32,5 +32,5 @@ static const Eo_Class_Description class_desc = {
32 NULL 32 NULL
33}; 33};
34 34
35EO_DEFINE_CLASS(simple6_class_get, &class_desc, EO_BASE_CLASS, NULL); 35EO_DEFINE_CLASS(simple6_class_get, &class_desc, EO_CLASS, NULL);
36 36
diff --git a/src/tests/eo/function_overrides/function_overrides_simple.c b/src/tests/eo/function_overrides/function_overrides_simple.c
index ce6590b143..1ba2382948 100644
--- a/src/tests/eo/function_overrides/function_overrides_simple.c
+++ b/src/tests/eo/function_overrides/function_overrides_simple.c
@@ -75,5 +75,5 @@ static const Eo_Class_Description class_desc = {
75 NULL 75 NULL
76}; 76};
77 77
78EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, NULL); 78EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL);
79 79
diff --git a/src/tests/eo/interface/interface_simple.c b/src/tests/eo/interface/interface_simple.c
index e4bd477357..d35e142d3a 100644
--- a/src/tests/eo/interface/interface_simple.c
+++ b/src/tests/eo/interface/interface_simple.c
@@ -75,4 +75,4 @@ static const Eo_Class_Description class_desc = {
75 NULL 75 NULL
76}; 76};
77 77
78EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, INTERFACE2_CLASS, NULL); 78EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, INTERFACE2_CLASS, NULL);
diff --git a/src/tests/eo/mixin/mixin_mixin.c b/src/tests/eo/mixin/mixin_mixin.c
index 073ad3b988..d91a04fe11 100644
--- a/src/tests/eo/mixin/mixin_mixin.c
+++ b/src/tests/eo/mixin/mixin_mixin.c
@@ -49,5 +49,5 @@ static const Eo_Class_Description class_desc = {
49 NULL 49 NULL
50}; 50};
51 51
52EO_DEFINE_CLASS(mixin_class_get, &class_desc, NULL, EO_BASE_CLASS, NULL) 52EO_DEFINE_CLASS(mixin_class_get, &class_desc, NULL, EO_CLASS, NULL)
53 53
diff --git a/src/tests/eo/mixin/mixin_simple.c b/src/tests/eo/mixin/mixin_simple.c
index 5da36be987..0212939580 100644
--- a/src/tests/eo/mixin/mixin_simple.c
+++ b/src/tests/eo/mixin/mixin_simple.c
@@ -56,6 +56,6 @@ static const Eo_Class_Description class_desc = {
56 NULL 56 NULL
57}; 57};
58 58
59EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, 59EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS,
60 MIXIN3_CLASS, MIXIN2_CLASS, NULL); 60 MIXIN3_CLASS, MIXIN2_CLASS, NULL);
61 61
diff --git a/src/tests/eo/signals/signals_main.c b/src/tests/eo/signals/signals_main.c
index eb0784febd..4886d35b5f 100644
--- a/src/tests/eo/signals/signals_main.c
+++ b/src/tests/eo/signals/signals_main.c
@@ -133,15 +133,15 @@ main(int argc, char *argv[])
133 eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1)); 133 eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1));
134 fail_if(pd->cb_count != 1); 134 fail_if(pd->cb_count != 1);
135 135
136 eo_do(EO_BASE_CLASS, fcount = eo_event_global_freeze_get()); 136 eo_do(EO_CLASS, fcount = eo_event_global_freeze_get());
137 fail_if(fcount != 0); 137 fail_if(fcount != 0);
138 138
139 eo_do(EO_BASE_CLASS, eo_event_global_freeze()); 139 eo_do(EO_CLASS, eo_event_global_freeze());
140 eo_do(EO_BASE_CLASS, fcount = eo_event_global_freeze_get()); 140 eo_do(EO_CLASS, fcount = eo_event_global_freeze_get());
141 fail_if(fcount != 1); 141 fail_if(fcount != 1);
142 142
143 eo_do(EO_BASE_CLASS, eo_event_global_freeze()); 143 eo_do(EO_CLASS, eo_event_global_freeze());
144 eo_do(EO_BASE_CLASS, fcount = eo_event_global_freeze_get()); 144 eo_do(EO_CLASS, fcount = eo_event_global_freeze_get());
145 fail_if(fcount != 2); 145 fail_if(fcount != 2);
146 146
147 eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2)); 147 eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2));
@@ -149,30 +149,30 @@ main(int argc, char *argv[])
149 149
150 eo_do(obj, simple_a_set(2)); 150 eo_do(obj, simple_a_set(2));
151 fail_if(cb_count != 0); 151 fail_if(cb_count != 0);
152 eo_do(EO_BASE_CLASS, eo_event_global_thaw()); 152 eo_do(EO_CLASS, eo_event_global_thaw());
153 eo_do(EO_BASE_CLASS, fcount = eo_event_global_freeze_get()); 153 eo_do(EO_CLASS, fcount = eo_event_global_freeze_get());
154 fail_if(fcount != 1); 154 fail_if(fcount != 1);
155 155
156 eo_do(EO_BASE_CLASS, eo_event_global_thaw()); 156 eo_do(EO_CLASS, eo_event_global_thaw());
157 eo_do(EO_BASE_CLASS, fcount = eo_event_global_freeze_get()); 157 eo_do(EO_CLASS, fcount = eo_event_global_freeze_get());
158 fail_if(fcount != 0); 158 fail_if(fcount != 0);
159 159
160 eo_do(obj, simple_a_set(3)); 160 eo_do(obj, simple_a_set(3));
161 fail_if(cb_count != 2); 161 fail_if(cb_count != 2);
162 162
163 cb_count = 0; 163 cb_count = 0;
164 eo_do(EO_BASE_CLASS, eo_event_global_thaw()); 164 eo_do(EO_CLASS, eo_event_global_thaw());
165 eo_do(EO_BASE_CLASS, fcount = eo_event_global_freeze_get()); 165 eo_do(EO_CLASS, fcount = eo_event_global_freeze_get());
166 fail_if(fcount != 0); 166 fail_if(fcount != 0);
167 167
168 eo_do(EO_BASE_CLASS, eo_event_global_freeze()); 168 eo_do(EO_CLASS, eo_event_global_freeze());
169 eo_do(EO_BASE_CLASS, fcount = eo_event_global_freeze_get()); 169 eo_do(EO_CLASS, fcount = eo_event_global_freeze_get());
170 fail_if(fcount != 1); 170 fail_if(fcount != 1);
171 171
172 eo_do(obj, simple_a_set(2)); 172 eo_do(obj, simple_a_set(2));
173 fail_if(cb_count != 0); 173 fail_if(cb_count != 0);
174 eo_do(EO_BASE_CLASS, eo_event_global_thaw()); 174 eo_do(EO_CLASS, eo_event_global_thaw());
175 eo_do(EO_BASE_CLASS, fcount = eo_event_global_freeze_get()); 175 eo_do(EO_CLASS, fcount = eo_event_global_freeze_get());
176 fail_if(fcount != 0); 176 fail_if(fcount != 0);
177 177
178 178
diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c
index f370a2794b..a928cec854 100644
--- a/src/tests/eo/signals/signals_simple.c
+++ b/src/tests/eo/signals/signals_simple.c
@@ -96,5 +96,5 @@ static const Eo_Class_Description class_desc = {
96 NULL 96 NULL
97}; 97};
98 98
99EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, NULL); 99EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL);
100 100
diff --git a/src/tests/eo/suite/eo_test_class_errors.c b/src/tests/eo/suite/eo_test_class_errors.c
index 36a85151cc..e6fee93cae 100644
--- a/src/tests/eo/suite/eo_test_class_errors.c
+++ b/src/tests/eo/suite/eo_test_class_errors.c
@@ -56,7 +56,7 @@ START_TEST(eo_inherit_errors)
56 klass_mixin = eo_class_new(&class_desc_mixin, NULL, NULL); 56 klass_mixin = eo_class_new(&class_desc_mixin, NULL, NULL);
57 fail_if(!klass_mixin); 57 fail_if(!klass_mixin);
58 58
59 klass_simple = eo_class_new(&class_desc_simple, EO_BASE_CLASS, NULL); 59 klass_simple = eo_class_new(&class_desc_simple, EO_CLASS, NULL);
60 fail_if(!klass_simple); 60 fail_if(!klass_simple);
61 61
62 TEST_EO_ERROR("eo_class_new", "Non-regular classes ('%s') aren't allowed to inherit from regular classes ('%s')."); 62 TEST_EO_ERROR("eo_class_new", "Non-regular classes ('%s') aren't allowed to inherit from regular classes ('%s').");
@@ -142,14 +142,14 @@ START_TEST(eo_inconsistent_mro)
142 fail_if(!klass_mixin3); 142 fail_if(!klass_mixin3);
143 143
144 TEST_EO_ERROR("_eo_class_mro_init", "Cannot create a consistent method resolution order for class '%s' because of '%s'."); 144 TEST_EO_ERROR("_eo_class_mro_init", "Cannot create a consistent method resolution order for class '%s' because of '%s'.");
145 klass = eo_class_new(&class_desc_simple, EO_BASE_CLASS, klass_mixin, klass_mixin2, NULL); 145 klass = eo_class_new(&class_desc_simple, EO_CLASS, klass_mixin, klass_mixin2, NULL);
146 fail_if(klass); 146 fail_if(klass);
147 fail_unless(ctx.did); 147 fail_unless(ctx.did);
148 148
149 klass = eo_class_new(&class_desc_simple, EO_BASE_CLASS, klass_mixin2, klass_mixin, NULL); 149 klass = eo_class_new(&class_desc_simple, EO_CLASS, klass_mixin2, klass_mixin, NULL);
150 fail_if(!klass); 150 fail_if(!klass);
151 151
152 klass = eo_class_new(&class_desc_simple, EO_BASE_CLASS, klass_mixin2, klass_mixin3, NULL); 152 klass = eo_class_new(&class_desc_simple, EO_CLASS, klass_mixin2, klass_mixin3, NULL);
153 fail_if(!klass); 153 fail_if(!klass);
154 154
155 eina_log_print_cb_set(eina_log_print_cb_stderr, NULL); 155 eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
diff --git a/src/tests/eo/suite/eo_test_class_simple.c b/src/tests/eo/suite/eo_test_class_simple.c
index 5b8c2e06ac..cbefee7d1d 100644
--- a/src/tests/eo/suite/eo_test_class_simple.c
+++ b/src/tests/eo/suite/eo_test_class_simple.c
@@ -98,5 +98,5 @@ static const Eo_Class_Description class_desc = {
98 NULL 98 NULL
99}; 99};
100 100
101EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_BASE_CLASS, NULL) 101EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL)
102 102
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index 2f6d79e4cc..cf2bd1bb36 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -11,7 +11,7 @@
11START_TEST(eo_simple) 11START_TEST(eo_simple)
12{ 12{
13 eo_init(); 13 eo_init();
14 Eo *obj = eo_add(EO_BASE_CLASS, NULL); 14 Eo *obj = eo_add(EO_CLASS, NULL);
15 fail_if(obj); 15 fail_if(obj);
16 16
17 obj = eo_add(SIMPLE_CLASS, NULL); 17 obj = eo_add(SIMPLE_CLASS, NULL);
@@ -135,7 +135,7 @@ START_TEST(eo_data_fetch)
135 NULL 135 NULL
136 }; 136 };
137 137
138 const Eo_Class *klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL); 138 const Eo_Class *klass = eo_class_new(&class_desc, EO_CLASS, NULL);
139 fail_if(!klass); 139 fail_if(!klass);
140 140
141 Eo *obj = eo_add(klass, NULL); 141 Eo *obj = eo_add(klass, NULL);
@@ -146,7 +146,7 @@ START_TEST(eo_data_fetch)
146 eo_unref(obj); 146 eo_unref(obj);
147 147
148 class_desc.data_size = 0; 148 class_desc.data_size = 0;
149 klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL); 149 klass = eo_class_new(&class_desc, EO_CLASS, NULL);
150 fail_if(!klass); 150 fail_if(!klass);
151 151
152 obj = eo_add(klass, NULL); 152 obj = eo_add(klass, NULL);
@@ -211,7 +211,7 @@ START_TEST(eo_isa_tests)
211 NULL 211 NULL
212 }; 212 };
213 213
214 klass = eo_class_new(&class_desc, EO_BASE_CLASS, iface, mixin, NULL); 214 klass = eo_class_new(&class_desc, EO_CLASS, iface, mixin, NULL);
215 fail_if(!klass); 215 fail_if(!klass);
216 } 216 }
217 217
@@ -221,7 +221,7 @@ START_TEST(eo_isa_tests)
221 fail_if(!eo_isa(obj, iface)); 221 fail_if(!eo_isa(obj, iface));
222 fail_if(!eo_isa(obj, mixin)); 222 fail_if(!eo_isa(obj, mixin));
223 fail_if(!eo_isa(obj, klass)); 223 fail_if(!eo_isa(obj, klass));
224 fail_if(!eo_isa(obj, EO_BASE_CLASS)); 224 fail_if(!eo_isa(obj, EO_CLASS));
225 eo_unref(obj); 225 eo_unref(obj);
226 226
227 obj = eo_add(SIMPLE_CLASS, NULL); 227 obj = eo_add(SIMPLE_CLASS, NULL);
@@ -230,7 +230,7 @@ START_TEST(eo_isa_tests)
230 fail_if(eo_isa(obj, iface)); 230 fail_if(eo_isa(obj, iface));
231 fail_if(eo_isa(obj, mixin)); 231 fail_if(eo_isa(obj, mixin));
232 fail_if(!eo_isa(obj, SIMPLE_CLASS)); 232 fail_if(!eo_isa(obj, SIMPLE_CLASS));
233 fail_if(!eo_isa(obj, EO_BASE_CLASS)); 233 fail_if(!eo_isa(obj, EO_CLASS));
234 eo_unref(obj); 234 eo_unref(obj);
235 235
236 eo_shutdown(); 236 eo_shutdown();
@@ -300,7 +300,7 @@ START_TEST(eo_man_free)
300 NULL 300 NULL
301 }; 301 };
302 302
303 const Eo_Class *klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL); 303 const Eo_Class *klass = eo_class_new(&class_desc, EO_CLASS, NULL);
304 fail_if(!klass); 304 fail_if(!klass);
305 cur_klass = klass; 305 cur_klass = klass;
306 306
@@ -314,7 +314,7 @@ START_TEST(eo_man_free)
314 eo_unref(obj); 314 eo_unref(obj);
315 315
316 _man_should_des = EINA_FALSE; 316 _man_should_des = EINA_FALSE;
317 klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL); 317 klass = eo_class_new(&class_desc, EO_CLASS, NULL);
318 cur_klass = klass; 318 cur_klass = klass;
319 fail_if(!klass); 319 fail_if(!klass);
320 320
@@ -333,7 +333,7 @@ START_TEST(eo_man_free)
333 fail_if(!eo_manual_free(obj)); 333 fail_if(!eo_manual_free(obj));
334 334
335 _man_should_con = EINA_FALSE; 335 _man_should_con = EINA_FALSE;
336 klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL); 336 klass = eo_class_new(&class_desc, EO_CLASS, NULL);
337 cur_klass = klass; 337 cur_klass = klass;
338 fail_if(!klass); 338 fail_if(!klass);
339 339
@@ -781,7 +781,7 @@ START_TEST(eo_pointers_indirection)
781 NULL 781 NULL
782 }; 782 };
783 783
784 const Eo_Class *klass = eo_class_new(&class_desc, EO_BASE_CLASS, NULL); 784 const Eo_Class *klass = eo_class_new(&class_desc, EO_CLASS, NULL);
785 fail_if(!klass); 785 fail_if(!klass);
786 786
787 /* Check simple id validity */ 787 /* Check simple id validity */
diff --git a/src/tests/eo/suite/eo_test_threaded_calls.c b/src/tests/eo/suite/eo_test_threaded_calls.c
index 951b6551b4..ee7b70f526 100644
--- a/src/tests/eo/suite/eo_test_threaded_calls.c
+++ b/src/tests/eo/suite/eo_test_threaded_calls.c
@@ -76,7 +76,7 @@ static const Eo_Class_Description class_desc = {
76 NULL 76 NULL
77}; 77};
78 78
79EO_DEFINE_CLASS(thread_test_class_get, &class_desc, EO_BASE_CLASS, NULL) 79EO_DEFINE_CLASS(thread_test_class_get, &class_desc, EO_CLASS, NULL)
80 80
81static void * 81static void *
82_thread_job(void *data, Eina_Thread t EINA_UNUSED) 82_thread_job(void *data, Eina_Thread t EINA_UNUSED)