tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=82f6dff7d799347ca85e9c5d9850690b0af4d8e7
commit 82f6dff7d799347ca85e9c5d9850690b0af4d8e7
Author: Tom Hacohen <t...@stosb.com>
Date: Mon Jun 1 11:16:22 2015 +0100
Evas smart: Migrate types to .eo files.
---
src/lib/evas/canvas/evas_object_smart.eo | 33 ++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/src/lib/evas/canvas/evas_object_smart.eo
b/src/lib/evas/canvas/evas_object_smart.eo
index 24c4bb5..92b93b3 100644
--- a/src/lib/evas/canvas/evas_object_smart.eo
+++ b/src/lib/evas/canvas/evas_object_smart.eo
@@ -1,3 +1,8 @@
+/* XXX: Putting the next two as externs because this interface will hopefully
+ be removed for efl 2.0, so no need to bother. */
+struct @extern Evas.Smart;
+struct @extern Evas.Smart_Cb_Description;
+
class Evas.Object_Smart (Evas.Object, Evas.Signal_Interface)
{
eo_prefix: evas_obj_smart;
@@ -55,7 +60,7 @@ class Evas.Object_Smart (Evas.Object, Evas.Signal_Interface)
legacy: null;
}
values {
- clip: Evas_Object *;
+ clip: Evas.Object *;
}
}
@property color {
@@ -113,7 +118,7 @@ class Evas.Object_Smart (Evas.Object, Evas.Signal_Interface)
@return the #Evas_Smart handle or @c NULL, on errors
@ingroup Evas_Smart_Object_Group */
- return: Evas_Smart * @warn_unused;
+ return: Evas.Smart * @warn_unused;
}
}
show {
@@ -124,8 +129,8 @@ class Evas.Object_Smart (Evas.Object, Evas.Signal_Interface)
/*@ No description supplied by the EAPI. */
legacy: null;
params {
- @in x: Evas_Coord;
- @in y: Evas_Coord;
+ @in x: Evas.Coord;
+ @in y: Evas.Coord;
}
}
callbacks_descriptions_set {
@@ -157,7 +162,7 @@ class Evas.Object_Smart (Evas.Object, Evas.Signal_Interface)
return: bool;
params {
- @in descriptions: const(Evas_Smart_Cb_Description)*; /*@ @c NULL
terminated array with
+ @in descriptions: const(Evas.Smart_Cb_Description)*; /*@ @c NULL
terminated array with
#Evas_Smart_Cb_Description descriptions. Array elements won't be
modified at run time, but references to them and their contents
will be made, so this array should be kept alive during the whole
@@ -186,12 +191,12 @@ class Evas.Object_Smart (Evas.Object,
Evas.Signal_Interface)
@ingroup Evas_Smart_Object_Group */
params {
- @out class_descriptions: const(Evas_Smart_Cb_Description)**; /*@
Where to store class callbacks
+ @out class_descriptions: const(Evas.Smart_Cb_Description)**; /*@
Where to store class callbacks
descriptions array, if any is known. If no descriptions are
known, @c NULL is returned */
@out class_count: uint; /*@ Returns how many class callbacks
descriptions
are known. */
- @out instance_descriptions: const(Evas_Smart_Cb_Description)**;
/*@ Where to store instance callbacks
+ @out instance_descriptions: const(Evas.Smart_Cb_Description)**;
/*@ Where to store instance callbacks
descriptions array, if any is known. If no descriptions are
known, @c NULL is returned. */
@out instance_count: uint; /*@ Returns how many instance callbacks
@@ -225,10 +230,10 @@ class Evas.Object_Smart (Evas.Object,
Evas.Signal_Interface)
search have a special case for @a name being the same
pointer as registered with Evas_Smart_Cb_Description, one
can use it to avoid excessive use of strcmp(). */
- @out class_description: const(Evas_Smart_Cb_Description)*; /*@
pointer to return class description or
+ @out class_description: const(Evas.Smart_Cb_Description)*; /*@
pointer to return class description or
@c NULL if not found. If parameter is @c NULL, no search will
be done on class descriptions. */
- @out instance_description: const(Evas_Smart_Cb_Description)*; /*@
pointer to return instance description */
+ @out instance_description: const(Evas.Smart_Cb_Description)*; /*@
pointer to return instance description */
}
}
hide {
@@ -284,7 +289,7 @@ class Evas.Object_Smart (Evas.Object, Evas.Signal_Interface)
@ingroup Evas_Smart_Object_Group */
params {
- @in sub_obj: Evas_Object * @nonull; /*@ The member object */
+ @in sub_obj: Evas.Object * @nonull; /*@ The member object */
}
legacy: null;
}
@@ -292,8 +297,8 @@ class Evas.Object_Smart (Evas.Object, Evas.Signal_Interface)
/*@ No description supplied by the EAPI. */
legacy: null;
params {
- @in w: Evas_Coord;
- @in h: Evas_Coord;
+ @in w: Evas.Coord;
+ @in h: Evas.Coord;
}
}
clip_unset {
@@ -326,7 +331,7 @@ class Evas.Object_Smart (Evas.Object, Evas.Signal_Interface)
@see evas_object_smart_members_get() */
params {
- @in sub_obj: Evas_Object *; /*@ the member object
+ @in sub_obj: Evas.Object *; /*@ the member object
@ingroup Evas_Smart_Object_Group */
}
legacy: null;
@@ -338,7 +343,7 @@ class Evas.Object_Smart (Evas.Object, Evas.Signal_Interface)
attach {
/*@ Attach a given smart data to a given smart object. */
params {
- @in s: Evas_Smart *;
+ @in s: Evas.Smart *;
}
legacy: null;
}
--
