From 95be425c35e82b73058e7ec161cb7ce94fcea6ff Mon Sep 17 00:00:00 2001 From: Shinwoo Kim Date: Tue, 12 Mar 2019 15:34:59 +0900 Subject: [PATCH] Remove and update deprecated API [Remove] ecore_input_joystick_init ecore_input_joystick_shutdown elm_ctxpopup_direction_available_get elm_win_profiles_set [Update] evas_out_add evas_output_del evas_output_view_set evas_output_view_get Change-Id: I6a9c49801fc395526bf375922625f50a13e38dd9 --- src/lib/ecore_input/Ecore_Input.h | 33 --------------------------------- src/lib/ecore_input/ecore_input.c | 8 -------- src/lib/elementary/efl_ui_win.c | 12 ------------ src/lib/elementary/elc_ctxpopup.c | 14 -------------- src/lib/elementary/elm_deprecated.h | 37 ------------------------------------- src/lib/evas/Evas_Legacy.h | 8 ++++---- 6 files changed, 4 insertions(+), 108 deletions(-) diff --git a/src/lib/ecore_input/Ecore_Input.h b/src/lib/ecore_input/Ecore_Input.h index 62dbf64..c2753f1 100644 --- a/src/lib/ecore_input/Ecore_Input.h +++ b/src/lib/ecore_input/Ecore_Input.h @@ -518,39 +518,6 @@ extern "C" { #ifndef _WIN32 #ifndef __APPLE__ // - //TIZEN_ONLY(20170307) Deprecate ecore_input_joystick_init/shutdown API - /** - * Initializes the Ecore Input Joystick system. - * - * @return How many times the lib has been initialized. - * - * @since 1.15 - * - * @if MOBILE @since_tizen 2.4 - * @elseif WEARABLE @since_tizen 3.0 - * @endif - * - * @deprecated Deprecated since Tizen 4.0 - * ecore_event_init calls this by default - */ - EINA_DEPRECATED EAPI int ecore_input_joystick_init(void); - /** - * Shutdowns the Ecore Input Joystick system. - * - * @return How many times the lib has been initialized. - * - * @since 1.15 - * - * @if MOBILE @since_tizen 2.4 - * @elseif WEARABLE @since_tizen 3.0 - * @endif - * - * @deprecated Deprecated since Tizen 4.0 - * ecore_event_shutdown calls this by default - */ - EINA_DEPRECATED EAPI int ecore_input_joystick_shutdown(void); - // - /** * Set deadzone of joystick event for an axis. * diff --git a/src/lib/ecore_input/ecore_input.c b/src/lib/ecore_input/ecore_input.c index 8382eab..c9e4db1 100644 --- a/src/lib/ecore_input/ecore_input.c +++ b/src/lib/ecore_input/ecore_input.c @@ -79,12 +79,8 @@ ecore_event_init(void) ECORE_EVENT_DEVICE_SUBCLASS_UPDATE = ecore_event_type_new(); // - //TIZEN_ONLY(20170307) Remove warning message - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" if (getenv("ECORE_INPUT_ENABLE_JOYSTICK_INIT")) ecore_input_joystick_init(); - #pragma GCC diagnostic pop - // return _ecore_event_init_count; } @@ -117,11 +113,7 @@ ecore_event_shutdown(void) ECORE_EVENT_DEVICE_SUBCLASS_UPDATE // ); - //TIZEN_ONLY(20170307) Remove warning message - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" ecore_input_joystick_shutdown(); - #pragma GCC diagnostic pop - // eina_log_domain_unregister(_ecore_input_log_dom); _ecore_input_log_dom = -1; ecore_shutdown(); diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 424cc59..68a1252 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -10565,18 +10565,6 @@ elm_win_active_win_orientation_get(Evas_Object *obj) return angle; } // -// TIZEN_ONLY(20160126) : add elm_win_profiles_set -EINA_DEPRECATED EAPI void -elm_win_profiles_set(Evas_Object *obj, const char **profiles, unsigned int num_profiles) -{ - ELM_WIN_DATA_GET_OR_RETURN(obj, sd); - - // TODO: may need to merge below eolian api - //_elm_win_available_profiles_set(obj, sd, profiles, num_profiles); - (void)profiles; - (void)num_profiles; -} -// ////////////////////////////////////////////////////////////////// // TIZEN_ONLY(20150722): added signal for aux_hint(auxiliary hint) diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c index c6aa221..36445d2 100644 --- a/src/lib/elementary/elc_ctxpopup.c +++ b/src/lib/elementary/elc_ctxpopup.c @@ -1483,20 +1483,6 @@ _elm_ctxpopup_direction_get(const Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *sd) return sd->dir; } -// TIZEN_ONLY(20160126): add direction available get function, it will be deprecated soon -EINA_DEPRECATED EAPI Eina_Bool -elm_ctxpopup_direction_available_get(Evas_Object *obj, Elm_Ctxpopup_Direction direction) -{ - ELM_CTXPOPUP_CHECK(obj) EINA_FALSE; - ELM_CTXPOPUP_DATA_GET(obj, sd); - - elm_layout_sizing_eval(obj); - - if (sd->dir == direction) return EINA_TRUE; - return EINA_FALSE; -} -// - EOLIAN static void _elm_ctxpopup_dismiss(Eo *obj, Elm_Ctxpopup_Data *sd) { diff --git a/src/lib/elementary/elm_deprecated.h b/src/lib/elementary/elm_deprecated.h index 115e782..14176d0 100644 --- a/src/lib/elementary/elm_deprecated.h +++ b/src/lib/elementary/elm_deprecated.h @@ -1676,49 +1676,12 @@ EINA_DEPRECATED EAPI const char *elm_fileselector_entry_selected_get(const Evas_ EINA_DEPRECATED EAPI void elm_access_external_info_set(Evas_Object *obj, const char *text); EINA_DEPRECATED EAPI char *elm_access_external_info_get(const Evas_Object *obj); -/** - * @deprecated Deprecated since 2.4. - * @ingroup Elm_Ctxpopup - * - * @param[in] obj The object. - * @param[in] direction The direction to check available to show ctxpopup. - * - * @return EINA_TRUE if object is available to show with @p direction. - * - * @if MOBILE @since_tizen 2.3 - * @elseif WEARABLE @since_tizen 2.3.1 - * @endif - */ -EINA_DEPRECATED EAPI Eina_Bool elm_ctxpopup_direction_available_get(Evas_Object *obj, Elm_Ctxpopup_Direction direction); - // elm_win /*TIZEN_ONLY(20171214): tizen need to change win type after win creating EINA_DEPRECATED EAPI void elm_win_type_set(Evas_Object *obj, Elm_Win_Type type); */ EINA_DEPRECATED EAPI void elm_win_name_set(Evas_Object *obj, const char *name); -// TIZEN_ONLY(20160126) : add elm_win_profiles_set -/** - * @brief Sets the profile list of a window. - * - * @if MOBILE @since_tizen 2.3 - * @elseif WEARABLE @since_tizen 2.3.1 - * @endif - * - * @param[in] obj The window object - * @param[in] profiles The list of profile names - * @param[in] num_profiles The number of profile names - * - * @ingroup Elm_Win - * - * @deprecated Deprecated since Tizen 2.4 - * - * @if MOBILE @since_tizen 2.3 - * @elseif WEARABLE @since_tizen 2.3.1 - * @endif - */ -EINA_DEPRECATED EAPI void elm_win_profiles_set(Evas_Object *obj, const char **profiles, unsigned int num_profiles); -// // TIZEN_ONLY(20180824) : elm: keep deprecated API before it removed. /** * Unset the left content used for the panes. diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h index 08508c2..968fcb6 100755 --- a/src/lib/evas/Evas_Legacy.h +++ b/src/lib/evas/Evas_Legacy.h @@ -7141,7 +7141,7 @@ EAPI Eina_Bool evas_object_grid_mirrored_get(const Eo *obj); * @endif * */ -/** @deprecated evas_out_add */ +/** @deprecated evas_out_add since 5.0 */ EAPI Evas_Out *evas_out_add(Evas *e) EINA_DEPRECATED; /** @@ -7159,7 +7159,7 @@ EAPI Evas_Out *evas_out_add(Evas *e) EINA_DEPRECATED; * @endif * */ -/** @deprecated evas_output_del */ +/** @deprecated evas_output_del since 5.0 */ EAPI void evas_output_del(Evas_Out *evo) EINA_DEPRECATED; /** @@ -7179,7 +7179,7 @@ EAPI void evas_output_del(Evas_Out *evo) EINA_DEPRECATED; * * @ingroup Evas_Canvas */ -/** @deprecated evas_output_view_set */ +/** @deprecated evas_output_view_set since 5.0 */ EAPI void evas_output_view_set(Evas_Out *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) EINA_DEPRECATED; /** @@ -7198,7 +7198,7 @@ EAPI void evas_output_view_set(Evas_Out *obj, Evas_Coord x, Evas_Coord y, Evas_C * * @ingroup Evas_Canvas */ -/** @deprecated evas_output_view_get */ +/** @deprecated evas_output_view_get since 5.0 */ EAPI void evas_output_view_get(const Evas_Out *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) EINA_DEPRECATED; /** -- 2.7.4