summaryrefslogtreecommitdiff
path: root/src/lib/elementary/elm_dayselector.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-04-20 14:55:26 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-04-26 11:36:23 +0900
commit902950018be3682c0549174fc0c6d1c04141cd39 (patch)
treee909eb2fdd7b12dfbba38d8a8c4f16d9340398e5 /src/lib/elementary/elm_dayselector.c
parent8c02bf5be65f6d8fa6c4659eb54746531fead1a4 (diff)
Efl: Introduce Efl.Container and unify APIs
This removes Efl.Pack_Named which had a terrible name, removes Elm.Container which should have been renamed Efl.Ui.Container anyway, and introduces an interface Efl.Container instead. The hierarchy tree is now changed as objects don't inherit from Efl.Container (it's an interface, not a regular class) but only implement it. Obviously it is very easy to reintroduce an Efl.Ui.Container parent class if we need it, but I guess it should have some actual logic. It's basically part of what Elm.Widget already does. Some function names have been modified to look better in C with the efl_content prefix. @feature
Diffstat (limited to 'src/lib/elementary/elm_dayselector.c')
-rw-r--r--src/lib/elementary/elm_dayselector.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c
index 3f1b209..052c4b3 100644
--- a/src/lib/elementary/elm_dayselector.c
+++ b/src/lib/elementary/elm_dayselector.c
@@ -217,7 +217,7 @@ _item_find(const Evas_Object *obj,
217} 217}
218 218
219EOLIAN static Eina_Bool 219EOLIAN static Eina_Bool
220_elm_dayselector_elm_container_content_set(Eo *obj, Elm_Dayselector_Data *sd, const char *item, Evas_Object *content) 220_elm_dayselector_efl_container_content_set(Eo *obj, Elm_Dayselector_Data *sd, const char *item, Evas_Object *content)
221{ 221{
222 Eina_Bool int_ret = EINA_FALSE; 222 Eina_Bool int_ret = EINA_FALSE;
223 223
@@ -239,7 +239,7 @@ _elm_dayselector_elm_container_content_set(Eo *obj, Elm_Dayselector_Data *sd, co
239 { 239 {
240 snprintf(buf, sizeof(buf), "day%d", _item_location_get(sd, it)); 240 snprintf(buf, sizeof(buf), "day%d", _item_location_get(sd, it));
241 241
242 int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), buf, content); 242 int_ret = efl_content_set(eo_super(obj, MY_CLASS), buf, content);
243 if (!int_ret) return EINA_FALSE; 243 if (!int_ret) return EINA_FALSE;
244 244
245 if (!content) return EINA_TRUE; /* item deletion already handled */ 245 if (!content) return EINA_TRUE; /* item deletion already handled */
@@ -255,7 +255,7 @@ _elm_dayselector_elm_container_content_set(Eo *obj, Elm_Dayselector_Data *sd, co
255 255
256 snprintf(buf, sizeof(buf), "day%d", _item_location_get(sd, it)); 256 snprintf(buf, sizeof(buf), "day%d", _item_location_get(sd, it));
257 257
258 int_ret = elm_obj_container_content_set(eo_super(obj, MY_CLASS), buf, content); 258 int_ret = efl_content_set(eo_super(obj, MY_CLASS), buf, content);
259 if (!int_ret) 259 if (!int_ret)
260 { 260 {
261 eo_del(eo_it); 261 eo_del(eo_it);
@@ -299,7 +299,7 @@ _elm_dayselector_item_eo_base_constructor(Eo *eo_item, Elm_Dayselector_Item_Data
299} 299}
300 300
301EOLIAN static Evas_Object* 301EOLIAN static Evas_Object*
302_elm_dayselector_elm_container_content_unset(Eo *obj, Elm_Dayselector_Data *sd, const char *item) 302_elm_dayselector_efl_container_content_unset(Eo *obj, Elm_Dayselector_Data *sd, const char *item)
303{ 303{
304 int day; 304 int day;
305 char buf[1024]; 305 char buf[1024];
@@ -314,7 +314,7 @@ _elm_dayselector_elm_container_content_unset(Eo *obj, Elm_Dayselector_Data *sd,
314 314
315 content = VIEW(it); 315 content = VIEW(it);
316 316
317 content = elm_obj_container_content_unset(eo_super(obj, MY_CLASS), buf); 317 content = efl_content_unset(eo_super(obj, MY_CLASS), buf);
318 if (!content) return NULL; 318 if (!content) return NULL;
319 319
320 sd->items = eina_list_remove(sd->items, it); 320 sd->items = eina_list_remove(sd->items, it);