From 1f524026f912a9ded4ca3aa5291348313fa7dd12 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sun, 26 Jul 2020 15:55:17 +0100 Subject: [PATCH] Fix merging issue --- Network/MessageClient.cpp | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/Network/MessageClient.cpp b/Network/MessageClient.cpp index 54abd9252..b545dd44e 100644 --- a/Network/MessageClient.cpp +++ b/Network/MessageClient.cpp @@ -428,24 +428,22 @@ MessageClient::MessageClient (QString const& id, QString const& version, QString { connect (&*m_ #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - connect (&*m_, static_cast (&impl::error) - , [this] (impl::SocketError e) { + , static_cast (&impl::error), [this] (impl::SocketError e) #else - connect (&*m_, &impl::errorOccurred, [this] (impl::SocketError e) { + , &impl::errorOccurred, [this] (impl::SocketError e) #endif + { #if defined (Q_OS_WIN) - // take this out when Qt 5.5 stops doing this spuriously - if (e != impl::NetworkError - // not interested in this with UDP socket - && e != impl::ConnectionRefusedError) + if (e != impl::NetworkError // take this out when Qt 5.5 stops doing this spuriously + && e != impl::ConnectionRefusedError) // not interested in this with UDP socket + { #else - Q_UNUSED (e); + { + Q_UNUSED (e); #endif - { - Q_EMIT error (m_->errorString ()); - } - }); - + Q_EMIT error (m_->errorString ()); + } + }); set_server (server); }