summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2014-05-10 14:07:14 +0900
committerDaniel Juyung Seo <seojuyung2@gmail.com>2014-05-10 14:13:57 +0900
commit8064e883bf749b42696b9e9e7836f73b1433e175 (patch)
tree5547c62afe7588dde32e69732967a30512313d0c
parentc92bc5ad9646b0ce7546885428ad249f5b944a71 (diff)
elm: fixed wrong internal variable name.
Unified the local variable name to ret if the ret is a return value of another content_unset calls. - Evas_Object *int_ret --> Evas_Object *ret - Evas_Object *int_content --> Evas_Object *ret - Evas_Object *content --> Evas_Object *ret
-rw-r--r--src/lib/elc_fileselector_entry.c6
-rw-r--r--src/lib/elm_entry.c8
-rw-r--r--src/lib/elm_hover.c8
-rw-r--r--src/lib/elm_panel.c10
-rw-r--r--src/lib/elm_widget.c6
5 files changed, 19 insertions, 19 deletions
diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c
index 85bdda0e1..869bcd311 100644
--- a/src/lib/elc_fileselector_entry.c
+++ b/src/lib/elc_fileselector_entry.c
@@ -260,9 +260,9 @@ _elm_fileselector_entry_elm_container_content_unset(Eo *obj, Elm_Fileselector_En
260{ 260{
261 if (part && strcmp(part, "button icon")) 261 if (part && strcmp(part, "button icon"))
262 { 262 {
263 Evas_Object *int_ret = NULL; 263 Evas_Object *ret = NULL;
264 eo_do_super(obj, MY_CLASS, int_ret = elm_obj_container_content_unset(part)); 264 eo_do_super(obj, MY_CLASS, ret = elm_obj_container_content_unset(part));
265 return int_ret; 265 return ret;
266 } 266 }
267 267
268 return elm_layout_content_unset(sd->button, NULL); 268 return elm_layout_content_unset(sd->button, NULL);
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 50ac4c1fe..829092cc1 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -2783,9 +2783,9 @@ _elm_entry_elm_container_content_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, c
2783EOLIAN static Evas_Object* 2783EOLIAN static Evas_Object*
2784_elm_entry_elm_container_content_unset(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *part) 2784_elm_entry_elm_container_content_unset(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *part)
2785{ 2785{
2786 Evas_Object *int_content = NULL; 2786 Evas_Object *ret = NULL;
2787 eo_do_super(obj, MY_CLASS, int_content = elm_obj_container_content_unset(part)); 2787 eo_do_super(obj, MY_CLASS, ret = elm_obj_container_content_unset(part));
2788 if (!int_content) return NULL; 2788 if (!ret) return NULL;
2789 2789
2790 /* too bad entry does not follow the pattern 2790 /* too bad entry does not follow the pattern
2791 * "elm,state,{icon,end},hidden", we have to repeat ourselves */ 2791 * "elm,state,{icon,end},hidden", we have to repeat ourselves */
@@ -2795,7 +2795,7 @@ _elm_entry_elm_container_content_unset(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED,
2795 if (!part || !strcmp(part, "end") || !strcmp(part, "elm.swallow.end")) 2795 if (!part || !strcmp(part, "end") || !strcmp(part, "elm.swallow.end"))
2796 elm_entry_end_visible_set(obj, EINA_FALSE); 2796 elm_entry_end_visible_set(obj, EINA_FALSE);
2797 2797
2798 return int_content; 2798 return ret;
2799} 2799}
2800 2800
2801EOLIAN static Eina_Bool 2801EOLIAN static Eina_Bool
diff --git a/src/lib/elm_hover.c b/src/lib/elm_hover.c
index 1ab00696b..29b4d78df 100644
--- a/src/lib/elm_hover.c
+++ b/src/lib/elm_hover.c
@@ -474,17 +474,17 @@ _elm_hover_elm_container_content_get(Eo *obj, Elm_Hover_Data *sd, const char *sw
474EOLIAN static Evas_Object* 474EOLIAN static Evas_Object*
475_elm_hover_elm_container_content_unset(Eo *obj, Elm_Hover_Data *sd, const char *swallow) 475_elm_hover_elm_container_content_unset(Eo *obj, Elm_Hover_Data *sd, const char *swallow)
476{ 476{
477 Evas_Object *int_ret = NULL; 477 Evas_Object *ret = NULL;
478 478
479 if (!swallow) return NULL; 479 if (!swallow) return NULL;
480 480
481 if (!strcmp(swallow, "smart")) 481 if (!strcmp(swallow, "smart"))
482 eo_do_super(obj, MY_CLASS, int_ret = elm_obj_container_content_unset 482 eo_do_super(obj, MY_CLASS, ret = elm_obj_container_content_unset
483 (sd->smt_sub->swallow)); 483 (sd->smt_sub->swallow));
484 else 484 else
485 eo_do_super(obj, MY_CLASS, int_ret = elm_obj_container_content_unset 485 eo_do_super(obj, MY_CLASS, ret = elm_obj_container_content_unset
486 (swallow)); 486 (swallow));
487 return int_ret; 487 return ret;
488} 488}
489 489
490static void 490static void
diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index f44e790d2..b0cc7d470 100644
--- a/src/lib/elm_panel.c
+++ b/src/lib/elm_panel.c
@@ -300,21 +300,21 @@ _elm_panel_elm_container_content_get(Eo *obj, Elm_Panel_Data *sd, const char *pa
300EOLIAN static Evas_Object* 300EOLIAN static Evas_Object*
301_elm_panel_elm_container_content_unset(Eo *obj, Elm_Panel_Data *sd, const char *part) 301_elm_panel_elm_container_content_unset(Eo *obj, Elm_Panel_Data *sd, const char *part)
302{ 302{
303 Evas_Object *content = NULL; 303 Evas_Object *ret = NULL;
304 304
305 if (part && strcmp(part, "default")) 305 if (part && strcmp(part, "default"))
306 { 306 {
307 eo_do_super(obj, MY_CLASS, content = elm_obj_container_content_unset(part)); 307 eo_do_super(obj, MY_CLASS, ret = elm_obj_container_content_unset(part));
308 return content; 308 return ret;
309 } 309 }
310 310
311 if (!sd->content) return NULL; 311 if (!sd->content) return NULL;
312 content = sd->content; 312 ret = sd->content;
313 313
314 evas_object_box_remove_all(sd->bx, EINA_FALSE); 314 evas_object_box_remove_all(sd->bx, EINA_FALSE);
315 sd->content = NULL; 315 sd->content = NULL;
316 316
317 return content; 317 return ret;
318} 318}
319 319
320EOLIAN static void 320EOLIAN static void
diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index 3c2d7ae3d..82295de34 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -1431,10 +1431,10 @@ _elm_widget_top_get(Eo *obj, Elm_Widget_Smart_Data *sd)
1431{ 1431{
1432 if (sd->parent_obj) 1432 if (sd->parent_obj)
1433 { 1433 {
1434 Evas_Object *int_ret = NULL; 1434 Evas_Object *ret = NULL;
1435 if (!eo_isa(sd->parent_obj, ELM_OBJ_WIDGET_CLASS)) return NULL; 1435 if (!eo_isa(sd->parent_obj, ELM_OBJ_WIDGET_CLASS)) return NULL;
1436 eo_do((Eo *) sd->parent_obj, int_ret = elm_obj_widget_top_get()); 1436 eo_do((Eo *) sd->parent_obj, ret = elm_obj_widget_top_get());
1437 return int_ret; 1437 return ret;
1438 } 1438 }
1439 return (Evas_Object *)obj; 1439 return (Evas_Object *)obj;
1440} 1440}