From 556c6b67315c25f7e4359ab19314f3485f10ecc6 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Mon, 5 Aug 2019 14:10:13 +0200 Subject: 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 --- src/serialbus/qmodbusrtuserialmaster_p.h | 2 +- src/serialbus/qmodbusrtuserialslave_p.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src') 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::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::of(&QSerialPort::error), q, + QObject::connect(m_serialPort, &QSerialPort::errorOccurred, q, [this](QSerialPort::SerialPortError error) { if (error == QSerialPort::NoError) return; -- cgit v1.2.3