elementary - removed ELM_CAST macro

SVN revision: 64138

diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index aa5cfe6..7231b74 100644 (file)
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -1119,7 +1119,7 @@ EAPI Evas_Object *
 elm_ctxpopup_item_icon_get(const Elm_Object_Item *it)
 {
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
-   Elm_Ctxpopup_Item *ctxpopup_it = ELM_CAST(it);
+   Elm_Ctxpopup_Item *ctxpopup_it = (Elm_Ctxpopup_Item *) it;
    return ctxpopup_it->icon;
 }
 
@@ -1129,7 +1129,7 @@ elm_ctxpopup_item_icon_set(Elm_Object_Item *it, Evas_Object *icon)
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
 
    Widget_Data *wd;
-   Elm_Ctxpopup_Item *ctxpopup_it  = ELM_CAST(it);
+   Elm_Ctxpopup_Item *ctxpopup_it  = (Elm_Ctxpopup_Item *) it;
 
    wd = elm_widget_data_get(ctxpopup_it->base.widget);
    if (!wd) return;
@@ -1148,7 +1148,7 @@ EAPI const char *
 elm_ctxpopup_item_label_get(const Elm_Object_Item *it)
 {
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
-   Elm_Ctxpopup_Item *ctxpopup_it = ELM_CAST(it);
+   Elm_Ctxpopup_Item *ctxpopup_it = (Elm_Ctxpopup_Item *) it;
    return ctxpopup_it->label;
 }
 
@@ -1158,7 +1158,7 @@ elm_ctxpopup_item_label_set(Elm_Object_Item *it, const char *label)
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
 
    Widget_Data *wd;
-   Elm_Ctxpopup_Item *ctxpopup_it = ELM_CAST(it);
+   Elm_Ctxpopup_Item *ctxpopup_it = (Elm_Ctxpopup_Item *) it;
 
    wd = elm_widget_data_get(ctxpopup_it->base.widget);
    if (!wd) return;
@@ -1330,7 +1330,7 @@ elm_ctxpopup_item_append(Evas_Object *obj, const char *label,
         _sizing_eval(obj);
      }
 
-   return ELM_CAST(item);
+   return (Elm_Object_Item *) item;
 }
 
 EAPI void
@@ -1339,7 +1339,7 @@ elm_ctxpopup_item_del(Elm_Object_Item *it)
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
 
    Widget_Data *wd;
-   Elm_Ctxpopup_Item *ctxpopup_it = ELM_CAST(it);
+   Elm_Ctxpopup_Item *ctxpopup_it = (Elm_Ctxpopup_Item *) it;
 
    wd = elm_widget_data_get(ctxpopup_it->base.widget);
    if (!wd) return;
@@ -1374,13 +1374,11 @@ elm_ctxpopup_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled)
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
 
    Widget_Data *wd;
-   Elm_Ctxpopup_Item *ctxpopup_it = ELM_CAST(it);
+   Elm_Ctxpopup_Item *ctxpopup_it = (Elm_Ctxpopup_Item *) it;
 
    wd = elm_widget_data_get(ctxpopup_it->base.widget);
    if (!wd) return;
 
-   ctxpopup_it = ELM_CAST(it);
-
    if (disabled == ctxpopup_it->disabled)
      return;
 
@@ -1396,7 +1394,7 @@ EAPI Eina_Bool
 elm_ctxpopup_item_disabled_get(const Elm_Object_Item *it)
 {
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
-   Elm_Ctxpopup_Item *ctxpopup_it = ELM_CAST(it);
+   Elm_Ctxpopup_Item *ctxpopup_it = (Elm_Ctxpopup_Item *) it;
    return ctxpopup_it->disabled;
 }
 

diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index b32feab..05d800b 100644 (file)
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -165,7 +165,7 @@ _theme_hook(Evas_Object *obj)
 
    EINA_INLIST_FOREACH(wd->stack, it)
      {
-        elm_naviframe_item_style_set(ELM_CAST(it), it->style);
+        elm_naviframe_item_style_set((Elm_Object_Item *) it, it->style);
         _item_title_visible_update(it);
      }
 
@@ -216,7 +216,7 @@ _item_text_set_hook(Elm_Object_Item *it,
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
 
    Elm_Naviframe_Text_Item_Pair *pair = NULL;
-   Elm_Naviframe_Item *navi_it = ELM_CAST(it);
+   Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
    char buf[1024];
 
    if (!part)
@@ -263,7 +263,7 @@ _item_text_get_hook(const Elm_Object_Item *it, const char *part)
 {
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
    Elm_Naviframe_Text_Item_Pair *pair = NULL;
-   Elm_Naviframe_Item *navi_it = ELM_CAST(it);
+   Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
    char buf[1024];
 
    if (!part)
@@ -287,7 +287,7 @@ _item_content_set_hook(Elm_Object_Item *it,
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
 
    Elm_Naviframe_Content_Item_Pair *pair = NULL;
-   Elm_Naviframe_Item *navi_it = ELM_CAST(it);
+   Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
 
    //specified parts
    if ((!part) || (!strcmp(part, "elm.swallow.content")))
@@ -315,7 +315,7 @@ _item_content_get_hook(const Elm_Object_Item *it, const char *part)
 {
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
    Elm_Naviframe_Content_Item_Pair *pair = NULL;
-   Elm_Naviframe_Item *navi_it = ELM_CAST(it);
+   Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
 
    //specified parts
    if ((!part) || (!strcmp(part, "elm.swallow.content")))
@@ -339,7 +339,7 @@ _item_content_unset_hook(Elm_Object_Item *it, const char *part)
 {
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
    Elm_Naviframe_Content_Item_Pair *pair = NULL;
-   Elm_Naviframe_Item *navi_it = ELM_CAST(it);
+   Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
    Evas_Object *content = NULL;
    char buf[1028];
 
@@ -389,7 +389,7 @@ _item_signal_emit_hook(Elm_Object_Item *it,
                        const char *source)
 {
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
-   Elm_Naviframe_Item *navi_it = ELM_CAST(it);
+   Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
    edje_object_signal_emit(navi_it->base.view, emission, source);
 }
 
@@ -872,9 +872,9 @@ elm_naviframe_item_push(Evas_Object *obj,
                                    "",
                                    _title_clicked, it);
 
-   elm_naviframe_item_style_set(ELM_CAST(it), item_style);
+   elm_naviframe_item_style_set((Elm_Object_Item *) it, item_style);
 
-   _item_text_set_hook(ELM_CAST(it), "elm.text.title", title_label);
+   _item_text_set_hook((Elm_Object_Item *) it, "elm.text.title", title_label);
 
    //title buttons
    if ((!prev_btn) && wd->auto_pushed && eina_inlist_count(wd->stack))
@@ -892,7 +892,7 @@ elm_naviframe_item_push(Evas_Object *obj,
    _item_sizing_eval(it);
    evas_object_show(it->base.view);
 
-   prev_it = ELM_CAST(elm_naviframe_top_item_get(obj));
+   prev_it = (Elm_Naviframe_Item *) elm_naviframe_top_item_get(obj);
    if (prev_it)
      {
         if (wd->freeze_events)
@@ -906,7 +906,7 @@ elm_naviframe_item_push(Evas_Object *obj,
      }
    it->title_visible = EINA_TRUE;
    wd->stack = eina_inlist_append(wd->stack, EINA_INLIST_GET(it));
-   return ELM_CAST(it);
+   return (Elm_Object_Item *) it;
 }
 
 EAPI Evas_Object *
@@ -920,7 +920,7 @@ elm_naviframe_item_pop(Evas_Object *obj)
    wd = elm_widget_data_get(obj);
    if (!wd) return NULL;
 
-   it = ELM_CAST(elm_naviframe_top_item_get(obj));
+   it = (Elm_Naviframe_Item *) elm_naviframe_top_item_get(obj);
    if (!it) return NULL;
    if (wd->preserve)
      content = it->content;
@@ -949,7 +949,7 @@ EAPI void
 elm_naviframe_item_pop_to(Elm_Object_Item *it)
 {
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
-   Elm_Naviframe_Item *navi_it = ELM_CAST(it);
+   Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
    Widget_Data *wd = elm_widget_data_get(navi_it->base.widget);
    Eina_Inlist *l, *prev_l;
 
@@ -959,8 +959,8 @@ elm_naviframe_item_pop_to(Elm_Object_Item *it)
 
    while(l)
      {
-        if (ELM_CAST(EINA_INLIST_CONTAINER_GET(l, Elm_Naviframe_Item)) == it)
-          break;
+        if (EINA_INLIST_CONTAINER_GET(l, Elm_Naviframe_Item) ==
+            ((Elm_Naviframe_Item *) it)) break;
         prev_l = l->prev;
         _item_del(EINA_INLIST_CONTAINER_GET(l, Elm_Naviframe_Item));
         l = prev_l;
@@ -972,12 +972,13 @@ EAPI void
 elm_naviframe_item_del(Elm_Object_Item *it)
 {
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
-   Elm_Naviframe_Item *navi_it = ELM_CAST(it);
+   Elm_Naviframe_Item *navi_it =(Elm_Naviframe_Item *) it;
    Widget_Data *wd = elm_widget_data_get(navi_it->base.widget);
    if (it == elm_naviframe_top_item_get(navi_it->base.widget))
      {
         _item_del(navi_it);
-        navi_it = ELM_CAST(EINA_INLIST_CONTAINER_GET(wd->stack->last, Elm_Naviframe_Item));
+        navi_it = EINA_INLIST_CONTAINER_GET(wd->stack->last,
+                                            Elm_Naviframe_Item);
         evas_object_show(navi_it->base.view);
         evas_object_raise(navi_it->base.view);
         edje_object_signal_emit(navi_it->base.view, "elm,state,visible", "elm");
@@ -1010,8 +1011,8 @@ elm_naviframe_top_item_get(const Evas_Object *obj)
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
    if ((!wd) || (!wd->stack)) return NULL;
-   return ELM_CAST(EINA_INLIST_CONTAINER_GET(wd->stack->last,
-                                             Elm_Naviframe_Item));
+   return (Elm_Object_Item *) (EINA_INLIST_CONTAINER_GET(wd->stack->last,
+                                                         Elm_Naviframe_Item));
 }
 
 EAPI Elm_Object_Item*
@@ -1020,15 +1021,15 @@ elm_naviframe_bottom_item_get(const Evas_Object *obj)
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
    if ((!wd) || (!wd->stack)) return NULL;
-   return ELM_CAST(EINA_INLIST_CONTAINER_GET(wd->stack,
-                                             Elm_Naviframe_Item));
+   return (Elm_Object_Item *) (EINA_INLIST_CONTAINER_GET(wd->stack,
+                                                         Elm_Naviframe_Item));
 }
 
 EAPI void
 elm_naviframe_item_style_set(Elm_Object_Item *it, const char *item_style)
 {
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
-   Elm_Naviframe_Item *navi_it = ELM_CAST(it);
+   Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
    Elm_Naviframe_Content_Item_Pair *content_pair;
    Elm_Naviframe_Text_Item_Pair *text_pair;
    Widget_Data *wd;
@@ -1089,7 +1090,7 @@ EAPI const char *
 elm_naviframe_item_style_get(const Elm_Object_Item *it)
 {
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
-   Elm_Naviframe_Item *navi_it = ELM_CAST(it);
+   Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
    return navi_it->style;
 }
 
@@ -1097,7 +1098,7 @@ EAPI void
 elm_naviframe_item_title_visible_set(Elm_Object_Item *it, Eina_Bool visible)
 {
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
-   Elm_Naviframe_Item *navi_it = ELM_CAST(it);
+   Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
 
    visible = !!visible;
    if (navi_it->title_visible == visible) return;
@@ -1110,7 +1111,7 @@ EAPI Eina_Bool
 elm_naviframe_item_title_visible_get(const Elm_Object_Item *it)
 {
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
-   Elm_Naviframe_Item *navi_it = ELM_CAST(it);
+   Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
    return navi_it->title_visible;
 }
 

diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index 332a744..9e2e472 100644 (file)
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -2103,20 +2103,20 @@ elm_object_item_content_part_set(Elm_Object_Item *it,
                                  const char *part,
                                  Evas_Object *content)
 {
-   _elm_widget_item_content_part_set(ELM_CAST(it), part, content);
+   _elm_widget_item_content_part_set((Elm_Widget_Item *) it, part, content);
 }
 
 EAPI Evas_Object *
 elm_object_item_content_part_get(const Elm_Object_Item *it,
                                  const char *part)
 {
-   return _elm_widget_item_content_part_get(ELM_CAST(it), part);
+   return _elm_widget_item_content_part_get((Elm_Widget_Item *) it, part);
 }
 
 EAPI Evas_Object *
 elm_object_item_content_part_unset(Elm_Object_Item *it, const char *part)
 {
-   return _elm_widget_item_content_part_unset(ELM_CAST(it), part);
+   return _elm_widget_item_content_part_unset((Elm_Widget_Item *) it, part);
 }
 
 EAPI void
@@ -2124,13 +2124,13 @@ elm_object_item_text_part_set(Elm_Object_Item *it,
                               const char *part,
                               const char *label)
 {
-   _elm_widget_item_text_part_set(ELM_CAST(it), part, label);
+   _elm_widget_item_text_part_set((Elm_Widget_Item *) it, part, label);
 }
 
 EAPI const char *
 elm_object_item_text_part_get(const Elm_Object_Item *it, const char *part)
 {
-   return _elm_widget_item_text_part_get(ELM_CAST(it), part);
+   return _elm_widget_item_text_part_get((Elm_Widget_Item *) it, part);
 }
 
 EAPI void
@@ -2142,7 +2142,7 @@ elm_object_access_info_set(Evas_Object *obj, const char *txt)
 EAPI void
 elm_object_item_access_info_set(Elm_Object_Item *it, const char *txt)
 {
-   _elm_widget_item_access_info_set(ELM_CAST(it), txt);
+   _elm_widget_item_access_info_set((Elm_Widget_Item *) it, txt);
 }
 
 EAPI void *
@@ -2160,5 +2160,5 @@ elm_object_item_data_set(Elm_Object_Item *it, void *data)
 EAPI void
 elm_object_item_signal_emit(Elm_Object_Item *it, const char *emission, const char *source)
 {
-   _elm_widget_item_signal_emit(ELM_CAST(it), emission, source);
+   _elm_widget_item_signal_emit((Elm_Widget_Item *) it, emission, source);
 }

diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index fad2a01..42985c4 100644 (file)
--- a/src/lib/elm_widget.h
+++ b/src/lib/elm_widget.h
@@ -269,8 +269,6 @@ struct _Elm_Object_Item
 
 #define ELM_NEW(t) calloc(1, sizeof(t))
 
-#define ELM_CAST(p) ((void *)(p))
-
 #define ELM_OBJ_ITEM_CHECK_OR_RETURN(it, ...)                               \
    ELM_WIDGET_ITEM_CHECK_OR_RETURN((Elm_Widget_Item *) (it), __VA_ARGS__);  \
    ELM_CHECK_WIDTYPE(it->it.widget, widtype) __VA_ARGS__;