diff --git a/src/blackcore/context/contextnetwork.h b/src/blackcore/context/contextnetwork.h index 79896a422..2a9d8d4a2 100644 --- a/src/blackcore/context/contextnetwork.h +++ b/src/blackcore/context/contextnetwork.h @@ -217,9 +217,6 @@ namespace BlackCore::Context //! Set client for given callsign virtual bool setOtherClient(const BlackMisc::Network::CClient &client) = 0; - //! Known voice servers, available when data file was first read - virtual BlackMisc::Network::CServerList getVatsimVoiceServers() const = 0; - //! Known FSD servers, available when data file was first read virtual BlackMisc::Network::CServerList getVatsimFsdServers() const = 0; diff --git a/src/blackcore/context/contextnetworkempty.h b/src/blackcore/context/contextnetworkempty.h index 205a742de..29fb58bc1 100644 --- a/src/blackcore/context/contextnetworkempty.h +++ b/src/blackcore/context/contextnetworkempty.h @@ -317,13 +317,6 @@ namespace BlackCore::Context return false; } - //! \copydoc IContextNetwork::getVatsimVoiceServers - virtual BlackMisc::Network::CServerList getVatsimVoiceServers() const override - { - logEmptyContextWarning(Q_FUNC_INFO); - return BlackMisc::Network::CServerList(); - } - //! \copydoc IContextNetwork::getVatsimFsdServers virtual BlackMisc::Network::CServerList getVatsimFsdServers() const override { diff --git a/src/blackcore/context/contextnetworkimpl.cpp b/src/blackcore/context/contextnetworkimpl.cpp index e816c0da5..35094b020 100644 --- a/src/blackcore/context/contextnetworkimpl.cpp +++ b/src/blackcore/context/contextnetworkimpl.cpp @@ -646,13 +646,6 @@ namespace BlackCore::Context return sApp->getWebDataServices()->getVatsimFsdServers(); } - CServerList CContextNetwork::getVatsimVoiceServers() const - { - Q_ASSERT_X(sApp->getWebDataServices(), Q_FUNC_INFO, "Missing data reader"); - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } - return sApp->getWebDataServices()->getVatsimVoiceServers(); - } - void CContextNetwork::onFsdConnectionStatusChanged(const CConnectionStatus &from, const CConnectionStatus &to) { // if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << from << to; } diff --git a/src/blackcore/context/contextnetworkimpl.h b/src/blackcore/context/contextnetworkimpl.h index 7e9f7e3c2..0fec0d1cd 100644 --- a/src/blackcore/context/contextnetworkimpl.h +++ b/src/blackcore/context/contextnetworkimpl.h @@ -365,9 +365,6 @@ namespace BlackCore //! \copydoc BlackCore::Context::IContextNetwork::getVatsimFsdServers virtual BlackMisc::Network::CServerList getVatsimFsdServers() const override; - //! \copydoc BlackCore::Context::IContextNetwork::getVatsimVoiceServers - virtual BlackMisc::Network::CServerList getVatsimVoiceServers() const override; - //! \copydoc BlackCore::Context::IContextNetwork::requestAircraftDataUpdates virtual void requestAircraftDataUpdates() override; diff --git a/src/blackcore/context/contextnetworkproxy.cpp b/src/blackcore/context/contextnetworkproxy.cpp index 35fa28873..c276d8569 100644 --- a/src/blackcore/context/contextnetworkproxy.cpp +++ b/src/blackcore/context/contextnetworkproxy.cpp @@ -164,11 +164,6 @@ namespace BlackCore::Context return m_dBusInterface->callDBusRet(QLatin1String("getVatsimFsdServers")); } - CServerList CContextNetworkProxy::getVatsimVoiceServers() const - { - return m_dBusInterface->callDBusRet(QLatin1String("getVatsimVoiceServers")); - } - CClientList CContextNetworkProxy::getClientsForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const { return m_dBusInterface->callDBusRet(QLatin1String("getClientsForCallsigns"), callsigns); diff --git a/src/blackcore/context/contextnetworkproxy.h b/src/blackcore/context/contextnetworkproxy.h index 811a0bb59..abac375e3 100644 --- a/src/blackcore/context/contextnetworkproxy.h +++ b/src/blackcore/context/contextnetworkproxy.h @@ -148,9 +148,6 @@ namespace BlackCore //! \copydoc BlackCore::Context::IContextNetwork::getClients virtual BlackMisc::Network::CClientList getClients() const override; - //! \copydoc BlackCore::Context::IContextNetwork::getVatsimVoiceServers - virtual BlackMisc::Network::CServerList getVatsimVoiceServers() const override; - //! \copydoc BlackCore::Context::IContextNetwork::getVatsimFsdServers virtual BlackMisc::Network::CServerList getVatsimFsdServers() const override; diff --git a/src/blackcore/webdataservices.cpp b/src/blackcore/webdataservices.cpp index 60aa9967e..2a04946ca 100644 --- a/src/blackcore/webdataservices.cpp +++ b/src/blackcore/webdataservices.cpp @@ -118,12 +118,6 @@ namespace BlackCore return CServerList(); } - CServerList CWebDataServices::getVatsimVoiceServers() const - { - if (m_vatsimDataFileReader) { return m_vatsimDataFileReader->getVoiceServers(); } - return CServerList(); - } - CUrlList CWebDataServices::getVatsimMetarUrls() const { if (m_vatsimStatusReader) { return m_vatsimStatusReader->getMetarFileUrls(); } diff --git a/src/blackcore/webdataservices.h b/src/blackcore/webdataservices.h index f1f9b9c33..b79f07ca9 100644 --- a/src/blackcore/webdataservices.h +++ b/src/blackcore/webdataservices.h @@ -126,10 +126,6 @@ namespace BlackCore //! \threadsafe BlackMisc::Network::CServerList getVatsimFsdServers() const; - //! Voice servers - //! \threadsafe - BlackMisc::Network::CServerList getVatsimVoiceServers() const; - //! METAR URLs (from status file) //! \threadsafe BlackMisc::Network::CUrlList getVatsimMetarUrls() const;