Skip to content
Snippets Groups Projects
Commit c770c19e authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

recommended by clang-tidy

parent 658f75cf
No related branches found
No related tags found
1 merge request!2184cleanup as suggested by clang-tidy
...@@ -137,14 +137,14 @@ QList<Data2DItem*> DataAccessWidget::allData2DItems() const ...@@ -137,14 +137,14 @@ QList<Data2DItem*> DataAccessWidget::allData2DItems() const
Data1DItem* DataAccessWidget::currentData1DItem() const Data1DItem* DataAccessWidget::currentData1DItem() const
{ {
if (allData1DItems().size() == 0) if (allData1DItems().empty())
return nullptr; return nullptr;
return allData1DItems().first(); return allData1DItems().first();
} }
Data2DItem* DataAccessWidget::currentData2DItem() const Data2DItem* DataAccessWidget::currentData2DItem() const
{ {
if (allData2DItems().size() == 0) if (allData2DItems().empty())
return nullptr; return nullptr;
return allData2DItems().first(); return allData2DItems().first();
} }
...@@ -36,13 +36,13 @@ Legacy1dDialog::Legacy1dDialog(QWidget* parent, QString fname) ...@@ -36,13 +36,13 @@ Legacy1dDialog::Legacy1dDialog(QWidget* parent, QString fname)
auto* viewer = new DatafileInspector(this, fname); auto* viewer = new DatafileInspector(this, fname);
viewer->show(); viewer->show();
auto vbox = new QVBoxLayout; auto* vbox = new QVBoxLayout;
setLayout(vbox); setLayout(vbox);
auto gridLayout = new QGridLayout; auto* gridLayout = new QGridLayout;
vbox->addLayout(gridLayout); vbox->addLayout(gridLayout);
auto have_sR = new QCheckBox; auto* have_sR = new QCheckBox;
gridLayout->addWidget(have_sR, 2, 0); gridLayout->addWidget(have_sR, 2, 0);
have_sR->setCheckState(Msettings.col_sR == 0 ? Qt::Unchecked : Qt::Checked); have_sR->setCheckState(Msettings.col_sR == 0 ? Qt::Unchecked : Qt::Checked);
// connect statement is below, as it needs access to other widgets // connect statement is below, as it needs access to other widgets
...@@ -54,23 +54,23 @@ Legacy1dDialog::Legacy1dDialog(QWidget* parent, QString fname) ...@@ -54,23 +54,23 @@ Legacy1dDialog::Legacy1dDialog(QWidget* parent, QString fname)
gridLayout->addWidget(new QLabel("from column"), 0, 2); gridLayout->addWidget(new QLabel("from column"), 0, 2);
gridLayout->addWidget(new QLabel("from column"), 1, 2); gridLayout->addWidget(new QLabel("from column"), 1, 2);
auto from_sR = new QLabel("from column"); // this one can be made invisible auto* from_sR = new QLabel("from column"); // this one can be made invisible
gridLayout->addWidget(from_sR, 2, 2); gridLayout->addWidget(from_sR, 2, 2);
from_sR->setVisible(Msettings.col_sR != 0); from_sR->setVisible(Msettings.col_sR != 0);
auto sb_Q = new QSpinBox; auto* sb_Q = new QSpinBox;
gridLayout->addWidget(sb_Q, 0, 3); gridLayout->addWidget(sb_Q, 0, 3);
sb_Q->setMinimum(1); sb_Q->setMinimum(1);
sb_Q->setValue(Msettings.col_Q); sb_Q->setValue(Msettings.col_Q);
connect(sb_Q, &QSpinBox::valueChanged, [&p = Msettings](int i) { p.col_Q = i; }); connect(sb_Q, &QSpinBox::valueChanged, [&p = Msettings](int i) { p.col_Q = i; });
auto sb_R = new QSpinBox; auto* sb_R = new QSpinBox;
gridLayout->addWidget(sb_R, 1, 3); gridLayout->addWidget(sb_R, 1, 3);
sb_R->setMinimum(1); sb_R->setMinimum(1);
sb_R->setValue(Msettings.col_R); sb_R->setValue(Msettings.col_R);
connect(sb_R, &QSpinBox::valueChanged, [&p = Msettings](int i) { p.col_R = i; }); connect(sb_R, &QSpinBox::valueChanged, [&p = Msettings](int i) { p.col_R = i; });
auto sb_sR = new QSpinBox; auto* sb_sR = new QSpinBox;
gridLayout->addWidget(sb_sR, 2, 3); gridLayout->addWidget(sb_sR, 2, 3);
sb_sR->setVisible(Msettings.col_sR != 0); sb_sR->setVisible(Msettings.col_sR != 0);
sb_sR->setMinimum(1); sb_sR->setMinimum(1);
...@@ -86,13 +86,13 @@ Legacy1dDialog::Legacy1dDialog(QWidget* parent, QString fname) ...@@ -86,13 +86,13 @@ Legacy1dDialog::Legacy1dDialog(QWidget* parent, QString fname)
sb_sR->setValue(p.col_R + 1); sb_sR->setValue(p.col_R + 1);
}); });
auto w21 = new QWidget; auto* w21 = new QWidget;
vbox->addWidget(w21); vbox->addWidget(w21);
auto form211 = new QFormLayout; auto* form211 = new QFormLayout;
w21->setLayout(form211); w21->setLayout(form211);
auto linesToSkipEdit = new QLineEdit; auto* linesToSkipEdit = new QLineEdit;
form211->addRow("Ignore line numbers:", linesToSkipEdit); form211->addRow("Ignore line numbers:", linesToSkipEdit);
if (Msettings.linesToSkip.empty()) if (Msettings.linesToSkip.empty())
linesToSkipEdit->setPlaceholderText("Example: 1-5, 12"); linesToSkipEdit->setPlaceholderText("Example: 1-5, 12");
...@@ -101,7 +101,7 @@ Legacy1dDialog::Legacy1dDialog(QWidget* parent, QString fname) ...@@ -101,7 +101,7 @@ Legacy1dDialog::Legacy1dDialog(QWidget* parent, QString fname)
connect(linesToSkipEdit, &QLineEdit::textEdited, connect(linesToSkipEdit, &QLineEdit::textEdited,
[&p = Msettings](const QString& text) { p.linesToSkip = text.toStdString(); }); [&p = Msettings](const QString& text) { p.linesToSkip = text.toStdString(); });
auto headerPrefixEdit = new QLineEdit; auto* headerPrefixEdit = new QLineEdit;
form211->addRow("Ignore lines starting with:", headerPrefixEdit); form211->addRow("Ignore lines starting with:", headerPrefixEdit);
if (Msettings.headerPrefix.empty()) if (Msettings.headerPrefix.empty())
headerPrefixEdit->setPlaceholderText("#,//"); headerPrefixEdit->setPlaceholderText("#,//");
...@@ -112,7 +112,7 @@ Legacy1dDialog::Legacy1dDialog(QWidget* parent, QString fname) ...@@ -112,7 +112,7 @@ Legacy1dDialog::Legacy1dDialog(QWidget* parent, QString fname)
const std::vector<std::string> qCoords{"q (1/nm)", "q(1/angstrom)", "alpha (rad)", const std::vector<std::string> qCoords{"q (1/nm)", "q(1/angstrom)", "alpha (rad)",
"alpha (deg)", "2alpha (rad)", "2alpha (deg)"}; "alpha (deg)", "2alpha (rad)", "2alpha (deg)"};
auto qUnitCombo = new QComboBox; auto* qUnitCombo = new QComboBox;
form211->addRow("Ordinate given as:", qUnitCombo); form211->addRow("Ordinate given as:", qUnitCombo);
qUnitCombo->addItem("q (1/nm)"); qUnitCombo->addItem("q (1/nm)");
qUnitCombo->addItem("q (1/Å)"); qUnitCombo->addItem("q (1/Å)");
...@@ -128,28 +128,28 @@ Legacy1dDialog::Legacy1dDialog(QWidget* parent, QString fname) ...@@ -128,28 +128,28 @@ Legacy1dDialog::Legacy1dDialog(QWidget* parent, QString fname)
connect(qUnitCombo, &QComboBox::currentIndexChanged, connect(qUnitCombo, &QComboBox::currentIndexChanged,
[&p = Msettings, qCoords](int i) { p.xCoord = qCoords[i]; }); [&p = Msettings, qCoords](int i) { p.xCoord = qCoords[i]; });
auto sortCheckbox = new QCheckBox; auto* sortCheckbox = new QCheckBox;
sortCheckbox->setChecked(Msettings.sort); sortCheckbox->setChecked(Msettings.sort);
form211->addRow("Sort by Q", sortCheckbox); form211->addRow("Sort by Q", sortCheckbox);
connect(sortCheckbox, &QCheckBox::toggled, connect(sortCheckbox, &QCheckBox::toggled,
[&p = Msettings](bool checked) { p.sort = checked; }); [&p = Msettings](bool checked) { p.sort = checked; });
auto negativeCheckbox = new QCheckBox; auto* negativeCheckbox = new QCheckBox;
negativeCheckbox->setChecked(Msettings.rm_negative); negativeCheckbox->setChecked(Msettings.rm_negative);
form211->addRow("Discard negative Q", negativeCheckbox); form211->addRow("Discard negative Q", negativeCheckbox);
connect(negativeCheckbox, &QCheckBox::toggled, connect(negativeCheckbox, &QCheckBox::toggled,
[&p = Msettings](bool checked) { p.rm_negative = checked; }); [&p = Msettings](bool checked) { p.rm_negative = checked; });
auto duplicateCheckbox = new QCheckBox; auto* duplicateCheckbox = new QCheckBox;
duplicateCheckbox->setChecked(Msettings.rm_duplications); duplicateCheckbox->setChecked(Msettings.rm_duplications);
form211->addRow("Discard Q duplications", duplicateCheckbox); form211->addRow("Discard Q duplications", duplicateCheckbox);
connect(duplicateCheckbox, &QCheckBox::toggled, connect(duplicateCheckbox, &QCheckBox::toggled,
[&p = Msettings](bool checked) { p.rm_duplications = checked; }); [&p = Msettings](bool checked) { p.rm_duplications = checked; });
auto buttonline = new QHBoxLayout; auto* buttonline = new QHBoxLayout;
vbox->addLayout(buttonline); vbox->addLayout(buttonline);
auto okButton = new QPushButton("OK"); auto* okButton = new QPushButton("OK");
buttonline->addWidget(okButton); buttonline->addWidget(okButton);
okButton->setDefault(true); okButton->setDefault(true);
connect(okButton, &QPushButton::clicked, this, &Legacy1dDialog::accept); connect(okButton, &QPushButton::clicked, this, &Legacy1dDialog::accept);
......
...@@ -54,12 +54,12 @@ F3Range::F3Range(F3 _1, F3 _2) ...@@ -54,12 +54,12 @@ F3Range::F3Range(F3 _1, F3 _2)
F3 F3Range::size() const F3 F3Range::size() const
{ {
return F3(x.size(), y.size(), z.size()); return {x.size(), y.size(), z.size()};
} }
F3 F3Range::mid() const F3 F3Range::mid() const
{ {
return F3(x.mid(), y.mid(), z.mid()); return {x.mid(), y.mid(), z.mid()};
} }
float F3Range::length() const float F3Range::length() const
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment