From dbb01be7dc822328303a97fe9eaf4f9bb3e36dde Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 21 Dec 2023 21:09:48 +0100
Subject: [PATCH] capture [this] -> [&]
---
GUI/Model/Model/FitParameterModel.cpp | 4 +-
GUI/Model/Sample/MaterialModel.cpp | 2 +-
GUI/View/Access/DataAccessWidget.cpp | 2 +-
GUI/View/Canvas/MaskEditorActions.cpp | 4 +-
GUI/View/Canvas/MaskToolbox.cpp | 4 +-
GUI/View/Combo/ItemComboWidget.cpp | 2 +-
GUI/View/Data/DatafilesSelector.cpp | 8 ++--
GUI/View/Fit/FitSessionWidget.cpp | 3 +-
GUI/View/FitControl/GUIFitObserver.cpp | 2 +-
.../FitControl/MinimizerSettingsWidget.cpp | 4 +-
GUI/View/Frame/Fit2DFrame.cpp | 2 +-
GUI/View/Frame/Plot2DWithProjectionFrame.cpp | 2 +-
GUI/View/Info/CautionSign.cpp | 2 +-
.../Instrument/InstrumentLibraryDialog.cpp | 2 +-
GUI/View/Main/AboutDialog.cpp | 2 +-
GUI/View/Numeric/DoubleSpinBox.cpp | 2 +-
GUI/View/ParEdit/CustomEditors.cpp | 2 +-
GUI/View/Plotter/ColorMap.cpp | 2 +-
GUI/View/Plotter/ProjectionsPlot.cpp | 2 +-
GUI/View/Project/SimulationView.cpp | 19 +++++----
GUI/View/Realspace/RealspacePanel.cpp | 4 +-
GUI/View/Sample/LatticeTypeSelectionForm.cpp | 2 +-
GUI/View/Sample/LayerForm.cpp | 2 +-
GUI/View/Sample/SampleForm.cpp | 2 +-
GUI/View/Sample/SampleView.cpp | 4 +-
GUI/View/Scene/MaskGraphicsScene.cpp | 2 +-
GUI/View/Setup/Scale1DEditor.cpp | 14 +++----
GUI/View/Setup/Scale2DEditor.cpp | 39 +++++++++----------
GUI/View/Tool/WidgetMoverButton.cpp | 4 +-
GUI/View/Tuning/FitParameterWidget.cpp | 2 +-
GUI/View/Tuning/ParameterBackupWidget.cpp | 6 +--
31 files changed, 75 insertions(+), 78 deletions(-)
diff --git a/GUI/Model/Model/FitParameterModel.cpp b/GUI/Model/Model/FitParameterModel.cpp
index 466853eb8dd..793d73314bd 100644
--- a/GUI/Model/Model/FitParameterModel.cpp
+++ b/GUI/Model/Model/FitParameterModel.cpp
@@ -31,8 +31,8 @@ FitParameterModel::FitParameterModel(FitParameterContainerItem* fitParContainer,
addColumn(COL_MAX, "Max", "Upper bound on fit parameter value");
connectContainer();
- connect(fitParContainer, &QObject::destroyed, [this] { m_fitParameterContainer = nullptr; });
- connect(jobItem, &QObject::destroyed, [this] { m_jobItem = nullptr; });
+ connect(fitParContainer, &QObject::destroyed, [&] { m_fitParameterContainer = nullptr; });
+ connect(jobItem, &QObject::destroyed, [&] { m_jobItem = nullptr; });
}
Qt::ItemFlags FitParameterModel::flags(const QModelIndex& index) const
diff --git a/GUI/Model/Sample/MaterialModel.cpp b/GUI/Model/Sample/MaterialModel.cpp
index cd95e6d3644..d1f038cd23b 100644
--- a/GUI/Model/Sample/MaterialModel.cpp
+++ b/GUI/Model/Sample/MaterialModel.cpp
@@ -86,7 +86,7 @@ MaterialItem* MaterialModel::addMaterialItem(MaterialItem* materialItem, bool si
ASSERT(materialItem);
materialItem->disconnect(this);
m_materials << materialItem;
- connect(materialItem, &MaterialItem::dataChanged, [this] { emit materialChanged(); });
+ connect(materialItem, &MaterialItem::dataChanged, [&] { emit materialChanged(); });
if (signalAdding)
emit materialAddedOrRemoved();
diff --git a/GUI/View/Access/DataAccessWidget.cpp b/GUI/View/Access/DataAccessWidget.cpp
index 73337bb843a..9d9df5a42a3 100644
--- a/GUI/View/Access/DataAccessWidget.cpp
+++ b/GUI/View/Access/DataAccessWidget.cpp
@@ -32,7 +32,7 @@ void DataAccessWidget::setBaseItem(QObject* item)
ASSERT(jobItem() || realItem());
disconnect(m_item, &QObject::destroyed, this, nullptr);
- connect(m_item, &QObject::destroyed, [this] { m_item = nullptr; });
+ connect(m_item, &QObject::destroyed, [&] { m_item = nullptr; });
}
QList<QAction*> DataAccessWidget::actionList()
diff --git a/GUI/View/Canvas/MaskEditorActions.cpp b/GUI/View/Canvas/MaskEditorActions.cpp
index 7de53f185d7..6637b62ca6c 100644
--- a/GUI/View/Canvas/MaskEditorActions.cpp
+++ b/GUI/View/Canvas/MaskEditorActions.cpp
@@ -37,12 +37,12 @@ MaskEditorActions::MaskEditorActions(QWidget* parent)
m_bringToFrontAction->setIcon(QIcon(":/images/maskeditor_bringtofront.svg"));
m_bringToFrontAction->setToolTip("Rise selected mask one level up (PgUp)");
m_bringToFrontAction->setShortcuts(QKeySequence::MoveToPreviousPage);
- connect(m_bringToFrontAction, &QAction::triggered, [this] { changeMaskStackingOrder(true); });
+ connect(m_bringToFrontAction, &QAction::triggered, [&] { changeMaskStackingOrder(true); });
m_sendToBackAction->setIcon(QIcon(":/images/maskeditor_sendtoback.svg"));
m_sendToBackAction->setToolTip("Lower selected mask one level down (PgDown)");
m_sendToBackAction->setShortcuts(QKeySequence::MoveToNextPage);
- connect(m_sendToBackAction, &QAction::triggered, [this] { changeMaskStackingOrder(false); });
+ connect(m_sendToBackAction, &QAction::triggered, [&] { changeMaskStackingOrder(false); });
m_deleteMaskAction->setToolTip("Remove selected mask (Del)");
m_deleteMaskAction->setShortcuts(QKeySequence::Delete);
diff --git a/GUI/View/Canvas/MaskToolbox.cpp b/GUI/View/Canvas/MaskToolbox.cpp
index c8f2dd39380..3a22dc943f3 100644
--- a/GUI/View/Canvas/MaskToolbox.cpp
+++ b/GUI/View/Canvas/MaskToolbox.cpp
@@ -155,8 +155,8 @@ MaskToolbox::MaskToolbox(MaskEditorActions* actions, QWidget* parent)
presentationButton->setToolTip("Press and hold to see mask results.");
addWidget(presentationButton);
- connect(presentationButton, &QToolButton::pressed, [this] { emit presentationChange(true); });
- connect(presentationButton, &QToolButton::released, [this] { emit presentationChange(false); });
+ connect(presentationButton, &QToolButton::pressed, [&] { emit presentationChange(true); });
+ connect(presentationButton, &QToolButton::released, [&] { emit presentationChange(false); });
auto* propertyPanelButton = new QToolButton(this);
propertyPanelButton->setIcon(QIcon(":/images/maskeditor_toolpanel.svg"));
diff --git a/GUI/View/Combo/ItemComboWidget.cpp b/GUI/View/Combo/ItemComboWidget.cpp
index a20d6a8134d..1b142aafe4b 100644
--- a/GUI/View/Combo/ItemComboWidget.cpp
+++ b/GUI/View/Combo/ItemComboWidget.cpp
@@ -97,7 +97,7 @@ void ItemComboWidget::setTheItem(QObject* item)
ASSERT(jobItem() || realItem());
disconnect(m_item, &QObject::destroyed, this, nullptr);
- connect(m_item, &QObject::destroyed, [this] { m_item = nullptr; });
+ connect(m_item, &QObject::destroyed, [&] { m_item = nullptr; });
setToolbarVisible(!itemPresentation().isEmpty());
m_toolbar->setPresentationList(presentationList(), activePresentationList());
diff --git a/GUI/View/Data/DatafilesSelector.cpp b/GUI/View/Data/DatafilesSelector.cpp
index 271a285e489..315f5e67693 100644
--- a/GUI/View/Data/DatafilesSelector.cpp
+++ b/GUI/View/Data/DatafilesSelector.cpp
@@ -75,13 +75,13 @@ DatafilesSelector::DatafilesSelector()
m_import2dDataAction->setIcon(QIcon(":/images/shape-square-plus.svg"));
m_import2dDataAction->setIconText("2D");
m_import2dDataAction->setToolTip("Import 2D data");
- connect(m_import2dDataAction, &QAction::triggered, [this] { importData2D(); });
+ connect(m_import2dDataAction, &QAction::triggered, [&] { importData2D(); });
m_import1dDataAction->setText("Import 1D data");
m_import1dDataAction->setIcon(QIcon(":/images/shape-square-plus.svg"));
m_import1dDataAction->setIconText("1D");
m_import1dDataAction->setToolTip("Import 1D data");
- connect(m_import1dDataAction, &QAction::triggered, [this] { importData1D(); });
+ connect(m_import1dDataAction, &QAction::triggered, [&] { importData1D(); });
m_renameDataAction->setText("Rename");
m_renameDataAction->setIcon(QIcon()); // #baTODO: Icon needed?
@@ -121,9 +121,9 @@ DatafilesSelector::DatafilesSelector()
connect(m_treeView, &QTreeView::customContextMenuRequested, this,
&DatafilesSelector::onContextMenuRequest);
- connect(m_treeModel, &QAbstractItemModel::modelReset, [this] { m_treeView->expandAll(); });
+ connect(m_treeModel, &QAbstractItemModel::modelReset, [&] { m_treeView->expandAll(); });
- connect(m_treeModel, &QAbstractItemModel::rowsInserted, [this] { m_treeView->expandAll(); });
+ connect(m_treeModel, &QAbstractItemModel::rowsInserted, [&] { m_treeView->expandAll(); });
connect(m_treeView->selectionModel(), &QItemSelectionModel::selectionChanged, this,
&DatafilesSelector::onSelectionChanged, Qt::UniqueConnection);
diff --git a/GUI/View/Fit/FitSessionWidget.cpp b/GUI/View/Fit/FitSessionWidget.cpp
index 9473ce72704..fe0124d34db 100644
--- a/GUI/View/Fit/FitSessionWidget.cpp
+++ b/GUI/View/Fit/FitSessionWidget.cpp
@@ -78,8 +78,7 @@ void FitSessionWidget::setSessionController(FitSessionController* sessionControl
if (m_sessionController) {
connect(m_sessionController, &FitSessionController::fittingError, this,
&FitSessionWidget::onFittingError);
- connect(m_sessionController, &QObject::destroyed,
- [this] { m_sessionController = nullptr; });
+ connect(m_sessionController, &QObject::destroyed, [&] { m_sessionController = nullptr; });
connect(m_controlWidget, &RunFitControlWidget::startFittingPushed, m_sessionController,
&FitSessionController::onStartFittingRequest);
connect(m_controlWidget, &RunFitControlWidget::stopFittingPushed, m_sessionController,
diff --git a/GUI/View/FitControl/GUIFitObserver.cpp b/GUI/View/FitControl/GUIFitObserver.cpp
index 882399a13b7..2d5a6ca0458 100644
--- a/GUI/View/FitControl/GUIFitObserver.cpp
+++ b/GUI/View/FitControl/GUIFitObserver.cpp
@@ -38,7 +38,7 @@ void GUIFitObserver::update(const FitObjective* subject)
return; // plotting still works, will skip iteration
if (m_block_update_plots)
- m_on_finish_notifier.wait(lock, [this] { return m_block_update_plots; });
+ m_on_finish_notifier.wait(lock, [&] { return m_block_update_plots; });
FitProgressInfo info;
info.m_chi2 = subject->iterationInfo().chi2();
diff --git a/GUI/View/FitControl/MinimizerSettingsWidget.cpp b/GUI/View/FitControl/MinimizerSettingsWidget.cpp
index 74c78590c08..87a907c23b4 100644
--- a/GUI/View/FitControl/MinimizerSettingsWidget.cpp
+++ b/GUI/View/FitControl/MinimizerSettingsWidget.cpp
@@ -59,7 +59,7 @@ void MinimizerSettingsWidget::setMinContainerItem(MinimizerContainerItem* contai
m_mainLayout->addRow("Objective metric:",
GUI::Util::createComboBox(
- [this] { return m_containerItem->objectiveMetricCombo(); },
+ [&] { return m_containerItem->objectiveMetricCombo(); },
[this](const QString& t) {
m_containerItem->setCurrentObjectiveMetric(t);
gDoc->setModified();
@@ -69,7 +69,7 @@ void MinimizerSettingsWidget::setMinContainerItem(MinimizerContainerItem* contai
"and experimental data"));
m_mainLayout->addRow("Norm function:",
GUI::Util::createComboBox(
- [this] { return m_containerItem->normFunctionCombo(); },
+ [&] { return m_containerItem->normFunctionCombo(); },
[this](const QString& t) {
m_containerItem->setCurrentNormFunction(t);
gDoc->setModified();
diff --git a/GUI/View/Frame/Fit2DFrame.cpp b/GUI/View/Frame/Fit2DFrame.cpp
index 5dc8b2e7e2d..32d2a47e5fe 100644
--- a/GUI/View/Frame/Fit2DFrame.cpp
+++ b/GUI/View/Frame/Fit2DFrame.cpp
@@ -130,7 +130,7 @@ void Fit2DFrame::connectItems()
// sync Z range between simulated and real
connect(simuData2DItem(), &Data2DItem::alignRanges,
- [this] { GUI::View::RangeUtil::setCommonRangeZ(mainData2DItems()); });
+ [&] { GUI::View::RangeUtil::setCommonRangeZ(mainData2DItems()); });
// sync Z range: simu --> real
connect(simuData2DItem(), &DataItem::updateOtherPlots, realData2DItem(),
diff --git a/GUI/View/Frame/Plot2DWithProjectionFrame.cpp b/GUI/View/Frame/Plot2DWithProjectionFrame.cpp
index e2d3cc62a31..7edf994e415 100644
--- a/GUI/View/Frame/Plot2DWithProjectionFrame.cpp
+++ b/GUI/View/Frame/Plot2DWithProjectionFrame.cpp
@@ -101,7 +101,7 @@ void Plot2DWithProjectionFrame::setup_connections()
// tool panel request is propagated from editorActions to this MaskEditor
connect(m_editorActions, &ProjectionActions::propertyPanelRequest,
- [this] { m_scaleEditor->setHidden(!m_scaleEditor->isHidden()); });
+ [&] { m_scaleEditor->setHidden(!m_scaleEditor->isHidden()); });
// selection/drawing activity is propagated from Toolbar to graphics scene
connect(m_toolbar, &ProjectionsToolpanel::activityChanged, m_projectionsCanvas,
diff --git a/GUI/View/Info/CautionSign.cpp b/GUI/View/Info/CautionSign.cpp
index cb78ca7b21f..d468543bdfd 100644
--- a/GUI/View/Info/CautionSign.cpp
+++ b/GUI/View/Info/CautionSign.cpp
@@ -45,7 +45,7 @@ void CautionSign::clear()
m_caution_message.clear();
m_clear_just_had_happened = true;
- QTimer::singleShot(10, this, [this] { m_clear_just_had_happened = false; });
+ QTimer::singleShot(10, this, [&] { m_clear_just_had_happened = false; });
}
//! Shows caution sign on the screen. If clear of previous caution sign had happened just
diff --git a/GUI/View/Instrument/InstrumentLibraryDialog.cpp b/GUI/View/Instrument/InstrumentLibraryDialog.cpp
index adf71ca346c..3a1951ec193 100644
--- a/GUI/View/Instrument/InstrumentLibraryDialog.cpp
+++ b/GUI/View/Instrument/InstrumentLibraryDialog.cpp
@@ -69,7 +69,7 @@ InstrumentLibraryDialog::InstrumentLibraryDialog(QWidget* parent,
m_treeView->setItemDelegate(new ItemDelegateForHTML(this));
m_treeView->setIconSize(QSize(128, 128));
- connect(m_treeModel, &QAbstractItemModel::modelReset, [this] { m_treeView->expandAll(); });
+ connect(m_treeModel, &QAbstractItemModel::modelReset, [&] { m_treeView->expandAll(); });
connect(m_buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
connect(m_buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
diff --git a/GUI/View/Main/AboutDialog.cpp b/GUI/View/Main/AboutDialog.cpp
index 5f5f7d8146d..3d950739493 100644
--- a/GUI/View/Main/AboutDialog.cpp
+++ b/GUI/View/Main/AboutDialog.cpp
@@ -153,6 +153,6 @@ AboutDialog::AboutDialog(QWidget* parent)
static const char mydata[] = {0x64, 0x65, 0x76, 0x73};
QByteArray b = QByteArray::fromRawData(mydata, sizeof(mydata));
auto* f = new ShortcodeFilter(b, this);
- connect(f, &ShortcodeFilter::found, [this] { layout()->addWidget(createLogoLabel()); });
+ connect(f, &ShortcodeFilter::found, [&] { layout()->addWidget(createLogoLabel()); });
installEventFilter(f);
}
diff --git a/GUI/View/Numeric/DoubleSpinBox.cpp b/GUI/View/Numeric/DoubleSpinBox.cpp
index a17d31622ad..789aa6b9885 100644
--- a/GUI/View/Numeric/DoubleSpinBox.cpp
+++ b/GUI/View/Numeric/DoubleSpinBox.cpp
@@ -48,7 +48,7 @@ DoubleSpinBox::DoubleSpinBox(DoubleProperty* d)
{
replaceProperty(d);
- QObject::connect(this, &QAbstractSpinBox::editingFinished, [this] {
+ QObject::connect(this, &QAbstractSpinBox::editingFinished, [&] {
ASSERT(m_property);
setValue(fromDisplay());
m_old_dir = 0;
diff --git a/GUI/View/ParEdit/CustomEditors.cpp b/GUI/View/ParEdit/CustomEditors.cpp
index 1a133fb4a97..10fe6be2fb0 100644
--- a/GUI/View/ParEdit/CustomEditors.cpp
+++ b/GUI/View/ParEdit/CustomEditors.cpp
@@ -155,7 +155,7 @@ ScientificSpinBoxEditor::ScientificSpinBoxEditor(QWidget* parent)
layout->setSpacing(0);
layout->addWidget(m_doubleEditor);
- connect(m_doubleEditor, &ScientificSpinBox::valueChanged, [this] { onEditingFinished(); });
+ connect(m_doubleEditor, &ScientificSpinBox::valueChanged, [&] { onEditingFinished(); });
setFocusProxy(m_doubleEditor);
}
diff --git a/GUI/View/Plotter/ColorMap.cpp b/GUI/View/Plotter/ColorMap.cpp
index ad9e1256b40..6af80b117d1 100644
--- a/GUI/View/Plotter/ColorMap.cpp
+++ b/GUI/View/Plotter/ColorMap.cpp
@@ -82,7 +82,7 @@ void ColorMap::itemToMap(Data2DItem* item)
// set nullptr at destruction
disconnect(m_data_item, &DataItem::destroyed, this, nullptr);
- connect(m_data_item, &DataItem::destroyed, [this] { m_data_item = nullptr; });
+ connect(m_data_item, &DataItem::destroyed, [&] { m_data_item = nullptr; });
//... Set initial state to match given intensity item.
setAxesRangeFromItem();
diff --git a/GUI/View/Plotter/ProjectionsPlot.cpp b/GUI/View/Plotter/ProjectionsPlot.cpp
index 7b64817ae77..a561e582662 100644
--- a/GUI/View/Plotter/ProjectionsPlot.cpp
+++ b/GUI/View/Plotter/ProjectionsPlot.cpp
@@ -51,7 +51,7 @@ void ProjectionsPlot::setData2DItem(Data2DItem* item)
// set nullptr at destruction
if (m_data2DItem) {
disconnect(m_data2DItem, &DataItem::destroyed, this, nullptr);
- connect(m_data2DItem, &DataItem::destroyed, [this] { m_data2DItem = nullptr; });
+ connect(m_data2DItem, &DataItem::destroyed, [&] { m_data2DItem = nullptr; });
}
clearAll();
diff --git a/GUI/View/Project/SimulationView.cpp b/GUI/View/Project/SimulationView.cpp
index db238e6b9d6..695a7614bec 100644
--- a/GUI/View/Project/SimulationView.cpp
+++ b/GUI/View/Project/SimulationView.cpp
@@ -139,27 +139,26 @@ SimulationView::SimulationView()
//... Connect
- connect(m_instrumentCombo, &QComboBox::currentTextChanged, [this] { updateStateFromUI(); });
- connect(m_sampleCombo, &QComboBox::currentTextChanged, [this] { updateStateFromUI(); });
- connect(m_realDataCombo, &QComboBox::currentTextChanged, [this] { updateStateFromUI(); });
+ connect(m_instrumentCombo, &QComboBox::currentTextChanged, [&] { updateStateFromUI(); });
+ connect(m_sampleCombo, &QComboBox::currentTextChanged, [&] { updateStateFromUI(); });
+ connect(m_realDataCombo, &QComboBox::currentTextChanged, [&] { updateStateFromUI(); });
connect(m_simulateButton, &QPushButton::clicked, this, &SimulationView::simulate);
connect(m_exportToPyScriptButton, &QPushButton::clicked, this,
&SimulationView::exportPythonScript);
connect(b_exec, &QButtonGroup::buttonClicked, this, &SimulationView::updateEnabling);
- connect(m_runPolicyImmediatelyRadio, &QRadioButton::toggled, [this] { updateStateFromUI(); });
+ connect(m_runPolicyImmediatelyRadio, &QRadioButton::toggled, [&] { updateStateFromUI(); });
- connect(m_analyticalRadio, &QRadioButton::toggled, [this] { updateStateFromUI(); });
+ connect(m_analyticalRadio, &QRadioButton::toggled, [&] { updateStateFromUI(); });
- connect(m_averageLayerRadio, &QRadioButton::toggled, [this] { updateStateFromUI(); });
+ connect(m_averageLayerRadio, &QRadioButton::toggled, [&] { updateStateFromUI(); });
- connect(m_numberOfThreadsCombo, &QComboBox::currentIndexChanged,
- [this] { updateStateFromUI(); });
+ connect(m_numberOfThreadsCombo, &QComboBox::currentIndexChanged, [&] { updateStateFromUI(); });
- connect(m_numberOfMonteCarloPoints, &QSpinBox::valueChanged, [this] { updateStateFromUI(); });
+ connect(m_numberOfMonteCarloPoints, &QSpinBox::valueChanged, [&] { updateStateFromUI(); });
- connect(m_includeSpecularCheck, &QCheckBox::toggled, [this] { updateStateFromUI(); });
+ connect(m_includeSpecularCheck, &QCheckBox::toggled, [&] { updateStateFromUI(); });
}
void SimulationView::showEvent(QShowEvent*)
diff --git a/GUI/View/Realspace/RealspacePanel.cpp b/GUI/View/Realspace/RealspacePanel.cpp
index 42a3bf6f1c7..9d2ba6baa78 100644
--- a/GUI/View/Realspace/RealspacePanel.cpp
+++ b/GUI/View/Realspace/RealspacePanel.cpp
@@ -47,10 +47,10 @@ RealspacePanel::RealspacePanel(QWidget* parent)
connect(action, &QAction::triggered, m_widget, &RealspaceWidget::topView);
action = createAction("Enlarge", "Increase layer size");
- connect(action, &QAction::triggered, [this] { m_widget->changeLayerSize(1.25); });
+ connect(action, &QAction::triggered, [&] { m_widget->changeLayerSize(1.25); });
action = createAction("Reduce", "Decrease layer size");
- connect(action, &QAction::triggered, [this] { m_widget->changeLayerSize(0.8); });
+ connect(action, &QAction::triggered, [&] { m_widget->changeLayerSize(0.8); });
auto* mainLayout = new QVBoxLayout(this);
mainLayout->setContentsMargins(0, 0, 0, 0);
diff --git a/GUI/View/Sample/LatticeTypeSelectionForm.cpp b/GUI/View/Sample/LatticeTypeSelectionForm.cpp
index fef6f7826d5..216b8f471e8 100644
--- a/GUI/View/Sample/LatticeTypeSelectionForm.cpp
+++ b/GUI/View/Sample/LatticeTypeSelectionForm.cpp
@@ -42,7 +42,7 @@ void LatticeTypeSelectionForm::createContent()
m_integrateOverXiCheckBox->setChecked(m_interferenceItem->xiIntegration());
m_gridLayout->addWidget(m_integrateOverXiCheckBox, 1, m_gridLayout->columnCount());
connect(m_integrateOverXiCheckBox, &QCheckBox::stateChanged,
- [this] { m_ec->setIntegrateOverXi(this, m_integrateOverXiCheckBox->isChecked()); });
+ [&] { m_ec->setIntegrateOverXi(this, m_integrateOverXiCheckBox->isChecked()); });
const int colOfXiLabel = m_gridLayout->columnCount();
LayerEditorUtil::addMultiPropertyToGrid(m_gridLayout, m_gridLayout->columnCount(),
diff --git a/GUI/View/Sample/LayerForm.cpp b/GUI/View/Sample/LayerForm.cpp
index 81a59111ee7..63167189340 100644
--- a/GUI/View/Sample/LayerForm.cpp
+++ b/GUI/View/Sample/LayerForm.cpp
@@ -98,7 +98,7 @@ LayerForm::LayerForm(QWidget* parent, LayerItem* layerItem, SampleEditorControll
m_layout->addValue(m_layer->thickness());
m_layout->addBoldRow("Number of slices:", GUI::Util::createIntSpinBox(
- [this] { return m_layer->numSlices(); },
+ [&] { return m_layer->numSlices(); },
[this](int v) {
m_layer->setNumSlices(v);
emit m_ec->modified();
diff --git a/GUI/View/Sample/SampleForm.cpp b/GUI/View/Sample/SampleForm.cpp
index 16792484d0b..ba61793ea50 100644
--- a/GUI/View/Sample/SampleForm.cpp
+++ b/GUI/View/Sample/SampleForm.cpp
@@ -95,7 +95,7 @@ SampleForm::SampleForm(SampleItem* sampleItem, SampleEditorController* ec)
// m_layout->addVector(sampleItem->externalField(), false);
auto* showInRealspaceAction = ActionFactory::createShowInRealspaceAction(
- this, "sample", [this] { m_ec->requestViewInRealspace(m_sampleItem); });
+ this, "sample", [&] { m_ec->requestViewInRealspace(m_sampleItem); });
summary->addTitleAction(showInRealspaceAction);
diff --git a/GUI/View/Sample/SampleView.cpp b/GUI/View/Sample/SampleView.cpp
index d93be90ab51..ec2bbb1bc01 100644
--- a/GUI/View/Sample/SampleView.cpp
+++ b/GUI/View/Sample/SampleView.cpp
@@ -79,11 +79,11 @@ SampleView::SampleView()
applySplitterPos();
// unfix RealspacePanel size only on manual resize
- connect(hSplitter, &QSplitter::splitterMoved, [this] {
+ connect(hSplitter, &QSplitter::splitterMoved, [&] {
m_realspacePanel->setMinimumWidth(1); // somehow with min width >0 it behaves better
m_realspacePanel->setMaximumWidth(QWIDGETSIZE_MAX);
});
- connect(vSplitter, &QSplitter::splitterMoved, [this] {
+ connect(vSplitter, &QSplitter::splitterMoved, [&] {
m_realspacePanel->setMinimumHeight(0);
m_realspacePanel->setMaximumHeight(QWIDGETSIZE_MAX);
});
diff --git a/GUI/View/Scene/MaskGraphicsScene.cpp b/GUI/View/Scene/MaskGraphicsScene.cpp
index 1f2a1c14898..7fd8e1939bf 100644
--- a/GUI/View/Scene/MaskGraphicsScene.cpp
+++ b/GUI/View/Scene/MaskGraphicsScene.cpp
@@ -63,7 +63,7 @@ MaskGraphicsScene::MaskGraphicsScene()
, m_mask_value(MaskFlags::MASK_ON)
{
setSceneRect(0, 0, 800, 600);
- connect(this, &QGraphicsScene::selectionChanged, [this] { onSceneSelectionChanged(); });
+ connect(this, &QGraphicsScene::selectionChanged, [&] { onSceneSelectionChanged(); });
}
MaskGraphicsScene::~MaskGraphicsScene() = default;
diff --git a/GUI/View/Setup/Scale1DEditor.cpp b/GUI/View/Setup/Scale1DEditor.cpp
index a8a6774337e..642f858dd4c 100644
--- a/GUI/View/Setup/Scale1DEditor.cpp
+++ b/GUI/View/Setup/Scale1DEditor.cpp
@@ -47,7 +47,7 @@ void Scale1DEditor::createPanelElements()
m_mainLayout->addRow("Axes units:",
GUI::Util::createUnitsComboBox(
axesUnitsList(),
- [this] { return currentData1DItem()->currentAxesUnits(); },
+ [&] { return currentData1DItem()->currentAxesUnits(); },
[this](const QString& newVal) {
for (auto item : allData1DItems())
item->setCurrentAxesUnits(newVal);
@@ -64,7 +64,7 @@ void Scale1DEditor::createPanelElements()
xFormLayout->setSpacing(5);
xFormLayout->addRow("Min:", GUI::Util::createDoubleSpinBox(
- [this] { return currentData1DItem()->axItemX()->min(); },
+ [&] { return currentData1DItem()->axItemX()->min(); },
[this](double newValue) {
for (auto* item : allData1DItems())
item->axItemX()->setMin(newValue);
@@ -73,7 +73,7 @@ void Scale1DEditor::createPanelElements()
&m_updaters));
xFormLayout->addRow("Max:", GUI::Util::createDoubleSpinBox(
- [this] { return currentData1DItem()->axItemX()->max(); },
+ [&] { return currentData1DItem()->axItemX()->max(); },
[this](double newValue) {
for (auto* item : allData1DItems())
item->axItemX()->setMax(newValue);
@@ -90,7 +90,7 @@ void Scale1DEditor::createPanelElements()
yFormLayout->setSpacing(5);
auto* logRangeSpinBox = GUI::Util::createDoubleSpinBox(
- [this] { return currentData1DItem()->axItemY()->logRangeOrders(); },
+ [&] { return currentData1DItem()->axItemY()->logRangeOrders(); },
[this](double newValue) {
for (auto* item : mainData1DItems()) {
item->axItemY()->setLogRangeOrders(newValue);
@@ -101,7 +101,7 @@ void Scale1DEditor::createPanelElements()
&m_updaters, "Dynamic range to display values", RealLimits::positive());
yFormLayout->addRow("Min:", GUI::Util::createDoubleSpinBox(
- [this] { return currentData1DItem()->axItemY()->min(); },
+ [&] { return currentData1DItem()->axItemY()->min(); },
[this](double newValue) {
for (auto* item : mainData1DItems()) {
item->axItemY()->setMin(newValue);
@@ -113,7 +113,7 @@ void Scale1DEditor::createPanelElements()
&m_updaters));
yFormLayout->addRow("Max:", GUI::Util::createDoubleSpinBox(
- [this] { return currentData1DItem()->axItemY()->max(); },
+ [&] { return currentData1DItem()->axItemY()->max(); },
[this](double newValue) {
for (auto* item : mainData1DItems()) {
item->axItemY()->setMax(newValue);
@@ -125,7 +125,7 @@ void Scale1DEditor::createPanelElements()
&m_updaters));
yFormLayout->addRow(GUI::Util::createCheckBox(
- "log10", [this] { return currentData1DItem()->axItemY()->isLogScale(); },
+ "log10", [&] { return currentData1DItem()->axItemY()->isLogScale(); },
[this, logRangeSpinBox](bool b) {
logRangeSpinBox->setEnabled(b);
for (auto* item : allData1DItems())
diff --git a/GUI/View/Setup/Scale2DEditor.cpp b/GUI/View/Setup/Scale2DEditor.cpp
index 88116172dd3..253d6f9d44c 100644
--- a/GUI/View/Setup/Scale2DEditor.cpp
+++ b/GUI/View/Setup/Scale2DEditor.cpp
@@ -50,7 +50,7 @@ void Scale2DEditor::createPanelElements()
m_mainLayout->addRow("Axes units:",
GUI::Util::createUnitsComboBox(
axesUnitsList(),
- [this] { return currentData2DItem()->currentAxesUnits(); },
+ [&] { return currentData2DItem()->currentAxesUnits(); },
[this](const QString& newVal) {
for (auto item : allData2DItems())
item->setCurrentAxesUnits(newVal);
@@ -60,18 +60,17 @@ void Scale2DEditor::createPanelElements()
&m_updaters));
*/
- m_mainLayout->addRow(
- "Color scheme:",
- GUI::Util::createComboBox([this] { return currentData2DItem()->gradientCombo(); },
- [this](const QString& newVal) {
- for (auto* item : allData2DItems())
- item->setCurrentGradient(newVal);
- gDoc->setModified();
- },
- false, &m_updaters));
+ m_mainLayout->addRow("Color scheme:", GUI::Util::createComboBox(
+ [&] { return currentData2DItem()->gradientCombo(); },
+ [this](const QString& newVal) {
+ for (auto* item : allData2DItems())
+ item->setCurrentGradient(newVal);
+ gDoc->setModified();
+ },
+ false, &m_updaters));
m_mainLayout->addRow(GUI::Util::createCheckBox(
- "Interpolate", [this] { return currentData2DItem()->isInterpolated(); },
+ "Interpolate", [&] { return currentData2DItem()->isInterpolated(); },
[this](bool b) {
for (auto* item : allData2DItems())
item->setInterpolated(b);
@@ -86,7 +85,7 @@ void Scale2DEditor::createPanelElements()
xFormLayout->setSpacing(5);
xFormLayout->addRow("Min:", GUI::Util::createDoubleSpinBox(
- [this] { return currentData2DItem()->axItemX()->min(); },
+ [&] { return currentData2DItem()->axItemX()->min(); },
[this](double newValue) {
for (auto* item : allData2DItems())
item->axItemX()->setMin(newValue);
@@ -95,7 +94,7 @@ void Scale2DEditor::createPanelElements()
&m_updaters));
xFormLayout->addRow("Max:", GUI::Util::createDoubleSpinBox(
- [this] { return currentData2DItem()->axItemX()->max(); },
+ [&] { return currentData2DItem()->axItemX()->max(); },
[this](double newValue) {
for (auto* item : allData2DItems())
item->axItemX()->setMax(newValue);
@@ -112,7 +111,7 @@ void Scale2DEditor::createPanelElements()
yFormLayout->setSpacing(5);
yFormLayout->addRow("Min:", GUI::Util::createDoubleSpinBox(
- [this] { return currentData2DItem()->axItemY()->min(); },
+ [&] { return currentData2DItem()->axItemY()->min(); },
[this](double newValue) {
for (auto* item : allData2DItems())
item->axItemY()->setMin(newValue);
@@ -121,7 +120,7 @@ void Scale2DEditor::createPanelElements()
&m_updaters));
yFormLayout->addRow("Max:", GUI::Util::createDoubleSpinBox(
- [this] { return currentData2DItem()->axItemY()->max(); },
+ [&] { return currentData2DItem()->axItemY()->max(); },
[this](double newValue) {
for (auto* item : allData2DItems())
item->axItemY()->setMax(newValue);
@@ -138,7 +137,7 @@ void Scale2DEditor::createPanelElements()
zFormLayout->setSpacing(5);
auto* logRangeSpinBox = GUI::Util::createDoubleSpinBox(
- [this] { return currentData2DItem()->zAxisItem()->logRangeOrders(); },
+ [&] { return currentData2DItem()->zAxisItem()->logRangeOrders(); },
[this](double newValue) {
for (auto* item : mainData2DItems()) {
item->zAxisItem()->setLogRangeOrders(newValue);
@@ -149,7 +148,7 @@ void Scale2DEditor::createPanelElements()
&m_updaters, "Dynamic range to display values", RealLimits::positive());
zFormLayout->addRow("Min:", GUI::Util::createDoubleSpinBox(
- [this] { return currentData2DItem()->zAxisItem()->min(); },
+ [&] { return currentData2DItem()->zAxisItem()->min(); },
[this](double newValue) {
for (auto* item : allData2DItems()) {
item->zAxisItem()->setMin(newValue);
@@ -161,7 +160,7 @@ void Scale2DEditor::createPanelElements()
&m_updaters));
zFormLayout->addRow("Max:", GUI::Util::createDoubleSpinBox(
- [this] { return currentData2DItem()->zAxisItem()->max(); },
+ [&] { return currentData2DItem()->zAxisItem()->max(); },
[this](double newValue) {
for (auto* item : mainData2DItems()) {
item->zAxisItem()->setMax(newValue);
@@ -173,7 +172,7 @@ void Scale2DEditor::createPanelElements()
&m_updaters));
zFormLayout->addRow(GUI::Util::createCheckBox(
- "log10", [this] { return currentData2DItem()->zAxisItem()->isLogScale(); },
+ "log10", [&] { return currentData2DItem()->zAxisItem()->isLogScale(); },
[this, logRangeSpinBox](bool b) {
logRangeSpinBox->setEnabled(b);
for (auto* item : allData2DItems())
@@ -185,7 +184,7 @@ void Scale2DEditor::createPanelElements()
zFormLayout->addRow("Log range:", logRangeSpinBox);
zFormLayout->addRow(GUI::Util::createCheckBox(
- "Visible", [this] { return currentData2DItem()->zAxisItem()->isVisible(); },
+ "Visible", [&] { return currentData2DItem()->zAxisItem()->isVisible(); },
[this](bool b) {
for (auto* item : allData2DItems())
item->zAxisItem()->setVisible(b);
diff --git a/GUI/View/Tool/WidgetMoverButton.cpp b/GUI/View/Tool/WidgetMoverButton.cpp
index e82099cd7fa..ce562ca5d1d 100644
--- a/GUI/View/Tool/WidgetMoverButton.cpp
+++ b/GUI/View/Tool/WidgetMoverButton.cpp
@@ -143,12 +143,12 @@ void WidgetMoverButton::mouseMoveEvent(QMouseEvent* event)
if (parPos.y() < 20) {
m_dragScrollTimer.setInterval(10);
m_dragScrollTimer.disconnect();
- connect(&m_dragScrollTimer, &QTimer::timeout, [this] { scrollParent(true); });
+ connect(&m_dragScrollTimer, &QTimer::timeout, [&] { scrollParent(true); });
m_dragScrollTimer.start();
} else if (parPos.y() > m_scrollArea->height() - 20) {
m_dragScrollTimer.setInterval(10);
m_dragScrollTimer.disconnect();
- connect(&m_dragScrollTimer, &QTimer::timeout, [this] { scrollParent(false); });
+ connect(&m_dragScrollTimer, &QTimer::timeout, [&] { scrollParent(false); });
m_dragScrollTimer.start();
} else
m_dragScrollTimer.stop();
diff --git a/GUI/View/Tuning/FitParameterWidget.cpp b/GUI/View/Tuning/FitParameterWidget.cpp
index 80a36e48ecb..159a06e76bb 100644
--- a/GUI/View/Tuning/FitParameterWidget.cpp
+++ b/GUI/View/Tuning/FitParameterWidget.cpp
@@ -89,7 +89,7 @@ void FitParameterWidget::setParameterTuningWidget(ParameterTuningWidget* tuningW
connect(m_tuningWidget, &ParameterTuningWidget::itemContextMenuRequest, this,
&FitParameterWidget::onTuningWidgetContextMenu, Qt::UniqueConnection);
- connect(tuningWidget, &QObject::destroyed, [this] { m_tuningWidget = nullptr; });
+ connect(tuningWidget, &QObject::destroyed, [&] { m_tuningWidget = nullptr; });
}
//! Creates context menu for ParameterTuningWidget
diff --git a/GUI/View/Tuning/ParameterBackupWidget.cpp b/GUI/View/Tuning/ParameterBackupWidget.cpp
index 7d022dd57aa..b46bbcd7fcc 100644
--- a/GUI/View/Tuning/ParameterBackupWidget.cpp
+++ b/GUI/View/Tuning/ParameterBackupWidget.cpp
@@ -84,7 +84,7 @@ ParameterBackupWidget::ParameterBackupWidget(QWidget* parent)
m_reset = new QPushButton(QIcon(":/images/undo.svg"), "Reset");
m_reset->setToolTip("Reset parameter tree to selected snapshot");
- connect(m_reset, &QPushButton::clicked, [this] { backupSwitched(m_combo->currentIndex()); });
+ connect(m_reset, &QPushButton::clicked, [&] { backupSwitched(m_combo->currentIndex()); });
h2->addWidget(m_reset);
mainLayout->addLayout(h1);
@@ -98,7 +98,7 @@ void ParameterBackupWidget::setParameterContainer(ParameterContainerItem* contai
// new snapshot
disconnect(m_create, nullptr, nullptr, nullptr);
- connect(m_create, &QPushButton::clicked, [this] {
+ connect(m_create, &QPushButton::clicked, [&] {
QString newName;
NewSnapshotDialog dialog(newName);
if (dialog.exec() == QDialog::Accepted)
@@ -111,7 +111,7 @@ void ParameterBackupWidget::setParameterContainer(ParameterContainerItem* contai
// delete snapshot
disconnect(m_remove, nullptr, nullptr, nullptr);
- connect(m_remove, &QPushButton::clicked, [this] {
+ connect(m_remove, &QPushButton::clicked, [&] {
if (m_combo->currentIndex() >= 0) {
m_container->deleteBackupValues(m_combo->currentIndex());
fillCombo();
--
GitLab