qPref: use helper function to ensure key/name grouping

We had a couple of instances of names being incorrectly merged with their
group, this should handle that better. It's a bit of a big hammer to use, but
it seems to work (and it makes it easy to then git grep for cases that don't
use the new helper function.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-09-07 09:06:00 -07:00
parent db57a633d5
commit 2ecbea3d24
15 changed files with 157 additions and 149 deletions

View file

@ -26,18 +26,18 @@ void qPrefLanguage::loadSync(bool doSync)
disk_use_system_language(doSync);
}
HANDLE_PREFERENCE_TXT(Language, "/date_format", date_format);
HANDLE_PREFERENCE_TXT(Language, "date_format", date_format);
HANDLE_PREFERENCE_BOOL(Language,"/date_format_override", date_format_override);
HANDLE_PREFERENCE_BOOL(Language,"date_format_override", date_format_override);
HANDLE_PREFERENCE_TXT(Language, "/date_format_short", date_format_short);
HANDLE_PREFERENCE_TXT(Language, "date_format_short", date_format_short);
HANDLE_PREFERENCE_TXT_EXT(Language, "/UiLanguage", language, locale.);
HANDLE_PREFERENCE_TXT_EXT(Language, "UiLanguage", language, locale.);
HANDLE_PREFERENCE_TXT_EXT(Language, "/UiLangLocale", lang_locale, locale.);
HANDLE_PREFERENCE_TXT_EXT(Language, "UiLangLocale", lang_locale, locale.);
HANDLE_PREFERENCE_TXT(Language, "/time_format", time_format);
HANDLE_PREFERENCE_TXT(Language, "time_format", time_format);
HANDLE_PREFERENCE_BOOL(Language, "/time_format_override", time_format_override);
HANDLE_PREFERENCE_BOOL(Language, "time_format_override", time_format_override);
HANDLE_PREFERENCE_BOOL_EXT(Language, "/UseSystemLanguage", use_system_language, locale.);
HANDLE_PREFERENCE_BOOL_EXT(Language, "UseSystemLanguage", use_system_language, locale.);