summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarsten Heimrich <karsten.heimrich@qt.io>2021-03-02 15:38:38 +0100
committerKarsten Heimrich <karsten.heimrich@qt.io>2021-03-04 01:00:10 +0100
commitac853f1fd0b73619925224955b3064f51fbdb923 (patch)
treec6444a91274c3fe5b296dcfe9f3f61fe430e1196
parent313cdda83f720709254c96c04190b3f218ac3042 (diff)
Remove now superfluous QOverload invocationsHEADdev
Task-number: QTBUG-91213 Change-Id: I0ca8f4d87fd356966a449675c7c18bc70f7c92dc Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r--examples/serialbus/can/bitratebox.cpp2
-rw-r--r--examples/serialbus/modbus/adueditor/mainwindow.cpp14
-rw-r--r--examples/serialbus/modbus/client/mainwindow.cpp9
-rw-r--r--examples/serialbus/modbus/server/mainwindow.cpp2
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<int>::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<int>::of(&QSpinBox::valueChanged),
+ connect(ti1Spin, &QSpinBox::valueChanged,
device, &ModbusTcpClient::valueChanged);
- connect(ti2Spin, QOverload<int>::of(&QSpinBox::valueChanged),
+ connect(ti2Spin, &QSpinBox::valueChanged,
device, &ModbusTcpClient::valueChanged);
- connect(pi1Spin, QOverload<int>::of(&QSpinBox::valueChanged),
+ connect(pi1Spin, &QSpinBox::valueChanged,
device, &ModbusTcpClient::valueChanged);
- connect(pi2Spin, QOverload<int>::of(&QSpinBox::valueChanged),
+ connect(pi2Spin, &QSpinBox::valueChanged,
device, &ModbusTcpClient::valueChanged);
- connect(l1Spin, QOverload<int>::of(&QSpinBox::valueChanged),
+ connect(l1Spin, &QSpinBox::valueChanged,
device, &ModbusTcpClient::valueChanged);
- connect(l2Spin, QOverload<int>::of(&QSpinBox::valueChanged),
+ connect(l2Spin, &QSpinBox::valueChanged,
device, &ModbusTcpClient::valueChanged);
- connect(ui1Spin, QOverload<int>::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<int>::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<int>::of(&QComboBox::currentIndexChanged),
+ connect(ui->connectType, &QComboBox::currentIndexChanged,
this, &MainWindow::onConnectTypeChanged);
- connect(ui->writeTable, QOverload<int>::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<int>::of(&QComboBox::currentIndexChanged),
+ connect(ui->connectType, &QComboBox::currentIndexChanged,
this, &MainWindow::onCurrentConnectTypeChanged);
connect(ui->actionExit, &QAction::triggered, this, &QMainWindow::close);