Convert to enum class

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

View File

@@ -67,13 +67,13 @@ void RicCreateDuplicateTemplateInOtherUnitSystemFeature::onActionTriggered( bool
fractureTemplateCollection->addFractureTemplate( copyOfTemplate );
auto currentUnit = copyOfTemplate->fractureTemplateUnit();
if ( currentUnit == RiaEclipseUnitTools::UNITS_METRIC )
if ( currentUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
copyOfTemplate->convertToUnitSystem( RiaEclipseUnitTools::UNITS_FIELD );
copyOfTemplate->convertToUnitSystem( RiaEclipseUnitTools::UnitSystem::UNITS_FIELD );
}
else
{
copyOfTemplate->convertToUnitSystem( RiaEclipseUnitTools::UNITS_METRIC );
copyOfTemplate->convertToUnitSystem( RiaEclipseUnitTools::UnitSystem::UNITS_METRIC );
}
QString name = copyOfTemplate->name();
@@ -99,11 +99,11 @@ void RicCreateDuplicateTemplateInOtherUnitSystemFeature::setupActionLook( QActio
if ( !fractureTemplate ) return;
QString destinationUnit;
if ( fractureTemplate->fractureTemplateUnit() == RiaEclipseUnitTools::UNITS_METRIC )
if ( fractureTemplate->fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
destinationUnit += "Field";
}
else if ( fractureTemplate->fractureTemplateUnit() == RiaEclipseUnitTools::UNITS_FIELD )
else if ( fractureTemplate->fractureTemplateUnit() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
destinationUnit += "Metric";
}