bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Eldbus model arguments: Fix Eolian warnings. 

This includes either migrating types to eolian, fixing namespace or
importing extra types.
This commit is contained in:
Tom Hacohen 2016-02-17 10:17:59 +00:00
parent 1c8ae97b83
commit 297fc1c42b
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/lib/eldbus/eldbus_introspection.h
View File

@ -2,6 +2,11 @@
#define _ELDBUS_INTROSPECTION_INTROSPECTION_H
#include <Eina.h>
#include <Eo.h>
typedef struct _Eldbus_Proxy Eldbus_Proxy;
#include "eldbus_model_arguments.eo.h"
// DTD conversion form: http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd
@ -9,18 +14,9 @@ typedef struct _Eldbus_Introspection_Node Eldbus_Introspection_Node;
typedef struct _Eldbus_Introspection_Interface Eldbus_Introspection_Interface;
typedef struct _Eldbus_Introspection_Method Eldbus_Introspection_Method;
typedef struct _Eldbus_Introspection_Signal Eldbus_Introspection_Signal;
typedef struct _Eldbus_Introspection_Argument Eldbus_Introspection_Argument;
typedef struct _Eldbus_Introspection_Property Eldbus_Introspection_Property;
typedef struct _Eldbus_Introspection_Annotation Eldbus_Introspection_Annotation;
typedef enum
{
ELDBUS_INTROSPECTION_ARGUMENT_DIRECTION_NONE = 0,
ELDBUS_INTROSPECTION_ARGUMENT_DIRECTION_IN,
ELDBUS_INTROSPECTION_ARGUMENT_DIRECTION_OUT,
} Eldbus_Introspection_Argument_Direction;
typedef enum
{
ELDBUS_INTROSPECTION_PROPERTY_ACCESS_READ,
@ -58,13 +54,6 @@ struct _Eldbus_Introspection_Signal
Eina_List *annotations;
};
struct _Eldbus_Introspection_Argument
{
Eina_Stringshare *name; // optional
Eina_Stringshare *type;
Eldbus_Introspection_Argument_Direction direction;
};
struct _Eldbus_Introspection_Property
{
Eina_Stringshare *name;

18
src/lib/eldbus/eldbus_model_arguments.eo
View File

@ -1,3 +1,19 @@
struct @extern Eldbus_Proxy; /* FIXME: Move to Eot file. */
enum Eldbus.Introspection.Argument_Direction
{
none = 0,
in,
out,
}
struct Eldbus.Introspection.Argument
{
name: Eina.Stringshare *; [[Optional]]
type: Eina.Stringshare *;
direction: Eldbus.Introspection.Argument_Direction;
}
class Eldbus.Model_Arguments (Eo.Base, Efl.Model.Base) {
legacy_prefix: null;
methods {
@ -8,7 +24,7 @@ class Eldbus.Model_Arguments (Eo.Base, Efl.Model.Base) {
params {
@in proxy: Eldbus_Proxy*; [[Eldbus proxy]]
@in name: const(char)*; [[Name]]
@in arguments: const(Eina_List)*; [[The introspected arguments]]
@in arguments: const(list<Eldbus.Introspection.Argument *>)*; [[The introspected arguments]]
}
}
@property name {