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

Ref T189, "private slot" -> "private"

Browse Source
This commit is contained in:
Klaus Basan
2017-11-11 23:23:31 +01:00
parent f55332b1ec
commit 22c34f4e23
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,10 +66,10 @@ namespace BlackCore
// 1. Init by "network driver"
m_network = new CNetworkVatlib(this->getRuntime()->getCContextOwnAircraft(), this);
connect(m_network, &INetwork::connectionStatusChanged, this, &CContextNetwork::ps_fsdConnectionStatusChanged);
connect(m_network, &INetwork::connectionStatusChanged, this, &CContextNetwork::fsdConnectionStatusChanged);
connect(m_network, &INetwork::kicked, this, &CContextNetwork::kicked);
connect(m_network, &INetwork::textMessagesReceived, this, &CContextNetwork::textMessagesReceived);
connect(m_network, &INetwork::textMessagesReceived, this, &CContextNetwork::ps_checkForSupervisiorTextMessage);
connect(m_network, &INetwork::textMessagesReceived, this, &CContextNetwork::checkForSupervisiorTextMessage);
connect(m_network, &INetwork::textMessageSent, this, &CContextNetwork::textMessageSent);
// 2. Update timer for data (network data such as frequency)
@@ -400,7 +400,7 @@ namespace BlackCore
return sApp->getWebDataServices()->getVatsimVoiceServers();
}
void CContextNetwork::ps_fsdConnectionStatusChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to)
void CContextNetwork::fsdConnectionStatusChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to)
{
if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << from << to; }
auto fromOld = m_currentStatus; // own status cached
@@ -441,7 +441,7 @@ namespace BlackCore
emit this->connectionStatusChanged(from, to);
}
void CContextNetwork::ps_simulatorRenderRestrictionsChanged(bool restricted, bool enabled, int maxAircraft, const CLength &maxRenderedDistance)
void CContextNetwork::simulatorRenderRestrictionsChanged(bool restricted, bool enabled, int maxAircraft, const CLength &maxRenderedDistance)
{
// mainly passing changed restrictions from simulator to network
if (!m_airspace) { return; }
@@ -449,20 +449,20 @@ namespace BlackCore
m_airspace->analyzer()->setSimulatorRenderRestrictionsChanged(restricted, enabled, maxAircraft, maxRenderedDistance);
}
void CContextNetwork::ps_updateMetars(const BlackMisc::Weather::CMetarList &metars)
void CContextNetwork::updateMetars(const BlackMisc::Weather::CMetarList &metars)
{
if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
CLogMessage(this).info("%1 METARs updated") << metars.size();
}
void CContextNetwork::ps_checkForSupervisiorTextMessage(const CTextMessageList &messages)
void CContextNetwork::checkForSupervisiorTextMessage(const CTextMessageList &messages)
{
if (messages.containsPrivateMessages())
{
CTextMessageList supMessages(messages.getSupervisorMessages());
for (const CTextMessage &m : supMessages)
{
emit supervisorTextMessageReceived(m);
emit this->supervisorTextMessageReceived(m);
}
}
}

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

@@ -219,19 +219,18 @@ namespace BlackCore
//! Own aircraft from \sa CContextOwnAircraft
const BlackMisc::Simulation::CSimulatedAircraft ownAircraft() const;
private slots:
//! Update METAR collection
void ps_updateMetars(const BlackMisc::Weather::CMetarList &metars);
void updateMetars(const BlackMisc::Weather::CMetarList &metars);
//! Check if a supervisor message was received
void ps_checkForSupervisiorTextMessage(const BlackMisc::Network::CTextMessageList &messages);
void checkForSupervisiorTextMessage(const BlackMisc::Network::CTextMessageList &messages);
//! Connection status changed
void ps_fsdConnectionStatusChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to);
void fsdConnectionStatusChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to);
//! Render restrictions have been changed, used with analyzer
//! \sa CAirspaceAnalyzer
void ps_simulatorRenderRestrictionsChanged(bool restricted, bool enabled, int maxAircraft, const BlackMisc::PhysicalQuantities::CLength &maxRenderedDistance);
void simulatorRenderRestrictionsChanged(bool restricted, bool enabled, int maxAircraft, const BlackMisc::PhysicalQuantities::CLength &maxRenderedDistance);
};
} // ns
} // ns

2
src/blackcore/corefacade.cpp
View File

@@ -218,7 +218,7 @@ namespace BlackCore
this->getCContextSimulator(), &CContextSimulator::ps_networkRequestedNewAircraft);
Q_ASSERT(c);
c = connect(this->getCContextSimulator(), &CContextSimulator::renderRestrictionsChanged,
this->getCContextNetwork(), &CContextNetwork::ps_simulatorRenderRestrictionsChanged);
this->getCContextNetwork(), &CContextNetwork::simulatorRenderRestrictionsChanged);
Q_ASSERT(c);
}