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

Based on discussion around T107 and slack

Browse Source 
* Use CJsonScope scope("MetaData") for stacktrace
* added Q_UNUSED(scope) to avoid QtC warnings
This commit is contained in:
Klaus Basan
2017-07-14 15:13:57 +02:00
committed by Mathew Sutcliffe
parent c4db854fad
commit 94c9886c35
8 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackmisc/simulation/aircraftmodellist.cpp
View File

@@ -749,14 +749,17 @@ namespace BlackMisc
if (distributors.isUndefined()) { throw CJsonException("Missing 'distributors'"); }
{
CJsonScope scope("aircraftIcaos");
Q_UNUSED(scope);
helper.getTable<CAircraftIcaoCode>().convertFromJson(aircraftIcaos.toObject());
}
{
CJsonScope scope("liveries");
Q_UNUSED(scope);
helper.getTable<CLivery>().convertFromJson(liveries.toObject());
}
{
CJsonScope scope("distributors");
Q_UNUSED(scope);
helper.getTable<CDistributor>().convertFromJson(distributors.toObject());
}
@@ -764,6 +767,7 @@ namespace BlackMisc
for (auto i = array.begin(); i != array.end(); ++i)
{
CJsonScope scope("containerbase", index++);
Q_UNUSED(scope);
CAircraftModel value;
value.convertFromMemoizedJson(i->toObject(), helper);
insert(value);

4
src/blackmisc/simulation/simulatorplugininfo.cpp
View File

@@ -29,8 +29,8 @@ namespace BlackMisc
if (! json.contains("MetaData")) { throw CJsonException("Missing 'MetaData'"); }
// json data is already validated by CPluginManagerSimulator
//! \todo for RW See T107, remove, change code?
// CJsonScope scope("MetaData");
CJsonScope scope("MetaData");
Q_UNUSED(scope);
CValueObject::convertFromJson(json["MetaData"].toObject());
m_valid = true;
}