Update slots/signals to Qt5 connection style and eliminate some clazy warnings

1 files changed, 22 insertions, 23 deletions

diff --git a/src/networkmanager.cpp b/src/networkmanager.cpp
index 5e29e219..8a90b7c9 100644
--- a/src/networkmanager.cpp
+++ b/src/networkmanager.cpp
@@ -13,15 +13,15 @@ NetworkManager::NetworkManager(AOApplication *parent) : QObject(parent)
 
   ms_reconnect_timer = new QTimer(this);
   ms_reconnect_timer->setSingleShot(true);
-  QObject::connect(ms_reconnect_timer, SIGNAL(timeout()), this,
-                   SLOT(retry_ms_connect()));
+  connect(ms_reconnect_timer, &QTimer::timeout, this,
+                   &NetworkManager::retry_ms_connect);
 
-  QObject::connect(ms_socket, SIGNAL(readyRead()), this,
-                   SLOT(handle_ms_packet()));
-  QObject::connect(server_socket, SIGNAL(readyRead()), this,
-                   SLOT(handle_server_packet()));
-  QObject::connect(server_socket, SIGNAL(disconnected()), ao_app,
-                   SLOT(server_disconnected()));
+  connect(ms_socket, &QTcpSocket::readyRead, this,
+                   &NetworkManager::handle_ms_packet);
+  connect(server_socket, &QTcpSocket::readyRead, this,
+                   &NetworkManager::handle_server_packet);
+  connect(server_socket, &QTcpSocket::disconnected, ao_app,
+                   &AOApplication::server_disconnected);
 
   QString master_config =
       ao_app->configini->value("master", "").value<QString>();
@@ -45,11 +45,11 @@ void NetworkManager::connect_to_master()
 
 void NetworkManager::connect_to_master_nosrv()
 {
-  QObject::connect(ms_socket, SIGNAL(error(QAbstractSocket::SocketError)), this,
-                   SLOT(on_ms_socket_error(QAbstractSocket::SocketError)));
+  connect(ms_socket, &QTcpSocket::errorOccurred, this,
+                   &NetworkManager::on_ms_socket_error);
 
-  QObject::connect(ms_socket, SIGNAL(connected()), this,
-                   SLOT(on_ms_nosrv_connect_success()));
+  connect(ms_socket, &QTcpSocket::connected, this,
+                   &NetworkManager::on_ms_nosrv_connect_success);
   ms_socket->connectToHost(ms_nosrv_hostname, ms_port);
 }
 
@@ -110,7 +110,7 @@ void NetworkManager::perform_srv_lookup()
 #ifdef MS_FAILOVER_SUPPORTED
   ms_dns = new QDnsLookup(QDnsLookup::SRV, ms_srv_hostname, this);
 
-  connect(ms_dns, SIGNAL(finished()), this, SLOT(on_srv_lookup()));
+  connect(ms_dns, &QDnsLookup::finished, this, &NetworkManager::on_srv_lookup);
   ms_dns->lookup();
 #endif
 }
@@ -155,9 +155,9 @@ void NetworkManager::on_srv_lookup()
       if (connected) {
         // Connect a one-shot signal in case the master server disconnects
         // randomly
-        QObject::connect(
-            ms_socket, SIGNAL(error(QAbstractSocket::SocketError)), this,
-            SLOT(on_ms_socket_error(QAbstractSocket::SocketError)));
+        connect(
+            ms_socket, &QTcpSocket::errorOccurred, this,
+            &NetworkManager::on_ms_socket_error);
         break;
       }
       else {
@@ -179,11 +179,11 @@ void NetworkManager::on_ms_nosrv_connect_success()
 {
   emit ms_connect_finished(true, false);
 
-  QObject::disconnect(ms_socket, SIGNAL(connected()), this,
-                      SLOT(on_ms_nosrv_connect_success()));
+  disconnect(ms_socket, &QTcpSocket::connected, this,
+                      &NetworkManager::on_ms_nosrv_connect_success);
 
-  QObject::connect(ms_socket, SIGNAL(error(QAbstractSocket::SocketError)), this,
-                   SLOT(on_ms_socket_error(QAbstractSocket::SocketError)));
+  connect(ms_socket, &QTcpSocket::errorOccurred, this,
+                   &NetworkManager::on_ms_socket_error);
 }
 
 void NetworkManager::on_ms_socket_error(QAbstractSocket::SocketError error)
@@ -193,9 +193,8 @@ void NetworkManager::on_ms_socket_error(QAbstractSocket::SocketError error)
 
   // Disconnect the one-shot signal - this way, failover connect attempts
   // don't trigger a full retry
-  QObject::disconnect(ms_socket, SIGNAL(error(QAbstractSocket::SocketError)),
-                      this,
-                      SLOT(on_ms_socket_error(QAbstractSocket::SocketError)));
+  disconnect(ms_socket, &QTcpSocket::errorOccurred, this,
+                      &NetworkManager::on_ms_socket_error);
 
   emit ms_connect_finished(false, true);