diskselector, entry, index: Refactoring by reducing unnecessary redundant function...

and removed unnecessary local variable.

- Do not need to call the same function with same parameter many times.
Use local variable for them.
- Remove unnecessary local variable if it is not needed.

diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c
index f1ed187..f74e34f 100644 (file)
--- a/src/lib/elm_diskselector.c
+++ b/src/lib/elm_diskselector.c
@@ -640,7 +640,6 @@ _item_new(Evas_Object *obj,
           const void *data)
 {
    Elm_Diskselector_Item *it;
-   const char *style = elm_widget_style_get(obj);
 
    it = elm_widget_item_new(obj, Elm_Diskselector_Item);
    if (!it) return NULL;
@@ -655,7 +654,8 @@ _item_new(Evas_Object *obj,
    it->func = func;
    it->base.data = data;
    VIEW(it) = edje_object_add(evas_object_evas_get(obj));
-   elm_widget_theme_object_set(obj, VIEW(it), "diskselector", "item", style);
+   elm_widget_theme_object_set(obj, VIEW(it), "diskselector", "item",
+                               elm_widget_style_get(obj));
 
    evas_object_size_hint_weight_set
      (VIEW(it), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -801,6 +801,7 @@ _elm_diskselector_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
    if (ret) *ret = EINA_FALSE;
    Eina_Bool int_ret = EINA_FALSE;
    Evas *evas;
+   const char *style = elm_widget_style_get(obj);
 
    Elm_Diskselector_Smart_Data *sd = _pd;
 
@@ -814,8 +815,8 @@ _elm_diskselector_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
      {
         EINA_LIST_FOREACH(sd->r_items, l, it)
           {
-             elm_widget_theme_object_set(obj, VIEW(it), "diskselector", "item",
-                                         elm_widget_style_get(obj));
+             elm_widget_theme_object_set(obj, VIEW(it),
+                                         "diskselector", "item", style);
              edje_object_part_text_escaped_set
                (VIEW(it), "elm.text", it->label);
           }
@@ -824,8 +825,8 @@ _elm_diskselector_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
      {
         EINA_LIST_FOREACH(sd->items, l, it)
           {
-             elm_widget_theme_object_set(obj, VIEW(it), "diskselector", "item",
-                                         elm_widget_style_get(obj));
+             elm_widget_theme_object_set(obj, VIEW(it),
+                                         "diskselector","item", style);
              edje_object_part_text_escaped_set
                (VIEW(it), "elm.text", it->label);
           }
@@ -833,15 +834,15 @@ _elm_diskselector_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
         /* left blank */
         EINA_LIST_FOREACH (sd->left_blanks, l, blank)
           {
-             elm_widget_theme_object_set(obj, blank, "diskselector", "item",
-                                         elm_widget_style_get(obj));
+             elm_widget_theme_object_set(obj, blank,
+                                         "diskselector", "item", style);
           }
 
         /* right blank */
         EINA_LIST_FOREACH (sd->right_blanks, l, blank)
           {
-             elm_widget_theme_object_set(obj, blank, "diskselector", "item",
-                                         elm_widget_style_get(obj));
+             elm_widget_theme_object_set(obj, blank,
+                                         "diskselector", "item", style);
           }
      }
 

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index fd38ff9..e460d90 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -541,6 +541,7 @@ _elm_entry_smart_theme(Eo *obj, void *_pd, va_list *list)
    const char *str;
    const char *t;
    Eina_Bool *ret = va_arg(*list, Eina_Bool *);
+   const char *style = elm_widget_style_get(obj);
    if (ret) *ret = EINA_FALSE;
 
    Elm_Entry_Smart_Data *sd = _pd;
@@ -564,8 +565,7 @@ _elm_entry_smart_theme(Eo *obj, void *_pd, va_list *list)
    t = eina_stringshare_add(elm_object_text_get(obj));
 
    elm_widget_theme_object_set
-     (obj, sd->entry_edje, "entry", _elm_entry_theme_group_get(obj),
-     elm_widget_style_get(obj));
+     (obj, sd->entry_edje, "entry", _elm_entry_theme_group_get(obj), style);
 
    if (_elm_config->desktop_entry)
      edje_object_part_text_select_allow_set
@@ -616,10 +616,10 @@ _elm_entry_smart_theme(Eo *obj, void *_pd, va_list *list)
 
         if (sd->single_line)
           ok = elm_widget_theme_object_set
-          (obj, sd->scr_edje, "scroller", "entry_single", elm_widget_style_get(obj));
+          (obj, sd->scr_edje, "scroller", "entry_single", style);
         if (!ok)
           elm_widget_theme_object_set
-          (obj, sd->scr_edje, "scroller", "entry", elm_widget_style_get(obj));
+          (obj, sd->scr_edje, "scroller", "entry", style);
 
         str = edje_object_data_get(sd->scr_edje, "focus_highlight");
      }
@@ -633,10 +633,10 @@ _elm_entry_smart_theme(Eo *obj, void *_pd, va_list *list)
    else
      elm_widget_highlight_in_theme_set(obj, EINA_FALSE);
 
-   elm_widget_theme_object_set(obj, sd->start_handler, "entry",
-                               "handler/start", elm_widget_style_get(obj));
-   elm_widget_theme_object_set(obj, sd->end_handler, "entry",
-                               "handler/end", elm_widget_style_get(obj));
+   elm_widget_theme_object_set(obj, sd->start_handler,
+                               "entry", "handler/start", style);
+   elm_widget_theme_object_set(obj, sd->end_handler,
+                               "entry", "handler/end", style);
 
    sd->changed = EINA_TRUE;
    elm_layout_sizing_eval(obj);
@@ -2351,6 +2351,7 @@ _item_get(void *data,
    Eina_List *l;
    Evas_Object *o;
    Elm_Entry_Item_Provider *ip;
+   const char *style = elm_widget_style_get(data);
 
    ELM_ENTRY_DATA_GET(data, sd);
 
@@ -2374,17 +2375,16 @@ _item_get(void *data,
              evas_object_del(o);
              o = edje_object_add(evas_object_evas_get(data));
              elm_widget_theme_object_set
-               (data, o, "entry/emoticon", "wtf",
-               elm_widget_style_get(data));
+               (data, o, "entry/emoticon", "wtf", style);
           }
         return o;
      }
 
    o = edje_object_add(evas_object_evas_get(data));
    if (!elm_widget_theme_object_set
-         (data, o, "entry", item, elm_widget_style_get(data)))
+         (data, o, "entry", item, style))
      elm_widget_theme_object_set
-       (data, o, "entry/emoticon", "wtf", elm_widget_style_get(data));
+       (data, o, "entry/emoticon", "wtf", style);
    return o;
 }
 

diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index d918ad8..d065a2e 100644 (file)
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -198,6 +198,7 @@ _index_box_auto_fill(Evas_Object *obj,
    Evas_Coord mw, mh, ih;
    Evas_Object *o;
    Elm_Index_Omit *om;
+   const char *style = elm_widget_style_get(obj);
 
    ELM_INDEX_DATA_GET(obj, sd);
 
@@ -222,8 +223,7 @@ _index_box_auto_fill(Evas_Object *obj,
      {
         o = edje_object_add(evas_object_evas_get(obj));
         elm_widget_theme_object_set
-           (obj, o, "index", "item/vertical",
-            elm_widget_style_get(obj));
+           (obj, o, "index", "item/vertical", style);
 
         edje_object_size_min_restricted_calc(o, NULL, &mh, 0, 0);
 
@@ -274,23 +274,19 @@ _index_box_auto_fill(Evas_Object *obj,
           {
              if (i & 0x1)
                elm_widget_theme_object_set
-                 (obj, o, "index", "item_odd/horizontal",
-                 elm_widget_style_get(obj));
+                 (obj, o, "index", "item_odd/horizontal", style);
              else
                elm_widget_theme_object_set
-                 (obj, o, "index", "item/horizontal",
-                 elm_widget_style_get(obj));
+                 (obj, o, "index", "item/horizontal", style);
           }
         else
           {
              if (i & 0x1)
                elm_widget_theme_object_set
-                 (obj, o, "index", "item_odd/vertical",
-                 elm_widget_style_get(obj));
+                 (obj, o, "index", "item_odd/vertical", style);
              else
                elm_widget_theme_object_set
-                 (obj, o, "index", "item/vertical",
-                 elm_widget_style_get(obj));
+                 (obj, o, "index", "item/vertical", style);
           }
 
         if (skip > 0)