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

Formatting

Browse Source
This commit is contained in:
Klaus Basan
2017-06-26 02:09:38 +02:00
committed by Mathew Sutcliffe
parent d96a9a9fa2
commit d2d44085ba
6 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackmisc/aviation/airlineicaocodelist.cpp
View File

@@ -157,7 +157,7 @@ namespace BlackMisc
// further reduce
if (patternUsed.hasName())
{
CAirlineIcaoCodeList backup(codesFound);
const CAirlineIcaoCodeList backup(codesFound);
codesFound = this->findByNamesOrTelephonyDesignator(patternUsed.getName());
if (codesFound.isEmpty()) { codesFound = backup; }
}

22
src/blackmisc/network/voicecapabilites.cpp
View File

@@ -22,7 +22,6 @@ namespace BlackMisc
{
namespace Network
{
CVoiceCapabilities::CVoiceCapabilities(const QString &flightPlanRemarks)
{
this->setFromFlightPlanRemarks(flightPlanRemarks);
@@ -66,20 +65,20 @@ namespace BlackMisc
return;
}
const QString r = flightPlanRemarks.toLower();
if (r.contains("/v/") || r.contains("/voice/"))
const QString r = flightPlanRemarks.toUpper(); // normally already upper case
if (r.contains("/V/") || r.contains("/VOICE/"))
{
this->setCapabilities(Voice);
return;
}
if (r.contains("/t/"))
if (r.contains("/T/"))
{
this->setCapabilities(TextOnly);
return;
}
if (r.contains("/r/"))
if (r.contains("/R/"))
{
this->setCapabilities(VoiceReceivingOnly);
return;
@@ -116,15 +115,11 @@ namespace BlackMisc
switch (capabilities)
{
case CVoiceCapabilities::TextOnly:
return to;
case CVoiceCapabilities::Voice:
return v;
case CVoiceCapabilities::VoiceReceivingOnly:
return vro;
case CVoiceCapabilities::TextOnly: return to;
case CVoiceCapabilities::Voice: return v;
case CVoiceCapabilities::VoiceReceivingOnly: return vro;
case CVoiceCapabilities::Unknown:
default:
return u;
default: return u;
}
}
@@ -133,6 +128,5 @@ namespace BlackMisc
static const QList<CVoiceCapabilities> all({fromVoiceCapabilities(Unknown), fromVoiceCapabilities(Voice), fromVoiceCapabilities(VoiceReceivingOnly), fromVoiceCapabilities(TextOnly)});
return all;
}
} // namespace
} // namespace