#5101 clang-format: Adjusted penalties

Use lower absolute values to improve control of behavior
This commit is contained in:
Magne Sjaastad
2020-02-12 11:43:15 +01:00
parent 10f0abc9b5
commit c82df63e10
710 changed files with 3167 additions and 4721 deletions

View File

@@ -302,8 +302,7 @@ void RimViewController::updateOverrides()
{
if ( isPropertyFilterOveridden() )
{
manGeoView->setOverridePropertyFilterCollection(
masterGeoView->geoMechPropertyFilterCollection() );
manGeoView->setOverridePropertyFilterCollection( masterGeoView->geoMechPropertyFilterCollection() );
}
else
{
@@ -617,14 +616,12 @@ const RigCaseToCaseCellMapper* RimViewController::cellMapper()
dependEclGrid = dependEclipseView->mainGrid();
}
if ( masterGeomechView && masterGeomechView->geoMechCase()->geoMechData() &&
masterGeomechView->femParts()->partCount() )
if ( masterGeomechView && masterGeomechView->geoMechCase()->geoMechData() && masterGeomechView->femParts()->partCount() )
{
masterFemPart = masterGeomechView->femParts()->part( 0 );
}
if ( dependGeomechView && dependGeomechView->geoMechCase()->geoMechData() &&
dependGeomechView->femParts()->partCount() )
if ( dependGeomechView && dependGeomechView->geoMechCase()->geoMechData() && dependGeomechView->femParts()->partCount() )
{
dependFemPart = dependGeomechView->femParts()->part( 0 );
}