@@ -64,14 +64,14 @@ OptionsDialog::~OptionsDialog() = default;
6464void OptionsDialog::initializeSaveToLogFileSetting ()
6565{
6666 // Save Logs to file
67- ui->saveLogsToFile ->setChecked (Core::Settings::instance ()-> value < bool >(Core::Settings:: SaveLogsToFile));
67+ ui->saveLogsToFile ->setChecked (DEFAULT_VALUE ( bool , SaveLogsToFile));
6868 connect (ui->saveLogsToFile , &QCheckBox::toggled, this , &OptionsDialog::changeSaveLogsToFileSetting);
6969}
7070
7171void OptionsDialog::initializeEnableLSPSetting ()
7272{
7373 // Enable LSP when running in Gui mode
74- ui->enableLSP ->setChecked (Core::Settings::instance ()-> value < bool >(Core::Settings:: EnableLSP));
74+ ui->enableLSP ->setChecked (DEFAULT_VALUE ( bool , EnableLSP));
7575 connect (ui->enableLSP , &QCheckBox::toggled, this , &OptionsDialog::changeEnableLSPSetting);
7676}
7777
@@ -122,9 +122,9 @@ void OptionsDialog::initializeTextSettings()
122122 auto settings = DEFAULT_VALUE (Core::TabSettings, Tab);
123123 settings.insertSpaces = ui->insertSpacesCheck ->isChecked ();
124124 settings.tabSize = ui->tabSize ->text ().toInt ();
125- Core::Settings::instance ()-> setValue (Core::Settings:: Tab, settings);
125+ SET_DEFAULT_VALUE ( Tab, settings);
126126 const auto encoding = ui->encoding ->currentData ().value <Core::TextDocument::Encoding>();
127- Core::Settings::instance ()-> setValue (Core::Settings:: Encoding, encoding);
127+ SET_DEFAULT_VALUE ( Encoding, encoding);
128128 };
129129 connect (ui->insertSpacesCheck , &QCheckBox::toggled, this , changeTextEditorSettings);
130130 connect (ui->tabSize , &QLineEdit::textEdited, this , changeTextEditorSettings);
@@ -203,8 +203,7 @@ void OptionsDialog::initializeRcSettings()
203203 SET_DEFAULT_VALUE (RcDialogScaleY, value);
204204 });
205205
206- auto languageMap =
207- Core::Settings::instance ()->value <std::map<std::string, std::string>>(Core::Settings::RcLanguageMap);
206+ auto languageMap = DEFAULT_VALUE (Core::RcDocument::LanguageMap, RcLanguageMap);
208207 for (const auto &[source, result] : languageMap) {
209208 auto item = new QTreeWidgetItem (ui->languageMap );
210209 item->setText (0 , QString::fromStdString (source));
@@ -334,7 +333,7 @@ void OptionsDialog::changeToggleSectionSetting()
334333 sectionSettings.tag = ui->tagEdit ->text ();
335334 sectionSettings.debug = ui->debugEdit ->text ();
336335 sectionSettings.return_values = returnValues;
337- Core::Settings::instance ()-> setValue (Core::Settings:: ToggleSection, sectionSettings);
336+ SET_DEFAULT_VALUE ( ToggleSection, sectionSettings);
338337}
339338
340339void OptionsDialog::changeAssetFlagsSetting ()
@@ -375,8 +374,7 @@ void OptionsDialog::changeDialogFlagsSetting()
375374
376375void OptionsDialog::changeLanguageMap ()
377376{
378- auto oldLanguageMap =
379- Core::Settings::instance ()->value <std::map<std::string, std::string>>(Core::Settings::RcLanguageMap);
377+ auto oldLanguageMap = DEFAULT_VALUE (Core::RcDocument::LanguageMap, RcLanguageMap);
380378 std::map<std::string, std::string> languageMap;
381379 for (int i = 0 ; i < ui->languageMap ->topLevelItemCount (); ++i) {
382380 auto item = ui->languageMap ->topLevelItem (i);
@@ -386,7 +384,7 @@ void OptionsDialog::changeLanguageMap()
386384 item->text (1 ).isEmpty () ? Core::RcDocument::DefaultLanguage : item->text (1 ).toStdString ();
387385 languageMap[item->text (0 ).toStdString ()] = result;
388386 }
389- Core::Settings::instance ()-> setValue (Core::Settings:: RcLanguageMap, languageMap);
387+ SET_DEFAULT_VALUE ( RcLanguageMap, languageMap);
390388}
391389
392390void OptionsDialog::changePage ()
0 commit comments