From eb908370e0c8212cf81f080f4bdbf663273b8063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Tue, 24 Mar 2020 09:55:43 +0100 Subject: Update connects to QSocketNotifier::activated The int-overload produces a warning Task-number: QTBUG-70441 Change-Id: I1c787e0a5852388d5a08630a51189f9c0661968e Reviewed-by: Alex Blasche --- src/bluetooth/bluez/hcimanager.cpp | 2 +- src/bluetooth/qbluetoothsocket_bluez.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bluetooth/bluez/hcimanager.cpp b/src/bluetooth/bluez/hcimanager.cpp index 2a7c9060..e2635fae 100644 --- a/src/bluetooth/bluez/hcimanager.cpp +++ b/src/bluetooth/bluez/hcimanager.cpp @@ -88,7 +88,7 @@ HciManager::HciManager(const QBluetoothAddress& deviceAdapter, QObject *parent) } notifier = new QSocketNotifier(hciSocket, QSocketNotifier::Read, this); - connect(notifier, SIGNAL(activated(int)), this, SLOT(_q_readNotify())); + connect(notifier, SIGNAL(activated(QSocketDescriptor)), this, SLOT(_q_readNotify())); } diff --git a/src/bluetooth/qbluetoothsocket_bluez.cpp b/src/bluetooth/qbluetoothsocket_bluez.cpp index 25f07bb3..e7d06f2e 100644 --- a/src/bluetooth/qbluetoothsocket_bluez.cpp +++ b/src/bluetooth/qbluetoothsocket_bluez.cpp @@ -111,9 +111,9 @@ bool QBluetoothSocketPrivateBluez::ensureNativeSocket(QBluetoothServiceInfo::Pro Q_Q(QBluetoothSocket); readNotifier = new QSocketNotifier(socket, QSocketNotifier::Read); - QObject::connect(readNotifier, SIGNAL(activated(int)), this, SLOT(_q_readNotify())); + QObject::connect(readNotifier, SIGNAL(activated(QSocketDescriptor)), this, SLOT(_q_readNotify())); connectWriteNotifier = new QSocketNotifier(socket, QSocketNotifier::Write, q); - QObject::connect(connectWriteNotifier, SIGNAL(activated(int)), this, SLOT(_q_writeNotify())); + QObject::connect(connectWriteNotifier, SIGNAL(activated(QSocketDescriptor)), this, SLOT(_q_writeNotify())); connectWriteNotifier->setEnabled(false); readNotifier->setEnabled(false); @@ -685,9 +685,9 @@ bool QBluetoothSocketPrivateBluez::setSocketDescriptor(int socketDescriptor, QBl fcntl(socket, F_SETFL, flags | O_NONBLOCK); readNotifier = new QSocketNotifier(socket, QSocketNotifier::Read); - QObject::connect(readNotifier, SIGNAL(activated(int)), this, SLOT(_q_readNotify())); + QObject::connect(readNotifier, SIGNAL(activated(QSocketDescriptor)), this, SLOT(_q_readNotify())); connectWriteNotifier = new QSocketNotifier(socket, QSocketNotifier::Write, q); - QObject::connect(connectWriteNotifier, SIGNAL(activated(int)), this, SLOT(_q_writeNotify())); + QObject::connect(connectWriteNotifier, SIGNAL(activated(QSocketDescriptor)), this, SLOT(_q_writeNotify())); q->setSocketState(socketState); q->setOpenMode(openMode); -- cgit v1.2.3