elementary - removed unnecessary checkings

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@68393 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index 4ef17dd..7cdd179 100644 (file)
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -933,8 +933,6 @@ _content_get_hook(const Evas_Object *obj, const char *part)
 static void
 _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label)
 {
 static void
 _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
-

    Widget_Data *wd;
    Elm_Ctxpopup_Item *ctxpopup_it;
 
    Widget_Data *wd;
    Elm_Ctxpopup_Item *ctxpopup_it;
 


@@ -958,7 +956,6 @@ _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label)
 static const char *
 _item_text_get_hook(const Elm_Object_Item *it, const char *part)
 {
 static const char *
 _item_text_get_hook(const Elm_Object_Item *it, const char *part)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);

    Elm_Ctxpopup_Item *ctxpopup_it;
    if (part && strcmp(part, "default")) return NULL;
    ctxpopup_it = (Elm_Ctxpopup_Item *) it;
    Elm_Ctxpopup_Item *ctxpopup_it;
    if (part && strcmp(part, "default")) return NULL;
    ctxpopup_it = (Elm_Ctxpopup_Item *) it;


@@ -970,7 +967,6 @@ _item_content_set_hook(Elm_Object_Item *it,
                        const char *part,
                        Evas_Object *content)
 {
                        const char *part,
                        Evas_Object *content)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);

    Widget_Data *wd;
    Elm_Ctxpopup_Item *ctxpopup_it;
 
    Widget_Data *wd;
    Elm_Ctxpopup_Item *ctxpopup_it;
 


@@ -994,7 +990,6 @@ _item_content_set_hook(Elm_Object_Item *it,
 static Evas_Object *
 _item_content_get_hook(const Elm_Object_Item *it, const char *part)
 {
 static Evas_Object *
 _item_content_get_hook(const Elm_Object_Item *it, const char *part)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);

    Elm_Ctxpopup_Item *ctxpopup_it;
    if (part && strcmp(part, "icon")) return NULL;
    ctxpopup_it  = (Elm_Ctxpopup_Item *) it;
    Elm_Ctxpopup_Item *ctxpopup_it;
    if (part && strcmp(part, "icon")) return NULL;
    ctxpopup_it  = (Elm_Ctxpopup_Item *) it;


@@ -1004,8 +999,6 @@ _item_content_get_hook(const Elm_Object_Item *it, const char *part)
 static void
 _item_disable_hook(Elm_Object_Item *it)
 {
 static void
 _item_disable_hook(Elm_Object_Item *it)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
-

    Widget_Data *wd;
    Elm_Ctxpopup_Item *ctxpopup_it = (Elm_Ctxpopup_Item *) it;
 
    Widget_Data *wd;
    Elm_Ctxpopup_Item *ctxpopup_it = (Elm_Ctxpopup_Item *) it;
 


@@ -1022,7 +1015,6 @@ static void
 _item_signal_emit_hook(Elm_Object_Item *it, const char *emission,
                        const char *source)
 {
 _item_signal_emit_hook(Elm_Object_Item *it, const char *emission,
                        const char *source)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);

    Elm_Ctxpopup_Item *ctxpopup_it = (Elm_Ctxpopup_Item *) it;
    edje_object_signal_emit(VIEW(ctxpopup_it), emission, source);
 }
    Elm_Ctxpopup_Item *ctxpopup_it = (Elm_Ctxpopup_Item *) it;
    edje_object_signal_emit(VIEW(ctxpopup_it), emission, source);
 }


@@ -1282,8 +1274,6 @@ _remove_items(Widget_Data *wd)
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
-

    Widget_Data *wd;
    Elm_Ctxpopup_Item *ctxpopup_it = (Elm_Ctxpopup_Item *) it;
 
    Widget_Data *wd;
    Elm_Ctxpopup_Item *ctxpopup_it = (Elm_Ctxpopup_Item *) it;
 

diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c
index 2494ad1..c982f10 100644 (file)
--- a/src/lib/elc_hoversel.c
+++ b/src/lib/elc_hoversel.c
@@ -304,7 +304,6 @@ _content_unset_hook(Evas_Object *obj, const char *part)
 static const char *
 _item_text_get_hook(const Elm_Object_Item *it, const char *part)
 {
 static const char *
 _item_text_get_hook(const Elm_Object_Item *it, const char *part)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);

    if (part && strcmp(part, "default")) return NULL;
    return ((Elm_Hoversel_Item *) it)->label;
 }
    if (part && strcmp(part, "default")) return NULL;
    return ((Elm_Hoversel_Item *) it)->label;
 }


@@ -312,7 +311,6 @@ _item_text_get_hook(const Elm_Object_Item *it, const char *part)
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);

    Widget_Data *wd;
    Elm_Hoversel_Item *item = (Elm_Hoversel_Item *) it;
    wd = elm_widget_data_get(WIDGET(item));
    Widget_Data *wd;
    Elm_Hoversel_Item *item = (Elm_Hoversel_Item *) it;
    wd = elm_widget_data_get(WIDGET(item));

diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index 31b4ea0..9cb709a 100644 (file)
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -763,7 +763,6 @@ _resize_button(Evas_Object *btn, Evas_Coord *realw, Evas_Coord *vieww)
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);

    _del_button_item((Elm_Multibuttonentry_Item *) it);
    return EINA_TRUE;
 }
    _del_button_item((Elm_Multibuttonentry_Item *) it);
    return EINA_TRUE;
 }


@@ -1326,8 +1325,6 @@ _box_layout_cb(Evas_Object *o, Evas_Object_Box_Data *priv, void *data __UNUSED__
 static void
 _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label)
 {
 static void
 _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
-

    Elm_Multibuttonentry_Item *item;
    if (part && strcmp(part, "default")) return;
    if (!label) return;
    Elm_Multibuttonentry_Item *item;
    if (part && strcmp(part, "default")) return;
    if (!label) return;


@@ -1339,7 +1336,6 @@ _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label)
 static const char *
 _item_text_get_hook(const Elm_Object_Item *it, const char *part)
 {
 static const char *
 _item_text_get_hook(const Elm_Object_Item *it, const char *part)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);

    Elm_Multibuttonentry_Item *item;
    if (part && strcmp(part, "default")) return NULL;
    item = (Elm_Multibuttonentry_Item *) it;
    Elm_Multibuttonentry_Item *item;
    if (part && strcmp(part, "default")) return NULL;
    item = (Elm_Multibuttonentry_Item *) it;


@@ -1660,14 +1656,12 @@ elm_multibuttonentry_item_next_get(const Elm_Object_Item *it)
 EAPI void *
 elm_multibuttonentry_item_data_get(const Elm_Object_Item *it)
 {
 EAPI void *
 elm_multibuttonentry_item_data_get(const Elm_Object_Item *it)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);

    return elm_widget_item_data_get(it);
 }
 
 EAPI void
 elm_multibuttonentry_item_data_set(Elm_Object_Item *it, void *data)
 {
    return elm_widget_item_data_get(it);
 }
 
 EAPI void
 elm_multibuttonentry_item_data_set(Elm_Object_Item *it, void *data)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);

    return elm_widget_item_data_set(it, data);
 }
 
    return elm_widget_item_data_set(it, data);
 }
 

diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 2aa05e9..f23265b 100644 (file)
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -241,8 +241,6 @@ _item_text_set_hook(Elm_Object_Item *it,
                     const char *part,
                     const char *label)
 {
                     const char *part,
                     const char *label)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
-

    Elm_Naviframe_Text_Item_Pair *pair = NULL;
    Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
    char buf[1024];
    Elm_Naviframe_Text_Item_Pair *pair = NULL;
    Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
    char buf[1024];


