# HG changeset patch # User John W. Eaton # Date 1673040645 18000 # Node ID fa24de314774e7e912bdb27c7c2e9f680ba11ac0 # Parent 3a23b89bd21d9e6dbaf59dedd9a289a1fdcbbcfa use type-specific value extractors in a few more places * settings-dialog.cc: Replace a few uses of value (key, def).toTYPE with Use gui_settings::TYPE_value (gui_pref) that were previously missed. diff -r 3a23b89bd21d -r fa24de314774 libgui/src/settings-dialog.cc --- a/libgui/src/settings-dialog.cc Fri Jan 06 16:11:59 2023 -0500 +++ b/libgui/src/settings-dialog.cc Fri Jan 06 16:30:45 2023 -0500 @@ -92,8 +92,7 @@ // System at beginning comboBox_language->insertItem (0, tr ("System setting")); comboBox_language->insertSeparator (1); // separator after System - QString language = settings.value (global_language.settings_key (), - global_language.def ()).toString (); + QString language = settings.string_value (global_language); if (language == global_language.def ().toString ()) language = tr ("System setting"); int selected = comboBox_language->findText (language); @@ -416,12 +415,8 @@ // shortcuts - cb_prevent_readline_conflicts->setChecked ( - settings.value (sc_prevent_rl_conflicts.settings_key (), - sc_prevent_rl_conflicts.def ()).toBool ()); - cb_prevent_readline_conflicts_menu->setChecked ( - settings.value (sc_prevent_rl_conflicts_menu.settings_key (), - sc_prevent_rl_conflicts_menu.def ()).toBool ()); + cb_prevent_readline_conflicts->setChecked (settings.bool_value (sc_prevent_rl_conflicts)); + cb_prevent_readline_conflicts_menu->setChecked (settings.bool_value (sc_prevent_rl_conflicts_menu)); // connect the buttons for import/export of the shortcut sets // FIXME: Should there also be a button to discard changes?