From 29bbce0d5ad3a94e8f5cb35cb4185c98c13666b9 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Thu, 11 Jul 2019 05:13:54 +0200 Subject: [PATCH] Use qMin and qMax instead of rolling our own --- src/FactSystem/FactMetaData.cc | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/src/FactSystem/FactMetaData.cc b/src/FactSystem/FactMetaData.cc index 570149ab9..777a650a4 100644 --- a/src/FactSystem/FactMetaData.cc +++ b/src/FactSystem/FactMetaData.cc @@ -1285,27 +1285,13 @@ QMap FactMetaData::createMapFromJsonArray(const QJsonArr 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. - QVariant cookedMax = _rawTranslator(_rawMax); - QVariant cookedMin = _rawTranslator(_rawMin); - if (cookedMax < cookedMin) { - // We need to flip - return cookedMin; - } else { - return cookedMax; - } + return qMax(_rawTranslator(_rawMax), _rawTranslator(_rawMin)); } 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. - QVariant cookedMax = _rawTranslator(_rawMax); - QVariant cookedMin = _rawTranslator(_rawMin); - if (cookedMax < cookedMin) { - // We need to flip - return cookedMax; - } else { - return cookedMin; - } + return qMin(_rawTranslator(_rawMax), _rawTranslator(_rawMin)); } void FactMetaData::setVolatileValue(bool bValue) -- 2.22.0