seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=f0bdf8b1e8e90f1268871cbe332d8d65b46d95de
commit f0bdf8b1e8e90f1268871cbe332d8d65b46d95de
Author: Daniel Juyung Seo <seojuyu...@gmail.com>
Date: Sat Oct 5 17:29:13 2013 +0900
elm: Use ELM_LAYOUT_DATA_GET convenient macro instead of calling
eo_data_scope_get(obj, ELM_OBJ_LAYOUT_CLASS).
---
src/lib/elm_bubble.c | 2 +-
src/lib/elm_frame.c | 2 +-
src/lib/elm_index.c | 2 +-
src/lib/elm_panes.c | 2 +-
src/lib/elm_progressbar.c | 2 +-
src/lib/elm_scroller.c | 2 +-
src/lib/elm_separator.c | 2 +-
src/lib/elm_slider.c | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/lib/elm_bubble.c b/src/lib/elm_bubble.c
index e78a38d..8d51498 100644
--- a/src/lib/elm_bubble.c
+++ b/src/lib/elm_bubble.c
@@ -269,7 +269,7 @@ _pos_set(Eo *obj, void *_pd, va_list *list)
{
Elm_Bubble_Pos pos = va_arg(*list, Elm_Bubble_Pos);
Elm_Bubble_Smart_Data *sd = _pd;
- Elm_Layout_Smart_Data *ld = eo_data_scope_get(obj, ELM_OBJ_LAYOUT_CLASS);
+ ELM_LAYOUT_DATA_GET(obj, ld);
if (pos < ELM_BUBBLE_POS_TOP_LEFT || pos > ELM_BUBBLE_POS_BOTTOM_RIGHT)
return;
diff --git a/src/lib/elm_frame.c b/src/lib/elm_frame.c
index a72816a..e8cf703 100644
--- a/src/lib/elm_frame.c
+++ b/src/lib/elm_frame.c
@@ -158,7 +158,7 @@ static void
_elm_frame_smart_calculate(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
{
Elm_Frame_Smart_Data *sd = _pd;
- Elm_Layout_Smart_Data *ld = eo_data_scope_get(obj,
elm_obj_layout_class_get());
+ ELM_LAYOUT_DATA_GET(obj, ld);
if (ld->needs_size_calc)
{
diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index b27c5b8..4f11399 100644
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -339,7 +339,7 @@ _elm_index_smart_theme(Eo *obj, void *_pd, va_list *list)
Elm_Index_Smart_Data *sd = _pd;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- Elm_Layout_Smart_Data *ld = eo_data_scope_get(obj, ELM_OBJ_LAYOUT_CLASS);
+ ELM_LAYOUT_DATA_GET(obj, ld);
_index_box_clear(obj, 0);
_index_box_clear(obj, 1);
diff --git a/src/lib/elm_panes.c b/src/lib/elm_panes.c
index bbc1d5e..48d8d75 100644
--- a/src/lib/elm_panes.c
+++ b/src/lib/elm_panes.c
@@ -51,7 +51,7 @@ _elm_panes_smart_theme(Eo *obj, void *_pd, va_list *list)
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
Eina_Bool int_ret = EINA_FALSE;
- Elm_Layout_Smart_Data *ld = eo_data_scope_get(obj, ELM_OBJ_LAYOUT_CLASS);
+ ELM_LAYOUT_DATA_GET(obj, ld);
if (sd->horizontal)
eina_stringshare_replace(&ld->group, "horizontal");
diff --git a/src/lib/elm_progressbar.c b/src/lib/elm_progressbar.c
index 84cdef6..541db17 100644
--- a/src/lib/elm_progressbar.c
+++ b/src/lib/elm_progressbar.c
@@ -176,7 +176,7 @@ _elm_progressbar_smart_theme(Eo *obj, void *_pd, va_list
*list)
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
Eina_Bool int_ret = EINA_FALSE;
- Elm_Layout_Smart_Data *ld = eo_data_scope_get(obj, ELM_OBJ_LAYOUT_CLASS);
+ ELM_LAYOUT_DATA_GET(obj, ld);
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (sd->horizontal)
diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index 52b575e..a9fdf20 100644
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -869,7 +869,7 @@ _custom_widget_base_theme_set(Eo *obj, void *_pd
EINA_UNUSED, va_list *list)
{
const char *klass = va_arg(*list, const char *);
const char *group = va_arg(*list, const char *);
- Elm_Layout_Smart_Data *ld = eo_data_scope_get(obj, ELM_OBJ_LAYOUT_CLASS);
+ ELM_LAYOUT_DATA_GET(obj, ld);
EINA_SAFETY_ON_NULL_RETURN(klass);
EINA_SAFETY_ON_NULL_RETURN(group);
diff --git a/src/lib/elm_separator.c b/src/lib/elm_separator.c
index 3b6e9fc..e4d1e49 100644
--- a/src/lib/elm_separator.c
+++ b/src/lib/elm_separator.c
@@ -21,7 +21,7 @@ _elm_separator_smart_theme(Eo *obj, void *_pd, va_list *list)
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
Eina_Bool int_ret;
- Elm_Layout_Smart_Data *ld = eo_data_scope_get(obj, ELM_OBJ_LAYOUT_CLASS);
+ ELM_LAYOUT_DATA_GET(obj, ld);
if (sd->horizontal)
eina_stringshare_replace(&ld->group, "horizontal");
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 162d423..f8ad153 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -471,7 +471,7 @@ _elm_slider_smart_theme(Eo *obj, void *_pd, va_list *list)
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
Eina_Bool int_ret;
- Elm_Layout_Smart_Data *ld = eo_data_scope_get(obj, ELM_OBJ_LAYOUT_CLASS);
+ ELM_LAYOUT_DATA_GET(obj, ld);
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (sd->horizontal)
--
