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

Issue #77 Break cyclic dependency statusmessage <-> jsonexception

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-08-27 13:20:34 +01:00
parent 9e0ebef5a1
commit 89659fdeaa
14 changed files with 30 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackmisc/aviation/flightplan.cpp
View File

@@ -630,7 +630,7 @@ namespace BlackMisc
}
catch (const CJsonException &ex)
{
const CStatusMessage m = ex.toStatusMessage(&fp, QString("Parsing flight plan from failed."));
const CStatusMessage m = CStatusMessage::fromJsonException(ex, &fp, QString("Parsing flight plan from failed."));
Q_UNUSED(m)
}
return fp;
@@ -703,7 +703,7 @@ namespace BlackMisc
}
catch (const CJsonException &ex)
{
m = ex.toStatusMessage(getLogCategories(), "Parse error in " + fileName);
m = CStatusMessage::fromJsonException(ex, getLogCategories(), "Parse error in " + fileName);
if (msgs) { msgs->push_back(m); }
break;
}
@@ -717,7 +717,7 @@ namespace BlackMisc
{
if (msgs)
{
msgs->push_back(ex.toStatusMessage(getLogCategories(), QStringLiteral("Parsing flight plan from '%1' failed.").arg(fileName)));
msgs->push_back(CStatusMessage::fromJsonException(ex, getLogCategories(), QStringLiteral("Parsing flight plan from '%1' failed.").arg(fileName)));
}
}
return CFlightPlan();