From 6547566326a3d59da1a8f9fb0bbc86073cd3dddc Mon Sep 17 00:00:00 2001 From: Doyoun Kang Date: Fri, 30 Jul 2021 16:44:39 +0900 Subject: [PATCH] e_policy_wl: refactoring rename to softkey_service from softkey Change-Id: I5067747880aeebdf04548751bb9daf9d08c4ec6f --- src/bin/e_policy_wl.c | 68 +++++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/src/bin/e_policy_wl.c b/src/bin/e_policy_wl.c index e58d143..54e41fc 100644 --- a/src/bin/e_policy_wl.c +++ b/src/bin/e_policy_wl.c @@ -3695,7 +3695,7 @@ static void _tzsh_srv_softkey_cb_msg_send(struct wl_client *client EINA_UNUSED, struct wl_resource *resource, uint32_t msg) { E_Policy_Wl_Tzsh_Srv *tzsh_srv; - E_Service_Softkey *softkey; + E_Service_Softkey *softkey_service; E_Client *softkey_ec; tzsh_srv = wl_resource_get_user_data(resource); @@ -3706,16 +3706,16 @@ _tzsh_srv_softkey_cb_msg_send(struct wl_client *client EINA_UNUSED, struct wl_re softkey_ec = tzsh_srv->tzsh->ec; EINA_SAFETY_ON_NULL_RETURN(softkey_ec); - softkey = e_service_softkey_get(softkey_ec->zone); - EINA_SAFETY_ON_NULL_RETURN(softkey); + softkey_service = e_service_softkey_get(softkey_ec->zone); + EINA_SAFETY_ON_NULL_RETURN(softkey_service); switch (msg) { case TWS_SERVICE_SOFTKEY_MSG_SHOW: - e_service_softkey_show(softkey); + e_service_softkey_show(softkey_service); break; case TWS_SERVICE_SOFTKEY_MSG_HIDE: - e_service_softkey_hide(softkey); + e_service_softkey_hide(softkey_service); break; default: ERR("Unknown message!! msg %d", msg); @@ -3733,7 +3733,7 @@ static void _tzsh_srv_iface_cb_softkey_get(struct wl_client *client, struct wl_resource *res_tzsh_srv, uint32_t id) { E_Policy_Wl_Tzsh_Srv *tzsh_srv; - E_Service_Softkey *softkey = NULL; + E_Service_Softkey *softkey_service = NULL; struct wl_resource *res; tzsh_srv = wl_resource_get_user_data(res_tzsh_srv); @@ -3754,12 +3754,12 @@ _tzsh_srv_iface_cb_softkey_get(struct wl_client *client, struct wl_resource *res if (tzsh_srv->tzsh && tzsh_srv->tzsh->ec) { E_Client *softkey_ec = tzsh_srv->tzsh->ec; - softkey = e_service_softkey_get(softkey_ec->zone); - ELOGF("TZSH", "[SOFTKEY SERVICE] resource set. res:%p, softkey:%p, softkey_ec:%p", NULL, res, softkey, softkey_ec); - if (softkey) + softkey_service = e_service_softkey_get(softkey_ec->zone); + ELOGF("TZSH", "[SOFTKEY SERVICE] resource set. res:%p, softkey_service:%p, softkey_ec:%p", NULL, res, softkey_service, softkey_ec); + if (softkey_service) { - e_service_softkey_wl_resource_set(softkey, res); - e_service_softkey_restore_visible_request(softkey); + e_service_softkey_wl_resource_set(softkey_service, res); + e_service_softkey_restore_visible_request(softkey_service); } } @@ -5183,12 +5183,12 @@ _tzsh_softkey_iface_cb_show(struct wl_client *client EINA_UNUSED, struct wl_reso if (e_config->use_softkey_service) { - E_Service_Softkey *softkey; - softkey = e_service_softkey_get(tzsh_client->tzsh->ec->zone); - if (softkey) + E_Service_Softkey *softkey_service; + softkey_service = e_service_softkey_get(tzsh_client->tzsh->ec->zone); + if (softkey_service) { - ELOGF("TZ_SOFTKEY", "Request to SHOW softkey. (service:%p)", NULL, softkey); - e_service_softkey_visible_set(softkey, 1); + ELOGF("TZ_SOFTKEY", "Request to SHOW softkey service. (service:%p)", NULL, softkey_service); + e_service_softkey_visible_set(softkey_service, 1); } else { @@ -5229,12 +5229,12 @@ _tzsh_softkey_iface_cb_hide(struct wl_client *client EINA_UNUSED, struct wl_reso if (e_config->use_softkey_service) { - E_Service_Softkey *softkey; - softkey = e_service_softkey_get(tzsh_client->tzsh->ec->zone); - if (softkey) + E_Service_Softkey *softkey_service; + softkey_service = e_service_softkey_get(tzsh_client->tzsh->ec->zone); + if (softkey_service) { - ELOGF("TZ_SOFTKEY", "Request to HIDE softkey. (service:%p)", NULL, softkey); - e_service_softkey_visible_set(softkey, 0); + ELOGF("TZ_SOFTKEY", "Request to HIDE softkey service. (service:%p)", NULL, softkey_service); + e_service_softkey_visible_set(softkey_service, 0); } else { @@ -5299,10 +5299,10 @@ _tzsh_softkey_iface_cb_state_set(struct wl_client *client EINA_UNUSED, struct wl if (e_config->use_softkey_service) { - E_Service_Softkey *softkey; + E_Service_Softkey *softkey_service; - softkey = e_service_softkey_get(tzsh_client->tzsh->ec->zone); - if (!softkey) return; + softkey_service = e_service_softkey_get(tzsh_client->tzsh->ec->zone); + if (!softkey_service) return; switch (type) { @@ -5312,8 +5312,8 @@ _tzsh_softkey_iface_cb_state_set(struct wl_client *client EINA_UNUSED, struct wl else expand = E_POLICY_SOFTKEY_EXPAND_OFF; - ELOGF("TZ_SOFTKEY", "Request to Change EXPAND state to %d. (service:%p)", NULL, expand, softkey); - e_service_softkey_expand_set(softkey, expand); + ELOGF("TZ_SOFTKEY", "Request to Change EXPAND state to %d. (service:%p)", NULL, expand, softkey_service); + e_service_softkey_expand_set(softkey_service, expand); break; case TWS_SOFTKEY_STATE_OPACITY: @@ -5322,8 +5322,8 @@ _tzsh_softkey_iface_cb_state_set(struct wl_client *client EINA_UNUSED, struct wl else opacity = E_POLICY_SOFTKEY_OPACITY_OPAQUE; - ELOGF("TZ_SOFTKEY", "Request to Change OPACITY state to %d. (service:%p)", NULL, opacity, softkey); - e_service_softkey_opacity_set(softkey, opacity); + ELOGF("TZ_SOFTKEY", "Request to Change OPACITY state to %d. (service:%p)", NULL, opacity, softkey_service); + e_service_softkey_opacity_set(softkey_service, opacity); break; default: @@ -5402,14 +5402,14 @@ _tzsh_softkey_iface_cb_state_get(struct wl_client *client EINA_UNUSED, struct wl if (e_config->use_softkey_service) { - E_Service_Softkey *softkey; - softkey = e_service_softkey_get(tzsh_client->tzsh->ec->zone); - if (!softkey) return; + E_Service_Softkey *softkey_service; + softkey_service = e_service_softkey_get(tzsh_client->tzsh->ec->zone); + if (!softkey_service) return; switch (type) { case TWS_SOFTKEY_STATE_VISIBLE: - visible = e_service_softkey_visible_get(softkey); + visible = e_service_softkey_visible_get(softkey_service); if (visible) val = TWS_SOFTKEY_STATE_VISIBLE_SHOW; else @@ -5420,7 +5420,7 @@ _tzsh_softkey_iface_cb_state_get(struct wl_client *client EINA_UNUSED, struct wl break; case TWS_SOFTKEY_STATE_EXPAND: - e_service_softkey_expand_get(softkey, &expand); + e_service_softkey_expand_get(softkey_service, &expand); if (expand == E_POLICY_SOFTKEY_EXPAND_ON) val = TWS_SOFTKEY_STATE_EXPAND_ON; else @@ -5431,7 +5431,7 @@ _tzsh_softkey_iface_cb_state_get(struct wl_client *client EINA_UNUSED, struct wl break; case TWS_SOFTKEY_STATE_OPACITY: - e_service_softkey_opacity_get(softkey, &opacity); + e_service_softkey_opacity_get(softkey_service, &opacity); if (opacity == E_POLICY_SOFTKEY_OPACITY_TRANSPARENT) val = TWS_SOFTKEY_STATE_OPACITY_TRANSPARENT; else -- 2.7.4