kindred/create
1
1
Fork 0
Code Issues 43 Pull Requests Actions 1 Packages Projects 9 Releases 2 Wiki Activity

[Core] [Preferences] Modernize for loop in DlgSettingsEditor.cpp (#12011)

Browse Source 
* Preferences: modernize for loop in DlgSettingsEditor.cpp

Signed-off-by: CalligaroV <vincenzo.calligaro@gmail.com>

* Preferences: modernize for loop in DlgSettingsEditor.cpp
added textType and textColor variables to unpack range-for loops iterators

Signed-off-by: CalligaroV <vincenzo.calligaro@gmail.com>

* Update src/Gui/PreferencePages/DlgSettingsEditor.cpp

Minor linter updates, as suggested

Co-authored-by: Chris Hennes <chennes@pioneerlibrarysystem.org>

* Update src/Gui/PreferencePages/DlgSettingsEditor.cpp

Minor linter updates, as suggested

Co-authored-by: Chris Hennes <chennes@pioneerlibrarysystem.org>

---------

Signed-off-by: CalligaroV <vincenzo.calligaro@gmail.com>
Co-authored-by: Chris Hennes <chennes@pioneerlibrarysystem.org>
This commit is contained in:
Vincenzo Calligaro
2024-01-22 18:19:46 +01:00
committed by GitHub
parent 9cd9d752ef
commit 1fdffef21d
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Gui/PreferencePages/DlgSettingsEditor.cpp
View File

@@ -163,9 +163,10 @@ DlgSettingsEditor::DlgSettingsEditor( QWidget* parent )
QStringList labels; labels << tr("Items");
ui->displayItems->setHeaderLabels(labels);
ui->displayItems->header()->hide();
for (QVector<QPair<QString, unsigned int> >::Iterator it = d->colormap.begin(); it != d->colormap.end(); ++it) {
for (const auto &[textType, textColor]: d->colormap)
{
auto item = new QTreeWidgetItem(ui->displayItems);
item->setText(0, tr((*it).first.toLatin1()));
item->setText(0, tr(textType.toLatin1()));
}
pythonSyntax = new PythonSyntaxHighlighter(ui->textEdit1);
pythonSyntax->setDocument(ui->textEdit1->document());
@@ -243,11 +244,11 @@ void DlgSettingsEditor::saveSettings()
// Saves the color map
ParameterGrp::handle hGrp = WindowParameter::getDefaultParameter()->GetGroup("Editor");
for (QVector<QPair<QString, unsigned int> >::Iterator it = d->colormap.begin(); it != d->colormap.end(); ++it) {
auto col = static_cast<unsigned long>((*it).second);
hGrp->SetUnsigned((*it).first.toLatin1(), col);
for (const auto &[textType, textColor] : d->colormap)
{
auto col = static_cast<unsigned long>(textColor);
hGrp->SetUnsigned(textType.toLatin1(), col);
}
hGrp->SetInt( "FontSize", ui->fontSize->value() );
hGrp->SetASCII( "Font", ui->fontFamily->currentText().toLatin1() );
@@ -280,13 +281,13 @@ void DlgSettingsEditor::loadSettings()
// Restores the color map
ParameterGrp::handle hGrp = WindowParameter::getDefaultParameter()->GetGroup("Editor");
for (QVector<QPair<QString, unsigned int>>::Iterator it = d->colormap.begin();
it != d->colormap.end(); ++it) {
auto col = static_cast<unsigned long>((*it).second);
col = hGrp->GetUnsigned((*it).first.toLatin1(), col);
(*it).second = static_cast<unsigned int>(col);
for (auto &[textType, textColor] : d->colormap)
{
auto col = static_cast<unsigned long>(textColor);
col = hGrp->GetUnsigned(textType.toLatin1(), col);
textColor = static_cast<unsigned int>(col);
QColor color = App::Color::fromPackedRGB<QColor>(col);
pythonSyntax->setColor((*it).first, color);
pythonSyntax->setColor(textType, color);
}
// fill up font styles
@@ -332,8 +333,9 @@ void DlgSettingsEditor::resetSettingsToDefaults()
ParameterGrp::handle hGrp;
hGrp = WindowParameter::getDefaultParameter()->GetGroup("Editor");
//reset the parameters in the "Editor" group
for (QVector<QPair<QString, unsigned int> >::Iterator it = d->colormap.begin(); it != d->colormap.end(); ++it) {
hGrp->RemoveUnsigned((*it).first.toLatin1());
for (const auto &[textType, textColor] : d->colormap)
{
hGrp->RemoveUnsigned(textType.toLatin1());
}
//reset "FontSize" parameter
hGrp->RemoveInt("FontSize");
@@ -351,8 +353,8 @@ void DlgSettingsEditor::changeEvent(QEvent *e)
{
if (e->type() == QEvent::LanguageChange) {
int index = 0;
for (QVector<QPair<QString, unsigned int> >::Iterator it = d->colormap.begin(); it != d->colormap.end(); ++it)
ui->displayItems->topLevelItem(index++)->setText(0, tr((*it).first.toLatin1()));
for (const auto &[textType, textColor]: d->colormap)
ui->displayItems->topLevelItem(index++)->setText(0, tr(textType.toLatin1()));
ui->retranslateUi(this);
} else {
QWidget::changeEvent(e);