elementary - renamed internal callback function

elm_widget_item_disabled_set_hook_set -> elm_widget_item_disabled_hook_set

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

diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index b6e4a81..be168fd 100644 (file)
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -91,7 +91,7 @@ static void _item_content_set_hook(Elm_Object_Item *it,
                                    Evas_Object *content);
 static Evas_Object * _item_content_get_hook(const Elm_Object_Item *it,
                                             const char *part);
-static void _item_disable_set_hook(Elm_Object_Item *it);
+static void _item_disable_hook(Elm_Object_Item *it);
 static void _item_signal_emit_hook(Elm_Object_Item *it,
                                    const char *emission,
                                    const char *source);
@@ -963,7 +963,7 @@ _item_content_get_hook(const Elm_Object_Item *it, const char *part)
 }
 
 static void
-_item_disable_set_hook(Elm_Object_Item *it)
+_item_disable_hook(Elm_Object_Item *it)
 {
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
 
@@ -1450,7 +1450,7 @@ elm_ctxpopup_item_append(Evas_Object *obj, const char *label,
    item = elm_widget_item_new(obj, Elm_Ctxpopup_Item);
    if (!item) return NULL;
 
-   elm_widget_item_disable_set_hook_set(item, _item_disable_set_hook);
+   elm_widget_item_disable_hook_set(item, _item_disable_hook);
    elm_widget_item_text_set_hook_set(item, _item_text_set_hook);
    elm_widget_item_text_get_hook_set(item, _item_text_get_hook);
    elm_widget_item_content_set_hook_set(item, _item_content_set_hook);

diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 4eb103f..3750c87 100644 (file)
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -1163,7 +1163,7 @@ _item_new(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *e
         evas_object_event_callback_add(it->end, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
                                        _changed_size_hints, obj);
      }
-   _elm_widget_item_disable_set_hook_set((Elm_Widget_Item *)it, _item_disable);
+   _elm_widget_item_disable_hook_set((Elm_Widget_Item *)it, _item_disable);
    _elm_widget_item_content_set_hook_set((Elm_Widget_Item *)it, _item_content_set);
    _elm_widget_item_content_get_hook_set((Elm_Widget_Item *)it, _item_content_get);
    _elm_widget_item_content_unset_hook_set((Elm_Widget_Item *)it, _item_content_unset);

diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index b189139..814c645 100644 (file)
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -35,7 +35,7 @@ struct _Widget_Data
 static const char *widtype = NULL;
 static void _del_hook(Evas_Object *obj);
 static void _theme_hook(Evas_Object *obj);
-static void _item_disable_set_hook(Elm_Object_Item *it);
+static void _item_disable_hook(Elm_Object_Item *it);
 static void _sizing_eval(Evas_Object *obj);
 static void _submenu_sizing_eval(Elm_Menu_Item *parent);
 static void _item_sizing_eval(Elm_Menu_Item *item);
@@ -131,7 +131,7 @@ _theme_hook(Evas_Object *obj)
                   elm_menu_item_object_icon_name_set((Elm_Object_Item *) item,
                                                      item->icon_str);
                }
-             _item_disable_set_hook((Elm_Object_Item *) item);
+             _item_disable_hook((Elm_Object_Item *) item);
              edje_object_scale_set(VIEW(item), elm_widget_scale_get(obj) *
                                    _elm_config->scale);
           }
@@ -205,7 +205,7 @@ _item_content_get_hook(const Elm_Object_Item *it, const char *part)
 }
 
 static void
