clang-format after intersection rename

ApplicationCode/Commands/CrossSectionCommands/RicAppendIntersectionFeature.cpp

@@ -19,9 +19,9 @@
 
 #include "RicAppendIntersectionFeature.h"
 
+#include "RimExtrudedCurveIntersection.h"
 #include "RimGeoMechView.h"
 #include "RimGridView.h"
-#include "RimExtrudedCurveIntersection.h"
 #include "RimIntersectionCollection.h"
 #include "RimTensorResults.h"
 

ApplicationCode/Commands/CrossSectionCommands/RicAppendSeparateIntersectionResultFeature.cpp

@@ -19,9 +19,9 @@
 
 #include "RicAppendSeparateIntersectionResultFeature.h"
 
+#include "RimGridView.h"
 #include "RimIntersectionResultDefinition.h"
 #include "RimIntersectionResultsDefinitionCollection.h"
-#include "RimGridView.h"
 
 #include "cafCmdExecCommandManager.h"
 #include "cafSelectionManager.h"
@@ -103,7 +103,7 @@ void RicAppendSeparateIntersectionResultFeatureCmd::redo()
 
     m_intersectionCollection->updateConnectedEditors();
 
-    //if ( m_intersectionCollection->intersectionResultsDefinitions().size() < 2 ) // New default created. Possible 
+    // if ( m_intersectionCollection->intersectionResultsDefinitions().size() < 2 ) // New default created. Possible
     //{
     //    RimGridView* gridView;
     //    m_intersectionCollection->firstAncestorOrThisOfTypeAsserted( gridView );

ApplicationCode/Commands/CrossSectionCommands/RicAppendSeparateIntersectionResultFeature.h

