diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-08-05 14:10:13 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-08-06 09:37:40 +0200 |
| commit | 556c6b67315c25f7e4359ab19314f3485f10ecc6 (patch) | |
| tree | e5862216942ced44bd52c15fdf9a1feb8a82e910 | |
| parent | 1bac9b37a9982eb5bf44f0fb16f580c2c1c1d959 (diff) | |
Remove usages of deprecated APIs
Replace QSerialPort::error(QSerialPort::SerialPortError) with
QSerialPort::errorOccurred(QSerialPort::SerialPortError).
Task-number: QTBUG-76491
Change-Id: Ic1d0a9ff89d346eca6cd2fd448cc02360c5e8783
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| -rw-r--r-- | src/serialbus/qmodbusrtuserialmaster_p.h | 2 | ||||
| -rw-r--r-- | src/serialbus/qmodbusrtuserialslave_p.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/serialbus/qmodbusrtuserialmaster_p.h b/src/serialbus/qmodbusrtuserialmaster_p.h index 9abd378..d206eec 100644 --- a/src/serialbus/qmodbusrtuserialmaster_p.h +++ b/src/serialbus/qmodbusrtuserialmaster_p.h @@ -310,7 +310,7 @@ public: onBytesWritten(bytes); }); - QObject::connect(m_serialPort, QOverload<QSerialPort::SerialPortError>::of(&QSerialPort::error), + QObject::connect(m_serialPort, &QSerialPort::errorOccurred, q, [this](QSerialPort::SerialPortError error) { onError(error); }); diff --git a/src/serialbus/qmodbusrtuserialslave_p.h b/src/serialbus/qmodbusrtuserialslave_p.h index b25a039..d6ff8d6 100644 --- a/src/serialbus/qmodbusrtuserialslave_p.h +++ b/src/serialbus/qmodbusrtuserialslave_p.h @@ -280,8 +280,7 @@ public: storeModbusCommEvent(event); // store the final event after processing }); - QObject::connect(m_serialPort, - QOverload<QSerialPort::SerialPortError>::of(&QSerialPort::error), q, + QObject::connect(m_serialPort, &QSerialPort::errorOccurred, q, [this](QSerialPort::SerialPortError error) { if (error == QSerialPort::NoError) return; |