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 #679 Missing values in json should not cause members of default-constructed object to be overwritten.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-06-29 17:32:42 +01:00
parent 903abcf514
commit 37b8436ebb
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/blackmisc/json.h
View File

@@ -303,7 +303,10 @@ namespace BlackMisc
{
baseConvertFromJson(static_cast<BaseOfT<Derived> *>(derived()), json);
auto meta = introspect<Derived>().without(MetaFlags<DisabledForJson>());
meta.forEachMemberName(*derived(), [ & ](auto & member, const QString & name) { json.value(name) >> member; });
meta.forEachMemberName(*derived(), [ & ](auto & member, const QString & name)
{
if (json.contains(name)) { json.value(name) >> member; }
});
}
//! Assign from JSON object string