summaryrefslogtreecommitdiff
path: root/src/lib/eldbus
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-02-17 10:17:59 +0000
committerTom Hacohen <tom@stosb.com>2016-02-17 10:17:59 +0000
commit297fc1c42b790afcddeed9556c2d7b601b94ae0a (patch)
tree2f0059046302784f91c9c228fbf207f71f780f82 /src/lib/eldbus
parent1c8ae97b8365920beb6d4407881cc899ea91160e (diff)
Eldbus model arguments: Fix Eolian warnings.
This includes either migrating types to eolian, fixing namespace or importing extra types.
Diffstat (limited to 'src/lib/eldbus')
-rw-r--r--src/lib/eldbus/eldbus_introspection.h21
-rw-r--r--src/lib/eldbus/eldbus_model_arguments.eo18
2 files changed, 22 insertions, 17 deletions
diff --git a/src/lib/eldbus/eldbus_introspection.h b/src/lib/eldbus/eldbus_introspection.h
index bb6078a1ff..542a474e32 100644
--- a/src/lib/eldbus/eldbus_introspection.h
+++ b/src/lib/eldbus/eldbus_introspection.h
@@ -2,6 +2,11 @@
2#define _ELDBUS_INTROSPECTION_INTROSPECTION_H 2#define _ELDBUS_INTROSPECTION_INTROSPECTION_H
3 3
4#include <Eina.h> 4#include <Eina.h>
5#include <Eo.h>
6
7typedef struct _Eldbus_Proxy Eldbus_Proxy;
8
9#include "eldbus_model_arguments.eo.h"
5 10
6// DTD conversion form: http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd 11// DTD conversion form: http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd
7 12
@@ -9,20 +14,11 @@ typedef struct _Eldbus_Introspection_Node Eldbus_Introspection_Node;
9typedef struct _Eldbus_Introspection_Interface Eldbus_Introspection_Interface; 14typedef struct _Eldbus_Introspection_Interface Eldbus_Introspection_Interface;
10typedef struct _Eldbus_Introspection_Method Eldbus_Introspection_Method; 15typedef struct _Eldbus_Introspection_Method Eldbus_Introspection_Method;
11typedef struct _Eldbus_Introspection_Signal Eldbus_Introspection_Signal; 16typedef struct _Eldbus_Introspection_Signal Eldbus_Introspection_Signal;
12typedef struct _Eldbus_Introspection_Argument Eldbus_Introspection_Argument;
13typedef struct _Eldbus_Introspection_Property Eldbus_Introspection_Property; 17typedef struct _Eldbus_Introspection_Property Eldbus_Introspection_Property;
14typedef struct _Eldbus_Introspection_Annotation Eldbus_Introspection_Annotation; 18typedef struct _Eldbus_Introspection_Annotation Eldbus_Introspection_Annotation;
15 19
16typedef enum 20typedef enum
17{ 21{
18 ELDBUS_INTROSPECTION_ARGUMENT_DIRECTION_NONE = 0,
19 ELDBUS_INTROSPECTION_ARGUMENT_DIRECTION_IN,
20 ELDBUS_INTROSPECTION_ARGUMENT_DIRECTION_OUT,
21
22} Eldbus_Introspection_Argument_Direction;
23
24typedef enum
25{
26 ELDBUS_INTROSPECTION_PROPERTY_ACCESS_READ, 22 ELDBUS_INTROSPECTION_PROPERTY_ACCESS_READ,
27 ELDBUS_INTROSPECTION_PROPERTY_ACCESS_WRITE, 23 ELDBUS_INTROSPECTION_PROPERTY_ACCESS_WRITE,
28 ELDBUS_INTROSPECTION_PROPERTY_ACCESS_READWRITE, 24 ELDBUS_INTROSPECTION_PROPERTY_ACCESS_READWRITE,
@@ -58,13 +54,6 @@ struct _Eldbus_Introspection_Signal
58 Eina_List *annotations; 54 Eina_List *annotations;
59}; 55};
60 56
61struct _Eldbus_Introspection_Argument
62{
63 Eina_Stringshare *name; // optional
64 Eina_Stringshare *type;
65 Eldbus_Introspection_Argument_Direction direction;
66};
67
68struct _Eldbus_Introspection_Property 57struct _Eldbus_Introspection_Property
69{ 58{
70 Eina_Stringshare *name; 59 Eina_Stringshare *name;
diff --git a/src/lib/eldbus/eldbus_model_arguments.eo b/src/lib/eldbus/eldbus_model_arguments.eo
index 64f39f9ce2..5a74690938 100644
--- a/src/lib/eldbus/eldbus_model_arguments.eo
+++ b/src/lib/eldbus/eldbus_model_arguments.eo
@@ -1,3 +1,19 @@
1struct @extern Eldbus_Proxy; /* FIXME: Move to Eot file. */
2
3enum Eldbus.Introspection.Argument_Direction
4{
5 none = 0,
6 in,
7 out,
8}
9
10struct Eldbus.Introspection.Argument
11{
12 name: Eina.Stringshare *; [[Optional]]
13 type: Eina.Stringshare *;
14 direction: Eldbus.Introspection.Argument_Direction;
15}
16
1class Eldbus.Model_Arguments (Eo.Base, Efl.Model.Base) { 17class Eldbus.Model_Arguments (Eo.Base, Efl.Model.Base) {
2 legacy_prefix: null; 18 legacy_prefix: null;
3 methods { 19 methods {
@@ -8,7 +24,7 @@ class Eldbus.Model_Arguments (Eo.Base, Efl.Model.Base) {
8 params { 24 params {
9 @in proxy: Eldbus_Proxy*; [[Eldbus proxy]] 25 @in proxy: Eldbus_Proxy*; [[Eldbus proxy]]
10 @in name: const(char)*; [[Name]] 26 @in name: const(char)*; [[Name]]
11 @in arguments: const(Eina_List)*; [[The introspected arguments]] 27 @in arguments: const(list<Eldbus.Introspection.Argument *>)*; [[The introspected arguments]]
12 } 28 }
13 } 29 }
14 @property name { 30 @property name {