[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [atelier] src: Use 4 Clause connect for lambdas
From: Chris Rizzitello <null () kde ! org>
Date: 2018-06-21 13:42:59
Message-ID: E1fVzrX-0007rx-OC () code ! kde ! org
[Download RAW message or body]
Git commit 24ac26e0337cbad15aca647205a65ffdb1d18339 by Chris Rizzitello.
Committed on 21/06/2018 at 13:34.
Pushed by rizzitello into branch 'master'.
Use 4 Clause connect for lambdas
Signed-off-by: Chris Rizzitello <rizzitello@kde.org>
M +1 -1 src/dialogs/choosefiledialog.cpp
M +4 -4 src/dialogs/profilesdialog.cpp
M +7 -7 src/mainwindow.cpp
M +11 -11 src/widgets/atcoreinstancewidget.cpp
M +2 -2 src/widgets/bedextruderwidget.cpp
M +1 -1 src/widgets/gcodeeditorwidget.cpp
M +1 -1 src/widgets/thermowidget.cpp
M +1 -1 src/widgets/videomonitorwidget.cpp
https://commits.kde.org/atelier/24ac26e0337cbad15aca647205a65ffdb1d18339
diff --git a/src/dialogs/choosefiledialog.cpp b/src/dialogs/choosefiledialog.cpp
index f9be170..33f787f 100644
--- a/src/dialogs/choosefiledialog.cpp
+++ b/src/dialogs/choosefiledialog.cpp
@@ -32,7 +32,7 @@ ChooseFileDialog::ChooseFileDialog(QWidget *parent, QList<QUrl> \
files) : foreach (const auto &url, files) {
listWigdet->addItem(url.toLocalFile());
}
- connect(listWigdet, &QListWidget::currentRowChanged, [this, &files](const int t) \
{ + connect(listWigdet, &QListWidget::currentRowChanged, this, [this, \
&files](const int t) { m_choosen_file = files.at(t);
});
diff --git a/src/dialogs/profilesdialog.cpp b/src/dialogs/profilesdialog.cpp
index cc24f78..c55d1d0 100644
--- a/src/dialogs/profilesdialog.cpp
+++ b/src/dialogs/profilesdialog.cpp
@@ -34,22 +34,22 @@ ProfilesDialog::ProfilesDialog(QWidget *parent) :
ui->baudCB->addItems(SERIAL::BAUDS);
ui->baudCB->setCurrentText(QLatin1String("115200"));
ui->profileCB->setAutoCompletion(true);
- connect(ui->profileCB, \
static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), [this] { + \
connect(ui->profileCB, \
static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, [this] { \
askToSave(); loadSettings();
});
updateCBProfiles();
connect(ui->buttonBox, &QDialogButtonBox::clicked, this, \
&ProfilesDialog::buttonBoxClicked);
- connect(ui->heatedBedCK, &QCheckBox::clicked, [this](const bool & status) {
+ connect(ui->heatedBedCK, &QCheckBox::clicked, this, [this](const bool & status) \
{ ui->bedTempSB->setEnabled(status);
});
- connect(ui->cartesianRB, &QRadioButton::clicked, [this] {
+ connect(ui->cartesianRB, &QRadioButton::clicked, this, [this] {
ui->printerTypeStack->setCurrentIndex(1);
});
- connect(ui->deltaRB, &QRadioButton::clicked, [this] {
+ connect(ui->deltaRB, &QRadioButton::clicked, this, [this] {
ui->printerTypeStack->setCurrentIndex(0);
});
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 5fde9b1..57b5ff3 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -43,7 +43,7 @@ MainWindow::MainWindow(QWidget *parent) :
setupActions();
setAcceptDrops(true);
- connect(m_instances, &QTabWidget::tabCloseRequested, [this](int index) {
+ connect(m_instances, &QTabWidget::tabCloseRequested, this, [this](int index) {
auto tempWidget = qobject_cast<AtCoreInstanceWidget \
*>(m_instances->widget(index)); if (tempWidget->isPrinting()) {
if (askToClose()) {
@@ -139,13 +139,13 @@ void MainWindow::newAtCoreInstance()
newInstanceWidget->setObjectName(name);
newInstanceWidget->setFileCount(m_openFiles.size());
connect(this, &MainWindow::profilesChanged, newInstanceWidget, \
&AtCoreInstanceWidget::updateProfileData);
- connect(newInstanceWidget, &AtCoreInstanceWidget::requestProfileDialog, [this] {
+ connect(newInstanceWidget, &AtCoreInstanceWidget::requestProfileDialog, this, \
[this] { std::unique_ptr<ProfilesDialog> pd(new ProfilesDialog);
pd->exec();
emit(profilesChanged());
});
- connect(newInstanceWidget, &AtCoreInstanceWidget::requestFileChooser, \
[newInstanceWidget, this] { + connect(newInstanceWidget, \
&AtCoreInstanceWidget::requestFileChooser, this, [newInstanceWidget, this] { switch \
(m_openFiles.size()) {
case 0:
@@ -200,7 +200,7 @@ void MainWindow::setupLateralArea()
m_lateral.m_map[key] = {btn, w};
buttonLayout->addWidget(btn);
- connect(btn, &QPushButton::clicked, [this, w, btn] {
+ connect(btn, &QPushButton::clicked, this, [this, w, btn] {
if (m_lateral.m_stack->currentWidget() == w)
{
m_lateral.m_stack->setHidden(m_lateral.m_stack->isVisible());
@@ -219,14 +219,14 @@ void MainWindow::setupLateralArea()
m_gcodeEditor = new GCodeEditorWidget(this);
connect(m_gcodeEditor, &GCodeEditorWidget::updateClientFactory, this, \
&MainWindow::updateClientFactory);
- connect(m_gcodeEditor, &GCodeEditorWidget::fileClosed, [this](const QUrl & file) \
{ + connect(m_gcodeEditor, &GCodeEditorWidget::fileClosed, this, [this](const QUrl \
& file) { m_openFiles.removeAll(file);
});
auto *viewer3D = new Viewer3D(this);
connect(viewer3D, &Viewer3D::droppedUrls, this, &MainWindow::processDropEvent);
- connect(m_gcodeEditor, &GCodeEditorWidget::currentFileChanged, [this, \
viewer3D](const QUrl & url) { + connect(m_gcodeEditor, \
&GCodeEditorWidget::currentFileChanged, this, [this, viewer3D](const QUrl & url) { \
viewer3D->drawModel(url.toString()); });
@@ -260,7 +260,7 @@ void MainWindow::setupActions()
action->setIcon(QIcon::fromTheme("document-properties", \
QIcon(QString(":/%1/configure").arg(m_theme))));
action->setText(i18n("&Profiles"));
- connect(action, &QAction::triggered, [this] {
+ connect(action, &QAction::triggered, this, [this] {
std::unique_ptr<ProfilesDialog> pd(new ProfilesDialog);
pd->exec();
emit(profilesChanged());
diff --git a/src/widgets/atcoreinstancewidget.cpp \
b/src/widgets/atcoreinstancewidget.cpp index ff08c82..718ab2a 100644
--- a/src/widgets/atcoreinstancewidget.cpp
+++ b/src/widgets/atcoreinstancewidget.cpp
@@ -108,14 +108,14 @@ void AtCoreInstanceWidget::buildToolbar()
m_toolBar->addWidget(lb);
auto homeAll = new QAction(i18n("All"));
- connect(homeAll, &QAction::triggered, [this] {
+ connect(homeAll, &QAction::triggered, this, [this] {
m_core.home();
});
m_toolBar->addAction(homeAll);
for (auto homes : std::map<QString, int> {{"X", AtCore::X}, {"Y", AtCore::Y}, \
{"Z", AtCore::Z}}) { auto home = new QAction(homes.first);
- connect(home, &QAction::triggered, [this, homes] {
+ connect(home, &QAction::triggered, this, [this, homes] {
m_core.home(homes.second);
});
m_toolBar->addAction(home);
@@ -124,7 +124,7 @@ void AtCoreInstanceWidget::buildToolbar()
m_toolBar->addSeparator();
m_printAction = new QAction(QIcon::fromTheme("media-playback-start", \
style()->standardIcon(QStyle::SP_MediaPlay)), i18n("Print"));
- connect(m_printAction, &QAction::triggered, [this] {
+ connect(m_printAction, &QAction::triggered, this, [this] {
if (m_core.state() == AtCore::BUSY)
{
@@ -146,7 +146,7 @@ void AtCoreInstanceWidget::buildToolbar()
m_stopAction = new QAction(QIcon::fromTheme("media-playback-stop", \
QIcon(QString(":/%1/stop").arg(m_theme))), i18n("Stop"));
connect(m_stopAction, &QAction::triggered, this, \
&AtCoreInstanceWidget::stopPrint);
- connect(m_stopAction, &QAction::triggered, [this] {
+ connect(m_stopAction, &QAction::triggered, this, [this] {
m_printAction->setText(i18n("Print"));
m_printAction->setIcon(QIcon::fromTheme("media-playback-start", \
QIcon(QString(":/%1/start").arg(m_theme)))); });
@@ -249,7 +249,7 @@ void AtCoreInstanceWidget::initConnectsToAtCore()
connect(m_bedExtWidget, &BedExtruderWidget::bedTemperatureChanged, &m_core, \
&AtCore::setBedTemp);
connect(m_bedExtWidget, &BedExtruderWidget::extTemperatureChanged, &m_core, \
&AtCore::setExtruderTemp); //command Widget
- connect(m_commandWidget, &CommandWidget::commandPressed, [this](const QString & \
command) { + connect(m_commandWidget, &CommandWidget::commandPressed, this, \
[this](const QString & command) { m_logWidget->appendLog(i18n("Push: %1", command));
m_core.pushCommand(command);
});
@@ -264,11 +264,11 @@ void AtCoreInstanceWidget::initConnectsToAtCore()
connect(m_printWidget, &PrintWidget::flowRateChanged, &m_core, \
&AtCore::setFlowRate);
connect(m_printWidget, &PrintWidget::printSpeedChanged, &m_core, \
&AtCore::setPrinterSpeed); //Movement Widget
- connect(m_movementWidget, &MovementWidget::absoluteMove, [this](const \
QLatin1Char & axis, const double value) { + connect(m_movementWidget, \
&MovementWidget::absoluteMove, this, [this](const QLatin1Char & axis, const double \
value) { m_logWidget->appendLog(GCode::description(GCode::G1));
m_core.move(axis, value);
});
- connect(m_movementWidget, &MovementWidget::relativeMove, [this](const \
QLatin1Char & axis, const double value) { + connect(m_movementWidget, \
&MovementWidget::relativeMove, this, [this](const QLatin1Char & axis, const double \
value) {
m_logWidget->appendLog(i18n("Relative Move: %1, %2", axis, \
QString::number(value))); m_core.setRelativePosition();
m_core.move(axis, value);
@@ -280,7 +280,7 @@ void AtCoreInstanceWidget::initConnectsToAtCore()
connect(m_sdWidget, &SdWidget::requestSdList, &m_core, &AtCore::sdFileList);
connect(&m_core, &AtCore::sdMountChanged, m_statusWidget, &StatusWidget::setSD);
- connect(m_sdWidget, &SdWidget::printSdFile, [this](const QString & fileName) {
+ connect(m_sdWidget, &SdWidget::printSdFile, this, [this](const QString & \
fileName) { if (fileName.isEmpty()) {
QMessageBox::information(
this
@@ -293,7 +293,7 @@ void AtCoreInstanceWidget::initConnectsToAtCore()
}
});
- connect(m_sdWidget, &SdWidget::deleteSdFile, [this](const QString & fileName) {
+ connect(m_sdWidget, &SdWidget::deleteSdFile, this, [this](const QString & \
fileName) { if (fileName.isEmpty()) {
QMessageBox::information(
this
@@ -582,13 +582,13 @@ void AtCoreInstanceWidget::connectExtruderTemperatureData(bool \
connected) }
//Add Extruder.
m_plotWidget->addPlot(i18n("Actual Ext.1"));
- connect(&m_core.temperature(), &Temperature::extruderTemperatureChanged, \
[this](const float & temp) { + connect(&m_core.temperature(), \
&Temperature::extruderTemperatureChanged, this, [this](const float & temp) { \
checkTemperature(0x02, 0, temp); m_plotWidget->appendPoint(i18n("Actual Ext.1"), \
temp); m_bedExtWidget->updateExtTemp(temp);
});
m_plotWidget->addPlot(i18n("Target Ext.1"));
- connect(&m_core.temperature(), \
&Temperature::extruderTargetTemperatureChanged, [this](const float & temp) { + \
connect(&m_core.temperature(), &Temperature::extruderTargetTemperatureChanged, this, \
[this](const float & temp) { checkTemperature(0x03, 0, temp);
m_plotWidget->appendPoint(i18n("Target Ext.1"), temp);
m_bedExtWidget->updateExtTargetTemp(temp);
diff --git a/src/widgets/bedextruderwidget.cpp b/src/widgets/bedextruderwidget.cpp
index 058f009..7dcba87 100644
--- a/src/widgets/bedextruderwidget.cpp
+++ b/src/widgets/bedextruderwidget.cpp
@@ -47,12 +47,12 @@ BedExtruderWidget::BedExtruderWidget(QWidget *parent) :
//Add Default Extruder
setExtruderCount(1);
- connect(m_bedThermo, &ThermoWidget::targetTemperatureChanged, [this](double v) {
+ connect(m_bedThermo, &ThermoWidget::targetTemperatureChanged, this, \
[this](double v) { qDebug() << "Receiving the temperature change for bed";
emit bedTemperatureChanged((int)v, false);
});
- connect(m_extruderThermo, &ThermoWidget::targetTemperatureChanged, [this](double \
v) { + connect(m_extruderThermo, &ThermoWidget::targetTemperatureChanged, this, \
[this](double v) { qDebug() << "Receiving the temperature changed for thermo";
emit extTemperatureChanged((int)v, currentExtruder(), false);
});
diff --git a/src/widgets/gcodeeditorwidget.cpp b/src/widgets/gcodeeditorwidget.cpp
index 0c84d34..72544b4 100644
--- a/src/widgets/gcodeeditorwidget.cpp
+++ b/src/widgets/gcodeeditorwidget.cpp
@@ -52,7 +52,7 @@ void GCodeEditorWidget::loadFile(const QUrl &file)
urlDoc[doc->url()] = doc;
urlTab[doc->url()] = m_tabwidget->widget(t);
//connect our new document's modified state changed signal.
- connect(doc, &KTextEditor::Document::modifiedChanged, [this, t](const \
KTextEditor::Document * document) { + connect(doc, \
&KTextEditor::Document::modifiedChanged, this, [this, t](const KTextEditor::Document \
* document) { QString filename = document->url().fileName(QUrl::FullyDecoded);
if (document->isModified()) {
filename.append(" *");
diff --git a/src/widgets/thermowidget.cpp b/src/widgets/thermowidget.cpp
index 927cef5..107d921 100644
--- a/src/widgets/thermowidget.cpp
+++ b/src/widgets/thermowidget.cpp
@@ -42,7 +42,7 @@ ThermoWidget::ThermoWidget(QWidget *parent, QString name) :
setFocusPolicy(Qt::StrongFocus);
m_cursorTimer = new QTimer();
- connect(m_cursorTimer, &QTimer::timeout, [&] {
+ connect(m_cursorTimer, &QTimer::timeout, this, [this] {
m_paintCursor = !m_paintCursor;
update();
});
diff --git a/src/widgets/videomonitorwidget.cpp b/src/widgets/videomonitorwidget.cpp
index 5f389ff..1e3d3ae 100644
--- a/src/widgets/videomonitorwidget.cpp
+++ b/src/widgets/videomonitorwidget.cpp
@@ -63,7 +63,7 @@ VideoMonitorWidget::VideoMonitorWidget(QWidget *parent) :
.replaceInStrings(QRegExp("^"), "v4l2:///dev/"));
#endif
- connect(_playPB, &QPushButton::clicked, [this, _playPB, _sourceCB, \
_videoWidget](bool b) { + connect(_playPB, &QPushButton::clicked, this, [this, \
_playPB, _sourceCB, _videoWidget](bool b) { if (b) {
if (_mediaplayer.state() != QMediaPlayer::PausedState) {
QString source = _sourceCB->currentText();
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic