Janitor : Several fixes by clang-tidy and use of clang compiler

ApplicationLibCode/ProjectDataModel/.clang-tidy

@@ -1 +0,0 @@
-Checks: 'google-readability-braces-around-statements,google-readability-casting,google-readability-function-size,google-readability-namespace-comments,google-readability-todo,modernize-avoid-bind,modernize-avoid-c-arrays,modernize-concat-nested-namespaces,modernize-deprecated-headers,modernize-deprecated-ios-base-aliases,modernize-loop-convert,modernize-make-shared,modernize-make-unique,modernize-pass-by-value,modernize-raw-string-literal,modernize-redundant-void-arg,modernize-replace-auto-ptr,modernize-replace-random-shuffle,modernize-return-braced-init-list,modernize-shrink-to-fit,modernize-unary-static-assert,modernize-use-auto,modernize-use-bool-literals,modernize-use-default-member-init,modernize-use-emplace,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-noexcept,modernize-use-nullptr,modernize-use-override,modernize-use-transparent-functors,modernize-use-uncaught-exceptions,modernize-use-using,readability-avoid-const-params-in-decls,readability-braces-around-statements,readability-const-return-type,readability-container-size-empty,readability-deleted-default,readability-delete-null-pointer,readability-else-after-return,readability-function-size,readability-identifier-naming,readability-implicit-bool-conversion,readability-inconsistent-declaration-parameter-name,readability-isolate-declaration,readability-magic-numbers,readability-misleading-indentation,readability-misplaced-array-index,readability-named-parameter,readability-non-const-parameter,readability-redundant-control-flow,readability-redundant-declaration,readability-redundant-function-ptr-dereference,readability-redundant-member-init,readability-redundant-smartptr-get,readability-redundant-string-cstr,readability-redundant-string-init,readability-simplify-boolean-expr,readability-simplify-subscript-expr,readability-static-accessed-through-instance,readability-static-definition-in-anonymous-namespace,readability-string-compare,readability-uniqueptr-delete-release,readability-uppercase-literal-suffix'

ApplicationLibCode/ProjectDataModel/Completions/.clang-tidy

@@ -1 +0,0 @@
-Checks: 'google-readability-braces-around-statements,google-readability-casting,google-readability-function-size,google-readability-namespace-comments,google-readability-todo,modernize-avoid-bind,modernize-avoid-c-arrays,modernize-concat-nested-namespaces,modernize-deprecated-headers,modernize-deprecated-ios-base-aliases,modernize-loop-convert,modernize-make-shared,modernize-make-unique,modernize-pass-by-value,modernize-raw-string-literal,modernize-redundant-void-arg,modernize-replace-auto-ptr,modernize-replace-random-shuffle,modernize-return-braced-init-list,modernize-shrink-to-fit,modernize-unary-static-assert,modernize-use-auto,modernize-use-bool-literals,modernize-use-default-member-init,modernize-use-emplace,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-noexcept,modernize-use-nullptr,modernize-use-override,modernize-use-transparent-functors,modernize-use-uncaught-exceptions,modernize-use-using,readability-avoid-const-params-in-decls,readability-braces-around-statements,readability-const-return-type,readability-container-size-empty,readability-deleted-default,readability-delete-null-pointer,readability-else-after-return,readability-function-size,readability-identifier-naming,readability-implicit-bool-conversion,readability-inconsistent-declaration-parameter-name,readability-isolate-declaration,readability-magic-numbers,readability-misleading-indentation,readability-misplaced-array-index,readability-named-parameter,readability-non-const-parameter,readability-redundant-control-flow,readability-redundant-declaration,readability-redundant-function-ptr-dereference,readability-redundant-member-init,readability-redundant-smartptr-get,readability-redundant-string-cstr,readability-redundant-string-init,readability-simplify-boolean-expr,readability-simplify-subscript-expr,readability-static-accessed-through-instance,readability-static-definition-in-anonymous-namespace,readability-string-compare,readability-uniqueptr-delete-release,readability-uppercase-literal-suffix'

ApplicationLibCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.cpp

@@ -337,18 +337,20 @@ QList<caf::PdmOptionItemInfo>
                 if ( !caf::Utils::isStringMatch( m_tracerFilter, tracerName ) ) continue;
 
                 RimFlowDiagSolution::TracerStatusType tracerStatus = m_flowDiagSolution->tracerStatusOverall( tracerName );
