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

Return const &

Browse Source
This commit is contained in:
Klaus Basan
2018-06-27 01:12:16 +02:00
parent 7a4f723fc0
commit c1208dd68c
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blackcore/airspacemonitor.cpp
View File

@@ -1027,12 +1027,18 @@ namespace BlackCore
return m_network && m_network->isConnected(); return m_network && m_network->isConnected();
} }
const CServer CAirspaceMonitor::getConnectedServer() const const CServer &CAirspaceMonitor::getConnectedServer() const
{ {
if (!this->isConnected()) { return CServer(); } static const CServer empty;
if (!this->isConnected()) { return empty; }
return m_network->getPresetServer(); return m_network->getPresetServer();
} }
const CEcosystem &CAirspaceMonitor::getCurrentEcosystem() const
{
return this->getConnectedServer().getEcosystem();
}
bool CAirspaceMonitor::supportsVatsimDataFile() const bool CAirspaceMonitor::supportsVatsimDataFile() const
{ {
const bool dataFile = sApp && sApp->getWebDataServices() && sApp->getWebDataServices()->getVatsimDataFileReader(); const bool dataFile = sApp && sApp->getWebDataServices() && sApp->getWebDataServices()->getVatsimDataFileReader();

5
src/blackcore/airspacemonitor.h
View File

@@ -195,7 +195,10 @@ namespace BlackCore
bool isConnected() const; bool isConnected() const;
//! Get the currently connected server //! Get the currently connected server
const BlackMisc::Network::CServer getConnectedServer() const; const BlackMisc::Network::CServer &getConnectedServer() const;
//! Current ECO system of connected server
const BlackMisc::Network::CEcosystem &getCurrentEcosystem() const;
//! Supports VATSIM data file //! Supports VATSIM data file
//! \remark depends on currently connected Ecosystem //! \remark depends on currently connected Ecosystem

2
src/blackcore/network.h
View File

@@ -160,7 +160,7 @@ namespace BlackCore
/*! /*!
* Get preset server. * Get preset server.
*/ */
virtual BlackMisc::Network::CServer getPresetServer() const = 0; virtual const BlackMisc::Network::CServer &getPresetServer() const = 0;
/*! /*!
* Returns true if the current ConnectionStatus is in transition, e.g. connecting. * Returns true if the current ConnectionStatus is in transition, e.g. connecting.

2
src/blackcore/vatsim/networkvatlib.h
View File

@@ -79,7 +79,7 @@ namespace BlackCore
//! \name Network functions //! \name Network functions
//! @{ //! @{
virtual bool isConnected() const override { return m_status == vatStatusConnected; } virtual bool isConnected() const override { return m_status == vatStatusConnected; }
virtual BlackMisc::Network::CServer getPresetServer() const override { return m_server; } virtual const BlackMisc::Network::CServer &getPresetServer() const override { return m_server; }
virtual bool isPendingConnection() const override { return m_status == vatStatusConnecting; } virtual bool isPendingConnection() const override { return m_status == vatStatusConnecting; }
virtual void presetLoginMode(LoginMode mode) override; virtual void presetLoginMode(LoginMode mode) override;
virtual void presetServer(const BlackMisc::Network::CServer &server) override; virtual void presetServer(const BlackMisc::Network::CServer &server) override;