@@ -30,7 +30,8 @@ class RimIntersectionResultsDefinitionCollection;
 class RicAppendSeparateIntersectionResultFeatureCmd : public caf::CmdExecuteCommand
 {
 public:
-    explicit RicAppendSeparateIntersectionResultFeatureCmd( RimIntersectionResultsDefinitionCollection* intersectionCollection );
+    explicit RicAppendSeparateIntersectionResultFeatureCmd(
+        RimIntersectionResultsDefinitionCollection* intersectionCollection );
     ~RicAppendSeparateIntersectionResultFeatureCmd() override;
 
     QString name() override;

ApplicationCode/Commands/CrossSectionCommands/RicCopyIntersectionsToAllViewsInCaseFeature.cpp

@@ -19,11 +19,11 @@
 
 #include "RicCopyIntersectionsToAllViewsInCaseFeature.h"
 
+#include "RimBoxIntersection.h"
 #include "RimCase.h"
 #include "RimEclipseCase.h"
-#include "RimGridView.h"
 #include "RimExtrudedCurveIntersection.h"
-#include "RimBoxIntersection.h"
+#include "RimGridView.h"
 #include "RimIntersectionCollection.h"
 
 #include "cafCmdExecCommandManager.h"
@@ -109,7 +109,8 @@ void RicCopyIntersectionsToAllViewsInCaseFeature::setupActionLook( QAction* acti
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RicCopyIntersectionsToAllViewsInCaseFeature::copyIntersectionsToOtherViews( RimCase&                      gridCase,
+void RicCopyIntersectionsToAllViewsInCaseFeature::copyIntersectionsToOtherViews(
+    RimCase&                                   gridCase,
     std::vector<RimExtrudedCurveIntersection*> intersections )
 {
     for ( RimExtrudedCurveIntersection* intersection : intersections )

ApplicationCode/Commands/CrossSectionCommands/RicNewAzimuthDipIntersectionFeature.cpp

@@ -21,8 +21,8 @@
 #include "RiaApplication.h"
 
 #include "RimCase.h"
-#include "RimGridView.h"
 #include "RimExtrudedCurveIntersection.h"
+#include "RimGridView.h"
 #include "RimIntersectionCollection.h"
 
 #include "Riu3DMainWindowTools.h"

ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineIntersectionFeature.cpp

@@ -22,8 +22,8 @@
 #include "RiaApplication.h"
 
 #include "RimCase.h"
-#include "RimGridView.h"
 #include "RimExtrudedCurveIntersection.h"
+#include "RimGridView.h"
 #include "RimIntersectionCollection.h"
 
 #include "Riu3DMainWindowTools.h"

ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathIntersectionFeature.cpp

@@ -21,8 +21,8 @@
 
 #include "RiaApplication.h"
 
-#include "RimGridView.h"
 #include "RimExtrudedCurveIntersection.h"
+#include "RimGridView.h"
 #include "RimIntersectionCollection.h"
 #include "RimWellPath.h"
 

ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportImpl.cpp

@@ -31,10 +31,10 @@
 #include "RimWellPath.h"
 
 #include "RiuViewer.h"
-#include "RivFemPickSourceInfo.h"
-#include "RivGeoMechVizLogic.h"
 #include "RivBoxIntersectionSourceInfo.h"
 #include "RivExtrudedCurveIntersectionSourceInfo.h"
+#include "RivFemPickSourceInfo.h"
+#include "RivGeoMechVizLogic.h"
 #include "RivMeshLinesSourceInfo.h"
 #include "RivSimWellPipeSourceInfo.h"
 #include "RivSourceInfo.h"

ApplicationCode/Commands/IntersectionBoxCommands/RicAppendIntersectionBoxFeature.cpp

@@ -18,9 +18,9 @@
 
 #include "RicAppendIntersectionBoxFeature.h"
 
+#include "RimBoxIntersection.h"
 #include "RimCase.h"
 #include "RimGridView.h"
-#include "RimBoxIntersection.h"
 #include "RimIntersectionCollection.h"
 #include "Riu3DMainWindowTools.h"
 

ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxAtPosFeature.cpp

@@ -20,9 +20,9 @@
 
 #include "RiaApplication.h"
 
+#include "RimBoxIntersection.h"
 #include "RimCase.h"
 #include "RimGridView.h"
-#include "RimBoxIntersection.h"
 #include "RimIntersectionCollection.h"
 
 #include "RiuMainWindow.h"

ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxXSliceFeature.cpp

@@ -22,9 +22,9 @@
 
 #include "RiaApplication.h"
 
+#include "RimBoxIntersection.h"
 #include "RimCase.h"
 #include "RimGridView.h"
-#include "RimBoxIntersection.h"
 #include "RimIntersectionCollection.h"
 #include "RiuViewerCommands.h"
 

ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxYSliceFeature.cpp

@@ -22,9 +22,9 @@
 
 #include "RiaApplication.h"
 
+#include "RimBoxIntersection.h"
 #include "RimCase.h"
 #include "RimGridView.h"
-#include "RimBoxIntersection.h"
 #include "RimIntersectionCollection.h"
 
 #include "RiuMainWindow.h"

ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxZSliceFeature.cpp

@@ -22,9 +22,9 @@
 
 #include "RiaApplication.h"
 
+#include "RimBoxIntersection.h"
 #include "RimCase.h"
 #include "RimGridView.h"
-#include "RimBoxIntersection.h"
 #include "RimIntersectionCollection.h"
 #include "RiuViewerCommands.h"
 

ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionFeatureImpl.cpp

@@ -19,8 +19,8 @@
 
 #include "RiaApplication.h"
 
-#include "RimGridView.h"
 #include "RimBoxIntersection.h"
+#include "RimGridView.h"
 #include "RimIntersectionCollection.h"
 
 #include "RiuMainWindow.h"

ApplicationCode/Commands/IntersectionViewCommands/RicNewIntersectionViewFeature.cpp

@@ -111,7 +111,8 @@ std::set<RimExtrudedCurveIntersection*> RicNewIntersectionViewFeature::selectedI
     RiuGeneralSelectionItem* generalSelectionItem = static_cast<RiuGeneralSelectionItem*>( selItem );
     if ( generalSelectionItem )
     {
-        RimExtrudedCurveIntersection* intersection = dynamic_cast<RimExtrudedCurveIntersection*>( generalSelectionItem->m_object );
+        RimExtrudedCurveIntersection* intersection = dynamic_cast<RimExtrudedCurveIntersection*>(
+            generalSelectionItem->m_object );
         if ( intersection )
         {
             objects.insert( intersection );
@@ -123,7 +124,8 @@ std::set<RimExtrudedCurveIntersection*> RicNewIntersectionViewFeature::selectedI
     }
 
     {
-        std::vector<RimExtrudedCurveIntersection*> selectedObjects = caf::selectedObjectsByType<RimExtrudedCurveIntersection*>();
+        std::vector<RimExtrudedCurveIntersection*> selectedObjects =
+            caf::selectedObjectsByType<RimExtrudedCurveIntersection*>();
         for ( auto obj : selectedObjects )
         {
             objects.insert( obj );

ApplicationCode/Commands/MeasurementCommands/RicMeasurementPickEventHandler.cpp

@@ -23,8 +23,8 @@
 #include "RiuViewerCommands.h"
 
 #include "Rim3dView.h"
-#include "RimGridView.h"
 #include "RimExtrudedCurveIntersection.h"
+#include "RimGridView.h"
 #include "RimMeasurement.h"
 #include "RimProject.h"
 

ApplicationCode/Commands/OperationsUsingObjReferences/RicCopyReferencesToClipboardFeature.cpp

@@ -19,15 +19,15 @@
 
 #include "RicCopyReferencesToClipboardFeature.h"
 
+#include "RimBoxIntersection.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"
 #include "RimEnsembleCurveSet.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimFractureTemplate.h"
 #include "RimGeoMechView.h"
 #include "RimGridCrossPlotCurve.h"
 #include "RimGridCrossPlotDataSet.h"
-#include "RimExtrudedCurveIntersection.h"
-#include "RimBoxIntersection.h"
 #include "RimMimeData.h"
 #include "RimSummaryCurveFilter.h"
 #include "RimSummaryPlot.h"

ApplicationCode/Commands/OperationsUsingObjReferences/RicPasteIntersectionsFeature.cpp

@@ -20,8 +20,8 @@
 
 #include "RicPasteFeatureImpl.h"
 
-#include "RimExtrudedCurveIntersection.h"
 #include "RimBoxIntersection.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimIntersectionCollection.h"
 
 #include "RiuMainWindow.h"
@@ -112,7 +112,7 @@ void RicPasteIntersectionsFeature::onActionTriggered( bool isChecked )
                 caf::PdmDefaultObjectFactory::instance() ) );
 
         QString nameOfCopy = QString( "Copy of " ) + intersectionBox->name();
-        intersectionBox->setName(nameOfCopy);
+        intersectionBox->setName( nameOfCopy );
 
         if ( i == intersectionBoxObjects.size() - 1 )
         {

ApplicationCode/Commands/RicDeleteItemFeature.cpp

@@ -22,6 +22,7 @@
 #include "RicDeleteItemExecData.h"
 
 #include "RimAsciiDataCurve.h"
+#include "RimBoxIntersection.h"
 #include "RimCellRangeFilter.h"
 #include "RimDerivedEnsembleCaseCollection.h"
 #include "RimEclipseInputProperty.h"
@@ -30,6 +31,7 @@
 #include "RimEllipseFractureTemplate.h"
 #include "RimEnsembleCurveFilter.h"
 #include "RimEnsembleCurveSet.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimFishboneWellPath.h"
 #include "RimFishbonesMultipleSubs.h"
 #include "RimFlowCharacteristicsPlot.h"
@@ -41,8 +43,6 @@
 #include "RimGridCrossPlotDataSet.h"
 #include "RimGridTimeHistoryCurve.h"
 #include "RimIdenticalGridCaseGroup.h"
-#include "RimExtrudedCurveIntersection.h"
-#include "RimBoxIntersection.h"
 #include "RimIntersectionResultDefinition.h"
 #include "RimMultiPlotWindow.h"
 #include "RimPerforationInterval.h"

ApplicationCode/Commands/RicHideIntersectionBoxFeature.cpp

@@ -68,7 +68,7 @@ void RicHideIntersectionBoxFeature::onActionTriggered( bool isChecked )
     RimBoxIntersection* intersectionBox = dynamic_cast<RimBoxIntersection*>( generalSelectionItem->m_object );
     if ( intersectionBox )
     {
-        intersectionBox->setActive(false);
+        intersectionBox->setActive( false );
         intersectionBox->updateConnectedEditors();
 
         activeView->scheduleCreateDisplayModelAndRedraw();

ApplicationCode/Commands/RicHideIntersectionFeature.cpp

@@ -43,7 +43,8 @@ bool RicHideIntersectionFeature::isCommandEnabled()
     RiuGeneralSelectionItem* generalSelectionItem = static_cast<RiuGeneralSelectionItem*>( selItem );
     if ( !generalSelectionItem ) return false;
 
-    RimExtrudedCurveIntersection* intersection = dynamic_cast<RimExtrudedCurveIntersection*>( generalSelectionItem->m_object );
+    RimExtrudedCurveIntersection* intersection = dynamic_cast<RimExtrudedCurveIntersection*>(
+        generalSelectionItem->m_object );
     if ( intersection )
     {
         return true;
@@ -65,7 +66,8 @@ void RicHideIntersectionFeature::onActionTriggered( bool isChecked )
     RiuGeneralSelectionItem* generalSelectionItem = static_cast<RiuGeneralSelectionItem*>( selItem );
     if ( !generalSelectionItem ) return;
 
-    RimExtrudedCurveIntersection* intersection = dynamic_cast<RimExtrudedCurveIntersection*>( generalSelectionItem->m_object );
+    RimExtrudedCurveIntersection* intersection = dynamic_cast<RimExtrudedCurveIntersection*>(
+        generalSelectionItem->m_object );
     if ( intersection )
     {
         intersection->setActive( false );

ApplicationCode/Commands/RicSelectColorResult.cpp

@@ -23,10 +23,10 @@
 #include "Rim2dIntersectionView.h"
 #include "RimEclipseCellColors.h"
 #include "RimEclipseView.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimGeoMechCellColors.h"
 #include "RimGeoMechView.h"
 #include "RimGridView.h"
-#include "RimExtrudedCurveIntersection.h"
 
 #include "Riu3DMainWindowTools.h"
 

ApplicationCode/Commands/WellPathCommands/RicIntersectionPickEventHandler.cpp

@@ -19,8 +19,8 @@
 #include "RicIntersectionPickEventHandler.h"
 #include "RiaApplication.h"
 
-#include "RimGridView.h"
 #include "RimExtrudedCurveIntersection.h"
+#include "RimGridView.h"
 
 #include "cafDisplayCoordTransform.h"
 #include "cafSelectionManager.h"

ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionGeometryGenerator.cpp

@@ -18,9 +18,9 @@
 
 #include "RivBoxIntersectionGeometryGenerator.h"
 
+#include "RimBoxIntersection.h"
 #include "RimCase.h"
 #include "RimGridView.h"
-#include "RimBoxIntersection.h"
 
 #include "cafHexGridIntersectionTools/cafHexGridIntersectionTools.h"
 

ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionPartMgr.cpp

@@ -25,13 +25,13 @@
 #include "RigResultAccessor.h"
 #include "RigResultAccessorFactory.h"
 
+#include "RimBoxIntersection.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
 #include "RimEclipseView.h"
 #include "RimGeoMechCase.h"
 #include "RimGeoMechCellColors.h"
 #include "RimGeoMechView.h"
-#include "RimBoxIntersection.h"
 #include "RimIntersectionResultDefinition.h"
 #include "RimRegularLegendConfig.h"
 #include "RimTernaryLegendConfig.h"

ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionGeometryGenerator.cpp

@@ -24,11 +24,11 @@
 
 #include "Rim3dView.h"
 #include "RimCase.h"
-#include "RimGridView.h"
 #include "RimExtrudedCurveIntersection.h"
+#include "RimGridView.h"
 
-#include "RivHexGridIntersectionTools.h"
 #include "RivExtrudedCurveIntersectionPartMgr.h"
+#include "RivHexGridIntersectionTools.h"
 #include "RivPolylineGenerator.h"
 
 #include "cafDisplayCoordTransform.h"
@@ -58,7 +58,8 @@ cvf::ref<caf::DisplayCoordTransform> displayCoordTransform( const RimExtrudedCur
 /// isFlattened means to transform each flat section of the intersection onto the XZ plane
 /// placed adjacent to each other as if they were rotated around the common extrusion line like a hinge
 //--------------------------------------------------------------------------------------------------
-RivExtrudedCurveIntersectionGeometryGenerator::RivExtrudedCurveIntersectionGeometryGenerator( RimExtrudedCurveIntersection*                      crossSection,
+RivExtrudedCurveIntersectionGeometryGenerator::RivExtrudedCurveIntersectionGeometryGenerator(
+    RimExtrudedCurveIntersection*          crossSection,
     std::vector<std::vector<cvf::Vec3d>>&  polylines,
     const cvf::Vec3d&                      extrusionDirection,
     const RivIntersectionHexGridInterface* grid,
@@ -508,8 +509,8 @@ cvf::ref<cvf::DrawableGeo> RivExtrudedCurveIntersectionGeometryGenerator::create
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-cvf::ref<cvf::DrawableGeo>
+cvf::ref<cvf::DrawableGeo> RivExtrudedCurveIntersectionGeometryGenerator::createLineAlongExtrusionLineDrawable(
-    RivExtrudedCurveIntersectionGeometryGenerator::createLineAlongExtrusionLineDrawable( const std::vector<cvf::Vec3d>& extrusionLine )
+    const std::vector<cvf::Vec3d>& extrusionLine )
 {
     cvf::ref<caf::DisplayCoordTransform> transform = displayCoordTransform( intersection() );
     std::vector<cvf::Vec3d>              displayCoords;
@@ -534,8 +535,8 @@ cvf::ref<cvf::DrawableGeo> RivExtrudedCurveIntersectionGeometryGenerator::create
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-cvf::ref<cvf::DrawableGeo>
+cvf::ref<cvf::DrawableGeo> RivExtrudedCurveIntersectionGeometryGenerator::createPointsFromExtrusionLineDrawable(
-    RivExtrudedCurveIntersectionGeometryGenerator::createPointsFromExtrusionLineDrawable( const std::vector<cvf::Vec3d>& extrusionLine )
+    const std::vector<cvf::Vec3d>& extrusionLine )
 {
     cvf::ref<caf::DisplayCoordTransform> transform = displayCoordTransform( intersection() );
     std::vector<cvf::Vec3d>              displayCoords;

ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionPartMgr.cpp

@@ -34,12 +34,12 @@
 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
 #include "RimEclipseView.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimFaultInView.h"
 #include "RimFaultInViewCollection.h"
 #include "RimGeoMechCase.h"
 #include "RimGeoMechCellColors.h"
 #include "RimGeoMechView.h"
-#include "RimExtrudedCurveIntersection.h"
 #include "RimRegularLegendConfig.h"
 #include "RimSimWellInView.h"
 #include "RimSimWellInViewCollection.h"
@@ -49,10 +49,10 @@
 
 #include "RiuGeoMechXfTensorResultAccessor.h"
 
-#include "RivHexGridIntersectionTools.h"
 #include "RivExtrudedCurveIntersectionGeometryGenerator.h"
-#include "RivIntersectionResultsColoringTools.h"
 #include "RivExtrudedCurveIntersectionSourceInfo.h"
+#include "RivHexGridIntersectionTools.h"
+#include "RivIntersectionResultsColoringTools.h"
 #include "RivMeshLinesSourceInfo.h"
 #include "RivObjectSourceInfo.h"
 #include "RivPartPriority.h"
@@ -84,7 +84,8 @@
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RivExtrudedCurveIntersectionPartMgr::RivExtrudedCurveIntersectionPartMgr( RimExtrudedCurveIntersection* rimCrossSection, bool isFlattened )
+RivExtrudedCurveIntersectionPartMgr::RivExtrudedCurveIntersectionPartMgr( RimExtrudedCurveIntersection* rimCrossSection,
+                                                                          bool                          isFlattened )
     : m_rimIntersection( rimCrossSection )
     , m_isFlattened( isFlattened )
 {
@@ -243,7 +244,8 @@ void RivExtrudedCurveIntersectionPartMgr::generatePartGeometry()
             part->setDrawable( geo.p() );
 
             // Set mapping from triangle face index to cell index
-            cvf::ref<RivExtrudedCurveIntersectionSourceInfo> si = new RivExtrudedCurveIntersectionSourceInfo( m_intersectionGenerator.p() );
+            cvf::ref<RivExtrudedCurveIntersectionSourceInfo> si = new RivExtrudedCurveIntersectionSourceInfo(
+                m_intersectionGenerator.p() );
             part->setSourceInfo( si.p() );
 
             part->updateBoundingBox();
@@ -313,7 +315,8 @@ void RivExtrudedCurveIntersectionPartMgr::generatePartGeometry()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RivExtrudedCurveIntersectionPartMgr::createFaultLabelParts( const std::vector<std::pair<QString, cvf::Vec3d>>& labelAndAnchors )
+void RivExtrudedCurveIntersectionPartMgr::createFaultLabelParts(
+    const std::vector<std::pair<QString, cvf::Vec3d>>& labelAndAnchors )
 {
     m_faultMeshLabels     = nullptr;
     m_faultMeshLabelLines = nullptr;
@@ -605,7 +608,8 @@ void RivExtrudedCurveIntersectionPartMgr::appendNativeIntersectionFacesToModel(
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RivExtrudedCurveIntersectionPartMgr::appendMeshLinePartsToModel( cvf::ModelBasicList* model, cvf::Transform* scaleTransform )
+void RivExtrudedCurveIntersectionPartMgr::appendMeshLinePartsToModel( cvf::ModelBasicList* model,
+                                                                      cvf::Transform*      scaleTransform )
 {
     if ( m_intersectionGridLines.isNull() )
     {

ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionPartMgr.h

@@ -64,7 +64,8 @@ class RivPipeGeometryGenerator;
 class RivExtrudedCurveIntersectionPartMgr : public cvf::Object
 {
 public:
-    explicit RivExtrudedCurveIntersectionPartMgr( RimExtrudedCurveIntersection* rimIntersection, bool isFlattened = false );
+    explicit RivExtrudedCurveIntersectionPartMgr( RimExtrudedCurveIntersection* rimIntersection,
+                                                  bool                          isFlattened = false );
 
     void applySingleColorEffect();
     void updateCellResultColor( size_t                        timeStepIndex,

ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionSourceInfo.cpp

@@ -24,7 +24,8 @@
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RivExtrudedCurveIntersectionSourceInfo::RivExtrudedCurveIntersectionSourceInfo( RivExtrudedCurveIntersectionGeometryGenerator* geometryGenerator )
+RivExtrudedCurveIntersectionSourceInfo::RivExtrudedCurveIntersectionSourceInfo(
+    RivExtrudedCurveIntersectionGeometryGenerator* geometryGenerator )
     : m_intersectionGeometryGenerator( geometryGenerator )
 {
     CVF_ASSERT( m_intersectionGeometryGenerator.notNull() );

ApplicationCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.cpp

@@ -803,7 +803,7 @@ QString RimFlowCharacteristicsPlot::curveDataAsText() const
 
     std::vector<QDateTime> timeStepDates = m_case->timeStepDates();
 
-    std::vector<double> storageCapacitySamplingValues = { 0.08, 0.1, 0.2, 0.3, 0.4 };
+    std::vector<double> storageCapacitySamplingValues = {0.08, 0.1, 0.2, 0.3, 0.4};
     size_t              sampleCount                   = storageCapacitySamplingValues.size();
 
     for ( const auto& timeIndex : m_currentlyPlottedTimeSteps )

ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp

@@ -23,10 +23,10 @@
 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
 #include "RimEclipseView.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimGeoMechCellColors.h"
 #include "RimGeoMechView.h"
 #include "RimGridView.h"
-#include "RimExtrudedCurveIntersection.h"
 #include "RimIntersectionResultDefinition.h"
 #include "RimRegularLegendConfig.h"
 #include "RimSimWellInView.h"

ApplicationCode/ProjectDataModel/RimBoxIntersection.cpp

@@ -478,7 +478,7 @@ void RimBoxIntersection::defineUiOrdering( QString uiConfigName, caf::PdmUiOrder
 
     uiOrdering.add( &m_show3DManipulator );
 
-    this->defineSeparateDataSourceUi(uiConfigName, uiOrdering);
+    this->defineSeparateDataSourceUi( uiConfigName, uiOrdering );
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -522,7 +522,6 @@ void RimBoxIntersection::slotUpdateGeometry( const cvf::Vec3d& origin, const cvf
     }
 }
 
-
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimCase.cpp

@@ -32,8 +32,8 @@
 
 #include "Rim2dIntersectionView.h"
 #include "Rim2dIntersectionViewCollection.h"
-#include "RimGridView.h"
 #include "RimExtrudedCurveIntersection.h"
+#include "RimGridView.h"
 
 CAF_PDM_XML_ABSTRACT_SOURCE_INIT( RimCase, "RimCase" );
 

ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp

@@ -31,6 +31,7 @@
 #include "RimAnnotationCollection.h"
 #include "RimAnnotationGroupCollection.h"
 #include "RimAnnotationInViewCollection.h"
+#include "RimBoxIntersection.h"
 #include "RimCalcScript.h"
 #include "RimCaseCollection.h"
 #include "RimCellEdgeColors.h"
@@ -51,6 +52,7 @@
 #include "RimEnsembleCurveFilterCollection.h"
 #include "RimEnsembleCurveSet.h"
 #include "RimEnsembleCurveSetCollection.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimFaultInView.h"
 #include "RimFishboneWellPathCollection.h"
 #include "RimFishbonesCollection.h"
@@ -74,8 +76,6 @@
 #include "RimGridCrossPlotCollection.h"
 #include "RimGridCrossPlotDataSet.h"
 #include "RimIdenticalGridCaseGroup.h"
-#include "RimExtrudedCurveIntersection.h"
-#include "RimBoxIntersection.h"
 #include "RimIntersectionCollection.h"
 #include "RimIntersectionResultDefinition.h"
 #include "RimIntersectionResultsDefinitionCollection.h"

ApplicationCode/ProjectDataModel/RimEclipseView.cpp

@@ -50,6 +50,7 @@
 #include "RimEclipsePropertyFilter.h"
 #include "RimEclipsePropertyFilterCollection.h"
 #include "RimEclipseResultDefinition.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimFaultInViewCollection.h"
 #include "RimFlowCharacteristicsPlot.h"
 #include "RimFlowDiagSolution.h"
@@ -59,7 +60,6 @@
 #include "RimGridCollection.h"
 #include "RimGridCrossPlotDataSet.h"
 #include "RimGridView.h"
-#include "RimExtrudedCurveIntersection.h"
 #include "RimIntersectionCollection.h"
 #include "RimIntersectionResultDefinition.h"
 #include "RimIntersectionResultsDefinitionCollection.h"

ApplicationCode/ProjectDataModel/RimExtrudedCurveIntersection.cpp

@@ -304,7 +304,8 @@ void RimExtrudedCurveIntersection::defineUiOrdering( QString uiConfigName, caf::
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QList<caf::PdmOptionItemInfo> RimExtrudedCurveIntersection::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
+QList<caf::PdmOptionItemInfo>
+    RimExtrudedCurveIntersection::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
                                                          bool*                      useOptionsOnly )
 {
     QList<caf::PdmOptionItemInfo> options;

ApplicationCode/ProjectDataModel/RimExtrudedCurveIntersection.h

@@ -25,9 +25,9 @@
 #include "cafPdmObject.h"
 #include "cafPdmPtrField.h"
 
+#include "RimIntersection.h"
 #include "cvfObject.h"
 #include "cvfVector3.h"
-#include "RimIntersection.h"
 
 class RimWellPath;
 class RivExtrudedCurveIntersectionPartMgr;

ApplicationCode/ProjectDataModel/RimIntersection.cpp

@@ -115,8 +115,8 @@ RimIntersectionResultDefinition* RimIntersection::activeSeparateResultDefinition
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QList<caf::PdmOptionItemInfo>
+QList<caf::PdmOptionItemInfo> RimIntersection::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
-    RimIntersection::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly )
+                                                                      bool*                      useOptionsOnly )
 {
     QList<caf::PdmOptionItemInfo> options;
 

ApplicationCode/ProjectDataModel/RimIntersectionCollection.cpp

@@ -22,9 +22,9 @@
 #include "Rim2dIntersectionView.h"
 #include "Rim2dIntersectionViewCollection.h"
 #include "Rim3dView.h"
+#include "RimBoxIntersection.h"
 #include "RimCase.h"
 #include "RimExtrudedCurveIntersection.h"
-#include "RimBoxIntersection.h"
 #include "RimSimWellInView.h"
 
 #include "Riu3DMainWindowTools.h"
@@ -200,7 +200,8 @@ void RimIntersectionCollection::recomputeSimWellBranchData()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimIntersectionCollection::appendIntersectionAndUpdate( RimExtrudedCurveIntersection* intersection, bool allowActiveViewChange )
+void RimIntersectionCollection::appendIntersectionAndUpdate( RimExtrudedCurveIntersection* intersection,
+                                                             bool                          allowActiveViewChange )
 {
     m_intersections.push_back( intersection );
 
@@ -304,7 +305,8 @@ bool RimIntersectionCollection::hasActiveIntersectionForSimulationWell( const Ri
 
     for ( RimExtrudedCurveIntersection* cs : m_intersections )
     {
-        if ( cs->isActive() && cs->type() == RimExtrudedCurveIntersection::CS_SIMULATION_WELL && cs->simulationWell() == simWell )
+        if ( cs->isActive() && cs->type() == RimExtrudedCurveIntersection::CS_SIMULATION_WELL &&
+             cs->simulationWell() == simWell )
         {
             return true;
         }

ApplicationCode/ProjectDataModel/RimIntersectionResultDefinition.cpp

@@ -22,10 +22,10 @@
 #include "RimCase.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimGeoMechCase.h"
 #include "RimGeoMechCellColors.h"
 #include "RimGridView.h"
-#include "RimExtrudedCurveIntersection.h"
 #include "RimIntersectionResultsDefinitionCollection.h"
 #include "RimRegularLegendConfig.h"
 #include "RimTernaryLegendConfig.h"

ApplicationCode/ProjectDataModel/RimIntersectionResultsDefinitionCollection.cpp

@@ -67,7 +67,7 @@ std::vector<RimIntersectionResultDefinition*> RimIntersectionResultsDefinitionCo
 void RimIntersectionResultsDefinitionCollection::appendIntersectionResultDefinition(
     RimIntersectionResultDefinition* interResDef )
 {
-    m_intersectionResultsDefs.push_back(interResDef);
+    m_intersectionResultsDefs.push_back( interResDef );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/UserInterface/RiuMainWindow.cpp

@@ -36,10 +36,10 @@
 #include "RimEclipsePropertyFilter.h"
 #include "RimEclipseResultDefinition.h"
 #include "RimEclipseView.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimFaultInViewCollection.h"
 #include "RimGeoMechCase.h"
 #include "RimGeoMechView.h"
-#include "RimExtrudedCurveIntersection.h"
 #include "RimProject.h"
 #include "RimSimWellInViewCollection.h"
 #include "RimViewLinker.h"

ApplicationCode/UserInterface/RiuResultTextBuilder.cpp

@@ -33,8 +33,8 @@
 #include "RimEclipseCellColors.h"
 #include "RimEclipseFaultColors.h"
 #include "RimEclipseView.h"
-#include "RimFormationNames.h"
 #include "RimExtrudedCurveIntersection.h"
+#include "RimFormationNames.h"
 #include "RimRegularLegendConfig.h"
 #include "RimReservoirCellResultsStorage.h"
 

ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp

@@ -33,10 +33,10 @@
 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
 #include "RimEclipseView.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimGeoMechCase.h"
 #include "RimGeoMechResultDefinition.h"
 #include "RimGeoMechView.h"
-#include "RimExtrudedCurveIntersection.h"
 #include "RimProject.h"
 
 #include "Riu3dSelectionManager.h"

ApplicationCode/UserInterface/RiuViewerCommands.cpp

@@ -42,6 +42,7 @@
 
 #include "RiaOptionItemFactory.h"
 #include "Rim2dIntersectionView.h"
+#include "RimBoxIntersection.h"
 #include "RimCellEdgeColors.h"
 #include "RimContextCommandBuilder.h"
 #include "RimEclipseCase.h"
@@ -50,6 +51,7 @@
 #include "RimEclipseFaultColors.h"
 #include "RimEclipseView.h"
 #include "RimEllipseFractureTemplate.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimFaultInView.h"
 #include "RimFaultInViewCollection.h"
 #include "RimFracture.h"
@@ -57,8 +59,6 @@
 #include "RimGeoMechCellColors.h"
 #include "RimGeoMechContourMapView.h"
 #include "RimGeoMechView.h"
-#include "RimExtrudedCurveIntersection.h"
-#include "RimBoxIntersection.h"
 #include "RimIntersectionResultDefinition.h"
 #include "RimLegendConfig.h"
 #include "RimPerforationInterval.h"
@@ -75,10 +75,10 @@
 #include "RiuResultTextBuilder.h"
 #include "RiuViewer.h"
 
-#include "RivFemPartGeometryGenerator.h"
-#include "RivFemPickSourceInfo.h"
 #include "RivBoxIntersectionSourceInfo.h"
 #include "RivExtrudedCurveIntersectionSourceInfo.h"
+#include "RivFemPartGeometryGenerator.h"
+#include "RivFemPickSourceInfo.h"
 #include "RivObjectSourceInfo.h"
 #include "RivPartPriority.h"
 #include "RivSimWellConnectionSourceInfo.h"
@@ -270,8 +270,8 @@ void RiuViewerCommands::displayContextMenu( QMouseEvent* event )
         const RivSourceInfo*        rivSourceInfo = dynamic_cast<const RivSourceInfo*>( firstHitPart->sourceInfo() );
         const RivFemPickSourceInfo* femSourceInfo = dynamic_cast<const RivFemPickSourceInfo*>(
             firstHitPart->sourceInfo() );
-        const RivExtrudedCurveIntersectionSourceInfo* crossSectionSourceInfo = dynamic_cast<const RivExtrudedCurveIntersectionSourceInfo*>(
+        const RivExtrudedCurveIntersectionSourceInfo* crossSectionSourceInfo =
-            firstHitPart->sourceInfo() );
+            dynamic_cast<const RivExtrudedCurveIntersectionSourceInfo*>( firstHitPart->sourceInfo() );
         const RivBoxIntersectionSourceInfo* intersectionBoxSourceInfo = dynamic_cast<const RivBoxIntersectionSourceInfo*>(
             firstHitPart->sourceInfo() );
 
@@ -723,8 +723,8 @@ void RiuViewerCommands::handlePickAction( int winPosX, int winPosY, Qt::Keyboard
             const RivSourceInfo* rivSourceInfo = dynamic_cast<const RivSourceInfo*>( firstHitPart->sourceInfo() );
             const RivFemPickSourceInfo* femSourceInfo = dynamic_cast<const RivFemPickSourceInfo*>(
                 firstHitPart->sourceInfo() );
-            const RivExtrudedCurveIntersectionSourceInfo* crossSectionSourceInfo = dynamic_cast<const RivExtrudedCurveIntersectionSourceInfo*>(
+            const RivExtrudedCurveIntersectionSourceInfo* crossSectionSourceInfo =
-                firstHitPart->sourceInfo() );
+                dynamic_cast<const RivExtrudedCurveIntersectionSourceInfo*>( firstHitPart->sourceInfo() );
             const RivBoxIntersectionSourceInfo* intersectionBoxSourceInfo =
                 dynamic_cast<const RivBoxIntersectionSourceInfo*>( firstHitPart->sourceInfo() );
             const RivSimWellPipeSourceInfo* eclipseWellSourceInfo = dynamic_cast<const RivSimWellPipeSourceInfo*>(