summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2015-05-28 17:03:49 +0100
committerTom Hacohen <tom@stosb.com>2015-05-28 17:47:59 +0100
commitd0b58aab54131eb71be6d3289fd11a78b8c9adf5 (patch)
tree1d530282cec991bb3a625d801f6d15735f961997
parent293d286977acb8a5ac5da72241de2c2912dfa1d9 (diff)
Eo base: Fix Eolian files to use Eo.Base instead of Eo.
Eo is not a known Eolian type, we should only be using the class names.
-rw-r--r--src/lib/eo/Eo.h1
-rw-r--r--src/lib/eo/eo_base.eo20
2 files changed, 10 insertions, 11 deletions
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index 5a4014adf0..6c985c4d20 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -1076,7 +1076,6 @@ struct _Eo_Callback_Array_Item
1076 * @} 1076 * @}
1077 */ 1077 */
1078 1078
1079#define _EO_BASE_EO_CLASS_TYPE
1080#include "eo_base.eo.h" 1079#include "eo_base.eo.h"
1081 1080
1082#define EO_CLASS EO_BASE_CLASS 1081#define EO_CLASS EO_BASE_CLASS
diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo
index b81ed6e3f9..de44698bfa 100644
--- a/src/lib/eo/eo_base.eo
+++ b/src/lib/eo/eo_base.eo
@@ -13,7 +13,7 @@ Parents keep references to their children so in order to delete objects that hav
13 /*@ Get the parent of an object */ 13 /*@ Get the parent of an object */
14 } 14 }
15 values { 15 values {
16 parent: Eo*; /*@ the new parent */ 16 parent: Eo.Base*; /*@ the new parent */
17 } 17 }
18 } 18 }
19 @property event_global_freeze_count @class { 19 @property event_global_freeze_count @class {
@@ -45,7 +45,7 @@ Return event freeze count. */
45 constructor { 45 constructor {
46 /*@ Call the object's constructor. 46 /*@ Call the object's constructor.
47Should not be used with #eo_do. Only use it with #eo_do_super. */ 47Should not be used with #eo_do. Only use it with #eo_do_super. */
48 return: Eo *; /*@ The new object created, can be NULL if aborting */ 48 return: Eo.Base *; /*@ The new object created, can be NULL if aborting */
49 } 49 }
50 destructor { 50 destructor {
51 /*@ Call the object's destructor. 51 /*@ Call the object's destructor.
@@ -53,19 +53,19 @@ Should not be used with #eo_do. Only use it with #eo_do_super. */
53 } 53 }
54 finalize { 54 finalize {
55 /*@ Called at the end of #eo_add. Should not be called, just overridden. */ 55 /*@ Called at the end of #eo_add. Should not be called, just overridden. */
56 return: Eo *; /*@ The new object created, can be NULL if aborting */ 56 return: Eo.Base *; /*@ The new object created, can be NULL if aborting */
57 } 57 }
58 wref_add { 58 wref_add {
59 /*@ Add a new weak reference to obj. 59 /*@ Add a new weak reference to obj.
60This function registers the object handle pointed by wref to obj so when obj is deleted it'll be updated to NULL. This functions should be used when you want to keep track of an object in a safe way, but you don't want to prevent it from being freed. */ 60This function registers the object handle pointed by wref to obj so when obj is deleted it'll be updated to NULL. This functions should be used when you want to keep track of an object in a safe way, but you don't want to prevent it from being freed. */
61 params { 61 params {
62 @out wref: Eo*; 62 @out wref: Eo.Base *;
63 } 63 }
64 } 64 }
65 wref_del { 65 wref_del {
66 /*@ Delete the weak reference passed. */ 66 /*@ Delete the weak reference passed. */
67 params { 67 params {
68 @in wref: Eo**; 68 @in wref: Eo.Base **;
69 } 69 }
70 } 70 }
71 key_data_set { 71 key_data_set {
@@ -151,14 +151,14 @@ callbacks of the same priority are called in reverse order of creation. */
151 /*@ Add an event callback forwarder for an event and an object. */ 151 /*@ Add an event callback forwarder for an event and an object. */
152 params { 152 params {
153 @in desc: const(Eo_Event_Description)*; /*@ The description of the event to listen to */ 153 @in desc: const(Eo_Event_Description)*; /*@ The description of the event to listen to */
154 @in new_obj: Eo*; /*@ The object to emit events from */ 154 @in new_obj: Eo.Base *; /*@ The object to emit events from */
155 } 155 }
156 } 156 }
157 event_callback_forwarder_del { 157 event_callback_forwarder_del {
158 /*@ Remove an event callback forwarder for an event and an object. */ 158 /*@ Remove an event callback forwarder for an event and an object. */
159 params { 159 params {
160 @in desc: const(Eo_Event_Description)*; /*@ The description of the event to listen to */ 160 @in desc: const(Eo_Event_Description)*; /*@ The description of the event to listen to */
161 @in new_obj: Eo*; /*@ The object to emit events from */ 161 @in new_obj: Eo.Base *; /*@ The object to emit events from */
162 } 162 }
163 } 163 }
164 dbg_info_get { 164 dbg_info_get {
@@ -169,7 +169,7 @@ callbacks of the same priority are called in reverse order of creation. */
169 } 169 }
170 children_iterator_new { 170 children_iterator_new {
171 /*@ Get an iterator on all childrens */ 171 /*@ Get an iterator on all childrens */
172 return: free(own(iterator<Eo *> *), eina_iterator_free) @warn_unused; 172 return: free(own(iterator<Eo.Base *> *), eina_iterator_free) @warn_unused;
173 } 173 }
174 composite_attach @beta { 174 composite_attach @beta {
175 /*@ 175 /*@
@@ -184,7 +184,7 @@ callbacks of the same priority are called in reverse order of creation. */
184 * @ingroup Eo_Composite_Objects 184 * @ingroup Eo_Composite_Objects
185 */ 185 */
186 params { 186 params {
187 @in comp_obj: Eo *; /*@ the object that will be used to composite the parent. */ 187 @in comp_obj: Eo.Base *; /*@ the object that will be used to composite the parent. */
188 } 188 }
189 return: bool; /*@ EINA_TRUE if successfull. EINA_FALSE otherwise. */ 189 return: bool; /*@ EINA_TRUE if successfull. EINA_FALSE otherwise. */
190 } 190 }
@@ -199,7 +199,7 @@ callbacks of the same priority are called in reverse order of creation. */
199 * @ingroup Eo_Composite_Objects 199 * @ingroup Eo_Composite_Objects
200 */ 200 */
201 params { 201 params {
202 @in comp_obj: Eo *; /*@ the object that will be removed from the parent. */ 202 @in comp_obj: Eo.Base *; /*@ the object that will be removed from the parent. */
203 } 203 }
204 return: bool; /*@ EINA_TRUE if successfull. EINA_FALSE otherwise. */ 204 return: bool; /*@ EINA_TRUE if successfull. EINA_FALSE otherwise. */
205 } 205 }