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

refs #815 Throw CJsonException when required JSON objects are not found.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-12-18 04:44:25 +00:00
parent 7c5c9d30e6
commit bbdbd26f82
10 changed files with 112 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/blackmisc/dictionary.h
View File

@@ -257,7 +257,10 @@ namespace BlackMisc
//! \copydoc BlackMisc::Mixin::JsonByMetaClass::convertFromJson
void convertFromJson(const QJsonObject &json)
{
QJsonArray array = json.value("associativecontainerbase").toArray();
QJsonValue value = json.value("associativecontainerbase");
if (value.isUndefined()) { throw CJsonException("Missing 'associativecontainerbase'"); }
QJsonArray array = value.toArray();
int index = 0;
for (auto it = array.begin(); it != array.end(); ++it)
{
QJsonValueRef jsonKey = (*it);
@@ -265,10 +268,16 @@ namespace BlackMisc
if (it == array.end()) { qWarning("Odd number of elements in CDictionary::convertFromJson"); return; }
QJsonValueRef jsonValue = (*it);
Key key;
Value value;
jsonKey >> key;
jsonValue >> value;
m_impl.insert(key, value);
Value val;
{
CJsonScope scope("associativecontainerbase", 2 * index);
jsonKey >> key;
}
{
CJsonScope scope("associativecontainerbase", 2 * index++ + 1);
jsonValue >> val;
}
m_impl.insert(std::move(key), std::move(val));
}
}