-_item_disable_set_hook(Elm_Object_Item *it)
+_item_disable_hook(Elm_Object_Item *it)
 {
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
    Elm_Menu_Item *item = (Elm_Menu_Item *) it;
@@ -710,7 +710,7 @@ elm_menu_item_add(Evas_Object *obj, Elm_Object_Item *parent, const char *icon, c
         return NULL;
      }
 
-   elm_widget_item_disable_set_hook_set(subitem, _item_disable_set_hook);
+   elm_widget_item_disable_hook_set(subitem, _item_disable_hook);
    elm_widget_item_text_set_hook_set(subitem, _item_text_set_hook);
    elm_widget_item_text_get_hook_set(subitem, _item_text_get_hook);
    elm_widget_item_content_set_hook_set(subitem, _item_content_set_hook);
@@ -745,7 +745,7 @@ elm_menu_item_add_object(Evas_Object *obj, Elm_Object_Item *parent, Evas_Object
    subitem = elm_widget_item_new(obj, Elm_Menu_Item);
    if (!subitem) return NULL;
 
-   elm_widget_item_disable_set_hook_set(subitem, _item_disable_set_hook);
+   elm_widget_item_disable_hook_set(subitem, _item_disable_hook);
    elm_widget_item_text_set_hook_set(subitem, _item_text_set_hook);
    elm_widget_item_text_get_hook_set(subitem, _item_text_get_hook);
    elm_widget_item_content_set_hook_set(subitem, _item_content_set_hook);
@@ -840,7 +840,7 @@ elm_menu_item_separator_add(Evas_Object *obj, Elm_Object_Item *parent)
    subitem = elm_widget_item_new(obj, Elm_Menu_Item);
    if (!subitem) return NULL;
 
-   elm_widget_item_disable_set_hook_set(subitem, _item_disable_set_hook);
+   elm_widget_item_disable_hook_set(subitem, _item_disable_hook);
    elm_widget_item_text_set_hook_set(subitem, _item_text_set_hook);
    elm_widget_item_text_get_hook_set(subitem, _item_text_get_hook);
    elm_widget_item_content_set_hook_set(subitem, _item_content_set_hook);

diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 759b0c1..e534548 100644 (file)
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -88,7 +88,7 @@ static const Evas_Smart_Cb_Description _signals[] = {
 };
 
 static void
-_item_disable_set_hook(Elm_Object_Item *it)
+_item_disable_hook(Elm_Object_Item *it)
 {
    ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
 
@@ -780,7 +780,7 @@ _item_new(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb f
         return NULL;
      }
 
-   elm_widget_item_disable_set_hook_set(it, _item_disable_set_hook);
+   elm_widget_item_disable_hook_set(it, _item_disable_hook);
    elm_widget_item_text_set_hook_set(it, _item_text_set_hook);
    elm_widget_item_text_get_hook_set(it, _item_text_get_hook);
 

diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index 37a8d83..4c3e291 100644 (file)
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -2864,7 +2864,7 @@ _elm_widget_item_del(Elm_Widget_Item *item)
  * @ingroup Widget
  */
 EAPI void
-_elm_widget_item_del_pre_hook_set(Elm_Widget_Item *item, Elm_Widget_Item_Del_Pre_Cb func)
+_elm_widget_item_del_pre_hook_set(Elm_Widget_Item *item, Elm_Widget_Del_Pre_Cb func)
 {
    ELM_WIDGET_ITEM_CHECK_OR_RETURN(item);
    if ((item->del_pre_func) && (item->del_pre_func != func))
@@ -2983,8 +2983,8 @@ _elm_widget_item_disabled_get(const Elm_Widget_Item *item)
 }
 
 EAPI void
-_elm_widget_item_disable_set_hook_set(Elm_Widget_Item *item,
-                                      Elm_Widget_Disable_Set_Cb func)
+_elm_widget_item_disable_hook_set(Elm_Widget_Item *item,
+                                  Elm_Widget_Disable_Cb func)
 {
    ELM_WIDGET_ITEM_CHECK_OR_RETURN(item);
    item->disable_func = func;

diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index 12ce06f..aebc725 100644 (file)
--- a/src/lib/elm_widget.h
+++ b/src/lib/elm_widget.h
@@ -206,8 +206,8 @@ typedef const char           *(*Elm_Widget_Text_Get_Cb)(const void *data, const
 typedef Evas_Object          *(*Elm_Widget_Content_Get_Cb)(const void *data, const char *part);
 typedef Evas_Object          *(*Elm_Widget_Content_Unset_Cb)(const void *data, const char *part);
 typedef void                  (*Elm_Widget_Signal_Emit_Cb)(void *data, const char *emission, const char *source);
-typedef void                  (*Elm_Widget_Disable_Set_Cb)(void *data);
-typedef void                  (*Elm_Widget_Item_Del_Pre_Cb)(Elm_Object_Item *it);
+typedef void                  (*Elm_Widget_Disable_Cb)(void *data);
+typedef void                  (*Elm_Widget_Del_Pre_Cb)(void *data);
 
 #define ELM_ACCESS_TYPE    0    // when reading out widget or item this is read first
 #define ELM_ACCESS_INFO    1    // next read is info - this is normally label
@@ -266,7 +266,7 @@ struct _Elm_Widget_Item
    const void                    *data;
    Evas_Smart_Cb                  del_func;
    /**< don't expose this callback call */
-   Elm_Widget_Item_Del_Pre_Cb     del_pre_func;
+   Elm_Widget_Del_Pre_Cb          del_pre_func;
 
    Elm_Widget_Content_Set_Cb      content_set_func;
    Elm_Widget_Content_Get_Cb      content_get_func;
@@ -274,7 +274,7 @@ struct _Elm_Widget_Item
    Elm_Widget_Text_Set_Cb         text_set_func;
    Elm_Widget_Text_Get_Cb         text_get_func;
    Elm_Widget_Signal_Emit_Cb      signal_emit_func;
-   Elm_Widget_Disable_Set_Cb      disable_func;
+   Elm_Widget_Disable_Cb          disable_func;
    Elm_Access_Info               *access;
    const char                    *access_info;
    Eina_Bool                      disabled : 1;
@@ -476,8 +476,8 @@ EAPI void             _elm_widget_item_signal_emit_hook_set(Elm_Widget_Item *it,
 EAPI void             _elm_widget_item_access_info_set(Elm_Widget_Item *item, const char *txt);
 EAPI void             _elm_widget_item_disabled_set(Elm_Widget_Item *item, Eina_Bool disabled);
 EAPI Eina_Bool        _elm_widget_item_disabled_get(const Elm_Widget_Item *item);
-EAPI void             _elm_widget_item_disable_set_hook_set(Elm_Widget_Item *item, Elm_Widget_Disable_Set_Cb func);
-EAPI void             _elm_widget_item_del_pre_hook_set(Elm_Widget_Item *item, Elm_Widget_Item_Del_Pre_Cb func);
+EAPI void             _elm_widget_item_disable_hook_set(Elm_Widget_Item *item, Elm_Widget_Disable_Cb func);
+EAPI void             _elm_widget_item_del_pre_hook_set(Elm_Widget_Item *item, Elm_Widget_Del_Pre_Cb func);
 
 /* debug function. don't use it unless you are tracking parenting issues */
 EAPI void             elm_widget_tree_dump(const Evas_Object *top);
@@ -653,16 +653,16 @@ EAPI void             elm_widget_tree_dot_dump(const Evas_Object *top, FILE *out
   _elm_widget_item_disabled_get((Elm_Widget_Item *)item)
 /**
  * Convenience function to query disable set hook.
- * @see _elm_widget_item_disable_set_hook_set()
+ * @see _elm_widget_item_disable_hook_set()
  */
-#define elm_widget_item_disable_set_hook_set(item, func) \
-  _elm_widget_item_disable_set_hook_set((Elm_Widget_Item *)item, (Elm_Widget_Disable_Set_Cb)func)
+#define elm_widget_item_disable_hook_set(item, func) \
+  _elm_widget_item_disable_hook_set((Elm_Widget_Item *)item, (Elm_Widget_Disable_Cb)func)
 /**
  * Convenience function to query del pre hook.
  * @see _elm_widget_item_del_pre_hook_set()
  */
 #define elm_widget_item_del_pre_hook_set(item, func) \
-  _elm_widget_item_del_pre_hook_set((Elm_Widget_Item *)item, (Elm_Widget_Item_Del_Pre_Cb)func)
+  _elm_widget_item_del_pre_hook_set((Elm_Widget_Item *)item, (Elm_Widget_Del_Pre_Cb)func)
 
 #define ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, ...)           \
   do {                                                       \