summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2016-07-04 14:55:33 +0100
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2016-07-04 14:56:44 +0100
commitf72c47586743225756583e0961441e13bc7e0007 (patch)
tree3a723c5b1971656b4ff6eafd53e7a0f63eb98587
parent9527240d7422ff828f29c54df2211dd9374c2867 (diff)
eo: use ref types in eo_base
-rw-r--r--src/lib/eo/eo_base.eo25
1 files changed, 12 insertions, 13 deletions
diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo
index 07db677884..ce567152b3 100644
--- a/src/lib/eo/eo_base.eo
+++ b/src/lib/eo/eo_base.eo
@@ -11,7 +11,7 @@ struct Eo.Event.Description {
11struct Eo.Event { 11struct Eo.Event {
12 [[Parameter passed in event callbacks holding extra event parameters]] 12 [[Parameter passed in event callbacks holding extra event parameters]]
13 object: Eo.Base; [[The object the event was called on.]] 13 object: Eo.Base; [[The object the event was called on.]]
14 desc: const(Eo.Event.Description) *; [[The event description.]] 14 desc: ref(const(Eo.Event.Description)); [[The event description.]]
15 info: void_ptr; [[Extra event information passed by the event caller.]] 15 info: void_ptr; [[Extra event information passed by the event caller.]]
16} 16}
17 17
@@ -24,7 +24,7 @@ struct Eo.Callback_Array_Item {
24 24
25 See also \@ref eo_event_callback_array_add. 25 See also \@ref eo_event_callback_array_add.
26 ]] 26 ]]
27 desc: const(Eo.Event.Description) *; [[The event description.]] 27 desc: ref(const(Eo.Event.Description)); [[The event description.]]
28 func: Eo.Event_Cb; [[The callback function.]] 28 func: Eo.Event_Cb; [[The callback function.]]
29} 29}
30 30
@@ -206,8 +206,7 @@ abstract Eo.Base ()
206 wref_del { 206 wref_del {
207 [[Delete the weak reference passed.]] 207 [[Delete the weak reference passed.]]
208 params { 208 params {
209 /* FIXME: this should be @ref when I add it */ 209 @in wref: ref(Eo.Base);
210 @out wref: Eo.Base;
211 } 210 }
212 } 211 }
213 @property key_data { 212 @property key_data {
@@ -268,7 +267,7 @@ abstract Eo.Base ()
268 key: string; [[the key associated with the value]] 267 key: string; [[the key associated with the value]]
269 } 268 }
270 values { 269 values {
271 value: generic_value *; [[the value to set]] 270 value: ref(generic_value); [[the value to set]]
272 } 271 }
273 } 272 }
274 event_thaw { 273 event_thaw {
@@ -303,7 +302,7 @@ abstract Eo.Base ()
303 ]] 302 ]]
304 return: bool; [[Return true when the callback has been successfully added.]] 303 return: bool; [[Return true when the callback has been successfully added.]]
305 params { 304 params {
306 @in desc: const(Eo.Event.Description)*; [[The description of the event to listen to]] 305 @in desc: ref(const(Eo.Event.Description)); [[The description of the event to listen to]]
307 @in priority: Eo.Callback_Priority; [[The priority of the callback]] 306 @in priority: Eo.Callback_Priority; [[The priority of the callback]]
308 @in cb: Eo.Event_Cb; [[the callback to call]] 307 @in cb: Eo.Event_Cb; [[the callback to call]]
309 @in data: const(void_ptr); [[additional data to pass to the callback]] 308 @in data: const(void_ptr); [[additional data to pass to the callback]]
@@ -313,7 +312,7 @@ abstract Eo.Base ()
313 [[Del a callback with a specific data associated to it for an event.]] 312 [[Del a callback with a specific data associated to it for an event.]]
314 return: bool; [[Return true when the callback has been successfully removed.]] 313 return: bool; [[Return true when the callback has been successfully removed.]]
315 params { 314 params {
316 @in desc: const(Eo.Event.Description)*; [[The description of the event to listen to]] 315 @in desc: ref(const(Eo.Event.Description)); [[The description of the event to listen to]]
317 @in func: Eo.Event_Cb; [[the callback to delete]] 316 @in func: Eo.Event_Cb; [[the callback to delete]]
318 @in user_data: const(void_ptr); [[The data to compare]] 317 @in user_data: const(void_ptr); [[The data to compare]]
319 } 318 }
@@ -326,7 +325,7 @@ abstract Eo.Base ()
326 ]] 325 ]]
327 return: bool; [[Return true when the callback has been successfully added.]] 326 return: bool; [[Return true when the callback has been successfully added.]]
328 params { 327 params {
329 @in array: const(Eo.Callback_Array_Item)*; [[an #Eo_Callback_Array_Item of events to listen to]] 328 @in array: ref(const(Eo.Callback_Array_Item)); [[an #Eo_Callback_Array_Item of events to listen to]]
330 @in priority: Eo.Callback_Priority; [[The priority of the callback]] 329 @in priority: Eo.Callback_Priority; [[The priority of the callback]]
331 @in data: const(void_ptr); [[additional data to pass to the callback]] 330 @in data: const(void_ptr); [[additional data to pass to the callback]]
332 } 331 }
@@ -337,14 +336,14 @@ abstract Eo.Base ()
337 ]] 336 ]]
338 return: bool; [[Return true when the callback has been successfully removed.]] 337 return: bool; [[Return true when the callback has been successfully removed.]]
339 params { 338 params {
340 @in array: const(Eo.Callback_Array_Item)*; [[an #Eo_Callback_Array_Item of events to listen to]] 339 @in array: ref(const(Eo.Callback_Array_Item)); [[an #Eo_Callback_Array_Item of events to listen to]]
341 @in user_data: const(void_ptr); [[The data to compare]] 340 @in user_data: const(void_ptr); [[The data to compare]]
342 } 341 }
343 } 342 }
344 event_callback_call { 343 event_callback_call {
345 [[Call the callbacks for an event of an object.]] 344 [[Call the callbacks for an event of an object.]]
346 params { 345 params {
347 @in desc: const(Eo.Event.Description)*; [[The description of the event to call]] 346 @in desc: ref(const(Eo.Event.Description)); [[The description of the event to call]]
348 @in event_info: void_ptr; [[Extra event info to pass to the callbacks]] 347 @in event_info: void_ptr; [[Extra event info to pass to the callbacks]]
349 } 348 }
350 return: bool; [[$false if one of the callbacks aborted the call, 349 return: bool; [[$false if one of the callbacks aborted the call,
@@ -363,21 +362,21 @@ abstract Eo.Base ()
363 event_callback_forwarder_add { 362 event_callback_forwarder_add {
364 [[Add an event callback forwarder for an event and an object.]] 363 [[Add an event callback forwarder for an event and an object.]]
365 params { 364 params {
366 @in desc: const(Eo.Event.Description)*; [[The description of the event to listen to]] 365 @in desc: ref(const(Eo.Event.Description)); [[The description of the event to listen to]]
367 @in new_obj: Eo.Base; [[The object to emit events from]] 366 @in new_obj: Eo.Base; [[The object to emit events from]]
368 } 367 }
369 } 368 }
370 event_callback_forwarder_del { 369 event_callback_forwarder_del {
371 [[Remove an event callback forwarder for an event and an object.]] 370 [[Remove an event callback forwarder for an event and an object.]]
372 params { 371 params {
373 @in desc: const(Eo.Event.Description)*; [[The description of the event to listen to]] 372 @in desc: ref(const(Eo.Event.Description)); [[The description of the event to listen to]]
374 @in new_obj: Eo.Base; [[The object to emit events from]] 373 @in new_obj: Eo.Base; [[The object to emit events from]]
375 } 374 }
376 } 375 }
377 dbg_info_get { 376 dbg_info_get {
378 [[Get dbg information from the object.]] 377 [[Get dbg information from the object.]]
379 params { 378 params {
380 @in root_node: Eo.Dbg_Info*; [[node of the tree]] 379 @in root_node: ref(Eo.Dbg_Info); [[node of the tree]]
381 } 380 }
382 } 381 }
383 children_iterator_new { 382 children_iterator_new {