Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add compiler flags to ensure correct signal is used in older versions (#617)

Browse Source
This commit is contained in:
Salanto 2021-12-15 03:32:05 +01:00 committed by GitHub
parent c8f99bd904
commit 641cca6504
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/networkmanager.cpp
View File

@ -45,11 +45,17 @@ void NetworkManager::connect_to_master()
void NetworkManager::connect_to_master_nosrv() void NetworkManager::connect_to_master_nosrv()
{ {
connect(ms_socket, &QTcpSocket::errorOccurred, this, #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
&NetworkManager::on_ms_socket_error); connect(ms_socket, QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error),
this, &NetworkManager::on_ms_socket_error);
#else
connect(ms_socket, &QTcpSocket::errorOccurred,
this, &NetworkManager::on_ms_socket_error);
#endif
connect(ms_socket, &QTcpSocket::connected,
this, &NetworkManager::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); ms_socket->connectToHost(ms_nosrv_hostname, ms_port);
} }
@ -155,9 +161,13 @@ void NetworkManager::on_srv_lookup()
if (connected) { if (connected) {
// Connect a one-shot signal in case the master server disconnects // Connect a one-shot signal in case the master server disconnects
// randomly // randomly
connect( #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
ms_socket, &QTcpSocket::errorOccurred, this, connect(ms_socket, QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error),
&NetworkManager::on_ms_socket_error); this, &NetworkManager::on_ms_socket_error);
#else
connect(ms_socket, &QTcpSocket::errorOccurred,
this, &NetworkManager::on_ms_socket_error);
#endif
break; break;
} }
else { else {
@ -182,8 +192,13 @@ void NetworkManager::on_ms_nosrv_connect_success()
disconnect(ms_socket, &QTcpSocket::connected, this, disconnect(ms_socket, &QTcpSocket::connected, this,
&NetworkManager::on_ms_nosrv_connect_success); &NetworkManager::on_ms_nosrv_connect_success);
connect(ms_socket, &QTcpSocket::errorOccurred, this, #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
&NetworkManager::on_ms_socket_error); connect(ms_socket, QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error),
this, &NetworkManager::on_ms_socket_error);
#else
connect(ms_socket, &QTcpSocket::errorOccurred,
this, &NetworkManager::on_ms_socket_error);
#endif
} }
void NetworkManager::on_ms_socket_error(QAbstractSocket::SocketError error) void NetworkManager::on_ms_socket_error(QAbstractSocket::SocketError error)
@ -193,8 +208,13 @@ void NetworkManager::on_ms_socket_error(QAbstractSocket::SocketError error)
// Disconnect the one-shot signal - this way, failover connect attempts // Disconnect the one-shot signal - this way, failover connect attempts
// don't trigger a full retry // don't trigger a full retry
disconnect(ms_socket, &QTcpSocket::errorOccurred, this, #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
&NetworkManager::on_ms_socket_error); disconnect(ms_socket, QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error),
this, &NetworkManager::on_ms_socket_error);
#else
disconnect(ms_socket, &QTcpSocket::errorOccurred,
this, &NetworkManager::on_ms_socket_error);
#endif
emit ms_connect_finished(false, true); emit ms_connect_finished(false, true);