@@ -289,7 +287,6 @@ _item_text_set_hook(Elm_Object_Item *it,
 static const char *
 _item_text_get_hook(const Elm_Object_Item *it, const char *part)
 {
 static const char *
 _item_text_get_hook(const Elm_Object_Item *it, const char *part)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);

    char buf[1024];
 
    if (!part || !strcmp(part, "default"))
    char buf[1024];
 
    if (!part || !strcmp(part, "default"))


@@ -307,8 +304,6 @@ _item_content_set_hook(Elm_Object_Item *it,
                        const char *part,
                        Evas_Object *content)
 {
                        const char *part,
                        Evas_Object *content)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
-

    Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
 
    //specified parts
    Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
 
    //specified parts


@@ -340,7 +335,6 @@ _item_content_set_hook(Elm_Object_Item *it,
 static Evas_Object *
 _item_content_get_hook(const Elm_Object_Item *it, const char *part)
 {
 static Evas_Object *
 _item_content_get_hook(const Elm_Object_Item *it, const char *part)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);

    Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
 
    //specified parts
    Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
 
    //specified parts


@@ -360,7 +354,6 @@ _item_content_get_hook(const Elm_Object_Item *it, const char *part)
 static Evas_Object *
 _item_content_unset_hook(Elm_Object_Item *it, const char *part)
 {
 static Evas_Object *
 _item_content_unset_hook(Elm_Object_Item *it, const char *part)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);

    Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
 
    //specified parts
    Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
 
    //specified parts


@@ -381,7 +374,6 @@ _item_signal_emit_hook(Elm_Object_Item *it,
                        const char *emission,
                        const char *source)
 {
                        const char *emission,
                        const char *source)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);

    elm_object_signal_emit(VIEW(it), emission, source);
 }
 
    elm_object_signal_emit(VIEW(it), emission, source);
 }
 


@@ -836,7 +828,6 @@ _item_del(Elm_Naviframe_Item *it)
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);

    Elm_Naviframe_Item *navi_it;
    Widget_Data *wd;
 
    Elm_Naviframe_Item *navi_it;
    Widget_Data *wd;
 

diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c
index bdae20b..c544fba 100644 (file)
--- a/src/lib/elm_diskselector.c
+++ b/src/lib/elm_diskselector.c
@@ -229,7 +229,6 @@ _check_string(void *data)
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);

    Elm_Diskselector_Item *item, *item2, *dit;
    Eina_List *l;
    int i = 0;
    Elm_Diskselector_Item *item, *item2, *dit;
    Eina_List *l;
    int i = 0;


@@ -945,7 +944,6 @@ _check_identical_item(Elm_Diskselector_Item *it, Evas_Object *icon)
 static void
 _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label)
 {
 static void
 _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);

    Elm_Diskselector_Item *item;
    if (part && strcmp(part, "default")) return;
    item = (Elm_Diskselector_Item *) it;
    Elm_Diskselector_Item *item;
    if (part && strcmp(part, "default")) return;
    item = (Elm_Diskselector_Item *) it;


@@ -956,7 +954,6 @@ _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label)
 static const char *
 _item_text_get_hook(const Elm_Object_Item *it, const char *part)
 {
 static const char *
 _item_text_get_hook(const Elm_Object_Item *it, const char *part)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);

    if (part && strcmp(part, "default")) return NULL;
    return ((Elm_Diskselector_Item *) it)->label;
 }
    if (part && strcmp(part, "default")) return NULL;
    return ((Elm_Diskselector_Item *) it)->label;
 }


@@ -966,7 +963,6 @@ _item_content_set_hook(Elm_Object_Item *it,
                        const char *part,
                        Evas_Object *content)
 {
                        const char *part,
                        Evas_Object *content)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);

    if (part && strcmp(part, "icon")) return;
    _item_icon_set((Elm_Diskselector_Item *) it, content);
    _check_identical_item((Elm_Diskselector_Item *) it, content);
    if (part && strcmp(part, "icon")) return;
    _item_icon_set((Elm_Diskselector_Item *) it, content);
    _check_identical_item((Elm_Diskselector_Item *) it, content);


@@ -975,7 +971,6 @@ _item_content_set_hook(Elm_Object_Item *it,
 static Evas_Object *
 _item_content_get_hook(const Elm_Object_Item *it, const char *part)
 {
 static Evas_Object *
 _item_content_get_hook(const Elm_Object_Item *it, const char *part)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);

    if (part && strcmp(part, "icon")) return NULL;
    return ((Elm_Diskselector_Item *) it)->icon;
 }
    if (part && strcmp(part, "icon")) return NULL;
    return ((Elm_Diskselector_Item *) it)->icon;
 }

diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c
index 292b7d6..5780e3a 100644 (file)
--- a/src/lib/elm_flipselector.c
+++ b/src/lib/elm_flipselector.c
@@ -73,8 +73,6 @@ _item_text_set_hook(Elm_Object_Item *it,
                     const char *part,
                     const char *label)
 {
                     const char *part,
                     const char *label)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
-

    Widget_Data *wd;
    Eina_List *l;
    Elm_Flipselector_Item *item;
    Widget_Data *wd;
    Eina_List *l;
    Elm_Flipselector_Item *item;


@@ -106,8 +104,6 @@ _item_text_set_hook(Elm_Object_Item *it,
 static const char *
 _item_text_get_hook(const Elm_Object_Item *it, const char *part)
 {
 static const char *
 _item_text_get_hook(const Elm_Object_Item *it, const char *part)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
-

    if (part && strcmp(part ,"default")) return NULL;
 
    return ((Elm_Flipselector_Item *) it)->label;
    if (part && strcmp(part ,"default")) return NULL;
 
    return ((Elm_Flipselector_Item *) it)->label;


@@ -118,7 +114,6 @@ _item_signal_emit_hook(Elm_Object_Item *it,
                        const char *emission,
                        const char *source)
 {
                        const char *emission,
                        const char *source)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);

    Elm_Flipselector_Item *item = (Elm_Flipselector_Item *) it;
    edje_object_signal_emit(VIEW(item), emission, source);
 }
    Elm_Flipselector_Item *item = (Elm_Flipselector_Item *) it;
    edje_object_signal_emit(VIEW(item), emission, source);
 }


@@ -580,7 +575,6 @@ _callbacks_set(Evas_Object *obj)
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);

    Widget_Data *wd;
    Elm_Flipselector_Item *item, *item2;
    Eina_List *l;
    Widget_Data *wd;
    Elm_Flipselector_Item *item, *item2;
    Eina_List *l;

diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 36c76a2..c3d4adc 100644 (file)
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -1856,7 +1856,6 @@ _elm_gengrid_item_compare(const void *data, const void *data1)
 static void
 _item_disable_hook(Elm_Object_Item *it)
 {
 static void
 _item_disable_hook(Elm_Object_Item *it)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);

    Elm_Gen_Item *_it = (Elm_Gen_Item *) it;
 
    if (_it->generation < _it->wd->generation) return;
    Elm_Gen_Item *_it = (Elm_Gen_Item *) it;
 
    if (_it->generation < _it->wd->generation) return;


@@ -1873,7 +1872,6 @@ _item_disable_hook(Elm_Object_Item *it)
 static void
 _item_del_pre_hook(Elm_Object_Item *it)
 {
 static void
 _item_del_pre_hook(Elm_Object_Item *it)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);

    Elm_Gen_Item *_it = (Elm_Gen_Item *) it;
    if ((_it->relcount > 0) || (_it->walking > 0))
      {
    Elm_Gen_Item *_it = (Elm_Gen_Item *) it;
    if ((_it->relcount > 0) || (_it->walking > 0))
      {


@@ -2520,7 +2518,6 @@ elm_gengrid_item_cursor_set(Elm_Object_Item  *it,
 EAPI const char *
 elm_gengrid_item_cursor_get(const Elm_Object_Item *it)
 {
 EAPI const char *
 elm_gengrid_item_cursor_get(const Elm_Object_Item *it)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);

    return elm_widget_item_cursor_get(it);
 }
 
    return elm_widget_item_cursor_get(it);
 }
 


@@ -2543,14 +2540,12 @@ EAPI void
 elm_gengrid_item_cursor_style_set(Elm_Object_Item  *it,
                                   const char       *style)
 {
 elm_gengrid_item_cursor_style_set(Elm_Object_Item  *it,
                                   const char       *style)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);

    elm_widget_item_cursor_style_set(it, style);
 }
 
 EAPI const char *
 elm_gengrid_item_cursor_style_get(const Elm_Object_Item *it)
 {
    elm_widget_item_cursor_style_set(it, style);
 }
 
 EAPI const char *
 elm_gengrid_item_cursor_style_get(const Elm_Object_Item *it)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);

    return elm_widget_item_cursor_style_get(it);
 }
 
    return elm_widget_item_cursor_style_get(it);
 }
 