-                if ( tracerStatus == RimFlowDiagSolution::CLOSED ) continue;
+                if ( tracerStatus == RimFlowDiagSolution::TracerStatusType::CLOSED ) continue;
 
                 if ( m_cellFilter() == RigFlowDiagResults::CELLS_FLOODED )
                 {
-                    if ( tracerStatus == RimFlowDiagSolution::INJECTOR || tracerStatus == RimFlowDiagSolution::VARYING )
+                    if ( tracerStatus == RimFlowDiagSolution::TracerStatusType::INJECTOR ||
+                         tracerStatus == RimFlowDiagSolution::TracerStatusType::VARYING )
                     {
                         sortedTracerNames.push_back( std::make_pair( tracerName, tracerName ) );
                     }
                 }
                 else if ( m_cellFilter() == RigFlowDiagResults::CELLS_DRAINED )
                 {
-                    if ( tracerStatus == RimFlowDiagSolution::PRODUCER || tracerStatus == RimFlowDiagSolution::VARYING )
+                    if ( tracerStatus == RimFlowDiagSolution::TracerStatusType::PRODUCER ||
+                         tracerStatus == RimFlowDiagSolution::TracerStatusType::VARYING )
                     {
                         sortedTracerNames.push_back( std::make_pair( tracerName, tracerName ) );
                     }
@@ -358,16 +360,16 @@ QList<caf::PdmOptionItemInfo>
                     QString prefix;
                     switch ( tracerStatus )
                     {
-                        case RimFlowDiagSolution::INJECTOR:
+                        case RimFlowDiagSolution::TracerStatusType::INJECTOR:
                             prefix = "I   : ";
                             break;
-                        case RimFlowDiagSolution::PRODUCER:
+                        case RimFlowDiagSolution::TracerStatusType::PRODUCER:
                             prefix = "P  : ";
                             break;
-                        case RimFlowDiagSolution::VARYING:
+                        case RimFlowDiagSolution::TracerStatusType::VARYING:
                             prefix = "I/P: ";
                             break;
-                        case RimFlowDiagSolution::UNDEFINED:
+                        case RimFlowDiagSolution::TracerStatusType::UNDEFINED:
                             prefix = "U  : ";
                             break;
                     }

ApplicationLibCode/ProjectDataModel/Flow/RimFlowDiagSolution.cpp

@@ -228,7 +228,7 @@ RimFlowDiagSolution::TracerStatusType RimFlowDiagSolution::tracerStatusOverall(
     RimEclipseResultCase* eclCase;
     this->firstAncestorOrThisOfTypeAsserted( eclCase );
 
-    TracerStatusType tracerStatus = UNDEFINED;
+    TracerStatusType tracerStatus = TracerStatusType::UNDEFINED;
     if ( eclCase && eclCase->eclipseCaseData() )
     {
         const cvf::Collection<RigSimWellData>& simWellData = eclCase->eclipseCaseData()->wellResults();
@@ -239,26 +239,26 @@ RimFlowDiagSolution::TracerStatusType RimFlowDiagSolution::tracerStatusOverall(
 
             if ( simWellData[wIdx]->m_wellName != wellName ) continue;
 
-            tracerStatus = CLOSED;
+            tracerStatus = TracerStatusType::CLOSED;
             for ( const RigWellResultFrame& wellResFrame : simWellData[wIdx]->m_wellCellsTimeSteps )
             {
                 if ( wellResFrame.m_productionType == RigWellResultFrame::GAS_INJECTOR ||
                      wellResFrame.m_productionType == RigWellResultFrame::OIL_INJECTOR ||
                      wellResFrame.m_productionType == RigWellResultFrame::WATER_INJECTOR )
                 {
-                    if ( tracerStatus == PRODUCER )
-                        tracerStatus = VARYING;
+                    if ( tracerStatus == TracerStatusType::PRODUCER )
+                        tracerStatus = TracerStatusType::VARYING;
                     else
-                        tracerStatus = INJECTOR;
+                        tracerStatus = TracerStatusType::INJECTOR;
                 }
                 else if ( wellResFrame.m_productionType == RigWellResultFrame::PRODUCER )
                 {
-                    if ( tracerStatus == INJECTOR )
-                        tracerStatus = VARYING;
+                    if ( tracerStatus == TracerStatusType::INJECTOR )
+                        tracerStatus = TracerStatusType::VARYING;
                     else
-                        tracerStatus = PRODUCER;
+                        tracerStatus = TracerStatusType::PRODUCER;
                 }
-                if ( tracerStatus == VARYING ) break;
+                if ( tracerStatus == TracerStatusType::VARYING ) break;
             }
 
             break;
@@ -266,10 +266,10 @@ RimFlowDiagSolution::TracerStatusType RimFlowDiagSolution::tracerStatusOverall(
 
         if ( hasCrossFlowEnding( tracerName ) )
         {
-            if ( tracerStatus == PRODUCER )
-                tracerStatus = INJECTOR;
-            else if ( tracerStatus == INJECTOR )
-                tracerStatus = PRODUCER;
+            if ( tracerStatus == TracerStatusType::PRODUCER )
+                tracerStatus = TracerStatusType::INJECTOR;
+            else if ( tracerStatus == TracerStatusType::INJECTOR )
+                tracerStatus = TracerStatusType::PRODUCER;
         }
     }
 
@@ -294,7 +294,7 @@ RimFlowDiagSolution::TracerStatusType RimFlowDiagSolution::tracerStatusInTimeSte
             QString wellName = removeCrossFlowEnding( tracerName );
 
             if ( simWellData[wIdx]->m_wellName != wellName ) continue;
-            if ( !simWellData[wIdx]->hasWellResult( timeStepIndex ) ) return CLOSED;
+            if ( !simWellData[wIdx]->hasWellResult( timeStepIndex ) ) return TracerStatusType::CLOSED;
 
             const RigWellResultFrame& wellResFrame = simWellData[wIdx]->wellResultFrame( timeStepIndex );
 
@@ -302,16 +302,16 @@ RimFlowDiagSolution::TracerStatusType RimFlowDiagSolution::tracerStatusInTimeSte
                  wellResFrame.m_productionType == RigWellResultFrame::OIL_INJECTOR ||
                  wellResFrame.m_productionType == RigWellResultFrame::WATER_INJECTOR )
             {
-                if ( hasCrossFlowEnding( tracerName ) ) return PRODUCER;
+                if ( hasCrossFlowEnding( tracerName ) ) return TracerStatusType::PRODUCER;
 
-                return INJECTOR;
+                return TracerStatusType::INJECTOR;
             }
             else if ( wellResFrame.m_productionType == RigWellResultFrame::PRODUCER ||
                       wellResFrame.m_productionType == RigWellResultFrame::UNDEFINED_PRODUCTION_TYPE )
             {
-                if ( hasCrossFlowEnding( tracerName ) ) return INJECTOR;
+                if ( hasCrossFlowEnding( tracerName ) ) return TracerStatusType::INJECTOR;
 
-                return PRODUCER;
+                return TracerStatusType::PRODUCER;
             }
             else
             {
@@ -320,7 +320,7 @@ RimFlowDiagSolution::TracerStatusType RimFlowDiagSolution::tracerStatusInTimeSte
         }
     }
 
-    return UNDEFINED;
+    return TracerStatusType::UNDEFINED;
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/ProjectDataModel/Flow/RimFlowDiagSolution.h

@@ -45,7 +45,7 @@ public:
     std::map<std::string, std::vector<int>> allInjectorTracerActiveCellIndices( size_t timeStepIndex ) const;
     std::map<std::string, std::vector<int>> allProducerTracerActiveCellIndices( size_t timeStepIndex ) const;
 
-    enum TracerStatusType
+    enum class TracerStatusType
     {
         CLOSED, ///< Tracer has no active cells, and does not contribute
         PRODUCER, ///< Tracer with producing cells

ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp

@@ -441,16 +441,16 @@ std::map<QString, const std::vector<double>*>
 
     if ( m_flowDiagSolution && simWellData->hasWellResult( m_timeStep ) )
     {
-        RimFlowDiagSolution::TracerStatusType requestedTracerType = RimFlowDiagSolution::UNDEFINED;
+        RimFlowDiagSolution::TracerStatusType requestedTracerType = RimFlowDiagSolution::TracerStatusType::UNDEFINED;
 
         const RigWellResultFrame::WellProductionType prodType = simWellData->wellProductionType( m_timeStep );
         if ( prodType == RigWellResultFrame::PRODUCER || prodType == RigWellResultFrame::UNDEFINED_PRODUCTION_TYPE )
         {
-            requestedTracerType = RimFlowDiagSolution::INJECTOR;
+            requestedTracerType = RimFlowDiagSolution::TracerStatusType::INJECTOR;
         }
         else
         {
-            requestedTracerType = RimFlowDiagSolution::PRODUCER;
+            requestedTracerType = RimFlowDiagSolution::TracerStatusType::PRODUCER;
         }
 
         std::vector<QString> tracerNames = m_flowDiagSolution->tracerNames();

ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp

@@ -542,12 +542,14 @@ void RimEclipseResultDefinition::setTofAndSelectTracer( const QString& tracerNam
 
         std::vector<QString> tracers;
         tracers.push_back( tracerName );
-        if ( ( tracerStatus == RimFlowDiagSolution::INJECTOR ) || ( tracerStatus == RimFlowDiagSolution::VARYING ) )
+        if ( ( tracerStatus == RimFlowDiagSolution::TracerStatusType::INJECTOR ) ||
+             ( tracerStatus == RimFlowDiagSolution::TracerStatusType::VARYING ) )
         {
             setSelectedInjectorTracers( tracers );
         }
 
-        if ( ( tracerStatus == RimFlowDiagSolution::PRODUCER ) || ( tracerStatus == RimFlowDiagSolution::VARYING ) )
+        if ( ( tracerStatus == RimFlowDiagSolution::TracerStatusType::PRODUCER ) ||
+             ( tracerStatus == RimFlowDiagSolution::TracerStatusType::VARYING ) )
         {
             setSelectedProducerTracers( tracers );
         }
@@ -989,7 +991,7 @@ RigFlowDiagResultAddress RimEclipseResultDefinition::flowDiagResAddress() const
                     {
                         RimFlowDiagSolution::TracerStatusType status =
                             flowSol->tracerStatusInTimeStep( tracerName, timeStep );
-                        if ( status == RimFlowDiagSolution::INJECTOR )
+                        if ( status == RimFlowDiagSolution::TracerStatusType::INJECTOR )
                         {
                             selTracerNames.insert( tracerName.toStdString() );
                         }
@@ -1002,7 +1004,7 @@ RigFlowDiagResultAddress RimEclipseResultDefinition::flowDiagResAddress() const
                     {
                         RimFlowDiagSolution::TracerStatusType status =
                             flowSol->tracerStatusInTimeStep( tracerName, timeStep );
-                        if ( status == RimFlowDiagSolution::PRODUCER )
+                        if ( status == RimFlowDiagSolution::TracerStatusType::PRODUCER )
                         {
                             selTracerNames.insert( tracerName.toStdString() );
                         }
@@ -1381,15 +1383,16 @@ void RimEclipseResultDefinition::setSelectedTracers( const std::vector<QString>&
         for ( const QString& tracerName : selectedTracers )
         {
             RimFlowDiagSolution::TracerStatusType tracerStatus = m_flowSolution()->tracerStatusOverall( tracerName );
-            if ( tracerStatus == RimFlowDiagSolution::INJECTOR )
+            if ( tracerStatus == RimFlowDiagSolution::TracerStatusType::INJECTOR )
             {
                 injectorTracers.push_back( tracerName );
             }
-            else if ( tracerStatus == RimFlowDiagSolution::PRODUCER )
+            else if ( tracerStatus == RimFlowDiagSolution::TracerStatusType::PRODUCER )
             {
                 producerTracers.push_back( tracerName );
             }
-            else if ( tracerStatus == RimFlowDiagSolution::VARYING || tracerStatus == RimFlowDiagSolution::UNDEFINED )
+            else if ( tracerStatus == RimFlowDiagSolution::TracerStatusType::VARYING ||
+                      tracerStatus == RimFlowDiagSolution::TracerStatusType::UNDEFINED )
             {
                 injectorTracers.push_back( tracerName );
                 producerTracers.push_back( tracerName );
@@ -2216,11 +2219,11 @@ QList<caf::PdmOptionItemInfo> RimEclipseResultDefinition::calcOptionsForSelected
         {
             QString                               postfix;
             RimFlowDiagSolution::TracerStatusType status = flowSol->tracerStatusOverall( tracerName );
-            if ( status == RimFlowDiagSolution::VARYING )
+            if ( status == RimFlowDiagSolution::TracerStatusType::VARYING )
             {
                 postfix = " [I/P]";
             }
-            else if ( status == RimFlowDiagSolution::UNDEFINED )
+            else if ( status == RimFlowDiagSolution::TracerStatusType::UNDEFINED )
             {
                 postfix = " [U]";
             }
@@ -2406,9 +2409,10 @@ std::set<QString, RimEclipseResultDefinition::TracerComp> RimEclipseResultDefini
         for ( const QString& tracerName : tracerNames )
         {
             RimFlowDiagSolution::TracerStatusType status = flowSol->tracerStatusOverall( tracerName );
-            bool includeTracer = status == RimFlowDiagSolution::VARYING || status == RimFlowDiagSolution::UNDEFINED;
-            includeTracer |= injector && status == RimFlowDiagSolution::INJECTOR;
-            includeTracer |= !injector && status == RimFlowDiagSolution::PRODUCER;
+            bool includeTracer                           = status == RimFlowDiagSolution::TracerStatusType::VARYING ||
+                                 status == RimFlowDiagSolution::TracerStatusType::UNDEFINED;
+            includeTracer |= injector && status == RimFlowDiagSolution::TracerStatusType::INJECTOR;
+            includeTracer |= !injector && status == RimFlowDiagSolution::TracerStatusType::PRODUCER;
 
             if ( includeTracer )
             {