summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDerek Foreman <derek.foreman.samsung@gmail.com>2019-01-31 15:06:46 -0500
committerChristopher Michael <cp.michael@samsung.com>2019-01-31 15:06:46 -0500
commit94f5ea19bb8d8e24364b2c4cd6f570d9f8895f72 (patch)
treeaa22761a507741faf879e9332b01953bcbabba10 /src
parent2a218e28c3e53954915e11ebfc27d1ff6d9d4e9b (diff)
evas_object_smart: Consistently use MY_CLASS
Summary: While it may not be popular opinion that MY_CLASS is confusing and does more harm than good, using it sometimes and not others in the same file is pretty obviously not helpful to casual readers. Reviewers: devilhorns Reviewed By: devilhorns Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D7852
Diffstat (limited to 'src')
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index 7f0daf7331..d945f53a85 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -10,7 +10,7 @@
10#define MY_CLASS_NAME_LEGACY "Evas_Object_Smart" 10#define MY_CLASS_NAME_LEGACY "Evas_Object_Smart"
11 11
12#define EVAS_OBJECT_SMART_GET_OR_RETURN(eo_obj, ...) \ 12#define EVAS_OBJECT_SMART_GET_OR_RETURN(eo_obj, ...) \
13 Evas_Smart_Data *o = efl_data_scope_safe_get(eo_obj, EFL_CANVAS_GROUP_CLASS); \ 13 Evas_Smart_Data *o = efl_data_scope_safe_get(eo_obj, MY_CLASS); \
14 do { if (!o) { MAGIC_CHECK_FAILED(eo_obj,0,MAGIC_SMART) return __VA_ARGS__; } } while (0) 14 do { if (!o) { MAGIC_CHECK_FAILED(eo_obj,0,MAGIC_SMART) return __VA_ARGS__; } } while (0)
15 15
16extern Eina_Hash* signals_hash_table; 16extern Eina_Hash* signals_hash_table;
@@ -273,7 +273,7 @@ _efl_canvas_group_group_member_add(Eo *smart_obj, Evas_Smart_Data *o, Evas_Objec
273 273
274 if (obj->is_smart) 274 if (obj->is_smart)
275 { 275 {
276 member_o = efl_data_scope_get(eo_obj, EFL_CANVAS_GROUP_CLASS); 276 member_o = efl_data_scope_get(eo_obj, MY_CLASS);
277 277
278 if ((member_o->inherit_paragraph_direction) && 278 if ((member_o->inherit_paragraph_direction) &&
279 (member_o->paragraph_direction != o->paragraph_direction)) 279 (member_o->paragraph_direction != o->paragraph_direction))
@@ -367,7 +367,7 @@ _efl_canvas_group_group_member_del(Eo *smart_obj, Evas_Smart_Data *_pd EINA_UNUS
367 367
368 if (obj->is_smart) 368 if (obj->is_smart)
369 { 369 {
370 member_o = efl_data_scope_get(eo_obj, EFL_CANVAS_GROUP_CLASS); 370 member_o = efl_data_scope_get(eo_obj, MY_CLASS);
371 371
372 if ((member_o->inherit_paragraph_direction) && 372 if ((member_o->inherit_paragraph_direction) &&
373 (member_o->paragraph_direction != EVAS_BIDI_DIRECTION_NEUTRAL)) 373 (member_o->paragraph_direction != EVAS_BIDI_DIRECTION_NEUTRAL))
@@ -675,7 +675,7 @@ evas_object_smart_add(Evas *eo_e, Evas_Smart *s)
675 675
676 eo_e = evas_find(eo_e); 676 eo_e = evas_find(eo_e);
677 EINA_SAFETY_ON_FALSE_RETURN_VAL(efl_isa(eo_e, EVAS_CANVAS_CLASS), NULL); 677 EINA_SAFETY_ON_FALSE_RETURN_VAL(efl_isa(eo_e, EVAS_CANVAS_CLASS), NULL);
678 eo_obj = efl_add(EFL_CANVAS_GROUP_CLASS, eo_e, efl_canvas_object_legacy_ctor(efl_added)); 678 eo_obj = efl_add(MY_CLASS, eo_e, efl_canvas_object_legacy_ctor(efl_added));
679 evas_object_smart_attach(eo_obj, s); 679 evas_object_smart_attach(eo_obj, s);
680 return eo_obj; 680 return eo_obj;
681} 681}
@@ -768,7 +768,7 @@ evas_object_smart_move_children_relative(Eo *eo_obj, Evas_Coord dx, Evas_Coord d
768void 768void
769_evas_object_smart_clipped_smart_move_internal(Evas_Object *eo_obj, Evas_Coord x, Evas_Coord y) 769_evas_object_smart_clipped_smart_move_internal(Evas_Object *eo_obj, Evas_Coord x, Evas_Coord y)
770{ 770{
771 Evas_Smart_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_GROUP_CLASS); 771 Evas_Smart_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
772 Evas_Coord orig_x, orig_y; 772 Evas_Coord orig_x, orig_y;
773 773
774 orig_x = o->x; 774 orig_x = o->x;
@@ -1763,7 +1763,7 @@ _efl_canvas_group_group_paragraph_direction_set_internal(Eo *eo_obj,
1763 1763
1764 if (o->is_smart) 1764 if (o->is_smart)
1765 { 1765 {
1766 member_o = efl_data_scope_get(o->object, EFL_CANVAS_GROUP_CLASS); 1766 member_o = efl_data_scope_get(o->object, MY_CLASS);
1767 1767
1768 if ((member_o->inherit_paragraph_direction) && 1768 if ((member_o->inherit_paragraph_direction) &&
1769 (member_o->paragraph_direction != dir)) 1769 (member_o->paragraph_direction != dir))
@@ -1793,7 +1793,7 @@ _efl_canvas_group_efl_canvas_object_paragraph_direction_set(Eo *eo_obj, Evas_Sma
1793 1793
1794 if (obj->smart.parent) 1794 if (obj->smart.parent)
1795 { 1795 {
1796 parent = efl_data_scope_get(obj->smart.parent, EFL_CANVAS_GROUP_CLASS); 1796 parent = efl_data_scope_get(obj->smart.parent, MY_CLASS);
1797 1797
1798 if (parent) 1798 if (parent)
1799 parent_dir = parent->paragraph_direction; 1799 parent_dir = parent->paragraph_direction;