refs #246 style: remove "query" where it makes no sense

This commit is contained in:
Mathew Sutcliffe
2014-06-11 19:01:51 +01:00
parent ef1c5d0d77
commit c479b7f6e3
3 changed files with 10 additions and 10 deletions

View File

@@ -215,7 +215,7 @@ namespace BlackCore
emit this->changedAtcStationsOnline(); emit this->changedAtcStationsOnline();
// Remark: this->changedAtcStationOnlineConnectionStatus(station, true); // Remark: this->changedAtcStationOnlineConnectionStatus(station, true);
// will be sent in psFsdAtisVoiceRoomQueryReceived // will be sent in psFsdAtisVoiceRoomReceived
} }
else else
{ {
@@ -249,7 +249,7 @@ namespace BlackCore
/* /*
* ATIS received * ATIS received
*/ */
void CContextNetwork::psFsdAtisQueryReceived(const CCallsign &callsign, const CInformationMessage &atisMessage) void CContextNetwork::psFsdAtisReceived(const CCallsign &callsign, const CInformationMessage &atisMessage)
{ {
if (callsign.isEmpty()) return; if (callsign.isEmpty()) return;
CIndexVariantMap vm(CAtcStation::IndexAtis, atisMessage.toQVariant()); CIndexVariantMap vm(CAtcStation::IndexAtis, atisMessage.toQVariant());
@@ -262,7 +262,7 @@ namespace BlackCore
/* /*
* ATIS (voice room part) received * ATIS (voice room part) received
*/ */
void CContextNetwork::psFsdAtisVoiceRoomQueryReceived(const CCallsign &callsign, const QString &url) void CContextNetwork::psFsdAtisVoiceRoomReceived(const CCallsign &callsign, const QString &url)
{ {
QString trimmedUrl = url.trimmed(); QString trimmedUrl = url.trimmed();
CIndexVariantMap vm(CAtcStation::IndexVoiceRoomUrl, trimmedUrl); CIndexVariantMap vm(CAtcStation::IndexVoiceRoomUrl, trimmedUrl);
@@ -285,7 +285,7 @@ namespace BlackCore
/* /*
* ATIS (logoff time part) received * ATIS (logoff time part) received
*/ */
void CContextNetwork::psFsdAtisLogoffTimeQueryReceived(const CCallsign &callsign, const QString &zuluTime) void CContextNetwork::psFsdAtisLogoffTimeReceived(const CCallsign &callsign, const QString &zuluTime)
{ {
if (zuluTime.length() == 4) if (zuluTime.length() == 4)
{ {

View File

@@ -60,9 +60,9 @@ namespace BlackCore
// 5. connect signals and slots // 5. connect signals and slots
this->connect(this->m_network, &INetwork::connectionStatusChanged, this, &CContextNetwork::psFsdConnectionStatusChanged); this->connect(this->m_network, &INetwork::connectionStatusChanged, this, &CContextNetwork::psFsdConnectionStatusChanged);
this->connect(this->m_network, &INetwork::atcPositionUpdate, this, &CContextNetwork::psFsdAtcPositionUpdate); this->connect(this->m_network, &INetwork::atcPositionUpdate, this, &CContextNetwork::psFsdAtcPositionUpdate);
this->connect(this->m_network, &INetwork::atisReplyReceived, this, &CContextNetwork::psFsdAtisQueryReceived); this->connect(this->m_network, &INetwork::atisReplyReceived, this, &CContextNetwork::psFsdAtisReceived);
this->connect(this->m_network, &INetwork::atisVoiceRoomReplyReceived, this, &CContextNetwork::psFsdAtisVoiceRoomQueryReceived); this->connect(this->m_network, &INetwork::atisVoiceRoomReplyReceived, this, &CContextNetwork::psFsdAtisVoiceRoomReceived);
this->connect(this->m_network, &INetwork::atisLogoffTimeReplyReceived, this, &CContextNetwork::psFsdAtisLogoffTimeQueryReceived); this->connect(this->m_network, &INetwork::atisLogoffTimeReplyReceived, this, &CContextNetwork::psFsdAtisLogoffTimeReceived);
this->connect(this->m_network, &INetwork::metarReplyReceived, this, &CContextNetwork::psFsdMetarReceived); this->connect(this->m_network, &INetwork::metarReplyReceived, this, &CContextNetwork::psFsdMetarReceived);
this->connect(this->m_network, &INetwork::flightPlanReplyReceived, this, &CContextNetwork::psFsdFlightplanReceived); this->connect(this->m_network, &INetwork::flightPlanReplyReceived, this, &CContextNetwork::psFsdFlightplanReceived);
this->connect(this->m_network, &INetwork::realNameReplyReceived, this, &CContextNetwork::psFsdRealNameReplyReceived); this->connect(this->m_network, &INetwork::realNameReplyReceived, this, &CContextNetwork::psFsdRealNameReplyReceived);

View File

@@ -194,21 +194,21 @@ namespace BlackCore
void psFsdAtcControllerDisconnected(const BlackMisc::Aviation::CCallsign &callsign); void psFsdAtcControllerDisconnected(const BlackMisc::Aviation::CCallsign &callsign);
//! ATIS received //! ATIS received
void psFsdAtisQueryReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CInformationMessage &atisMessage); void psFsdAtisReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CInformationMessage &atisMessage);
/*! /*!
* \brief ATIS received (voice room part) * \brief ATIS received (voice room part)
* \param callsign station callsign * \param callsign station callsign
* \param url voice room's URL * \param url voice room's URL
*/ */
void psFsdAtisVoiceRoomQueryReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &url); void psFsdAtisVoiceRoomReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &url);
/*! /*!
* \brief ATIS received (logoff time part) * \brief ATIS received (logoff time part)
* \param callsign station callsign * \param callsign station callsign
* \param zuluTime UTC time, when controller will logoff * \param zuluTime UTC time, when controller will logoff
*/ */
void psFsdAtisLogoffTimeQueryReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &zuluTime); void psFsdAtisLogoffTimeReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &zuluTime);
//! METAR received //! METAR received
void psFsdMetarReceived(const QString &metarMessage); void psFsdMetarReceived(const QString &metarMessage);