@@ -2558,14 +2553,12 @@ EAPI void
 elm_gengrid_item_cursor_engine_only_set(Elm_Object_Item  *it,
                                         Eina_Bool         engine_only)
 {
 elm_gengrid_item_cursor_engine_only_set(Elm_Object_Item  *it,
                                         Eina_Bool         engine_only)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);

    elm_widget_item_cursor_engine_only_set(it, engine_only);
 }
 
 EAPI Eina_Bool
 elm_gengrid_item_cursor_engine_only_get(const Elm_Object_Item *it)
 {
    elm_widget_item_cursor_engine_only_set(it, engine_only);
 }
 
 EAPI Eina_Bool
 elm_gengrid_item_cursor_engine_only_get(const Elm_Object_Item *it)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);

    return elm_widget_item_cursor_engine_only_get(it);
 }
 
    return elm_widget_item_cursor_engine_only_get(it);
 }
 

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index bcc23b5..792a7e9 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -3474,7 +3474,6 @@ _item_text_hook(Elm_Gen_Item *it, const char *part)
 static void
 _item_disable_hook(Elm_Object_Item *it)
 {
 static void
 _item_disable_hook(Elm_Object_Item *it)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);

    Eina_List *l;
    Evas_Object *obj;
    Elm_Gen_Item *_it = (Elm_Gen_Item *) it;
    Eina_List *l;
    Evas_Object *obj;
    Elm_Gen_Item *_it = (Elm_Gen_Item *) it;


@@ -3506,7 +3505,6 @@ _item_disable_hook(Elm_Object_Item *it)
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);

    Elm_Gen_Item *_it = (Elm_Gen_Item *) it;
 
    if ((_it->relcount > 0) || (_it->walking > 0))
    Elm_Gen_Item *_it = (Elm_Gen_Item *) it;
 
    if ((_it->relcount > 0) || (_it->walking > 0))


@@ -5138,7 +5136,6 @@ elm_genlist_item_cursor_set(Elm_Object_Item  *it,
 EAPI const char *
 elm_genlist_item_cursor_get(const Elm_Object_Item *it)
 {
 EAPI const char *
 elm_genlist_item_cursor_get(const Elm_Object_Item *it)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);

    return elm_widget_item_cursor_get(it);
 }
 
    return elm_widget_item_cursor_get(it);
 }
 


@@ -5160,14 +5157,12 @@ EAPI void
 elm_genlist_item_cursor_style_set(Elm_Object_Item  *it,
                                   const char       *style)
 {
 elm_genlist_item_cursor_style_set(Elm_Object_Item  *it,
                                   const char       *style)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);

    elm_widget_item_cursor_style_set(it, style);
 }
 
 EAPI const char *
 elm_genlist_item_cursor_style_get(const Elm_Object_Item *it)
 {
    elm_widget_item_cursor_style_set(it, style);
 }
 
 EAPI const char *
 elm_genlist_item_cursor_style_get(const Elm_Object_Item *it)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);

    return elm_widget_item_cursor_style_get(it);
 }
 
    return elm_widget_item_cursor_style_get(it);
 }
 


