flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-24 09:54:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

[FSD] Check for empty string in FSD serializer

Browse Source 
* follow up of Q_UNREACHABLE
* without that check the UNIT test fails, as BLACK_AUDIT is called
This commit is contained in:
Klaus Basan
2020-01-23 04:06:47 +01:00
parent c46ca3c616
commit 12f50dc92c
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/blackcore/fsd/serializer.cpp
View File

@@ -44,6 +44,10 @@ namespace BlackCore
template<> template<>
AtcRating fromQString(const QString &str) AtcRating fromQString(const QString &str)
{ {
// empty string intentionally ignored, also for UNIT test and 3rd parth networks
if (str.isEmpty()) return AtcRating::Unknown;
// valid types
if (str == "1") return AtcRating::Observer; if (str == "1") return AtcRating::Observer;
else if (str == "2") return AtcRating::Student; else if (str == "2") return AtcRating::Student;
else if (str == "3") return AtcRating::Student2; else if (str == "3") return AtcRating::Student2;
@@ -83,6 +87,10 @@ namespace BlackCore
template<> template<>
PilotRating fromQString(const QString &str) PilotRating fromQString(const QString &str)
{ {
// empty string intentionally ignored, also for UNIT test and 3rd parth networks
if (str.isEmpty()) return PilotRating::Unknown;
// valid types
if (str == "0") return PilotRating::Unknown; if (str == "0") return PilotRating::Unknown;
else if (str == "1") return PilotRating::Student; else if (str == "1") return PilotRating::Student;
else if (str == "2") return PilotRating::VFR; else if (str == "2") return PilotRating::VFR;
@@ -129,6 +137,10 @@ namespace BlackCore
template<> template<>
SimType fromQString(const QString &str) SimType fromQString(const QString &str)
{ {
// empty string intentionally ignored, also for UNIT test and 3rd parth networks
if (str.isEmpty()) return SimType::Unknown;
// valid types
if (str == "0") return SimType::Unknown; if (str == "0") return SimType::Unknown;
else if (str == "1") return SimType::MSFS95; else if (str == "1") return SimType::MSFS95;
else if (str == "2") return SimType::MSFS98; else if (str == "2") return SimType::MSFS98;
@@ -178,6 +190,10 @@ namespace BlackCore
BlackMisc::Network::CFacilityType fromQString(const QString &str) BlackMisc::Network::CFacilityType fromQString(const QString &str)
{ {
using namespace BlackMisc::Network; using namespace BlackMisc::Network;
// empty string intentionally ignored, also for UNIT test and 3rd parth networks
if (str.isEmpty()) return CFacilityType::Unknown;
if (str == "0") return CFacilityType::OBS; if (str == "0") return CFacilityType::OBS;
if (str == "1") return CFacilityType::FSS; if (str == "1") return CFacilityType::FSS;
else if (str == "2") return CFacilityType::DEL; else if (str == "2") return CFacilityType::DEL;
@@ -217,6 +233,10 @@ namespace BlackCore
template<> template<>
ClientQueryType fromQString(const QString &str) ClientQueryType fromQString(const QString &str)
{ {
// empty string intentionally ignored, also for UNIT test, 3rd party networks
if (str.isEmpty()) return ClientQueryType::Unknown;
// valid queries
if (str == "ATC") return ClientQueryType::IsValidATC; if (str == "ATC") return ClientQueryType::IsValidATC;
if (str == "CAPS") return ClientQueryType::Capabilities; if (str == "CAPS") return ClientQueryType::Capabilities;
if (str == "C?") return ClientQueryType::Com1Freq; if (str == "C?") return ClientQueryType::Com1Freq;
@@ -282,7 +302,8 @@ namespace BlackCore
else if (str == QLatin1String("V")) return FlightType::VFR; else if (str == QLatin1String("V")) return FlightType::VFR;
else if (str == QLatin1String("S")) return FlightType::SVFR; else if (str == QLatin1String("S")) return FlightType::SVFR;
else if (str == QLatin1String("D")) return FlightType::DVFR; else if (str == QLatin1String("D")) return FlightType::DVFR;
else return FlightType::IFR;
return FlightType::IFR;
} }
template<> template<>
@@ -315,7 +336,8 @@ namespace BlackCore
if (str == "S") return CTransponder::StateStandby; if (str == "S") return CTransponder::StateStandby;
else if (str == "N") return CTransponder::ModeC; else if (str == "N") return CTransponder::ModeC;
else if (str == "Y") return CTransponder::StateIdent; else if (str == "Y") return CTransponder::StateIdent;
else return CTransponder::StateStandby;
return CTransponder::StateStandby;
} }
template<> template<>