diff --git a/src/libs/vmisc/compatibility.h b/src/libs/vmisc/compatibility.h index 8b8f91b56..4aaeaa7c0 100644 --- a/src/libs/vmisc/compatibility.h +++ b/src/libs/vmisc/compatibility.h @@ -286,4 +286,20 @@ inline auto TextWidthF(const QFontMetricsF &fm, const QString &text) -> qreal #endif } +//--------------------------------------------------------------------------------------------------------------------- +template +inline auto Insert(QMap &map1, const QMap &map2) -> void +{ +#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) + map1.insert(map2); +#else + auto i = map2.constBegin(); + while (i != map2.constEnd()) + { + map1.insert(i.key(), i.value()); + ++i; + } +#endif +} + #endif // COMPATIBILITY_H diff --git a/src/libs/vpatterndb/vcontainer.cpp b/src/libs/vpatterndb/vcontainer.cpp index 1a9851cc4..de03964af 100644 --- a/src/libs/vpatterndb/vcontainer.cpp +++ b/src/libs/vpatterndb/vcontainer.cpp @@ -597,12 +597,7 @@ const QMap > VContainer::DataMeasurementsW QMap > measurements = DataVar(VarType::Measurement); QMap > separators = DataVar(VarType::MeasurementSeparator); - QMap>::const_iterator i = separators.constBegin(); - while (i != separators.constEnd()) - { - measurements.insert(i.key(), i.value()); - ++i; - } + Insert(measurements, separators); return measurements; } @@ -619,12 +614,7 @@ const QMap > VContainer::DataIncrementsWithS QMap > increments = DataVar(VarType::Increment); QMap > separators = DataVar(VarType::IncrementSeparator); - QMap>::const_iterator i = separators.constBegin(); - while (i != separators.constEnd()) - { - increments.insert(i.key(), i.value()); - ++i; - } + Insert(increments, separators); return increments; }