From 44a67054de32162d226e12ef97c33977686d23b2 Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Sat, 10 May 2014 14:07:14 +0900 Subject: [PATCH] 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 --- legacy/elementary/src/lib/elc_fileselector_entry.c | 6 +++--- legacy/elementary/src/lib/elm_entry.c | 8 ++++---- legacy/elementary/src/lib/elm_hover.c | 8 ++++---- legacy/elementary/src/lib/elm_panel.c | 10 +++++----- legacy/elementary/src/lib/elm_widget.c | 6 +++--- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/legacy/elementary/src/lib/elc_fileselector_entry.c b/legacy/elementary/src/lib/elc_fileselector_entry.c index 85bdda0e10..869bcd311e 100644 --- a/legacy/elementary/src/lib/elc_fileselector_entry.c +++ b/legacy/elementary/src/lib/elc_fileselector_entry.c @@ -260,9 +260,9 @@ _elm_fileselector_entry_elm_container_content_unset(Eo *obj, Elm_Fileselector_En { if (part && strcmp(part, "button icon")) { - Evas_Object *int_ret = NULL; - eo_do_super(obj, MY_CLASS, int_ret = elm_obj_container_content_unset(part)); - return int_ret; + Evas_Object *ret = NULL; + eo_do_super(obj, MY_CLASS, ret = elm_obj_container_content_unset(part)); + return ret; } return elm_layout_content_unset(sd->button, NULL); diff --git a/legacy/elementary/src/lib/elm_entry.c b/legacy/elementary/src/lib/elm_entry.c index 50ac4c1fe5..829092cc19 100644 --- a/legacy/elementary/src/lib/elm_entry.c +++ b/legacy/elementary/src/lib/elm_entry.c @@ -2783,9 +2783,9 @@ _elm_entry_elm_container_content_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, c EOLIAN static Evas_Object* _elm_entry_elm_container_content_unset(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *part) { - Evas_Object *int_content = NULL; - eo_do_super(obj, MY_CLASS, int_content = elm_obj_container_content_unset(part)); - if (!int_content) return NULL; + Evas_Object *ret = NULL; + eo_do_super(obj, MY_CLASS, ret = elm_obj_container_content_unset(part)); + if (!ret) return NULL; /* too bad entry does not follow the pattern * "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, if (!part || !strcmp(part, "end") || !strcmp(part, "elm.swallow.end")) elm_entry_end_visible_set(obj, EINA_FALSE); - return int_content; + return ret; } EOLIAN static Eina_Bool diff --git a/legacy/elementary/src/lib/elm_hover.c b/legacy/elementary/src/lib/elm_hover.c index 1ab00696bc..29b4d78df9 100644 --- a/legacy/elementary/src/lib/elm_hover.c +++ b/legacy/elementary/src/lib/elm_hover.c @@ -474,17 +474,17 @@ _elm_hover_elm_container_content_get(Eo *obj, Elm_Hover_Data *sd, const char *sw EOLIAN static Evas_Object* _elm_hover_elm_container_content_unset(Eo *obj, Elm_Hover_Data *sd, const char *swallow) { - Evas_Object *int_ret = NULL; + Evas_Object *ret = NULL; if (!swallow) return NULL; if (!strcmp(swallow, "smart")) - eo_do_super(obj, MY_CLASS, int_ret = elm_obj_container_content_unset + eo_do_super(obj, MY_CLASS, ret = elm_obj_container_content_unset (sd->smt_sub->swallow)); else - eo_do_super(obj, MY_CLASS, int_ret = elm_obj_container_content_unset + eo_do_super(obj, MY_CLASS, ret = elm_obj_container_content_unset (swallow)); - return int_ret; + return ret; } static void diff --git a/legacy/elementary/src/lib/elm_panel.c b/legacy/elementary/src/lib/elm_panel.c index f44e790d2b..b0cc7d4707 100644 --- a/legacy/elementary/src/lib/elm_panel.c +++ b/legacy/elementary/src/lib/elm_panel.c @@ -300,21 +300,21 @@ _elm_panel_elm_container_content_get(Eo *obj, Elm_Panel_Data *sd, const char *pa EOLIAN static Evas_Object* _elm_panel_elm_container_content_unset(Eo *obj, Elm_Panel_Data *sd, const char *part) { - Evas_Object *content = NULL; + Evas_Object *ret = NULL; if (part && strcmp(part, "default")) { - eo_do_super(obj, MY_CLASS, content = elm_obj_container_content_unset(part)); - return content; + eo_do_super(obj, MY_CLASS, ret = elm_obj_container_content_unset(part)); + return ret; } if (!sd->content) return NULL; - content = sd->content; + ret = sd->content; evas_object_box_remove_all(sd->bx, EINA_FALSE); sd->content = NULL; - return content; + return ret; } EOLIAN static void diff --git a/legacy/elementary/src/lib/elm_widget.c b/legacy/elementary/src/lib/elm_widget.c index 3c2d7ae3d6..82295de348 100644 --- a/legacy/elementary/src/lib/elm_widget.c +++ b/legacy/elementary/src/lib/elm_widget.c @@ -1431,10 +1431,10 @@ _elm_widget_top_get(Eo *obj, Elm_Widget_Smart_Data *sd) { if (sd->parent_obj) { - Evas_Object *int_ret = NULL; + Evas_Object *ret = NULL; if (!eo_isa(sd->parent_obj, ELM_OBJ_WIDGET_CLASS)) return NULL; - eo_do((Eo *) sd->parent_obj, int_ret = elm_obj_widget_top_get()); - return int_ret; + eo_do((Eo *) sd->parent_obj, ret = elm_obj_widget_top_get()); + return ret; } return (Evas_Object *)obj; }