@@ -5175,14 +5170,12 @@ EAPI void
 elm_genlist_item_cursor_engine_only_set(Elm_Object_Item *it,
                                         Eina_Bool        engine_only)
 {
 elm_genlist_item_cursor_engine_only_set(Elm_Object_Item *it,
                                         Eina_Bool        engine_only)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);

    elm_widget_item_cursor_engine_only_set(it, engine_only);
 }
 
 EAPI Eina_Bool
 elm_genlist_item_cursor_engine_only_get(const Elm_Object_Item *it)
 {
    elm_widget_item_cursor_engine_only_set(it, engine_only);
 }
 
 EAPI Eina_Bool
 elm_genlist_item_cursor_engine_only_get(const Elm_Object_Item *it)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);

    return elm_widget_item_cursor_engine_only_get(it);
 }
 
    return elm_widget_item_cursor_engine_only_get(it);
 }
 


@@ -5199,7 +5192,7 @@ elm_genlist_item_index_get(Elm_Object_Item *it)
 
 EAPI void
 elm_genlist_mode_set(Evas_Object  *obj,
 
 EAPI void
 elm_genlist_mode_set(Evas_Object  *obj,

-                    Elm_List_Mode mode)
+                     Elm_List_Mode mode)

 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);

diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index c80a7dc..65bae50 100644 (file)
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -192,7 +192,6 @@ _sizing_eval(Evas_Object *obj)
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);

    Widget_Data *wd = elm_widget_data_get(WIDGET(it));
    if (!wd) return EINA_FALSE;
    _item_free((Elm_Index_Item *) it);
    Widget_Data *wd = elm_widget_data_get(WIDGET(it));
    if (!wd) return EINA_FALSE;
    _item_free((Elm_Index_Item *) it);

diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 0c38ddd..4a9ccf0 100644 (file)
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -1033,7 +1033,6 @@ _item_disable(Elm_Object_Item *it)
 static void
 _item_content_set(Elm_Object_Item *it, const char *part, Evas_Object *content)
 {
 static void
 _item_content_set(Elm_Object_Item *it, const char *part, Evas_Object *content)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);

    Elm_List_Item *item = (Elm_List_Item *) it;
    Evas_Object **icon_p = NULL;
    Eina_Bool dummy = EINA_FALSE;
    Elm_List_Item *item = (Elm_List_Item *) it;
    Evas_Object **icon_p = NULL;
    Eina_Bool dummy = EINA_FALSE;


@@ -1076,7 +1075,6 @@ _item_content_set(Elm_Object_Item *it, const char *part, Evas_Object *content)
 static Evas_Object *
 _item_content_get(const Elm_Object_Item *it, const char *part)
 {
 static Evas_Object *
 _item_content_get(const Elm_Object_Item *it, const char *part)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);

    Elm_List_Item *item = (Elm_List_Item *) it;
 
    if ((!part) || (!strcmp(part, "start")))
    Elm_List_Item *item = (Elm_List_Item *) it;
 
    if ((!part) || (!strcmp(part, "start")))


@@ -1115,7 +1113,6 @@ _item_content_unset(const Elm_Object_Item *it, const char *part)
 static void
 _item_text_set(Elm_Object_Item *it, const char *part, const char *text)
 {
 static void
 _item_text_set(Elm_Object_Item *it, const char *part, const char *text)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);

    Elm_List_Item *list_it = (Elm_List_Item *) it;
    if (part && strcmp(part, "default")) return;
    if (!eina_stringshare_replace(&list_it->label, text)) return;
    Elm_List_Item *list_it = (Elm_List_Item *) it;
    if (part && strcmp(part, "default")) return;
    if (!eina_stringshare_replace(&list_it->label, text)) return;


@@ -1126,7 +1123,6 @@ _item_text_set(Elm_Object_Item *it, const char *part, const char *text)
 static const char *
 _item_text_get(const Elm_Object_Item *it, const char *part)
 {
 static const char *
 _item_text_get(const Elm_Object_Item *it, const char *part)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);

    if (part && strcmp(part, "default")) return NULL;
    return ((Elm_List_Item *) it)->label;
 }
    if (part && strcmp(part, "default")) return NULL;
    return ((Elm_List_Item *) it)->label;
 }


