From 701e262d3d622898279167ba909da631ac460bc1 Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Wed, 30 Nov 2022 14:50:18 +0000 Subject: settings: Remove setting ID return from find_setting() Now that all users have replaced setting IDs with direct pointers, find_setting() and friends don't need to return an ID value. Change-Id: I8c5c31bb68d3bca5350d43538335265a55fd5517 --- apps/gui/skin_engine/skin_parser.c | 6 +++--- apps/gui/skin_engine/skin_touchsupport.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'apps/gui/skin_engine') diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 435bad9e1f..ad5fa48756 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -823,7 +823,7 @@ static int parse_setting_and_lang(struct skin_element *element, else { #ifndef __PCTOOL__ - const struct settings_list *setting = find_setting_by_cfgname(temp, NULL); + const struct settings_list *setting = find_setting_by_cfgname(temp); if (!setting) return WPS_ERROR_INVALID_PARAM; @@ -1158,7 +1158,7 @@ static int parse_progressbar_tag(struct skin_element* element, param++; text = SKINOFFSETTOPTR(skin_buffer, param->data.text); #ifndef __PCTOOL__ - pb->setting = find_setting_by_cfgname(text, NULL); + pb->setting = find_setting_by_cfgname(text); if (!pb->setting) return WPS_ERROR_INVALID_PARAM; #endif @@ -1548,7 +1548,7 @@ static int touchregion_setup_setting(struct skin_element *element, int param_no, #ifndef __PCTOOL__ int p = param_no; char *name = get_param_text(element, p++); - const struct settings_list *setting = find_setting_by_cfgname(name, NULL); + const struct settings_list *setting = find_setting_by_cfgname(name); if (!setting) return WPS_ERROR_INVALID_PARAM; diff --git a/apps/gui/skin_engine/skin_touchsupport.c b/apps/gui/skin_engine/skin_touchsupport.c index 27b82e6608..b952709562 100644 --- a/apps/gui/skin_engine/skin_touchsupport.c +++ b/apps/gui/skin_engine/skin_touchsupport.c @@ -300,7 +300,7 @@ int skin_get_touchaction(struct gui_wps *gwps, int* edge_offset) case ACTION_TOUCH_REPMODE: /* cycle the repeat mode setting */ { const struct settings_list *rep_setting = - find_setting(&global_settings.repeat_mode, NULL); + find_setting(&global_settings.repeat_mode); option_select_next_val(rep_setting, false, true); audio_flush_and_reload_tracks(); returncode = ACTION_REDRAW; -- cgit v1.2.3