From 8dccc8d79275213c7beff5c9ec00b29ac9687acb Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Thu, 12 Jun 2014 15:27:33 +0100 Subject: [PATCH] refs #246 renamed host to server to avoid ambiguity --- samples/cli_client/client.cpp | 4 ++-- samples/cli_client/client.h | 2 +- src/blackcore/context_network_impl.cpp | 6 +++--- src/blackcore/context_network_impl.h | 2 +- src/blackcore/network.h | 2 +- src/blackgui/clientlistmodel.cpp | 4 ++-- src/blackmisc/nwclient.cpp | 8 ++++---- src/blackmisc/nwclient.h | 12 ++++++------ 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/samples/cli_client/client.cpp b/samples/cli_client/client.cpp index 64b6cfbd8..3cd40cb52 100644 --- a/samples/cli_client/client.cpp +++ b/samples/cli_client/client.cpp @@ -481,9 +481,9 @@ void Client::freqReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, c std::cout << "FREQ_REPLY " << callsign << " " << freq << std::endl; } -void Client::serverReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &hostname) +void Client::serverReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &server) { - std::cout << "SERVER_REPLY " << callsign << " " << hostname.toStdString() << std::endl; + std::cout << "SERVER_REPLY " << callsign << " " << server.toStdString() << std::endl; } void Client::atcReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, bool isATC) diff --git a/samples/cli_client/client.h b/samples/cli_client/client.h index 78d07689c..2732eda6e 100644 --- a/samples/cli_client/client.h +++ b/samples/cli_client/client.h @@ -96,7 +96,7 @@ public slots: //to receive from INetwork const QString &errorMessage); void ipReplyReceived(const QString &ip); void freqReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::PhysicalQuantities::CFrequency &freq); - void serverReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &hostname); + void serverReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &server); void atcReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, bool isATC); void atisReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CInformationMessage &atis); void realNameReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &realname); diff --git a/src/blackcore/context_network_impl.cpp b/src/blackcore/context_network_impl.cpp index 5ef0a3ac8..1f454b899 100644 --- a/src/blackcore/context_network_impl.cpp +++ b/src/blackcore/context_network_impl.cpp @@ -438,10 +438,10 @@ namespace BlackCore /* * Host */ - void CContextNetwork::psFsdServerReplyReceived(const CCallsign &callsign, const QString &host) + void CContextNetwork::psFsdServerReplyReceived(const CCallsign &callsign, const QString &server) { - if (callsign.isEmpty() || host.isEmpty()) return; - CIndexVariantMap vm(CClient::IndexHost, QVariant(host)); + if (callsign.isEmpty() || server.isEmpty()) return; + CIndexVariantMap vm(CClient::IndexServer, QVariant(server)); this->m_otherClients.applyIf(&CClient::getCallsign, callsign, vm); } diff --git a/src/blackcore/context_network_impl.h b/src/blackcore/context_network_impl.h index bc21c7042..ab414ac48 100644 --- a/src/blackcore/context_network_impl.h +++ b/src/blackcore/context_network_impl.h @@ -232,7 +232,7 @@ namespace BlackCore void psFsdCustomPacketReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &package, const QStringList &data); //! Server reply received - void psFsdServerReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &host); + void psFsdServerReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &server); }; } diff --git a/src/blackcore/network.h b/src/blackcore/network.h index 42d7c8775..7f0250698 100644 --- a/src/blackcore/network.h +++ b/src/blackcore/network.h @@ -457,7 +457,7 @@ namespace BlackCore * We received a reply to one of our queries. * \sa sendServerQuery */ - void serverReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &hostname); + void serverReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &server); /*! * We received a reply to one of our queries. diff --git a/src/blackgui/clientlistmodel.cpp b/src/blackgui/clientlistmodel.cpp index afdebe931..29ebda324 100644 --- a/src/blackgui/clientlistmodel.cpp +++ b/src/blackgui/clientlistmodel.cpp @@ -19,7 +19,7 @@ namespace BlackGui this->m_columns.addColumn(CColumn("", CClient::IndexVoiceCapabilitiesIcon)); this->m_columns.addColumn(CColumn("capabilities", CClient::IndexCapabilitiesString)); this->m_columns.addColumn(CColumn("model", CClient::IndexQueriedModelString)); - this->m_columns.addColumn(CColumn("host", CClient::IndexHost)); + this->m_columns.addColumn(CColumn("server", CClient::IndexServer)); // force strings for translation in resource files // force strings for translation in resource files @@ -27,7 +27,7 @@ namespace BlackGui (void)QT_TRANSLATE_NOOP("ViewClientList", "realname"); (void)QT_TRANSLATE_NOOP("ViewClientList", "userid"); (void)QT_TRANSLATE_NOOP("ViewClientList", "model"); - (void)QT_TRANSLATE_NOOP("ViewClientList", "host"); + (void)QT_TRANSLATE_NOOP("ViewClientList", "server"); } /* diff --git a/src/blackmisc/nwclient.cpp b/src/blackmisc/nwclient.cpp index 64b43ea0f..88218b99b 100644 --- a/src/blackmisc/nwclient.cpp +++ b/src/blackmisc/nwclient.cpp @@ -179,8 +179,8 @@ namespace BlackMisc case IndexModel: return QVariant(this->m_model.toQVariant()); break; - case IndexHost: - return QVariant(this->m_host); + case IndexServer: + return QVariant(this->m_server); break; case IndexVoiceCapabilities: return this->m_voiceCapabilities.toQVariant(); @@ -223,8 +223,8 @@ namespace BlackMisc case IndexModel: this->m_model = variant.value(); break; - case IndexHost: - this->m_host = variant.toString(); + case IndexServer: + this->m_server = variant.toString(); break; case IndexVoiceCapabilities: this->m_voiceCapabilities = variant.value(); diff --git a/src/blackmisc/nwclient.h b/src/blackmisc/nwclient.h index 72b3383bf..6d0f47001 100644 --- a/src/blackmisc/nwclient.h +++ b/src/blackmisc/nwclient.h @@ -36,7 +36,7 @@ namespace BlackMisc IndexCapabilities = 1000, IndexCapabilitiesString, IndexModel, - IndexHost, + IndexServer, IndexVoiceCapabilities, IndexVoiceCapabilitiesString, IndexVoiceCapabilitiesIcon @@ -106,11 +106,11 @@ namespace BlackMisc //! Set voice capabilities void setVoiceCapabilities(const QString &flightPlanRemarks) { m_voiceCapabilities = CVoiceCapabilities(flightPlanRemarks);} - //! Host - const QString &getHost() const { return this->m_host; } + //! Server + const QString &getServer() const { return this->m_server; } - //! Host - void setHost(const QString &host) { this->m_host = host;} + //! Server + void setServer(const QString &server) { this->m_server = server;} //! Model const CAircraftModel &getAircraftModel() const { return this->m_model; } @@ -157,7 +157,7 @@ namespace BlackMisc CUser m_user; CAircraftModel m_model; CIndexVariantMap m_capabilities; - QString m_host; + QString m_server; CVoiceCapabilities m_voiceCapabilities; };