summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2018-12-13 10:01:34 -0800
committerCedric BAIL <cedric.bail@free.fr>2019-01-02 13:39:21 -0800
commitdf2629a1c92c2847a0b24258691e9bdd994519bf (patch)
treed4f0739b8b0d3b415e656dd71c21eb8cbc349c4a
parentd11e0b036e223a2f768a5d8d9279296646f71d8e (diff)
ecore: allow for not specifying any static string in Efl.Model.properties.get helper.
Reviewed-by: Xavi Artigas <xavierartigas@yahoo.es> Differential Revision: https://phab.enlightenment.org/D7485
-rw-r--r--src/lib/ecore/efl_model_composite_private.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/ecore/efl_model_composite_private.h b/src/lib/ecore/efl_model_composite_private.h
index eb9b07b47c..0b0f042349 100644
--- a/src/lib/ecore/efl_model_composite_private.h
+++ b/src/lib/ecore/efl_model_composite_private.h
@@ -2,13 +2,12 @@
2#define EFL_MODEL_COMPOSITE_PROPERTIES(name, dyn, sta, ...) \ 2#define EFL_MODEL_COMPOSITE_PROPERTIES(name, dyn, sta, ...) \
3 EFL_MODEL_COMPOSITE_PROPERTIES_SUPER(name, NULL, NULL, (dyn), sta, ##__VA_ARGS__) 3 EFL_MODEL_COMPOSITE_PROPERTIES_SUPER(name, NULL, NULL, (dyn), sta, ##__VA_ARGS__)
4 4
5#define EFL_MODEL_COMPOSITE_PROPERTIES_SUPER(name, obj, klass, dyn, sta, ...) \ 5#define EFL_MODEL_COMPOSITE_PROPERTIES_SUPER(name, obj, klass, dyn, ...) \
6 Eina_Iterator *name; \ 6 Eina_Iterator *name; \
7 do \ 7 do \
8 { \ 8 { \
9 static const char *static_props__[] = { \ 9 static const char *static_props__[] = { \
10 sta, \ 10 __VA_ARGS__ \
11 ##__VA_ARGS__ \
12 }; \ 11 }; \
13 name = _efl_model_composite_properties_mix( \ 12 name = _efl_model_composite_properties_mix( \
14 ((obj) ? efl_model_properties_get(efl_super((obj), (klass))) : NULL), \ 13 ((obj) ? efl_model_properties_get(efl_super((obj), (klass))) : NULL), \