From 5f85bf62f51ddbb5db96c7f3a04ccdb126355dcc Mon Sep 17 00:00:00 2001 From: Dmitriy Karpushin Date: Wed, 15 Mar 2023 17:46:22 +0300 Subject: [PATCH] Missing def check --- client/vpnconnection.cpp | 14 ++++++++------ client/vpnconnection.h | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/client/vpnconnection.cpp b/client/vpnconnection.cpp index 273fd7ad..6d8aa493 100644 --- a/client/vpnconnection.cpp +++ b/client/vpnconnection.cpp @@ -378,6 +378,13 @@ void VpnConnection::connectToVpn(int serverIndex, if (e) emit VpnProtocol::Error; } +void VpnConnection::createProtocolConnections() { + connect(m_vpnProtocol.data(), &VpnProtocol::protocolError, this, &VpnConnection::vpnProtocolError); + connect(m_vpnProtocol.data(), SIGNAL(connectionStateChanged(VpnProtocol::VpnConnectionState)), this, SLOT(onConnectionStateChanged(VpnProtocol::VpnConnectionState))); + connect(m_vpnProtocol.data(), SIGNAL(bytesChanged(quint64, quint64)), this, SLOT(onBytesChanged(quint64, quint64))); +} + +#ifdef Q_OS_ANDROID void VpnConnection::restoreConnection() { createAndroidConnections(); @@ -402,12 +409,6 @@ void VpnConnection::createAndroidConnections(DockerContainer container) connect(AndroidController::instance(), &AndroidController::statusUpdated, androidVpnProtocol, &AndroidVpnProtocol::connectionDataUpdated); } -void VpnConnection::createProtocolConnections() { - connect(m_vpnProtocol.data(), &VpnProtocol::protocolError, this, &VpnConnection::vpnProtocolError); - connect(m_vpnProtocol.data(), SIGNAL(connectionStateChanged(VpnProtocol::VpnConnectionState)), this, SLOT(onConnectionStateChanged(VpnProtocol::VpnConnectionState))); - connect(m_vpnProtocol.data(), SIGNAL(bytesChanged(quint64, quint64)), this, SLOT(onBytesChanged(quint64, quint64))); -} - AndroidVpnProtocol* VpnConnection::createDefaultAndroidVpnProtocol(DockerContainer container) { Proto proto = ContainerProps::defaultProtocol(container); @@ -415,6 +416,7 @@ AndroidVpnProtocol* VpnConnection::createDefaultAndroidVpnProtocol(DockerContain return androidVpnProtocol; } +#endif QString VpnConnection::bytesPerSecToText(quint64 bytes) { diff --git a/client/vpnconnection.h b/client/vpnconnection.h index b0fff393..ab8f2de0 100644 --- a/client/vpnconnection.h +++ b/client/vpnconnection.h @@ -111,8 +111,8 @@ private: #endif #ifdef Q_OS_ANDROID AndroidVpnProtocol* androidVpnProtocol = nullptr; - AndroidVpnProtocol* createDefaultAndroidVpnProtocol(DockerContainer container); + AndroidVpnProtocol* createDefaultAndroidVpnProtocol(DockerContainer container); void createAndroidConnections(); void createAndroidConnections(DockerContainer container); #endif