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

Convert to enum class

Browse Source
This commit is contained in:
Magne Sjaastad
2020-04-24 08:10:48 +02:00
parent e85c36b4a4
commit 95fc63fe7c
76 changed files with 363 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsImpl.cpp
View File

@@ -29,7 +29,7 @@
//--------------------------------------------------------------------------------------------------
bool RicWellPathsUnitSystemSettingsImpl::ensureHasUnitSystem( RimWellPath* wellPath )
{
if ( wellPath->unitSystem() != RiaEclipseUnitTools::UNITS_UNKNOWN )
if ( wellPath->unitSystem() != RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN )
{
return true;
}

12
ApplicationCode/Commands/WellPathCommands/RicWellPathsUnitSystemSettingsUi.cpp
View File

@@ -40,12 +40,12 @@ QList<caf::PdmOptionItemInfo>
QList<caf::PdmOptionItemInfo> options;
if ( fieldNeedingOptions == &unitSystem )
{
options.push_back(
caf::PdmOptionItemInfo( RiaEclipseUnitTools::UnitSystemType::uiText( RiaEclipseUnitTools::UNITS_METRIC ),
RiaEclipseUnitTools::UNITS_METRIC ) );
options.push_back(
caf::PdmOptionItemInfo( RiaEclipseUnitTools::UnitSystemType::uiText( RiaEclipseUnitTools::UNITS_FIELD ),
RiaEclipseUnitTools::UNITS_FIELD ) );
options.push_back( caf::PdmOptionItemInfo( RiaEclipseUnitTools::UnitSystemType::uiText(
RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ),
RiaEclipseUnitTools::UnitSystem::UNITS_METRIC ) );
options.push_back( caf::PdmOptionItemInfo( RiaEclipseUnitTools::UnitSystemType::uiText(
RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ),
RiaEclipseUnitTools::UnitSystem::UNITS_FIELD ) );
}
return options;
}