[EGIT] [core/elementary] master 02/04: colorselector: Remove unnecessary pointer redirection.

[Daniel Juyung Seo]

seoz pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=5ef676dc9880811a8278405fcd69d6230ce05120

commit 5ef676dc9880811a8278405fcd69d6230ce05120
Author: Daniel Juyung Seo <seojuyu...@gmail.com>
Date:   Fri Jan 16 14:13:30 2015 +0900

    colorselector: Remove unnecessary pointer redirection.
    
    Elm_Colorselector_Data pointer is already there.
---
 src/lib/elm_colorselector.c | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index ca49b93..4a29693 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -1170,13 +1170,11 @@ _item_sizing_eval(Elm_Color_Item_Data *item)
 
 /* fix size hints of color palette items, so that the box gets it */
 static void
-_palette_sizing_eval(Evas_Object *obj)
+_palette_sizing_eval(Elm_Colorselector_Data *sd)
 {
    Eina_List *elist;
    Elm_Object_Item *eo_item;
 
-   ELM_COLORSELECTOR_DATA_GET(obj, sd);
-
    EINA_LIST_FOREACH(sd->items, elist, eo_item)
      {
         ELM_COLOR_ITEM_DATA_GET(eo_item, item);
@@ -1185,13 +1183,11 @@ _palette_sizing_eval(Evas_Object *obj)
 }
 
 static void
-_component_sizing_eval(Evas_Object *obj)
+_component_sizing_eval(Elm_Colorselector_Data *sd)
 {
    Evas_Coord minw = -1, minh = -1;
    int i;
 
-   ELM_COLORSELECTOR_DATA_GET(obj, sd);
-
    for (i = 0; i < 4; i++)
      {
         if (sd->cb_data[i])
@@ -1212,10 +1208,10 @@ _component_sizing_eval(Evas_Object *obj)
 }
 
 static void
-_full_sizing_eval(Evas_Object *obj)
+_full_sizing_eval(Elm_Colorselector_Data *sd)
 {
-   _palette_sizing_eval(obj);
-   _component_sizing_eval(obj);
+   _palette_sizing_eval(sd);
+   _component_sizing_eval(sd);
 }
 
 static void
@@ -1241,15 +1237,15 @@ _elm_colorselector_elm_layout_sizing_eval(Eo *obj, 
Elm_Colorselector_Data *sd)
    switch (sd->mode)
      {
       case ELM_COLORSELECTOR_PALETTE:
-        _palette_sizing_eval(obj);
+        _palette_sizing_eval(sd);
         break;
 
       case ELM_COLORSELECTOR_COMPONENTS:
-        _component_sizing_eval(obj);
+        _component_sizing_eval(sd);
         break;
 
       case ELM_COLORSELECTOR_BOTH:
-        _full_sizing_eval(obj);
+        _full_sizing_eval(sd);
         break;
 
       case ELM_COLORSELECTOR_PICKER:
@@ -1257,7 +1253,7 @@ _elm_colorselector_elm_layout_sizing_eval(Eo *obj, 
Elm_Colorselector_Data *sd)
         break;
 
       case ELM_COLORSELECTOR_ALL:
-        _full_sizing_eval(obj);
+        _full_sizing_eval(sd);
         break;
 
       default:

--