From d111fde68b1a6b913e6746dea8906b3e4cfd9133 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Wed, 31 Jan 2018 10:18:37 +0100
Subject: [PATCH] #2425 Export Completions : Include cleanup

---
 ...sTransmissibilityCalculationFeatureImp.cpp |  1 +
 ...ellPathExportCompletionDataFeatureImpl.cpp | 26 ++++++-------------
 ...cWellPathExportCompletionDataFeatureImpl.h | 12 +++------
 3 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp b/ApplicationCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp
index 07d093a898..198df3f88b 100644
--- a/ApplicationCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp
+++ b/ApplicationCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp
@@ -26,6 +26,7 @@
 #include "RigEclipseCaseData.h"
 #include "RigMainGrid.h"
 #include "RigWellPath.h"
+#include "RigWellPathIntersectionTools.h"
 
 #include "RimFishboneWellPath.h"
 #include "RimFishboneWellPathCollection.h"
diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp
index 51facfece8..32f088ef81 100644
--- a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp
+++ b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp
@@ -24,30 +24,26 @@
 
 #include "RicExportCompletionDataSettingsUi.h"
 #include "RicExportFeatureImpl.h"
-#include "RicFishbonesTransmissibilityCalculationFeatureImp.h"
 #include "RicExportFractureCompletionsImpl.h"
+#include "RicFishbonesTransmissibilityCalculationFeatureImp.h"
+
+#include "RifEclipseDataTableFormatter.h"
 
 #include "RigActiveCellInfo.h"
 #include "RigCaseCellResultsData.h"
 #include "RigEclipseCaseData.h"
 #include "RigMainGrid.h"
 #include "RigResultAccessorFactory.h"
-
 #include "RigTransmissibilityEquations.h"
-
 #include "RigWellLogExtractionTools.h"
+#include "RigWellLogExtractor.h"
 #include "RigWellPath.h"
 #include "RigWellPathIntersectionTools.h"
 
-#include "RimDialogData.h"
-#include "RimSimWellInViewCollection.h"
-#include "RimFishboneWellPath.h"
-#include "RimFishboneWellPathCollection.h"
 #include "RimFishbonesCollection.h"
 #include "RimFishbonesMultipleSubs.h"
 #include "RimPerforationCollection.h"
 #include "RimPerforationInterval.h"
-#include "RimProject.h"
 #include "RimSimWellInView.h"
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
@@ -61,13 +57,7 @@
 
 #include "cvfPlane.h"
 
-#include <QAction>
 #include <QDir>
-#include <QFileDialog>
-#include <QMessageBox>
-#include "RigWellLogExtractor.h"
-
-
 
 
 
@@ -226,7 +216,7 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompletions(const std::ve
                 completions.push_back(combineEclipseCellCompletions(data.second, exportSettings));
             }
             std::vector<RigCompletionData> wellCompletions;
-            for (auto completion : completions)
+            for (const auto& completion : completions)
             {
                 if (completion.wellName() == wellPath->completions()->wellNameForExport())
                 {
@@ -294,7 +284,7 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompletions(const std::ve
                 completions.push_back(combineEclipseCellCompletions(data.second, exportSettings));
             }
             std::vector<RigCompletionData> wellCompletions;
-            for (auto completion : completions)
+            for (const auto& completion : completions)
             {
                 if (completion.wellName() == simWell->name())
                 {
@@ -516,7 +506,7 @@ std::vector<RigCompletionData> RicWellPathExportCompletionDataFeatureImpl::getCo
                                                                                                               RigCompletionData::CompletionType completionType)
 {
     std::vector<RigCompletionData> filteredCompletions;
-    for (auto completion : completions)
+    for (const auto& completion : completions)
     {
         if (completion.wellName() == wellName && completion.completionType() == completionType)
         {
@@ -847,7 +837,7 @@ void RicWellPathExportCompletionDataFeatureImpl::assignLateralIntersections(cons
 
         std::vector<std::pair<cvf::Vec3d, double> > lateralCoordMDPairs = location->fishbonesSubs->coordsAndMDForLateral(location->subIndex, lateral.lateralIndex);
         
-        if ( !lateralCoordMDPairs.size() ) 
+        if ( lateralCoordMDPairs.empty() ) 
         {
             continue;
         }
diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h
index 517b223c06..160422fc91 100644
--- a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h
+++ b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h
@@ -18,18 +18,14 @@
 
 #pragma once
 
-#include "RifEclipseDataTableFormatter.h"
-
-#include "RigWellLogExtractionTools.h"
-#include "RigWellPathIntersectionTools.h"
 #include "RigCompletionData.h"
 
 #include "RicExportCompletionDataSettingsUi.h"
 
-#include "cafCmdFeature.h"
-
-#include "cvfBoundingBox.h"
+#include "cvfBase.h"
+#include "cvfVector3.h"
 
+#include <vector>
 
 class RigCell;
 class RigEclipseCaseData;
@@ -38,7 +34,7 @@ class RimEclipseCase;
 class RimFishbonesMultipleSubs;
 class RimSimWellInView;
 class RimWellPath;
-
+class RifEclipseDataTableFormatter;
 
 //==================================================================================================
 ///