flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-09 05:28:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Remove pre-AFV methods

Browse Source
This commit is contained in:
Lars Toenning
2024-02-18 16:00:48 +01:00
parent 5f7c3efdb2
commit 8ecc680dfd
8 changed files with 0 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackcore/context/contextnetwork.h
View File

@@ -217,9 +217,6 @@ namespace BlackCore::Context
//! Set client for given callsign //! Set client for given callsign
virtual bool setOtherClient(const BlackMisc::Network::CClient &client) = 0; 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 //! Known FSD servers, available when data file was first read
virtual BlackMisc::Network::CServerList getVatsimFsdServers() const = 0; virtual BlackMisc::Network::CServerList getVatsimFsdServers() const = 0;

7
src/blackcore/context/contextnetworkempty.h
View File

@@ -317,13 +317,6 @@ namespace BlackCore::Context
return false; return false;
} }
//! \copydoc IContextNetwork::getVatsimVoiceServers
virtual BlackMisc::Network::CServerList getVatsimVoiceServers() const override
{
logEmptyContextWarning(Q_FUNC_INFO);
return BlackMisc::Network::CServerList();
}
//! \copydoc IContextNetwork::getVatsimFsdServers //! \copydoc IContextNetwork::getVatsimFsdServers
virtual BlackMisc::Network::CServerList getVatsimFsdServers() const override virtual BlackMisc::Network::CServerList getVatsimFsdServers() const override
{ {

7
src/blackcore/context/contextnetworkimpl.cpp
View File

@@ -646,13 +646,6 @@ namespace BlackCore::Context
return sApp->getWebDataServices()->getVatsimFsdServers(); 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) void CContextNetwork::onFsdConnectionStatusChanged(const CConnectionStatus &from, const CConnectionStatus &to)
{ {
// if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << from << to; } // if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO << from << to; }

3
src/blackcore/context/contextnetworkimpl.h
View File

@@ -365,9 +365,6 @@ namespace BlackCore
//! \copydoc BlackCore::Context::IContextNetwork::getVatsimFsdServers //! \copydoc BlackCore::Context::IContextNetwork::getVatsimFsdServers
virtual BlackMisc::Network::CServerList getVatsimFsdServers() const override; virtual BlackMisc::Network::CServerList getVatsimFsdServers() const override;
//! \copydoc BlackCore::Context::IContextNetwork::getVatsimVoiceServers
virtual BlackMisc::Network::CServerList getVatsimVoiceServers() const override;
//! \copydoc BlackCore::Context::IContextNetwork::requestAircraftDataUpdates //! \copydoc BlackCore::Context::IContextNetwork::requestAircraftDataUpdates
virtual void requestAircraftDataUpdates() override; virtual void requestAircraftDataUpdates() override;

5
src/blackcore/context/contextnetworkproxy.cpp
View File

@@ -164,11 +164,6 @@ namespace BlackCore::Context
return m_dBusInterface->callDBusRet<BlackMisc::Network::CServerList>(QLatin1String("getVatsimFsdServers")); return m_dBusInterface->callDBusRet<BlackMisc::Network::CServerList>(QLatin1String("getVatsimFsdServers"));
} }
CServerList CContextNetworkProxy::getVatsimVoiceServers() const
{
return m_dBusInterface->callDBusRet<BlackMisc::Network::CServerList>(QLatin1String("getVatsimVoiceServers"));
}
CClientList CContextNetworkProxy::getClientsForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const CClientList CContextNetworkProxy::getClientsForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const
{ {
return m_dBusInterface->callDBusRet<BlackMisc::Network::CClientList>(QLatin1String("getClientsForCallsigns"), callsigns); return m_dBusInterface->callDBusRet<BlackMisc::Network::CClientList>(QLatin1String("getClientsForCallsigns"), callsigns);

3
src/blackcore/context/contextnetworkproxy.h
View File

@@ -148,9 +148,6 @@ namespace BlackCore
//! \copydoc BlackCore::Context::IContextNetwork::getClients //! \copydoc BlackCore::Context::IContextNetwork::getClients
virtual BlackMisc::Network::CClientList getClients() const override; virtual BlackMisc::Network::CClientList getClients() const override;
//! \copydoc BlackCore::Context::IContextNetwork::getVatsimVoiceServers
virtual BlackMisc::Network::CServerList getVatsimVoiceServers() const override;
//! \copydoc BlackCore::Context::IContextNetwork::getVatsimFsdServers //! \copydoc BlackCore::Context::IContextNetwork::getVatsimFsdServers
virtual BlackMisc::Network::CServerList getVatsimFsdServers() const override; virtual BlackMisc::Network::CServerList getVatsimFsdServers() const override;

6
src/blackcore/webdataservices.cpp
View File

@@ -118,12 +118,6 @@ namespace BlackCore
return CServerList(); return CServerList();
} }
CServerList CWebDataServices::getVatsimVoiceServers() const
{
if (m_vatsimDataFileReader) { return m_vatsimDataFileReader->getVoiceServers(); }
return CServerList();
}
CUrlList CWebDataServices::getVatsimMetarUrls() const CUrlList CWebDataServices::getVatsimMetarUrls() const
{ {
if (m_vatsimStatusReader) { return m_vatsimStatusReader->getMetarFileUrls(); } if (m_vatsimStatusReader) { return m_vatsimStatusReader->getMetarFileUrls(); }

4
src/blackcore/webdataservices.h
View File

@@ -126,10 +126,6 @@ namespace BlackCore
//! \threadsafe //! \threadsafe
BlackMisc::Network::CServerList getVatsimFsdServers() const; BlackMisc::Network::CServerList getVatsimFsdServers() const;
//! Voice servers
//! \threadsafe
BlackMisc::Network::CServerList getVatsimVoiceServers() const;
//! METAR URLs (from status file) //! METAR URLs (from status file)
//! \threadsafe //! \threadsafe
BlackMisc::Network::CUrlList getVatsimMetarUrls() const; BlackMisc::Network::CUrlList getVatsimMetarUrls() const;