elm glview: Changed Elm_GLView_Func callback function typedef to

Elm_GLView_Func_Cb according to EFL coding convention.

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

diff --git a/src/bin/test_glview.c b/src/bin/test_glview.c
index a432578..96e6d67 100644 (file)
--- a/src/bin/test_glview.c
+++ b/src/bin/test_glview.c
@@ -598,7 +598,7 @@ test_glview(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    elm_glview_init_func_set(gl, _init_gl);
    elm_glview_del_func_set(gl, _del_gl);
    elm_glview_resize_func_set(gl, _resize_gl);
-   elm_glview_render_func_set(gl, (Elm_GLView_Func)_draw_gl);
+   elm_glview_render_func_set(gl, (Elm_GLView_Func_Cb)_draw_gl);
    elm_box_pack_end(bx, gl);
    evas_object_show(gl);
 

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 4b2fbd3..050a84c 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -2577,7 +2577,7 @@ extern "C" {
     */
 
    /* glview */
-   typedef void (*Elm_GLView_Func)(Evas_Object *obj);
+   typedef void (*Elm_GLView_Func_Cb)(Evas_Object *obj);
 
    typedef enum _Elm_GLView_Mode
      {
@@ -2611,10 +2611,10 @@ extern "C" {
    EAPI Eina_Bool        elm_glview_mode_set(Evas_Object *obj, Elm_GLView_Mode mode) EINA_ARG_NONNULL(1);
    EAPI Eina_Bool        elm_glview_resize_policy_set(Evas_Object *obj, Elm_GLView_Resize_Policy policy) EINA_ARG_NONNULL(1);
    EAPI Eina_Bool        elm_glview_render_policy_set(Evas_Object *obj, Elm_GLView_Render_Policy policy) EINA_ARG_NONNULL(1);
-   EAPI void             elm_glview_init_func_set(Evas_Object *obj, Elm_GLView_Func func) EINA_ARG_NONNULL(1);
-   EAPI void             elm_glview_del_func_set(Evas_Object *obj, Elm_GLView_Func func) EINA_ARG_NONNULL(1);
-   EAPI void             elm_glview_resize_func_set(Evas_Object *obj, Elm_GLView_Func func) EINA_ARG_NONNULL(1);
-   EAPI void             elm_glview_render_func_set(Evas_Object *obj, Elm_GLView_Func func) EINA_ARG_NONNULL(1);
+   EAPI void             elm_glview_init_func_set(Evas_Object *obj, Elm_GLView_Func_Cb func) EINA_ARG_NONNULL(1);
+   EAPI void             elm_glview_del_func_set(Evas_Object *obj, Elm_GLView_Func_Cb func) EINA_ARG_NONNULL(1);
+   EAPI void             elm_glview_resize_func_set(Evas_Object *obj, Elm_GLView_Func_Cb func) EINA_ARG_NONNULL(1);
+   EAPI void             elm_glview_render_func_set(Evas_Object *obj, Elm_GLView_Func_Cb func) EINA_ARG_NONNULL(1);
    EAPI void             elm_glview_changed_set(Evas_Object *obj) EINA_ARG_NONNULL(1);
 
    /* box */

diff --git a/src/lib/elm_glview.c b/src/lib/elm_glview.c
index a90a755..5e960a1 100644 (file)
--- a/src/lib/elm_glview.c
+++ b/src/lib/elm_glview.c
@@ -26,10 +26,10 @@ struct _Widget_Data
 
    Evas_Coord                w, h;
 
-   Elm_GLView_Func           init_func;
-   Elm_GLView_Func           del_func;
-   Elm_GLView_Func           resize_func;
-   Elm_GLView_Func           render_func;
+   Elm_GLView_Func_Cb        init_func;
+   Elm_GLView_Func_Cb        del_func;
+   Elm_GLView_Func_Cb        resize_func;
+   Elm_GLView_Func_Cb        render_func;
 
    Ecore_Idle_Enterer       *render_idle_enterer;
 
@@ -485,7 +485,7 @@ elm_glview_size_get(const Evas_Object *obj, int *width, int *height)
  * @ingroup GLView
  */
 EAPI void
-elm_glview_init_func_set(Evas_Object *obj, Elm_GLView_Func func)
+elm_glview_init_func_set(Evas_Object *obj, Elm_GLView_Func_Cb func)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -506,7 +506,7 @@ elm_glview_init_func_set(Evas_Object *obj, Elm_GLView_Func func)
  * @ingroup GLView
  */
 EAPI void
-elm_glview_del_func_set(Evas_Object *obj, Elm_GLView_Func func)
+elm_glview_del_func_set(Evas_Object *obj, Elm_GLView_Func_Cb func)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -524,7 +524,7 @@ elm_glview_del_func_set(Evas_Object *obj, Elm_GLView_Func func)
  * @ingroup GLView
  */
 EAPI void
-elm_glview_resize_func_set(Evas_Object *obj, Elm_GLView_Func func)
+elm_glview_resize_func_set(Evas_Object *obj, Elm_GLView_Func_Cb func)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -547,7 +547,7 @@ elm_glview_resize_func_set(Evas_Object *obj, Elm_GLView_Func func)
  * @ingroup GLView
  */
 EAPI void
-elm_glview_render_func_set(Evas_Object *obj, Elm_GLView_Func func)
+elm_glview_render_func_set(Evas_Object *obj, Elm_GLView_Func_Cb func)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);