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

refs #815 Added convertFromJsonNoThrow methods which catch CJsonException and return CStatusMessage.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-12-20 23:10:21 +00:00
parent bbdbd26f82
commit 4f6d3ed3a3
6 changed files with 149 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/blackmisc/statusmessage.h
View File

@@ -336,8 +336,37 @@ namespace BlackMisc
BLACK_METAMEMBER(timestampMSecsSinceEpoch)
);
};
} // namespace
// CContainerBase methods implemented out-of-line to avoid circular include
template <template <class> class C, class T, class CIt>
CStatusMessage CContainerBase<C, T, CIt>::convertFromJsonNoThrow(const QJsonObject &json, const CLogCategoryList &categories, const QString &prefix)
{
try
{
convertFromJson(json);
}
catch (const CJsonException &ex)
{
return ex.toStatusMessage(categories, prefix);
}
return {};
}
//! Call convertFromJson, catch any CJsonException that is thrown and return it as CStatusMessage.
template <template <class> class C, class T, class CIt>
CStatusMessage CContainerBase<C, T, CIt>::convertFromJsonNoThrow(const QString &jsonString, const CLogCategoryList &categories, const QString &prefix)
{
try
{
convertFromJson(jsonString);
}
catch (const CJsonException &ex)
{
return ex.toStatusMessage(categories, prefix);
}
return {};
}
} // namespace
Q_DECLARE_METATYPE(BlackMisc::CStatusMessage)
Q_DECLARE_METATYPE(BlackMisc::CStatusMessage::StatusSeverity)