diff --git a/src/blackcore/context_network_atc.cpp b/src/blackcore/context_network_atc.cpp index 9e6b5351b..c535649a1 100644 --- a/src/blackcore/context_network_atc.cpp +++ b/src/blackcore/context_network_atc.cpp @@ -215,7 +215,7 @@ namespace BlackCore emit this->changedAtcStationsOnline(); // Remark: this->changedAtcStationOnlineConnectionStatus(station, true); - // will be sent in psFsdAtisVoiceRoomQueryReceived + // will be sent in psFsdAtisVoiceRoomReceived } else { @@ -249,7 +249,7 @@ namespace BlackCore /* * ATIS received */ - void CContextNetwork::psFsdAtisQueryReceived(const CCallsign &callsign, const CInformationMessage &atisMessage) + void CContextNetwork::psFsdAtisReceived(const CCallsign &callsign, const CInformationMessage &atisMessage) { if (callsign.isEmpty()) return; CIndexVariantMap vm(CAtcStation::IndexAtis, atisMessage.toQVariant()); @@ -262,7 +262,7 @@ namespace BlackCore /* * 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(); CIndexVariantMap vm(CAtcStation::IndexVoiceRoomUrl, trimmedUrl); @@ -285,7 +285,7 @@ namespace BlackCore /* * 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) { diff --git a/src/blackcore/context_network_impl.cpp b/src/blackcore/context_network_impl.cpp index 3e39e6d31..d9970e61c 100644 --- a/src/blackcore/context_network_impl.cpp +++ b/src/blackcore/context_network_impl.cpp @@ -60,9 +60,9 @@ namespace BlackCore // 5. connect signals and slots 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::atisReplyReceived, this, &CContextNetwork::psFsdAtisQueryReceived); - this->connect(this->m_network, &INetwork::atisVoiceRoomReplyReceived, this, &CContextNetwork::psFsdAtisVoiceRoomQueryReceived); - this->connect(this->m_network, &INetwork::atisLogoffTimeReplyReceived, this, &CContextNetwork::psFsdAtisLogoffTimeQueryReceived); + this->connect(this->m_network, &INetwork::atisReplyReceived, this, &CContextNetwork::psFsdAtisReceived); + this->connect(this->m_network, &INetwork::atisVoiceRoomReplyReceived, this, &CContextNetwork::psFsdAtisVoiceRoomReceived); + 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::flightPlanReplyReceived, this, &CContextNetwork::psFsdFlightplanReceived); this->connect(this->m_network, &INetwork::realNameReplyReceived, this, &CContextNetwork::psFsdRealNameReplyReceived); diff --git a/src/blackcore/context_network_impl.h b/src/blackcore/context_network_impl.h index 60898d35f..9032639d6 100644 --- a/src/blackcore/context_network_impl.h +++ b/src/blackcore/context_network_impl.h @@ -194,21 +194,21 @@ namespace BlackCore void psFsdAtcControllerDisconnected(const BlackMisc::Aviation::CCallsign &callsign); //! 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) * \param callsign station callsign * \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) * \param callsign station callsign * \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 void psFsdMetarReceived(const QString &metarMessage);