From cae2d13aeb9d570eb9e0236de8739d9e2fb6a98a Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 23 Aug 2019 16:41:53 +0200 Subject: [PATCH] Fix implicit type conversion issues --- .../Summary/RimSummaryTimeAxisProperties.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp index cf7fdf2982..09e21a0715 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp @@ -476,7 +476,11 @@ double RimSummaryTimeAxisProperties::fromDaysToDisplayUnitScale() //-------------------------------------------------------------------------------------------------- RiaQDateTimeTools::DateFormatComponents RimSummaryTimeAxisProperties::dateComponents(RiaQDateTimeTools::DateFormatComponents fallback) const { - return m_automaticDateComponents() ? fallback : m_dateComponents(); + if (m_automaticDateComponents()) return fallback; + + RiaQDateTimeTools::DateFormatComponents components = m_dateComponents(); + + return components; } //-------------------------------------------------------------------------------------------------- @@ -484,7 +488,11 @@ RiaQDateTimeTools::DateFormatComponents RimSummaryTimeAxisProperties::dateCompon //-------------------------------------------------------------------------------------------------- RiaQDateTimeTools::TimeFormatComponents RimSummaryTimeAxisProperties::timeComponents(RiaQDateTimeTools::TimeFormatComponents fallback) const { - return m_automaticDateComponents() ? fallback : m_timeComponents(); + if (m_automaticDateComponents()) return fallback; + + RiaQDateTimeTools::TimeFormatComponents components = m_timeComponents(); + + return components; } //--------------------------------------------------------------------------------------------------