aboutsummaryrefslogtreecommitdiffstats
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
parentefl - fix lots of little init/shutdown pairs that are wrong (diff)
downloadefl-f72c47586743225756583e0961441e13bc7e0007.tar.gz
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 {
struct Eo.Event {
[[Parameter passed in event callbacks holding extra event parameters]]
object: Eo.Base; [[The object the event was called on.]]
- desc: const(Eo.Event.Description) *; [[The event description.]]
+ desc: ref(const(Eo.Event.Description)); [[The event description.]]
info: void_ptr; [[Extra event information passed by the event caller.]]
}
@@ -24,7 +24,7 @@ struct Eo.Callback_Array_Item {
See also \@ref eo_event_callback_array_add.
]]
- desc: const(Eo.Event.Description) *; [[The event description.]]
+ desc: ref(const(Eo.Event.Description)); [[The event description.]]
func: Eo.Event_Cb; [[The callback function.]]
}
@@ -206,8 +206,7 @@ abstract Eo.Base ()
wref_del {
[[Delete the weak reference passed.]]
params {
- /* FIXME: this should be @ref when I add it */
- @out wref: Eo.Base;
+ @in wref: ref(Eo.Base);
}
}
@property key_data {
@@ -268,7 +267,7 @@ abstract Eo.Base ()
key: string; [[the key associated with the value]]
}
values {
- value: generic_value *; [[the value to set]]
+ value: ref(generic_value); [[the value to set]]
}
}
event_thaw {
@@ -303,7 +302,7 @@ abstract Eo.Base ()
]]
return: bool; [[Return true when the callback has been successfully added.]]
params {
- @in desc: const(Eo.Event.Description)*; [[The description of the event to listen to]]
+ @in desc: ref(const(Eo.Event.Description)); [[The description of the event to listen to]]
@in priority: Eo.Callback_Priority; [[The priority of the callback]]
@in cb: Eo.Event_Cb; [[the callback to call]]
@in data: const(void_ptr); [[additional data to pass to the callback]]
@@ -313,7 +312,7 @@ abstract Eo.Base ()
[[Del a callback with a specific data associated to it for an event.]]
return: bool; [[Return true when the callback has been successfully removed.]]
params {
- @in desc: const(Eo.Event.Description)*; [[The description of the event to listen to]]
+ @in desc: ref(const(Eo.Event.Description)); [[The description of the event to listen to]]
@in func: Eo.Event_Cb; [[the callback to delete]]
@in user_data: const(void_ptr); [[The data to compare]]
}
@@ -326,7 +325,7 @@ abstract Eo.Base ()
]]
return: bool; [[Return true when the callback has been successfully added.]]
params {
- @in array: const(Eo.Callback_Array_Item)*; [[an #Eo_Callback_Array_Item of events to listen to]]
+ @in array: ref(const(Eo.Callback_Array_Item)); [[an #Eo_Callback_Array_Item of events to listen to]]
@in priority: Eo.Callback_Priority; [[The priority of the callback]]
@in data: const(void_ptr); [[additional data to pass to the callback]]
}
@@ -337,14 +336,14 @@ abstract Eo.Base ()
]]
return: bool; [[Return true when the callback has been successfully removed.]]
params {
- @in array: const(Eo.Callback_Array_Item)*; [[an #Eo_Callback_Array_Item of events to listen to]]
+ @in array: ref(const(Eo.Callback_Array_Item)); [[an #Eo_Callback_Array_Item of events to listen to]]
@in user_data: const(void_ptr); [[The data to compare]]
}
}
event_callback_call {
[[Call the callbacks for an event of an object.]]
params {
- @in desc: const(Eo.Event.Description)*; [[The description of the event to call]]
+ @in desc: ref(const(Eo.Event.Description)); [[The description of the event to call]]
@in event_info: void_ptr; [[Extra event info to pass to the callbacks]]
}
return: bool; [[$false if one of the callbacks aborted the call,
@@ -363,21 +362,21 @@ abstract Eo.Base ()
event_callback_forwarder_add {
[[Add an event callback forwarder for an event and an object.]]
params {
- @in desc: const(Eo.Event.Description)*; [[The description of the event to listen to]]
+ @in desc: ref(const(Eo.Event.Description)); [[The description of the event to listen to]]
@in new_obj: Eo.Base; [[The object to emit events from]]
}
}
event_callback_forwarder_del {
[[Remove an event callback forwarder for an event and an object.]]
params {
- @in desc: const(Eo.Event.Description)*; [[The description of the event to listen to]]
+ @in desc: ref(const(Eo.Event.Description)); [[The description of the event to listen to]]
@in new_obj: Eo.Base; [[The object to emit events from]]
}
}
dbg_info_get {
[[Get dbg information from the object.]]
params {
- @in root_node: Eo.Dbg_Info*; [[node of the tree]]
+ @in root_node: ref(Eo.Dbg_Info); [[node of the tree]]
}
}
children_iterator_new {