seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=dd31aac227c250a12dc59647eb58325eadb5ec7a
commit dd31aac227c250a12dc59647eb58325eadb5ec7a Author: Daniel Juyung Seo <seojuyu...@gmail.com> Date: Tue Jun 9 02:44:29 2015 +0900 elm: Add missing const for getters. --- src/lib/elm_cnp.c | 14 +++++++------- src/lib/elm_cnp.h | 2 +- src/lib/elm_focus.h | 2 +- src/lib/elm_main.c | 2 +- src/lib/elm_prefs_data.c | 2 +- src/lib/elm_prefs_data.h | 2 +- src/lib/elm_theme.c | 2 +- src/lib/elm_theme.h | 2 +- src/lib/elm_win.c | 2 +- src/lib/elm_win_legacy.h | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c index 301994d..4b19847 100644 --- a/src/lib/elm_cnp.c +++ b/src/lib/elm_cnp.c @@ -234,7 +234,7 @@ static Eina_Bool _x11_elm_cnp_init (void); static Eina_Bool _x11_elm_cnp_selection_set (Ecore_X_Window xwin, Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format, const void *selbuf, size_t buflen); static void _x11_elm_cnp_selection_loss_callback_set(Evas_Object *obj EINA_UNUSED, Elm_Sel_Type selection, Elm_Selection_Loss_Cb func, const void *data); static Eina_Bool _x11_elm_object_cnp_selection_clear (Evas_Object *obj, Elm_Sel_Type selection); -static Eina_Bool _x11_elm_cnp_selection_get (Ecore_X_Window xwin, Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format, Elm_Drop_Cb datacb, void *udata); +static Eina_Bool _x11_elm_cnp_selection_get (Ecore_X_Window xwin, const Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format, Elm_Drop_Cb datacb, void *udata); static Eina_Bool _x11_elm_drop_target_add (Evas_Object *obj, Elm_Sel_Format format, Elm_Drag_State entercb, void *enterdata, Elm_Drag_State leavecb, void *leavedata, @@ -1939,7 +1939,7 @@ _x11_elm_object_cnp_selection_clear(Evas_Object *obj, Elm_Sel_Type selection) } static Eina_Bool -_x11_elm_cnp_selection_get(Ecore_X_Window xwin, Evas_Object *obj, Elm_Sel_Type selection, +_x11_elm_cnp_selection_get(Ecore_X_Window xwin, const Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format, Elm_Drop_Cb datacb, void *udata) { @@ -1955,7 +1955,7 @@ _x11_elm_cnp_selection_get(Ecore_X_Window xwin, Evas_Object *obj, Elm_Sel_Type s sel->requestwidget = NULL; sel->requestformat = format; - sel->requestwidget = obj; + sel->requestwidget = (Evas_Object *)obj; sel->xwin = xwin; sel->request(xwin, ECORE_X_SELECTION_TARGET_TARGETS); sel->datacb = datacb; @@ -3465,7 +3465,7 @@ static Eina_Bool _local_elm_cnp_init(void); static Eina_Bool _local_elm_cnp_selection_set(Evas_Object *obj EINA_UNUSED, Elm_Sel_Type selection, Elm_Sel_Format format, const void *selbuf, size_t buflen); static void _local_elm_cnp_selection_loss_callback_set(Evas_Object *obj EINA_UNUSED, Elm_Sel_Type selection EINA_UNUSED, Elm_Selection_Loss_Cb func EINA_UNUSED, const void *data EINA_UNUSED); static Eina_Bool _local_elm_object_cnp_selection_clear(Evas_Object *obj EINA_UNUSED, Elm_Sel_Type selection); -static Eina_Bool _local_elm_cnp_selection_get(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format EINA_UNUSED, Elm_Drop_Cb datacb, void *udata); +static Eina_Bool _local_elm_cnp_selection_get(const Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format EINA_UNUSED, Elm_Drop_Cb datacb, void *udata); static Eina_Bool _local_elm_drop_target_add(Evas_Object *obj EINA_UNUSED, Elm_Sel_Format format EINA_UNUSED, Elm_Drag_State entercb EINA_UNUSED, void *enterdata EINA_UNUSED, Elm_Drag_State leavecb EINA_UNUSED, void *leavedata EINA_UNUSED, @@ -3555,7 +3555,7 @@ _local_elm_object_cnp_selection_clear(Evas_Object *obj EINA_UNUSED, } static Eina_Bool -_local_elm_cnp_selection_get(Evas_Object *obj, +_local_elm_cnp_selection_get(const Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format EINA_UNUSED, Elm_Drop_Cb datacb, void *udata) @@ -3563,7 +3563,7 @@ _local_elm_cnp_selection_get(Evas_Object *obj, _local_elm_cnp_init(); if (_local_selinfo[selection].get.job) ecore_job_del(_local_selinfo[selection].get.job); - _local_selinfo[selection].get.obj = obj; + _local_selinfo[selection].get.obj = (Evas_Object *)obj; _local_selinfo[selection].get.func = datacb; _local_selinfo[selection].get.data = udata; _local_selinfo[selection].get.job = @@ -3852,7 +3852,7 @@ elm_object_cnp_selection_clear(Evas_Object *obj, Elm_Sel_Type selection) } EAPI Eina_Bool -elm_cnp_selection_get(Evas_Object *obj, Elm_Sel_Type selection, +elm_cnp_selection_get(const Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format, Elm_Drop_Cb datacb, void *udata) { if (selection > ELM_SEL_TYPE_CLIPBOARD) return EINA_FALSE; diff --git a/src/lib/elm_cnp.h b/src/lib/elm_cnp.h index dceab77..61c9fc1 100644 --- a/src/lib/elm_cnp.h +++ b/src/lib/elm_cnp.h @@ -237,7 +237,7 @@ EAPI Eina_Bool elm_cnp_selection_set(Evas_Object *obj, Elm_Sel_Type selection, * * @ingroup CopyPaste */ -EAPI Eina_Bool elm_cnp_selection_get(Evas_Object *obj, Elm_Sel_Type selection, +EAPI Eina_Bool elm_cnp_selection_get(const Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format, Elm_Drop_Cb datacb, void *udata); diff --git a/src/lib/elm_focus.h b/src/lib/elm_focus.h index 2b3801d..258d5d9 100644 --- a/src/lib/elm_focus.h +++ b/src/lib/elm_focus.h @@ -370,4 +370,4 @@ EAPI void elm_object_focus_move_policy_set(Evas_Object *obj, Elm * * @ingroup Focus */ -EAPI Elm_Focus_Move_Policy elm_object_focus_move_policy_get(Evas_Object *obj); +EAPI Elm_Focus_Move_Policy elm_object_focus_move_policy_get(const Evas_Object *obj); diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c index 0fcebc5..8f1d614 100644 --- a/src/lib/elm_main.c +++ b/src/lib/elm_main.c @@ -1492,7 +1492,7 @@ elm_object_focus_move_policy_set(Evas_Object *obj, } EAPI Elm_Focus_Move_Policy -elm_object_focus_move_policy_get(Evas_Object *obj) +elm_object_focus_move_policy_get(const Evas_Object *obj) { EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE); return elm_widget_focus_move_policy_get(obj); diff --git a/src/lib/elm_prefs_data.c b/src/lib/elm_prefs_data.c index 2789db9..749c044 100644 --- a/src/lib/elm_prefs_data.c +++ b/src/lib/elm_prefs_data.c @@ -385,7 +385,7 @@ elm_prefs_data_new(const char *data_file, } EAPI unsigned int -elm_prefs_data_version_get(Elm_Prefs_Data *prefs_data) +elm_prefs_data_version_get(const Elm_Prefs_Data *prefs_data) { ELM_PREFS_DATA_CHECK_OR_RETURN_VAL(prefs_data, -1); diff --git a/src/lib/elm_prefs_data.h b/src/lib/elm_prefs_data.h index e37d8e6..54d3502 100644 --- a/src/lib/elm_prefs_data.h +++ b/src/lib/elm_prefs_data.h @@ -146,7 +146,7 @@ EAPI Eina_Bool elm_prefs_data_version_set(Elm_Prefs_Data *prefs_data, * * @since 1.8 */ -EAPI unsigned int elm_prefs_data_version_get(Elm_Prefs_Data *prefs_data); +EAPI unsigned int elm_prefs_data_version_get(const Elm_Prefs_Data *prefs_data); /** * Increment reference count on a given prefs data handle. diff --git a/src/lib/elm_theme.c b/src/lib/elm_theme.c index 8fa383e..1e9a9b0 100644 --- a/src/lib/elm_theme.c +++ b/src/lib/elm_theme.c @@ -519,7 +519,7 @@ elm_theme_ref_set(Elm_Theme *th, Elm_Theme *thref) } EAPI Elm_Theme * -elm_theme_ref_get(Elm_Theme *th) +elm_theme_ref_get(const Elm_Theme *th) { if (!th) th = &(theme_default); return th->ref_theme; diff --git a/src/lib/elm_theme.h b/src/lib/elm_theme.h index fbe6624..b5a1dbd 100644 --- a/src/lib/elm_theme.h +++ b/src/lib/elm_theme.h @@ -148,7 +148,7 @@ EAPI void elm_theme_ref_set(Elm_Theme *th, Elm_Theme *thref); * * @ingroup Theme */ -EAPI Elm_Theme *elm_theme_ref_get(Elm_Theme *th); +EAPI Elm_Theme *elm_theme_ref_get(const Elm_Theme *th); /** * Return the default theme diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index cb909a0..47087f6 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -4538,7 +4538,7 @@ elm_win_norender_pop(Evas_Object *obj) } EAPI int -elm_win_norender_get(Evas_Object *obj) +elm_win_norender_get(const Evas_Object *obj) { ELM_WIN_CHECK(obj) - 1; ELM_WIN_DATA_GET_OR_RETURN_VAL(obj, sd, -1); diff --git a/src/lib/elm_win_legacy.h b/src/lib/elm_win_legacy.h index f38bc45..883b375 100644 --- a/src/lib/elm_win_legacy.h +++ b/src/lib/elm_win_legacy.h @@ -161,7 +161,7 @@ EAPI void elm_win_norender_pop(Evas_Object *obj); * @ingroup Win * @since 1.7 */ -EAPI int elm_win_norender_get(Evas_Object *obj); +EAPI int elm_win_norender_get(const Evas_Object *obj); /** * This manually asks evas to render the window now --