Commit 29bbce0d authored by Tomaz Canabrava's avatar Tomaz Canabrava Committed by Daniel Agar

Use qMin and qMax instead of rolling our own

parent 1d7fabaa
...@@ -1285,27 +1285,13 @@ QMap<QString, FactMetaData*> FactMetaData::createMapFromJsonArray(const QJsonArr ...@@ -1285,27 +1285,13 @@ QMap<QString, FactMetaData*> FactMetaData::createMapFromJsonArray(const QJsonArr
QVariant FactMetaData::cookedMax(void) const QVariant FactMetaData::cookedMax(void) const
{ {
// We have to be careful with cooked min/max. Running the raw values through the translator could flip min and max. // We have to be careful with cooked min/max. Running the raw values through the translator could flip min and max.
QVariant cookedMax = _rawTranslator(_rawMax); return qMax(_rawTranslator(_rawMax), _rawTranslator(_rawMin));
QVariant cookedMin = _rawTranslator(_rawMin);
if (cookedMax < cookedMin) {
// We need to flip
return cookedMin;
} else {
return cookedMax;
}
} }
QVariant FactMetaData::cookedMin(void) const QVariant FactMetaData::cookedMin(void) const
{ {
// We have to be careful with cooked min/max. Running the raw values through the translator could flip min and max. // We have to be careful with cooked min/max. Running the raw values through the translator could flip min and max.
QVariant cookedMax = _rawTranslator(_rawMax); return qMin(_rawTranslator(_rawMax), _rawTranslator(_rawMin));
QVariant cookedMin = _rawTranslator(_rawMin);
if (cookedMax < cookedMin) {
// We need to flip
return cookedMax;
} else {
return cookedMin;
}
} }
void FactMetaData::setVolatileValue(bool bValue) void FactMetaData::setVolatileValue(bool bValue)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment