summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2015-06-10 15:52:33 +0100
committerTom Hacohen <tom@stosb.com>2015-06-10 15:52:33 +0100
commite8dd532854b64dbab3772b6426e07327b9268705 (patch)
tree0c3cf8456ae1393071e31acd14f69c649c03a1b7 /src
parent2605eb3c1524764c2bd5edef7bb08d914651cc75 (diff)
Efl model: Fix Eolian warnings (and migrate types).
Diffstat (limited to 'src')
-rw-r--r--src/lib/efl/Efl_Model_Common.h54
-rw-r--r--src/lib/efl/interfaces/efl_model_base.eo75
2 files changed, 38 insertions, 91 deletions
diff --git a/src/lib/efl/Efl_Model_Common.h b/src/lib/efl/Efl_Model_Common.h
index bd9ab62e5f..ce1ed3b66b 100644
--- a/src/lib/efl/Efl_Model_Common.h
+++ b/src/lib/efl/Efl_Model_Common.h
@@ -6,60 +6,6 @@ extern "C" {
6#endif 6#endif
7 7
8/** 8/**
9 * @enum _Efl_Model_Load_Status
10 * XXX/TODO/FIXME: Remove this enum (and possibly other data) from here
11 * as soon as eolian translates these data types in .eo's.
12 */
13enum _Efl_Model_Load_Status
14 {
15 EFL_MODEL_LOAD_STATUS_ERROR = 0,
16 EFL_MODEL_LOAD_STATUS_LOADING_PROPERTIES = (1 << 0),
17 EFL_MODEL_LOAD_STATUS_LOADING_CHILDREN = (1 << 1),
18 EFL_MODEL_LOAD_STATUS_LOADING = (1 << 0) | (1 << 1),
19
20 EFL_MODEL_LOAD_STATUS_LOADED_PROPERTIES = (1 << 2),
21 EFL_MODEL_LOAD_STATUS_LOADED_CHILDREN = (1 << 3),
22 EFL_MODEL_LOAD_STATUS_LOADED = (1 << 2) | (1 << 3),
23
24 EFL_MODEL_LOAD_STATUS_UNLOADING = (1 << 4),
25 EFL_MODEL_LOAD_STATUS_UNLOADED = (1 << 5)
26 };
27/**
28 * @typedef Efl_Model_Load_Status
29 */
30typedef enum _Efl_Model_Load_Status Efl_Model_Load_Status;
31
32/**
33 * @struct _Efl_Model_Load
34 * Structure to hold Efl_Model_Load_Status enum
35 * (and possible other data) to avoid ABI break.
36 */
37struct _Efl_Model_Load
38 {
39 Efl_Model_Load_Status status;
40 /* add more data below here if necessary */
41 };
42
43/**
44 * @typedef Efl_Model_Load
45 */
46typedef struct _Efl_Model_Load Efl_Model_Load;
47
48/**
49 * @struct _Efl_Model_Property_Event
50 */
51struct _Efl_Model_Property_Event
52{
53 const Eina_Array *changed_properties; /**< array of property name */
54 const Eina_Array *invalidated_properties; /**< array of property name */
55};
56
57/**
58 * @typedef Efl_Model_Property_Event
59 */
60typedef struct _Efl_Model_Property_Event Efl_Model_Property_Event;
61
62/**
63 * @struct _Efl_Model_Children_Event 9 * @struct _Efl_Model_Children_Event
64 * Every time a child id added the event 10 * Every time a child id added the event
65 * EFL_MODEL_EVENT_CHILD_ADDED is dispatched 11 * EFL_MODEL_EVENT_CHILD_ADDED is dispatched
diff --git a/src/lib/efl/interfaces/efl_model_base.eo b/src/lib/efl/interfaces/efl_model_base.eo
index dbda997c45..a7c6160fe5 100644
--- a/src/lib/efl/interfaces/efl_model_base.eo
+++ b/src/lib/efl/interfaces/efl_model_base.eo
@@ -1,26 +1,27 @@
1/* 1enum Efl.Model.Load_Status {
2 * enum Efl_Model_Load_Status 2 error = 0,
3 * { 3 loading_properties = (1 << 0),
4 * error = 0, /*@ Error in Load Model * 4 loading_children = (1 << 1),
5 * properties = (1 << 0), /*@ properties load in progress * 5 loading = (1 << 0) | (1 << 1),
6 * children = (1 << 1), /*@ children load in progress * 6
7 * loading = (1 << 0) | (1 << 1), /*@ children and properties load in progress * 7 loaded_properties = (1 << 2),
8 * 8 loaded_children = (1 << 3),
9 * loaded_properties = (1 << 2), /*@ Model as ready to fetch properties * 9 loaded = (1 << 2) | (1 << 3),
10 * loaded_children = (1 << 3), /*@ Model as ready to fetch children * 10
11 * loaded = (1 << 2) | (1 << 3), /*@ Model as ready to fetch properties and children * 11 unloading = (1 << 4),
12 * 12 unloaded = (1 << 5)
13 * unloading = (1 << 4), /*@ Model Unload in progress * 13}
14 * unloaded = (1 << 5) /*@ Model Unloaded * 14
15 * } 15struct Efl.Model.Property_Event {
16 * 16 changed_properties: array<const(char) *> *; [[List of changed properties]]
17 * 17 invalidated_properties: array<const(char) *> *; [[Removed properties identified by name]]
18 * struct Efl_Model_Property_Event 18}
19 * { 19
20 * changed_properties: Eina_Array* <const(char)*>; /*@ List of changed properties * 20struct Efl.Model.Load {
21 * invalidated_properties: Eina_Array* <const(char)*>; /*@ Removed properties identified by name * 21 [[Structure to hold Efl_Model_Load_Status enum (and possible other data) to avoid ABI break.]]
22 * } 22
23 */ 23 status: Efl.Model.Load_Status;
24}
24 25
25interface Efl.Model.Base () 26interface Efl.Model.Base ()
26{ 27{
@@ -41,7 +42,7 @@ interface Efl.Model.Base ()
41 @see efl_model_load 42 @see efl_model_load
42 43
43 @since 1.14 */ 44 @since 1.14 */
44 return: Efl_Model_Load_Status; 45 return: Efl.Model.Load_Status;
45 } 46 }
46 } 47 }
47 @property properties { 48 @property properties {
@@ -59,7 +60,7 @@ interface Efl.Model.Base ()
59 @see EFL_MODEL_EVENT_PROPERTIES_CHANGE 60 @see EFL_MODEL_EVENT_PROPERTIES_CHANGE
60 @since 1.14 */ 61 @since 1.14 */
61 62
62 return: Efl_Model_Load_Status; 63 return: Efl.Model.Load_Status;
63 } 64 }
64 values { 65 values {
65 properties: const(array<const(char*)>*); /*@ array of current properties */ 66 properties: const(array<const(char*)>*); /*@ array of current properties */
@@ -86,7 +87,7 @@ interface Efl.Model.Base ()
86 @see EFL_MODEL_EVENT_PROPERTIES_CHANGE 87 @see EFL_MODEL_EVENT_PROPERTIES_CHANGE
87 @since 1.14 */ 88 @since 1.14 */
88 89
89 return: Efl_Model_Load_Status; 90 return: Efl.Model.Load_Status;
90 } 91 }
91 get { 92 get {
92 /*@ 93 /*@
@@ -105,7 +106,7 @@ interface Efl.Model.Base ()
105 @see EFL_MODEL_EVENT_PROPERTIES_CHANGE 106 @see EFL_MODEL_EVENT_PROPERTIES_CHANGE
106 107
107 @since 1.14 */ 108 @since 1.14 */
108 return: Efl_Model_Load_Status; 109 return: Efl.Model.Load_Status;
109 } 110 }
110 keys { 111 keys {
111 property: const(char)*; /*@ Property name */ 112 property: const(char)*; /*@ Property name */
@@ -168,11 +169,11 @@ interface Efl.Model.Base ()
168 @see efl_model_load_status_get 169 @see efl_model_load_status_get
169 @since 1.14 */ 170 @since 1.14 */
170 171
171 return: Efl_Model_Load_Status; 172 return: Efl.Model.Load_Status;
172 } 173 }
173 keys { 174 keys {
174 start: unsigned; /*@ Range begin - start from here. If start and count are 0 slice is ignored.*/ 175 start: uint; /*@ Range begin - start from here. If start and count are 0 slice is ignored.*/
175 count: unsigned; /*@ Range size. If count and start are 0 slice is ignored.*/ 176 count: uint; /*@ Range size. If count and start are 0 slice is ignored.*/
176 } 177 }
177 values { 178 values {
178 children_accessor: accessor<list<Eo.Base*>*>*; 179 children_accessor: accessor<list<Eo.Base*>*>*;
@@ -196,10 +197,10 @@ interface Efl.Model.Base ()
196 @see efl_model_load_status_get 197 @see efl_model_load_status_get
197 @since 1.14 */ 198 @since 1.14 */
198 199
199 return: Efl_Model_Load_Status; 200 return: Efl.Model.Load_Status;
200 } 201 }
201 values { 202 values {
202 children_count: unsigned; 203 children_count: uint;
203 } 204 }
204 } 205 }
205 load { 206 load {
@@ -286,7 +287,7 @@ interface Efl.Model.Base ()
286 287
287 @since 1.14 */ 288 @since 1.14 */
288 289
289 return: Eo *; 290 return: Eo.Base *;
290 } 291 }
291 child_del { 292 child_del {
292 /*@ 293 /*@
@@ -301,17 +302,17 @@ interface Efl.Model.Base ()
301 @see EFL_MODEL_EVENT_CHILD_REMOVED 302 @see EFL_MODEL_EVENT_CHILD_REMOVED
302 @since 1.14 */ 303 @since 1.14 */
303 304
304 return: Efl_Model_Load_Status; 305 return: Efl.Model.Load_Status;
305 306
306 params { 307 params {
307 @in child: Eo*; /*@ Child to be removed */ 308 @in child: Eo.Base*; /*@ Child to be removed */
308 } 309 }
309 } 310 }
310 } 311 }
311 312
312 events { 313 events {
313 load,status: Efl_Model_Load_Status; /*@ Event dispatch when load status changes */ 314 load,status: Efl.Model.Load_Status; /*@ Event dispatch when load status changes */
314 properties,changed: Efl_Model_Properties_Evt; /*@ Event dispatched when properties list is available. */ 315 properties,changed: Efl.Model.Property_Event; /*@ Event dispatched when properties list is available. */
315 child,added; /*@ Event dispatched when new child is added. */ 316 child,added; /*@ Event dispatched when new child is added. */
316 child,removed; /*@ Event dispatched when child is removed. */ 317 child,removed; /*@ Event dispatched when child is removed. */
317 children,count,changed; /*@ Event dispatched when children count is finished. */ 318 children,count,changed; /*@ Event dispatched when children count is finished. */