OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-10 23:46:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix implicit type conversion issues

Browse Source
This commit is contained in:
Magne Sjaastad 2019-08-23 16:41:53 +02:00
parent 94a967cea4
commit cae2d13aeb
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp
View File

@ -476,7 +476,11 @@ double RimSummaryTimeAxisProperties::fromDaysToDisplayUnitScale()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiaQDateTimeTools::DateFormatComponents RimSummaryTimeAxisProperties::dateComponents(RiaQDateTimeTools::DateFormatComponents fallback) const 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 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;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------