Convert most old-style QObject::connect() to pointer syntax

The remaining cases (e.g. in QBluetoothServiceDiscoveryAgent)
are connected to Q_PRIVATE_SLOT usage which requires a redesign.

Change-Id: I9227b5459b81228a7aa2660193d5b984c036b74f
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>

5 files changed, 60 insertions, 39 deletions

diff --git a/src/bluetooth/qbluetoothsocket.cpp b/src/bluetooth/qbluetoothsocket.cpp
index a35863b4..6c14cffc 100644
--- a/src/bluetooth/qbluetoothsocket.cpp
+++ b/src/bluetooth/qbluetoothsocket.cpp
@@ -662,8 +662,10 @@ void QBluetoothSocket::doDeviceDiscovery(const QBluetoothServiceInfo &service, O
 
     //qDebug() << "Got agent";
 
-    connect(d->discoveryAgent, SIGNAL(serviceDiscovered(QBluetoothServiceInfo)), this, SLOT(serviceDiscovered(QBluetoothServiceInfo)));
-    connect(d->discoveryAgent, SIGNAL(finished()), this, SLOT(discoveryFinished()));
+    connect(d->discoveryAgent, &QBluetoothServiceDiscoveryAgent::serviceDiscovered,
+            this, &QBluetoothSocket::serviceDiscovered);
+    connect(d->discoveryAgent, &QBluetoothServiceDiscoveryAgent::finished,
+            this, &QBluetoothSocket::discoveryFinished);
 
     d->openMode = openMode;
 
diff --git a/src/bluetooth/qlowenergyservice.cpp b/src/bluetooth/qlowenergyservice.cpp
index 7e419e17..39de9d01 100644
--- a/src/bluetooth/qlowenergyservice.cpp
+++ b/src/bluetooth/qlowenergyservice.cpp
@@ -381,20 +381,20 @@ QLowEnergyService::QLowEnergyService(QSharedPointer<QLowEnergyServicePrivate> p,
     qRegisterMetaType<QLowEnergyService::ServiceType>();
     qRegisterMetaType<QLowEnergyService::WriteMode>();
 
-    connect(p.data(), SIGNAL(error(QLowEnergyService::ServiceError)),
-            this, SIGNAL(error(QLowEnergyService::ServiceError)));
-    connect(p.data(), SIGNAL(stateChanged(QLowEnergyService::ServiceState)),
-            this, SIGNAL(stateChanged(QLowEnergyService::ServiceState)));
-    connect(p.data(), SIGNAL(characteristicChanged(QLowEnergyCharacteristic,QByteArray)),
-            this, SIGNAL(characteristicChanged(QLowEnergyCharacteristic,QByteArray)));
-    connect(p.data(), SIGNAL(characteristicWritten(QLowEnergyCharacteristic,QByteArray)),
-            this, SIGNAL(characteristicWritten(QLowEnergyCharacteristic,QByteArray)));
-    connect(p.data(), SIGNAL(descriptorWritten(QLowEnergyDescriptor,QByteArray)),
-            this, SIGNAL(descriptorWritten(QLowEnergyDescriptor,QByteArray)));
-    connect(p.data(), SIGNAL(characteristicRead(QLowEnergyCharacteristic,QByteArray)),
-            this, SIGNAL(characteristicRead(QLowEnergyCharacteristic,QByteArray)));
-    connect(p.data(), SIGNAL(descriptorRead(QLowEnergyDescriptor,QByteArray)),
-            this, SIGNAL(descriptorRead(QLowEnergyDescriptor,QByteArray)));
+    connect(p.data(), &QLowEnergyServicePrivate::error,
+            this, QOverload<QLowEnergyService::ServiceError>::of(&QLowEnergyService::error));
+    connect(p.data(), &QLowEnergyServicePrivate::stateChanged,
+            this, &QLowEnergyService::stateChanged);
+    connect(p.data(), &QLowEnergyServicePrivate::characteristicChanged,
+            this, &QLowEnergyService::characteristicChanged);
+    connect(p.data(), &QLowEnergyServicePrivate::characteristicWritten,
+            this, &QLowEnergyService::characteristicWritten);
+    connect(p.data(), &QLowEnergyServicePrivate::descriptorWritten,
+            this, &QLowEnergyService::descriptorWritten);
+    connect(p.data(), &QLowEnergyServicePrivate::characteristicRead,
+            this, &QLowEnergyService::characteristicRead);
+    connect(p.data(), &QLowEnergyServicePrivate::descriptorRead,
+            this, &QLowEnergyService::descriptorRead);
 }
 
 /*!
diff --git a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp
index ee78fbdb..fc1accbd 100644
--- a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp
+++ b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp
@@ -142,21 +142,29 @@ QDeclarativeBluetoothDiscoveryModel::QDeclarativeBluetoothDiscoveryModel(QObject
     d(new QDeclarativeBluetoothDiscoveryModelPrivate)
 {
     d->m_deviceAgent = new QBluetoothDeviceDiscoveryAgent(this);
-    connect(d->m_deviceAgent, SIGNAL(deviceDiscovered(QBluetoothDeviceInfo)),
-            this, SLOT(deviceDiscovered(QBluetoothDeviceInfo)));
-    connect(d->m_deviceAgent, SIGNAL(finished()), this, SLOT(finishedDiscovery()));
-    connect(d->m_deviceAgent, SIGNAL(canceled()), this, SLOT(finishedDiscovery()));
-    connect(d->m_deviceAgent, SIGNAL(error(QBluetoothDeviceDiscoveryAgent::Error)),
-            this, SLOT(errorDeviceDiscovery(QBluetoothDeviceDiscoveryAgent::Error)));
+    connect(d->m_deviceAgent, &QBluetoothDeviceDiscoveryAgent::deviceDiscovered,
+            this, QOverload<const QBluetoothDeviceInfo&>::of(&QDeclarativeBluetoothDiscoveryModel::deviceDiscovered));
+    connect(d->m_deviceAgent, &QBluetoothDeviceDiscoveryAgent::finished,
+            this, &QDeclarativeBluetoothDiscoveryModel::finishedDiscovery);
+    connect(d->m_deviceAgent, &QBluetoothDeviceDiscoveryAgent::canceled,
+            this, &QDeclarativeBluetoothDiscoveryModel::finishedDiscovery);
+    connect(d->m_deviceAgent,
+            QOverload<QBluetoothDeviceDiscoveryAgent::Error>::of(&QBluetoothDeviceDiscoveryAgent::error),
+            this,
+            &QDeclarativeBluetoothDiscoveryModel::errorDeviceDiscovery);
     d->m_deviceAgent->setObjectName(QStringLiteral("DeviceDiscoveryAgent"));
 
     d->m_serviceAgent = new QBluetoothServiceDiscoveryAgent(this);
-    connect(d->m_serviceAgent, SIGNAL(serviceDiscovered(QBluetoothServiceInfo)),
-            this, SLOT(serviceDiscovered(QBluetoothServiceInfo)));
-    connect(d->m_serviceAgent, SIGNAL(finished()), this, SLOT(finishedDiscovery()));
-    connect(d->m_serviceAgent, SIGNAL(canceled()), this, SLOT(finishedDiscovery()));
-    connect(d->m_serviceAgent, SIGNAL(error(QBluetoothServiceDiscoveryAgent::Error)),
-            this, SLOT(errorDiscovery(QBluetoothServiceDiscoveryAgent::Error)));
+    connect(d->m_serviceAgent, &QBluetoothServiceDiscoveryAgent::serviceDiscovered,
+            this, QOverload<const QBluetoothServiceInfo&>::of(&QDeclarativeBluetoothDiscoveryModel::serviceDiscovered));
+    connect(d->m_serviceAgent, &QBluetoothServiceDiscoveryAgent::finished,
+            this, &QDeclarativeBluetoothDiscoveryModel::finishedDiscovery);
+    connect(d->m_serviceAgent, &QBluetoothServiceDiscoveryAgent::canceled,
+            this, &QDeclarativeBluetoothDiscoveryModel::finishedDiscovery);
+    connect(d->m_serviceAgent,
+            QOverload<QBluetoothServiceDiscoveryAgent::Error>::of(&QBluetoothServiceDiscoveryAgent::error),
+            this,
+            &QDeclarativeBluetoothDiscoveryModel::errorDiscovery);
     d->m_serviceAgent->setObjectName(QStringLiteral("ServiceDiscoveryAgent"));
 
     QHash<int, QByteArray> roleNames;
diff --git a/src/imports/bluetooth/qdeclarativebluetoothservice.cpp b/src/imports/bluetooth/qdeclarativebluetoothservice.cpp
index efbf217b..48c9da9a 100644
--- a/src/imports/bluetooth/qdeclarativebluetoothservice.cpp
+++ b/src/imports/bluetooth/qdeclarativebluetoothservice.cpp
@@ -297,7 +297,8 @@ void QDeclarativeBluetoothService::setRegistered(bool registered)
     }
 
     d->m_server = server;
-    connect(d->m_server, SIGNAL(newConnection()), this, SLOT(new_connection()));
+    connect(d->m_server, &QBluetoothServer::newConnection,
+            this, &QDeclarativeBluetoothService::new_connection);
 
     d->m_service->setAttribute(QBluetoothServiceInfo::ServiceRecordHandle, (uint)0x00010010);
 
diff --git a/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp b/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp
index 0d5a5eae..07de35bc 100644
--- a/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp
+++ b/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp
@@ -112,11 +112,16 @@ public:
 
         m_socket = new QBluetoothSocket(socketProtocol);
         m_socket->connectToService(*m_service->serviceInfo());
-        QObject::connect(m_socket, SIGNAL(connected()), m_dbs, SLOT(socket_connected()));
-        QObject::connect(m_socket, SIGNAL(disconnected()), m_dbs, SLOT(socket_disconnected()));
-        QObject::connect(m_socket, SIGNAL(error(QBluetoothSocket::SocketError)), m_dbs, SLOT(socket_error(QBluetoothSocket::SocketError)));
-        QObject::connect(m_socket, SIGNAL(stateChanged(QBluetoothSocket::SocketState)), m_dbs, SLOT(socket_state(QBluetoothSocket::SocketState)));
-        QObject::connect(m_socket, SIGNAL(readyRead()), m_dbs, SLOT(socket_readyRead()));
+        QObject::connect(m_socket, &QBluetoothSocket::connected,
+                         m_dbs, &QDeclarativeBluetoothSocket::socket_connected);
+        QObject::connect(m_socket, &QBluetoothSocket::disconnected,
+                         m_dbs, &QDeclarativeBluetoothSocket::socket_disconnected);
+        QObject::connect(m_socket, QOverload<QBluetoothSocket::SocketError>::of(&QBluetoothSocket::error),
+                         m_dbs, &QDeclarativeBluetoothSocket::socket_error);
+        QObject::connect(m_socket, &QBluetoothSocket::stateChanged,
+                         m_dbs, &QDeclarativeBluetoothSocket::socket_state);
+        QObject::connect(m_socket, &QIODevice::readyRead,
+                         m_dbs, &QDeclarativeBluetoothSocket::socket_readyRead);
     }
 
     QDeclarativeBluetoothSocket *m_dbs;
@@ -363,11 +368,16 @@ void QDeclarativeBluetoothSocket::newSocket(QBluetoothSocket *socket, QDeclarati
     d->m_componentCompleted = true;
     d->m_error = NoError;
 
-    QObject::connect(socket, SIGNAL(connected()), this, SLOT(socket_connected()));
-    QObject::connect(socket, SIGNAL(disconnected()), this, SLOT(socket_disconnected()));
-    QObject::connect(socket, SIGNAL(error(QBluetoothSocket::SocketError)), this, SLOT(socket_error(QBluetoothSocket::SocketError)));
-    QObject::connect(socket, SIGNAL(stateChanged(QBluetoothSocket::SocketState)), this, SLOT(socket_state(QBluetoothSocket::SocketState)));
-    QObject::connect(socket, SIGNAL(readyRead()), this, SLOT(socket_readyRead()));
+    QObject::connect(socket, &QBluetoothSocket::connected,
+                     this, &QDeclarativeBluetoothSocket::socket_connected);
+    QObject::connect(socket, &QBluetoothSocket::disconnected,
+                     this, &QDeclarativeBluetoothSocket::socket_disconnected);
+    QObject::connect(socket, QOverload<QBluetoothSocket::SocketError>::of(&QBluetoothSocket::error),
+                     this, &QDeclarativeBluetoothSocket::socket_error);
+    QObject::connect(socket, &QBluetoothSocket::stateChanged,
+                     this, &QDeclarativeBluetoothSocket::socket_state);
+    QObject::connect(socket, &QIODevice::readyRead,
+                     this, &QDeclarativeBluetoothSocket::socket_readyRead);
 
     socket_state(socket->state());