Use structured bindings (C++17 feature)

This commit is contained in:
Mat Sutcliffe
2021-04-17 16:31:39 +01:00
parent 9964f44d25
commit 22301c1a1f
6 changed files with 18 additions and 23 deletions

View File

@@ -53,15 +53,14 @@ namespace BlackMisc
// used simple string JSON generation as it is faster
QString json;
for (const auto pair : makePairsRange(m_modelStringVsCG))
for (const auto [string, cg] : makePairsRange(m_modelStringVsCG))
{
json += QStringLiteral("{ \"type\": \"cg\", \"modelstring\": \"%1\", \"cgft\": %2 },\n").arg(pair.first, pair.second.valueRoundedAsString(CLengthUnit::ft(), 1));
json += QStringLiteral("{ \"type\": \"cg\", \"modelstring\": \"%1\", \"cgft\": %2 },\n").arg(string, cg.valueRoundedAsString(CLengthUnit::ft(), 1));
}
for (const auto pair : makePairsRange(m_modelStringVsSimulatorInfo))
for (const auto [string, sim] : makePairsRange(m_modelStringVsSimulatorInfo))
{
const QString sim = pair.second.toQString(false);
json += QStringLiteral("{ \"type\": \"simulatorupdate\", \"modelstring\": \"%1\", \"simulator\": \"%2\" },\n").arg(pair.first, sim);
json += QStringLiteral("{ \"type\": \"simulatorupdate\", \"modelstring\": \"%1\", \"simulator\": \"%2\" },\n").arg(string, sim.toQString(false));
}
if (json.isEmpty()) { return {}; }