From ac853f1fd0b73619925224955b3064f51fbdb923 Mon Sep 17 00:00:00 2001 From: Karsten Heimrich Date: Tue, 2 Mar 2021 15:38:38 +0100 Subject: Remove now superfluous QOverload invocations Task-number: QTBUG-91213 Change-Id: I0ca8f4d87fd356966a449675c7c18bc70f7c92dc Reviewed-by: Alex Blasche --- examples/serialbus/can/bitratebox.cpp | 2 +- examples/serialbus/modbus/adueditor/mainwindow.cpp | 14 +++++++------- examples/serialbus/modbus/client/mainwindow.cpp | 9 ++++----- examples/serialbus/modbus/server/mainwindow.cpp | 2 +- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/examples/serialbus/can/bitratebox.cpp b/examples/serialbus/can/bitratebox.cpp index 7c19a5d..e43bb93 100644 --- a/examples/serialbus/can/bitratebox.cpp +++ b/examples/serialbus/can/bitratebox.cpp @@ -58,7 +58,7 @@ BitRateBox::BitRateBox(QWidget *parent) : { fillBitRates(); - connect(this, QOverload::of(&QComboBox::currentIndexChanged), + connect(this, &QComboBox::currentIndexChanged, this, &BitRateBox::checkCustomSpeedPolicy); } diff --git a/examples/serialbus/modbus/adueditor/mainwindow.cpp b/examples/serialbus/modbus/adueditor/mainwindow.cpp index b1d2fd9..53d3b6e 100644 --- a/examples/serialbus/modbus/adueditor/mainwindow.cpp +++ b/examples/serialbus/modbus/adueditor/mainwindow.cpp @@ -149,22 +149,22 @@ void MainWindow::on_connectButton_clicked() { if (tcpRadio->isChecked()) { auto device = new ModbusTcpClient; - connect(ti1Spin, QOverload::of(&QSpinBox::valueChanged), + connect(ti1Spin, &QSpinBox::valueChanged, device, &ModbusTcpClient::valueChanged); - connect(ti2Spin, QOverload::of(&QSpinBox::valueChanged), + connect(ti2Spin, &QSpinBox::valueChanged, device, &ModbusTcpClient::valueChanged); - connect(pi1Spin, QOverload::of(&QSpinBox::valueChanged), + connect(pi1Spin, &QSpinBox::valueChanged, device, &ModbusTcpClient::valueChanged); - connect(pi2Spin, QOverload::of(&QSpinBox::valueChanged), + connect(pi2Spin, &QSpinBox::valueChanged, device, &ModbusTcpClient::valueChanged); - connect(l1Spin, QOverload::of(&QSpinBox::valueChanged), + connect(l1Spin, &QSpinBox::valueChanged, device, &ModbusTcpClient::valueChanged); - connect(l2Spin, QOverload::of(&QSpinBox::valueChanged), + connect(l2Spin, &QSpinBox::valueChanged, device, &ModbusTcpClient::valueChanged); - connect(ui1Spin, QOverload::of(&QSpinBox::valueChanged), + connect(ui1Spin, &QSpinBox::valueChanged, device, &ModbusTcpClient::valueChanged); m_device = device; diff --git a/examples/serialbus/modbus/client/mainwindow.cpp b/examples/serialbus/modbus/client/mainwindow.cpp index a7d1d5e..ebbe8f2 100644 --- a/examples/serialbus/modbus/client/mainwindow.cpp +++ b/examples/serialbus/modbus/client/mainwindow.cpp @@ -106,9 +106,8 @@ MainWindow::MainWindow(QWidget *parent) connect(ui->writeSize, &QComboBox::currentTextChanged, writeModel, &WriteRegisterModel::setNumberOfValues); - auto valueChanged = QOverload::of(&QSpinBox::valueChanged); - connect(ui->writeAddress, valueChanged, writeModel, &WriteRegisterModel::setStartAddress); - connect(ui->writeAddress, valueChanged, this, [this, model](int i) { + connect(ui->writeAddress, &QSpinBox::valueChanged, writeModel, &WriteRegisterModel::setStartAddress); + connect(ui->writeAddress, &QSpinBox::valueChanged, this, [this, model](int i) { int lastPossibleIndex = 0; const int currentIndex = ui->writeSize->currentIndex(); for (int ii = 0; ii < 10; ++ii) { @@ -152,9 +151,9 @@ void MainWindow::initActions() this, &MainWindow::onWriteButtonClicked); connect(ui->readWriteButton, &QPushButton::clicked, this, &MainWindow::onReadWriteButtonClicked); - connect(ui->connectType, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->connectType, &QComboBox::currentIndexChanged, this, &MainWindow::onConnectTypeChanged); - connect(ui->writeTable, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->writeTable, &QComboBox::currentIndexChanged, this, &MainWindow::onWriteTableChanged); connect(ui->actionExit, &QAction::triggered, this, &QMainWindow::close); diff --git a/examples/serialbus/modbus/server/mainwindow.cpp b/examples/serialbus/modbus/server/mainwindow.cpp index 5307f66..de2ed18 100644 --- a/examples/serialbus/modbus/server/mainwindow.cpp +++ b/examples/serialbus/modbus/server/mainwindow.cpp @@ -107,7 +107,7 @@ void MainWindow::initActions() this, &MainWindow::onConnectButtonClicked); connect(ui->actionDisconnect, &QAction::triggered, this, &MainWindow::onConnectButtonClicked); - connect(ui->connectType, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->connectType, &QComboBox::currentIndexChanged, this, &MainWindow::onCurrentConnectTypeChanged); connect(ui->actionExit, &QAction::triggered, this, &QMainWindow::close); -- cgit v1.2.3