Skip to content

Commit 16cf8b4

Browse files
Nicolas Arnaud-Cormosnarnaud
authored andcommitted
refactor: Make the code consiustent for accessing settings
Use the macro DEFAUL_VALUE and SET_DEFAULT_VALUE everywhere.
1 parent b74157c commit 16cf8b4

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

src/core/logger.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ void HistoryModel::clear()
105105

106106
QString HistoryModel::createScript(int start, int end)
107107
{
108-
const auto settings = Core::Settings::instance()->value<Core::TabSettings>(Core::Settings::Tab);
108+
const auto settings = DEFAULT_VALUE(Core::TabSettings, Tab);
109109
const auto tab = settings.insertSpaces ? QString(settings.tabSize, ' ') : QString('\t');
110110

111111
std::tie(start, end) = std::minmax(start, end);

src/core/rcdocument.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ class RcDocument : public Document
5757

5858
static inline constexpr char DefaultLanguage[] = "[default]";
5959

60+
using LanguageMap = std::map<std::string, std::string>;
61+
6062
public:
6163
explicit RcDocument(QObject *parent = nullptr);
6264

src/core/textdocument.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1561,7 +1561,7 @@ static int indentOneLine(QTextCursor &cursor, int tabCount, const TabSettings &s
15611561

15621562
static void indentBlocksInTextEdit(QPlainTextEdit *textEdit, int blockStart, int blockEnd, int tabCount, bool relative)
15631563
{
1564-
const auto settings = Core::Settings::instance()->value<Core::TabSettings>(Core::Settings::Tab);
1564+
const auto settings = DEFAULT_VALUE(Core::TabSettings, Tab);
15651565
QTextCursor cursor = textEdit->textCursor();
15661566

15671567
// Make sure we don't move the cursor outside the first line it started on.
@@ -1727,7 +1727,7 @@ int TextDocument::indentationAtPosition(int pos) const
17271727
LOG(LOG_ARG("position", pos));
17281728

17291729
const auto indentText = indentTextAtPosition(pos);
1730-
const auto settings = Core::Settings::instance()->value<Core::TabSettings>(Core::Settings::Tab);
1730+
const auto settings = DEFAULT_VALUE(Core::TabSettings, Tab);
17311731
return columnAt(indentText, indentText.size(), settings.tabSize) / settings.tabSize;
17321732
}
17331733

@@ -1743,7 +1743,7 @@ int TextDocument::indentationAtLine(int line /* = -1 */) const
17431743
LOG(LOG_ARG("line", line));
17441744

17451745
const auto indentText = indentTextAtLine(line);
1746-
const auto settings = Core::Settings::instance()->value<Core::TabSettings>(Core::Settings::Tab);
1746+
const auto settings = DEFAULT_VALUE(Core::TabSettings, Tab);
17471747
return columnAt(indentText, indentText.size(), settings.tabSize) / settings.tabSize;
17481748
}
17491749

src/gui/guisettings.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ GuiSettings::TextEditSettings GuiSettings::computeTextEditSettings() const
314314
f.setPointSize(m_fontSize);
315315

316316
QFontMetrics fm(f);
317-
const auto tabSettings = Core::Settings::instance()->value<Core::TabSettings>(Core::Settings::Tab);
317+
const auto tabSettings = DEFAULT_VALUE(Core::TabSettings, Tab);
318318
return {f, tabSettings.tabSize * fm.horizontalAdvance(' ')};
319319
}
320320

src/gui/optionsdialog.cpp

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ OptionsDialog::~OptionsDialog() = default;
6464
void 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

7171
void 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

340339
void OptionsDialog::changeAssetFlagsSetting()
@@ -375,8 +374,7 @@ void OptionsDialog::changeDialogFlagsSetting()
375374

376375
void 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

392390
void OptionsDialog::changePage()

0 commit comments

Comments
 (0)