@@ -1134,8 +1130,6 @@ _item_text_get(const Elm_Object_Item *it, const char *part)
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {

-  ELM_LIST_ITEM_CHECK_DELETED_RETURN(it, EINA_FALSE);
-

    Evas_Object *obj = WIDGET(it);
    Elm_List_Item *item = (Elm_List_Item *) it;
    Widget_Data *wd = elm_widget_data_get(obj);
    Evas_Object *obj = WIDGET(it);
    Elm_List_Item *item = (Elm_List_Item *) it;
    Widget_Data *wd = elm_widget_data_get(obj);

diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index d712f5b..c548a1b 100644 (file)
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -142,7 +142,6 @@ _item_text_set_hook(Elm_Object_Item *it,
                     const char *part,
                     const char *label)
 {
                     const char *part,
                     const char *label)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);

    Elm_Menu_Item *item;
 
    if (part && strcmp(part, "default")) return;
    Elm_Menu_Item *item;
 
    if (part && strcmp(part, "default")) return;


@@ -164,7 +163,6 @@ _item_text_set_hook(Elm_Object_Item *it,
 static const char *
 _item_text_get_hook(const Elm_Object_Item *it, const char *part)
 {
 static const char *
 _item_text_get_hook(const Elm_Object_Item *it, const char *part)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);

    if (part && strcmp(part, "default")) return NULL;
    return ((Elm_Menu_Item *) it)->label;
 }
    if (part && strcmp(part, "default")) return NULL;
    return ((Elm_Menu_Item *) it)->label;
 }


@@ -174,7 +172,6 @@ _item_content_set_hook(Elm_Object_Item *it,
                        const char *part,
                        Evas_Object *content)
 {
                        const char *part,
                        Evas_Object *content)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);

    Elm_Menu_Item *item;
 
    if (part && strcmp(part, "default")) return;
    Elm_Menu_Item *item;
 
    if (part && strcmp(part, "default")) return;


@@ -197,7 +194,6 @@ _item_content_set_hook(Elm_Object_Item *it,
 static Evas_Object *
 _item_content_get_hook(const Elm_Object_Item *it, const char *part)
 {
 static Evas_Object *
 _item_content_get_hook(const Elm_Object_Item *it, const char *part)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);

    if (part && strcmp(part, "default")) return NULL;
    return ((Elm_Menu_Item *) it)->content;
 }
    if (part && strcmp(part, "default")) return NULL;
    return ((Elm_Menu_Item *) it)->content;
 }


@@ -205,7 +201,6 @@ _item_content_get_hook(const Elm_Object_Item *it, const char *part)
 static void
 _item_disable_hook(Elm_Object_Item *it)
 {
 static void
 _item_disable_hook(Elm_Object_Item *it)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);

    Elm_Menu_Item *item = (Elm_Menu_Item *) it;
 
    if (elm_widget_item_disabled_get(item))
    Elm_Menu_Item *item = (Elm_Menu_Item *) it;
 
    if (elm_widget_item_disabled_get(item))


@@ -693,7 +688,6 @@ _elm_menu_item_add_helper(Evas_Object *obj, Elm_Menu_Item *parent, Elm_Menu_Item
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);

    Elm_Menu_Item *item = (Elm_Menu_Item *) it;
    Elm_Object_Item *_item;
 
    Elm_Menu_Item *item = (Elm_Menu_Item *) it;
    Elm_Object_Item *_item;
 

diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c
index 72475c3..5f03e57 100644 (file)
--- a/src/lib/elm_segment_control.c
+++ b/src/lib/elm_segment_control.c
@@ -437,7 +437,6 @@ _item_find(const Evas_Object *obj, int idx)
 static void
 _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label)
 {
 static void
 _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);

    Widget_Data *wd;
    Elm_Segment_Item *item;
 
    Widget_Data *wd;
    Elm_Segment_Item *item;
 


@@ -460,7 +459,6 @@ _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label)
 static const char *
 _item_text_get_hook(const Elm_Object_Item *it, const char *part)
 {
 static const char *
 _item_text_get_hook(const Elm_Object_Item *it, const char *part)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);

    if (part && strcmp(part, "default")) return NULL;
    return ((Elm_Segment_Item *) it)->label;
 }
    if (part && strcmp(part, "default")) return NULL;
    return ((Elm_Segment_Item *) it)->label;
 }


