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

7
src/blackmisc/statusmessage.h
View File

@@ -510,6 +510,9 @@ namespace BlackMisc
//! Object from JSON
static CStatusMessage fromDatabaseJson(const QJsonObject &json);
//! Object from JSON exception message
static CStatusMessage fromJsonException(const CJsonException &ex, const CLogCategoryList &categories, const QString &prefix);
//! \copydoc BlackMisc::CValueObject::registerMetadata
static void registerMetadata();
@@ -543,7 +546,7 @@ namespace BlackMisc
}
catch (const CJsonException &ex)
{
return ex.toStatusMessage(categories, prefix);
return CStatusMessage::fromJsonException(ex, categories, prefix);
}
return {};
}
@@ -558,7 +561,7 @@ namespace BlackMisc
}
catch (const CJsonException &ex)
{
return ex.toStatusMessage(categories, prefix);
return CStatusMessage::fromJsonException(ex, categories, prefix);
}
return {};
}