From 4c0e083128a4e9c3eefefaab70648057bd1d9fb2 Mon Sep 17 00:00:00 2001 From: rubidium42 Date: Sat, 29 May 2021 09:12:11 +0200 Subject: Cleanup: set the base in the setting templates, instead of defining the base for every setting This has the added benefit of not getting mistaken that multiple bases can be used for the same SettingTable --- src/table/window_settings.ini | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/table/window_settings.ini') diff --git a/src/table/window_settings.ini b/src/table/window_settings.ini index 5334b0fc1..560a197ab 100644 --- a/src/table/window_settings.ini +++ b/src/table/window_settings.ini @@ -10,14 +10,13 @@ static const SettingTable _window_settings{ [post-amble] }; [templates] -SDT_BOOL = SDT_BOOL($base, $var, $flags, $guiflags, $def, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $cat, $extra, $startup), -SDT_VAR = SDT_VAR($base, $var, $type, $flags, $guiflags, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $cat, $extra, $startup), +SDT_BOOL = SDT_BOOL(WindowDesc, $var, $flags, $guiflags, $def, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $cat, $extra, $startup), +SDT_VAR = SDT_VAR(WindowDesc, $var, $type, $flags, $guiflags, $def, $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $from, $to, $cat, $extra, $startup), [validation] -SDT_VAR = static_assert($max <= MAX_$type, "Maximum value for $base.$var exceeds storage size"); +SDT_VAR = static_assert($max <= MAX_$type, "Maximum value for WindowDesc.$var exceeds storage size"); [defaults] -base = WindowDesc flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC guiflags = SGF_NONE interval = 0 -- cgit v1.2.3-54-g00ecf