From b8c820db17065bc0e3c5f60b8b941bdbb2d96372 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Wed, 2 Mar 2016 13:50:19 +0000 Subject: [PATCH] eolian: fix generation tests --- src/tests/eolian/data/class_simple_ref.c | 2 +- src/tests/eolian/data/class_simple_ref_eo.h | 10 +++++----- src/tests/eolian/data/docs_ref.h | 6 +++--- src/tests/eolian/data/override_ref.c | 8 ++++---- src/tests/eolian/data/struct_ref.c | 4 ++-- src/tests/eolian/data/typedef_ref.c | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/tests/eolian/data/class_simple_ref.c b/src/tests/eolian/data/class_simple_ref.c index 0c6a86fec2..b97639d3c3 100644 --- a/src/tests/eolian/data/class_simple_ref.c +++ b/src/tests/eolian/data/class_simple_ref.c @@ -5,7 +5,7 @@ EOAPI EO_FUNC_BODYV(evas_obj_simple_a_set, Eina_Bool, EINA_TRUE, EO_FUNC_CALL(va int _class_simple_a_get(Eo *obj, Evas_Simple_Data *pd); -EOAPI EO_FUNC_BODY(evas_obj_simple_a_get, int, 100); +EOAPI EO_FUNC_BODY_CONST(evas_obj_simple_a_get, int, 100); void _class_simple_b_set(Eo *obj, Evas_Simple_Data *pd); diff --git a/src/tests/eolian/data/class_simple_ref_eo.h b/src/tests/eolian/data/class_simple_ref_eo.h index 52d8a58654..f5b4f78d51 100644 --- a/src/tests/eolian/data/class_simple_ref_eo.h +++ b/src/tests/eolian/data/class_simple_ref_eo.h @@ -33,7 +33,7 @@ EAPI const Eo_Class *class_simple_class_get(void); * * @ingroup Class_Simple */ -EOAPI Eina_Bool evas_obj_simple_a_set(int value); +EOAPI Eina_Bool evas_obj_simple_a_set(Eo *obj, int value); #endif #ifdef CLASS_SIMPLE_BETA @@ -44,10 +44,10 @@ EOAPI Eina_Bool evas_obj_simple_a_set(int value); * * @ingroup Class_Simple */ -EOAPI int evas_obj_simple_a_get(void); +EOAPI int evas_obj_simple_a_get(const Eo *obj); #endif -EOAPI void evas_obj_simple_b_set(void); +EOAPI void evas_obj_simple_b_set(Eo *obj); #ifdef CLASS_SIMPLE_BETA /** @@ -60,10 +60,10 @@ EOAPI void evas_obj_simple_b_set(void); * * @ingroup Class_Simple */ -EOAPI char *evas_obj_simple_foo(int a, char *b, double *c); +EOAPI char *evas_obj_simple_foo(Eo *obj, int a, char *b, double *c); #endif -EOAPI int evas_obj_simple_bar(int x); +EOAPI int evas_obj_simple_bar(Eo *obj, int x); #endif diff --git a/src/tests/eolian/data/docs_ref.h b/src/tests/eolian/data/docs_ref.h index 3b61d3571b..d8939e48c7 100644 --- a/src/tests/eolian/data/docs_ref.h +++ b/src/tests/eolian/data/docs_ref.h @@ -90,7 +90,7 @@ EAPI const Eo_Class *docs_class_get(void); * * @ingroup Docs */ -EOAPI void docs_prop_set(int val); +EOAPI void docs_prop_set(Eo *obj, int val); /** * @brief Property common documentation. @@ -103,7 +103,7 @@ EOAPI void docs_prop_set(int val); * * @ingroup Docs */ -EOAPI int docs_prop_get(void); +EOAPI int docs_prop_get(const Eo *obj); /** * @brief Method documentation. @@ -117,7 +117,7 @@ EOAPI int docs_prop_get(void); * * @ingroup Docs */ -EOAPI int docs_meth(int a, float *b, long *c); +EOAPI int docs_meth(Eo *obj, int a, float *b, long *c); EOAPI extern const Eo_Event_Description _DOCS_EVENT_CLICKED; diff --git a/src/tests/eolian/data/override_ref.c b/src/tests/eolian/data/override_ref.c index 934e15ec82..5e9d08fb57 100644 --- a/src/tests/eolian/data/override_ref.c +++ b/src/tests/eolian/data/override_ref.c @@ -23,15 +23,15 @@ static int __eolian_override_c_get(Eo *obj EINA_UNUSED, Override_Data *pd EINA_U return 50; } -EOAPI EO_FUNC_BODYV(override_c_get, int, 50, EO_FUNC_CALL(idx), int idx); +EOAPI EO_FUNC_BODYV_CONST(override_c_get, int, 50, EO_FUNC_CALL(idx), int idx); void _override_a_get(Eo *obj, Override_Data *pd); -EOAPI EO_VOID_FUNC_BODY(override_a_get); +EOAPI EO_VOID_FUNC_BODY_CONST(override_a_get); void _override_b_get(Eo *obj, Override_Data *pd, int idx, float *a, char *b, int *c); -EOAPI EO_VOID_FUNC_BODYV(override_b_get, EO_FUNC_CALL(idx, a, b, c), int idx, float *a, char *b, int *c); +EOAPI EO_VOID_FUNC_BODYV_CONST(override_b_get, EO_FUNC_CALL(idx, a, b, c), int idx, float *a, char *b, int *c); void _override_c_set(Eo *obj, Override_Data *pd, int idx, int c); @@ -78,4 +78,4 @@ static const Eo_Class_Description _override_class_desc = { NULL }; -EO_DEFINE_CLASS(override_class_get, &_override_class_desc, BASE_CLASS, NULL); +EO_DEFINE_CLASS(override_class_get, &_override_class_desc, BASE_CLASS, NULL); \ No newline at end of file diff --git a/src/tests/eolian/data/struct_ref.c b/src/tests/eolian/data/struct_ref.c index 7739427da8..567ff9fd20 100644 --- a/src/tests/eolian/data/struct_ref.c +++ b/src/tests/eolian/data/struct_ref.c @@ -37,9 +37,9 @@ EAPI const Eo_Class *struct_class_get(void); * * @ingroup Struct */ -EOAPI char *struct_foo(int idx); +EOAPI char *struct_foo(Eo *obj, int idx); -EOAPI Named *struct_bar(void); +EOAPI Named *struct_bar(Eo *obj); #endif diff --git a/src/tests/eolian/data/typedef_ref.c b/src/tests/eolian/data/typedef_ref.c index 202d4cbf34..5236e54af8 100644 --- a/src/tests/eolian/data/typedef_ref.c +++ b/src/tests/eolian/data/typedef_ref.c @@ -41,7 +41,7 @@ typedef enum EAPI const Eo_Class *typedef_class_get(void); -EOAPI char *typedef_foo(int idx); +EOAPI char *typedef_foo(Eo *obj, int idx); #endif