diff --git a/src/dialogs/choosefiledialog.cpp b/src/dialogs/choosefiledialog.cpp --- a/src/dialogs/choosefiledialog.cpp +++ b/src/dialogs/choosefiledialog.cpp @@ -33,7 +33,7 @@ files_list.append(file.toLocalFile()); } listWigdet->addItems(files_list); - connect(listWigdet, &QListWidget::currentTextChanged, [ & ](const QString& t){ + connect(listWigdet, &QListWidget::currentTextChanged, [ this ](const QString& t){ m_choosen_file = t; }); auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); diff --git a/src/dialogs/profilesdialog.cpp b/src/dialogs/profilesdialog.cpp --- a/src/dialogs/profilesdialog.cpp +++ b/src/dialogs/profilesdialog.cpp @@ -39,12 +39,12 @@ ui->baudCB->addItems(SERIAL::BAUDS); ui->baudCB->setCurrentText(QLatin1String("115200")); ui->profileCB->setAutoCompletion(true); - connect(ui->profileCB, static_cast(&QComboBox::currentIndexChanged), [ = ] { + connect(ui->profileCB, static_cast(&QComboBox::currentIndexChanged), [ this ] { loadSettings(); }); updateCBProfiles(); - connect(ui->buttonBox, &QDialogButtonBox::clicked, [ = ](QAbstractButton * btn) { + connect(ui->buttonBox, &QDialogButtonBox::clicked, [ this ](QAbstractButton * btn) { switch (ui->buttonBox->buttonRole(btn)) { case QDialogButtonBox::ResetRole: loadSettings(); @@ -57,16 +57,16 @@ } }); - connect(ui->heatedBedCK, &QCheckBox::clicked, [ = ](const bool & status) { + connect(ui->heatedBedCK, &QCheckBox::clicked, [ this ](const bool & status) { ui->bedTempSB->setEnabled(status); }); - connect(ui->cartesianRB, &QRadioButton::clicked, [ = ]() { + connect(ui->cartesianRB, &QRadioButton::clicked, [ this ]() { ui->cartesianGB->setHidden(false); ui->deltaGB->setHidden(true); }); - connect(ui->deltaRB, &QRadioButton::clicked, [ = ]() { + connect(ui->deltaRB, &QRadioButton::clicked, [ this ]() { ui->cartesianGB->setHidden(true); ui->deltaGB->setHidden(false); }); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -96,7 +96,7 @@ }; auto *gcodeEditor = new GCodeEditorWidget(this); - connect(gcodeEditor, &GCodeEditorWidget::updateClientFactory, this, [&](KTextEditor::View* view){ + connect(gcodeEditor, &GCodeEditorWidget::updateClientFactory, this, [this](KTextEditor::View* view){ guiFactory()->removeClient(m_currEditorView); guiFactory()->addClient(view); m_currEditorView = view; @@ -121,15 +121,15 @@ action->setText(i18n("&Connect")); connect(action, &QAction::triggered, [ & ]{ std::unique_ptr csd(new ConnectSettingsDialog); - connect(csd.get(), &ConnectSettingsDialog::startConnection, [ & ](const QString& port, const QMap& data) { + connect(csd.get(), &ConnectSettingsDialog::startConnection, [this](const QString& port, const QMap& data) { newConnection(port, data); }); csd->exec(); }); action = actionCollection()->addAction(QStringLiteral("profiles")); action->setText(i18n("&Profiles")); - connect(action, &QAction::triggered, [ & ] { + connect(action, &QAction::triggered, [this] { std::unique_ptr pd(new ProfilesDialog); pd->exec(); }); diff --git a/src/widgets/atcoreinstancewidget.cpp b/src/widgets/atcoreinstancewidget.cpp --- a/src/widgets/atcoreinstancewidget.cpp +++ b/src/widgets/atcoreinstancewidget.cpp @@ -55,14 +55,14 @@ m_toolBar->addAction(lb); auto homeAll = new QAction("All"); - connect(homeAll, &QAction::triggered, [&]{ + connect(homeAll, &QAction::triggered, [this]{ m_core.home(); }); m_toolBar->addAction(homeAll); for(auto homes : std::map{{"X", AtCore::X}, {"Y", AtCore::Y}, {"Z", AtCore::Z}}) { auto home = new QAction(homes.first); - connect(home, &QAction::triggered, [&, homes] { + connect(home, &QAction::triggered, [this, homes] { m_core.home(homes.second); }); m_toolBar->addAction(home); @@ -98,13 +98,13 @@ auto disconnectAction = new QAction(style()->standardIcon(QStyle::SP_DialogCloseButton), i18n("Disconnect")); connect(this, &AtCoreInstanceWidget::disableDisconnect, disconnectAction, &QAction::setDisabled); - connect(disconnectAction, &QAction::triggered, [&](){ + connect(disconnectAction, &QAction::triggered, [this](){ m_core.closeConnection(); }); m_mainToolBar->addAction(disconnectAction); m_printAction = new QAction(style()->standardIcon(QStyle::SP_MediaPlay),i18n("Print")); - connect(m_printAction, &QAction::triggered, [ & ](){ + connect(m_printAction, &QAction::triggered, [ this ](){ if(m_core.state() == AtCore::BUSY) { pausePrint(); return; @@ -119,7 +119,7 @@ auto stopAction = new QAction(style()->standardIcon(QStyle::SP_MediaStop),i18n("Stop")); connect(stopAction, &QAction::triggered, this, &AtCoreInstanceWidget::stopPrint); - connect(stopAction, &QAction::triggered, [&](){ + connect(stopAction, &QAction::triggered, [this](){ m_printAction->setText(i18n("Print")); m_printAction->setIcon(style()->standardIcon(QStyle::SP_MediaPlay)); }); @@ -155,32 +155,32 @@ connect(ui->bedExtWidget, &BedExtruderWidget::extTemperatureChanged, &m_core, &AtCore::setExtruderTemp); // Connect AtCore temperatures changes on Atelier Plot - connect(&m_core.temperature(), &Temperature::bedTemperatureChanged, [ & ](const float& temp) { + connect(&m_core.temperature(), &Temperature::bedTemperatureChanged, [ this ](const float& temp) { checkTemperature(0x00, 0, temp); ui->plotWidget->appendPoint(i18n("Actual Bed"), temp); ui->plotWidget->update(); ui->bedExtWidget->updateBedTemp(temp); }); - connect(&m_core.temperature(), &Temperature::bedTargetTemperatureChanged, [ & ](const float& temp) { + connect(&m_core.temperature(), &Temperature::bedTargetTemperatureChanged, [ this ](const float& temp) { checkTemperature(0x01, 0, temp); ui->plotWidget->appendPoint(i18n("Target Bed"), temp); ui->plotWidget->update(); ui->bedExtWidget->updateBedTargetTemp(temp); }); - connect(&m_core.temperature(), &Temperature::extruderTemperatureChanged, [ & ](const float& temp) { + connect(&m_core.temperature(), &Temperature::extruderTemperatureChanged, [ this ](const float& temp) { checkTemperature(0x02, 0, temp); ui->plotWidget->appendPoint(i18n("Actual Ext.1"), temp); ui->plotWidget->update(); ui->bedExtWidget->updateExtTemp(temp); }); - connect(&m_core.temperature(), &Temperature::extruderTargetTemperatureChanged, [ & ](const float& temp) { + connect(&m_core.temperature(), &Temperature::extruderTargetTemperatureChanged, [ this ](const float& temp) { checkTemperature(0x03, 0, temp); ui->plotWidget->appendPoint(i18n("Target Ext.1"), temp); ui->plotWidget->update(); ui->bedExtWidget->updateExtTargetTemp(temp); }); - connect(ui->pushGCodeWidget, &PushGCodeWidget::push, [ & ](QString command) { + connect(ui->pushGCodeWidget, &PushGCodeWidget::push, [ this ](QString command) { ui->logWidget->addLog("Push " + command); m_core.pushCommand(command); }); diff --git a/src/widgets/axiscontrol.cpp b/src/widgets/axiscontrol.cpp --- a/src/widgets/axiscontrol.cpp +++ b/src/widgets/axiscontrol.cpp @@ -93,7 +93,7 @@ setScene(new QGraphicsScene()); - auto createPie = [ = ](QLatin1Char axis, int value, int size, int angle) { + auto createPie = [ this ](QLatin1Char axis, int value, int size, int angle) { auto pie = new PieButton(axis, value, size, angle); pie->setPalette(this->palette()); connect(pie, &PieButton::clicked, this, &AxisControl::clicked); @@ -103,7 +103,7 @@ scene()->addItem(pie); }; - auto createRect = [ = ](QLatin1Char axis, int value, int size, int xPos, int yPos) { + auto createRect = [ this ](QLatin1Char axis, int value, int size, int xPos, int yPos) { auto z = new RectButton(axis, value, size); z->setPalette(this->palette()); z->setPos(xPos, yPos); diff --git a/src/widgets/bedextruderwidget.cpp b/src/widgets/bedextruderwidget.cpp --- a/src/widgets/bedextruderwidget.cpp +++ b/src/widgets/bedextruderwidget.cpp @@ -31,13 +31,13 @@ connect(ui->heatBedPB, &QPushButton::clicked, this, &BedExtruderWidget::heatBedClicked); connect(ui->heatExtPB, &QPushButton::clicked, this, &BedExtruderWidget::heatExtruderClicked); - connect(ui->bedTempSB, static_cast(&QDoubleSpinBox::valueChanged), [ = ](double tmp) { + connect(ui->bedTempSB, static_cast(&QDoubleSpinBox::valueChanged), [ this ](double tmp) { if (ui->heatBedPB->isChecked()) { emit bedTemperatureChanged(tmp,ui->bedAndWaitCB->isChecked()); } }); - connect(ui->extTempSB, static_cast(&QDoubleSpinBox::valueChanged), [ = ](double tmp) { + connect(ui->extTempSB, static_cast(&QDoubleSpinBox::valueChanged), [ this ](double tmp) { if (ui->heatExtPB->isChecked()) { emit extTemperatureChanged(tmp, currentExtruder(),ui->extAndWaitCB->isChecked()); } diff --git a/src/widgets/pushgcodewidget.cpp b/src/widgets/pushgcodewidget.cpp --- a/src/widgets/pushgcodewidget.cpp +++ b/src/widgets/pushgcodewidget.cpp @@ -38,8 +38,7 @@ layout->addItem(items); this->setLayout(layout); - connect(bt, &QPushButton::clicked, [ = ] { + connect(bt, &QPushButton::clicked, [ this ] { push(input->text()); }); } - diff --git a/src/widgets/ratescontrolwidget.cpp b/src/widgets/ratescontrolwidget.cpp --- a/src/widgets/ratescontrolwidget.cpp +++ b/src/widgets/ratescontrolwidget.cpp @@ -23,13 +23,13 @@ ui(new Ui::RatesControlWidget) { ui->setupUi(this); - connect(ui->flowRateSB, static_cast(&QDoubleSpinBox::valueChanged), [ = ](float value){ + connect(ui->flowRateSB, static_cast(&QDoubleSpinBox::valueChanged), [ this ](float value){ emit flowRateChanged(value); }); - connect(ui->fanSpeedSB, static_cast(&QDoubleSpinBox::valueChanged), [ = ](float value){ + connect(ui->fanSpeedSB, static_cast(&QDoubleSpinBox::valueChanged), [ this ](float value){ emit fanSpeedChanged(value); }); - connect(ui->printSpeedSB, static_cast(&QDoubleSpinBox::valueChanged), [ = ](float value){ + connect(ui->printSpeedSB, static_cast(&QDoubleSpinBox::valueChanged), [ this ](float value){ emit printSpeedChanged(value); }); diff --git a/src/widgets/videomonitorwidget.cpp b/src/widgets/videomonitorwidget.cpp --- a/src/widgets/videomonitorwidget.cpp +++ b/src/widgets/videomonitorwidget.cpp @@ -64,7 +64,7 @@ .replaceInStrings( QRegExp("^"), "v4l2:///dev/")); #endif - connect(_playPB, &QPushButton::clicked, [=](bool b){ + connect(_playPB, &QPushButton::clicked, [this, _playPB, _sourceCB](bool b){ if(b){ _playPB->setIcon(style()->standardIcon(QStyle::SP_MediaPause)); QString source = _sourceCB->currentText(); @@ -84,7 +84,7 @@ VideoMonitorWidget::~VideoMonitorWidget() { - + } void VideoMonitorWidget::handleError()