seoz pushed a commit to branch master.
commit ab74cab928e37963bb883c25ac4ddc6887047fa2
Author: Daniel Juyung Seo <[email protected]>
Date: Tue Jul 23 05:34:19 2013 +0900
elm: use more descriptive and consistent local variable name.
---
src/lib/elc_fileselector_entry.c | 12 ++++++------
src/lib/elm_bubble.c | 6 +++---
src/lib/elm_entry.c | 8 ++++----
src/lib/elm_label.c | 4 ++--
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c
index f76f8df..99ec5d3 100644
--- a/src/lib/elc_fileselector_entry.c
+++ b/src/lib/elc_fileselector_entry.c
@@ -253,14 +253,14 @@ _elm_fileselector_entry_smart_text_set(Eo *obj, void
*_pd, va_list *list)
{
Elm_Fileselector_Entry_Smart_Data *sd = _pd;
- const char *item = va_arg(*list, const char *);
+ const char *part = va_arg(*list, const char *);
const char *label = va_arg(*list, const char *);
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
Eina_Bool int_ret;
- if (item && strcmp(item, "default"))
+ if (part && strcmp(part, "default"))
{
- eo_do_super(obj, MY_CLASS, elm_obj_layout_text_set(item, label,
&int_ret));
+ eo_do_super(obj, MY_CLASS, elm_obj_layout_text_set(part, label,
&int_ret));
goto end;
}
@@ -276,12 +276,12 @@ _elm_fileselector_entry_smart_text_get(Eo *obj, void
*_pd, va_list *list)
{
Elm_Fileselector_Entry_Smart_Data *sd = _pd;
- const char *item = va_arg(*list, const char *);
+ const char *part = va_arg(*list, const char *);
const char **text = va_arg(*list, const char **);
- if (item && strcmp(item, "default"))
+ if (part && strcmp(part, "default"))
{
- eo_do_super(obj, MY_CLASS, elm_obj_layout_text_get(item, text));
+ eo_do_super(obj, MY_CLASS, elm_obj_layout_text_get(part, text));
return;
}
diff --git a/src/lib/elm_bubble.c b/src/lib/elm_bubble.c
index 97d0dd4..1abd003 100644
--- a/src/lib/elm_bubble.c
+++ b/src/lib/elm_bubble.c
@@ -133,16 +133,16 @@ _elm_bubble_smart_focus_direction(Eo *obj, void *_pd
EINA_UNUSED, va_list *list)
static void
_elm_bubble_smart_text_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
{
- const char *item = va_arg(*list, const char *);
+ const char *part = va_arg(*list, const char *);
const char *label = va_arg(*list, const char *);
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
Eina_Bool int_ret = EINA_FALSE;
- eo_do_super(obj, MY_CLASS, elm_obj_layout_text_set(item, label, &int_ret));
+ eo_do_super(obj, MY_CLASS, elm_obj_layout_text_set(part, label, &int_ret));
if (!int_ret) return;
- if (item && (!strcmp(item, "info") || !strcmp(item, "elm.info")))
+ if (part && (!strcmp(part, "info") || !strcmp(part, "elm.info")))
{
if (label)
elm_layout_signal_emit(obj, "elm,state,info,visible", "elm");
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 5e87cd1..acaf84a 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -2681,7 +2681,7 @@ _elm_entry_smart_content_unset(Eo *obj, void *_pd
EINA_UNUSED, va_list *list)
static void
_elm_entry_smart_text_set(Eo *obj, void *_pd, va_list *list)
{
- const char *item = va_arg(*list, const char *);
+ const char *part = va_arg(*list, const char *);
const char *entry = va_arg(*list, const char *);
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_TRUE;
@@ -2691,12 +2691,12 @@ _elm_entry_smart_text_set(Eo *obj, void *_pd, va_list
*list)
Elm_Entry_Smart_Data *sd = _pd;
if (!entry) entry = "";
- if (item)
+ if (part)
{
- if (!strcmp(item, "guide"))
+ if (!strcmp(part, "guide"))
edje_object_part_text_set(sd->entry_edje, "elm.guide", entry);
else
- edje_object_part_text_set(sd->entry_edje, item, entry);
+ edje_object_part_text_set(sd->entry_edje, part, entry);
return;
}
diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c
index 4482578..97b9667 100644
--- a/src/lib/elm_label.c
+++ b/src/lib/elm_label.c
@@ -325,7 +325,7 @@ _elm_label_smart_text_set(Eo *obj, void *_pd, va_list *list)
{
Elm_Label_Smart_Data *sd = _pd;
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
- const char *item = va_arg(*list, const char *);
+ const char *part = va_arg(*list, const char *);
const char *label = va_arg(*list, const char *);
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
@@ -334,7 +334,7 @@ _elm_label_smart_text_set(Eo *obj, void *_pd, va_list *list)
if (!label) label = "";
_label_format_set(wd->resize_obj, sd->format);
- eo_do_super(obj, MY_CLASS, elm_obj_layout_text_set(item, label, &int_ret));
+ eo_do_super(obj, MY_CLASS, elm_obj_layout_text_set(part, label, &int_ret));
if (int_ret)
{
sd->lastw = 0;
--
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