@@ -470,7 +468,6 @@ _item_content_set_hook(Elm_Object_Item *it,
                        const char *part,
                        Evas_Object *content)
 {
                        const char *part,
                        Evas_Object *content)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);

    Elm_Segment_Item *item;
 
    if (part && strcmp(part, "icon")) return;
    Elm_Segment_Item *item;
 
    if (part && strcmp(part, "icon")) return;


@@ -498,7 +495,6 @@ _item_content_set_hook(Elm_Object_Item *it,
 static Evas_Object *
 _item_content_get_hook(const Elm_Object_Item *it, const char *part)
 {
 static Evas_Object *
 _item_content_get_hook(const Elm_Object_Item *it, const char *part)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);

    if (part && strcmp(part, "icon")) return NULL;
    return ((Elm_Segment_Item *) it)->icon;
 }
    if (part && strcmp(part, "icon")) return NULL;
    return ((Elm_Segment_Item *) it)->icon;
 }


@@ -506,7 +502,6 @@ _item_content_get_hook(const Elm_Object_Item *it, const char *part)
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);

    Widget_Data *wd;
    Elm_Segment_Item *item = (Elm_Segment_Item *) it;
 
    Widget_Data *wd;
    Elm_Segment_Item *item = (Elm_Segment_Item *) it;
 

diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c
index f56a2da..ddd308d 100644 (file)
--- a/src/lib/elm_slideshow.c
+++ b/src/lib/elm_slideshow.c
@@ -351,8 +351,6 @@ _timer_cb(void *data)
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
-

    Elm_Slideshow_Item *item = (Elm_Slideshow_Item *) it;
    Widget_Data *wd = elm_widget_data_get(WIDGET(item));
    if (!wd) return EINA_FALSE;
    Elm_Slideshow_Item *item = (Elm_Slideshow_Item *) it;
    Widget_Data *wd = elm_widget_data_get(WIDGET(item));
    if (!wd) return EINA_FALSE;

diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 428ba90..e6017a4 100644 (file)
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -90,8 +90,6 @@ static const Evas_Smart_Cb_Description _signals[] = {
 static void
 _item_disable_hook(Elm_Object_Item *it)
 {
 static void
 _item_disable_hook(Elm_Object_Item *it)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
-

    Widget_Data *wd;
    Elm_Toolbar_Item *toolbar_it = (Elm_Toolbar_Item *) it;
 
    Widget_Data *wd;
    Elm_Toolbar_Item *toolbar_it = (Elm_Toolbar_Item *) it;
 


@@ -387,7 +385,6 @@ _item_text_set_hook(Elm_Object_Item *it,
                     const char *part,
                     const char *label)
 {
                     const char *part,
                     const char *label)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);

    if (part && strcmp(part, "default")) return;
    _item_label_set(((Elm_Toolbar_Item *) it), label, "elm,state,label_set");
 }
    if (part && strcmp(part, "default")) return;
    _item_label_set(((Elm_Toolbar_Item *) it), label, "elm,state,label_set");
 }


@@ -395,7 +392,6 @@ _item_text_set_hook(Elm_Object_Item *it,
 static const char *
 _item_text_get_hook(const Elm_Object_Item *it, const char *part)
 {
 static const char *
 _item_text_get_hook(const Elm_Object_Item *it, const char *part)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);

    if (part && strcmp(part, "default")) return NULL;
    return ((Elm_Toolbar_Item *) it)->label;
 }
    if (part && strcmp(part, "default")) return NULL;
    return ((Elm_Toolbar_Item *) it)->label;
 }


@@ -815,8 +811,6 @@ _access_state_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, Elm_Widget_
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {
 static Eina_Bool
 _item_del_pre_hook(Elm_Object_Item *it)
 {

-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
-

    Widget_Data *wd;
    Evas_Object *obj2;
    Elm_Toolbar_Item *item, *next;
    Widget_Data *wd;
    Evas_Object *obj2;
    Elm_Toolbar_Item *item, *next;