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

refs #246 renamed host to server to avoid ambiguity

Browse Source
This commit is contained in:
Mathew Sutcliffe
2014-06-12 15:27:33 +01:00
parent ab72dce8b5
commit 8dccc8d792
8 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/cli_client/client.cpp
View File

@@ -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)

2
samples/cli_client/client.h
View File

@@ -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);

6
src/blackcore/context_network_impl.cpp
View File

@@ -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);
}

2
src/blackcore/context_network_impl.h
View File

@@ -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);
};
}

2
src/blackcore/network.h
View File

@@ -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.

4
src/blackgui/clientlistmodel.cpp
View File

@@ -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");
}
/*

8
src/blackmisc/nwclient.cpp
View File

@@ -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<CAircraftModel>();
break;
case IndexHost:
this->m_host = variant.toString();
case IndexServer:
this->m_server = variant.toString();
break;
case IndexVoiceCapabilities:
this->m_voiceCapabilities = variant.value<CVoiceCapabilities>();

12
src/blackmisc/nwclient.h
View File

@@ -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;
};