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

#5101 clang-format: Adjusted penalties

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ProjectDataModel/RimEclipsePropertyFilterCollection.cpp
View File

@@ -125,8 +125,7 @@ bool RimEclipsePropertyFilterCollection::isUsingFormationNames() const
for ( RimEclipsePropertyFilter* propertyFilter : propertyFilters )
{
if ( propertyFilter->isActive() &&
propertyFilter->resultDefinition()->resultType() == RiaDefines::FORMATION_NAMES &&
if ( propertyFilter->isActive() && propertyFilter->resultDefinition()->resultType() == RiaDefines::FORMATION_NAMES &&
propertyFilter->resultDefinition()->resultVariable() != RiaDefines::undefinedResultName() )
return true;
}
@@ -146,8 +145,7 @@ void RimEclipsePropertyFilterCollection::updateIconState()
if ( view )
{
RimViewController* viewController = view->viewController();
if ( viewController &&
( viewController->isPropertyFilterOveridden() || viewController->isVisibleCellsOveridden() ) )
if ( viewController && ( viewController->isPropertyFilterOveridden() || viewController->isVisibleCellsOveridden() ) )
{
activeIcon = false;
}