flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 12:55:33 +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

2
src/blackgui/components/copymodelsfromotherswiftversionscomponent.cpp
View File

@@ -152,7 +152,7 @@ namespace BlackGui
}
catch (const CJsonException &ex)
{
this->showOverlayMessage(ex.toStatusMessage(this, QStringLiteral("JSON format error. '%1'").arg(fiOtherModelFile.absoluteFilePath())));
this->showOverlayMessage(CStatusMessage::fromJsonException(ex, this, QStringLiteral("JSON format error. '%1'").arg(fiOtherModelFile.absoluteFilePath())));
return false;
}

2
src/blackgui/editors/aircraftpartsform.cpp
View File

@@ -88,7 +88,7 @@ namespace BlackGui
}
catch (const CJsonException &ex)
{
ex.toLogMessage(this, "Parse error");
CLogMessage(this).preformatted(CStatusMessage::fromJsonException(ex, this, "Parse error"));
return parts;
}
return parts;

2
src/blackgui/views/viewbase.cpp
View File

@@ -801,7 +801,7 @@ namespace BlackGui
}
catch (const CJsonException &ex)
{
m = ex.toStatusMessage(this, QString("Reading JSON from '%1'").arg(fileName));
m = CStatusMessage::fromJsonException(ex, this, QString("Reading JSON from '%1'").arg(fileName));
break;
}
}