Cleaned up includes

Removed includes to cvfLibCore and friends. Removed several includes from header files.

ApplicationCode/FileInterface/RifEclipseInputFileTools.h

@@ -22,7 +22,7 @@
 
 #include "cvfBase.h"
 #include "cvfObject.h"
-#include "cvfLibCore.h"
+#include "cvfCollection.h"
 
 #include "RifReaderInterface.h"
 #include "RigFault.h"

ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp

@@ -26,10 +26,13 @@
 
 #include "cafProgressInfo.h"
 
+#include "cvfMath.h"
+
 #include <QFileInfo>
 #include <QDebug>
 
 #include <assert.h>
+#include <algorithm>
 
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/FileInterface/RifEclipseOutputFileTools.h

@@ -22,7 +22,6 @@
 
 #include "cvfBase.h"
 #include "cvfObject.h"
-#include "cvfLibCore.h"
 
 #include "RifReaderInterface.h"
 #include "RifEclipseRestartDataAccess.h"

ApplicationCode/FileInterface/RifEclipseRestartDataAccess.h

@@ -22,7 +22,6 @@
 
 #include "cvfBase.h"
 #include "cvfObject.h"
-#include "cvfLibCore.h"
 
 #include <QStringList>
 #include <QDateTime>

ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp

@@ -20,25 +20,28 @@
 
 #include "RifReaderEclipseOutput.h"
 
-#include "RigActiveCellInfo.h"
-#include "RigCaseCellResultsData.h"
-#include "RigEclipseCaseData.h"
-#include "RigMainGrid.h"
-
+#include "RifEclipseInputFileTools.h"
 #include "RifEclipseOutputFileTools.h"
 #include "RifEclipseRestartFilesetAccess.h"
 #include "RifEclipseUnifiedRestartFileAccess.h"
 #include "RifReaderOpmParserInput.h"
 
+#include "RigActiveCellInfo.h"
+#include "RigCaseCellResultsData.h"
+#include "RigEclipseCaseData.h"
+#include "RigMainGrid.h"
+#include "RigSingleWellResultsData.h"
+
 #include "cafProgressInfo.h"
 
-#include "ert/ecl/ecl_nnc_export.h"
-#include "ert/ecl/ecl_kw_magic.h"
+#include "cvfTrace.h"
 
+#include "ert/ecl/ecl_kw_magic.h"
+#include "ert/ecl/ecl_nnc_export.h"
+
+#include <cmath> // Needed for HUGE_VAL on Linux
 #include <iostream>
 #include <map>
-#include <cmath> // Needed for HUGE_VAL on Linux
-#include "RifEclipseInputFileTools.h"
 
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/FileInterface/RifReaderEclipseOutput.h

@@ -22,8 +22,7 @@
 
 #include "RifReaderInterface.h"
 
-#include "RigFault.h"
-#include "RigSingleWellResultsData.h"
+#include "cvfCollection.h"
 
 #include <QList>
 #include <QDateTime>
@@ -33,6 +32,9 @@ class RifEclipseRestartDataAccess;
 class RigGridBase;
 class RigMainGrid;
 class RigActiveCellInfo;
+class RigFault;
+
+struct RigWellResultPoint;
 
 typedef struct ecl_grid_struct ecl_grid_type;
 typedef struct ecl_file_struct ecl_file_type;

ApplicationCode/FileInterface/RifReaderInterface.h

@@ -22,7 +22,6 @@
 
 #include "cvfBase.h"
 #include "cvfObject.h"
-#include "cvfLibCore.h"
 
 #include "cafPdmPointer.h"
 
@@ -30,6 +29,8 @@
 #include <QStringList>
 #include <QDateTime>
 
+#include <vector>
+
 
 class RigEclipseCaseData;
 class RifReaderSettings;

ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.cpp

@@ -24,13 +24,16 @@
 
 #include "RimIntersection.h"
 
+#include "RivHexGridIntersectionTools.h"
+
 #include "cafHexGridIntersectionTools/cafHexGridIntersectionTools.h"
 
 #include "cvfDrawableGeo.h"
+#include "cvfGeometryTools.h"
+#include "cvfPlane.h"
 #include "cvfPrimitiveSetDirect.h"
 #include "cvfPrimitiveSetIndexedUInt.h"
 #include "cvfScalarMapper.h"
-#include "cvfGeometryTools.h"
 
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.h

@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include "RivHexGridIntersectionTools.h"
-
 #include "cafPdmPointer.h"
 
 #include "cvfArray.h"
@@ -35,6 +33,8 @@ class RigMainGrid;
 class RigActiveCellInfo;
 class RigResultAccessor;
 class RimIntersection;
+class RivIntersectionHexGridInterface;
+class RivIntersectionVertexWeights;
 
 namespace cvf
 {

ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp

@@ -36,6 +36,8 @@
 #include "RimLegendConfig.h"
 #include "RimTernaryLegendConfig.h"
 
+#include "RivHexGridIntersectionTools.h"
+#include "RivIntersectionGeometryGenerator.h"
 #include "RivIntersectionSourceInfo.h"
 #include "RivResultToTextureMapper.h"
 #include "RivScalarMapperUtils.h"
@@ -45,6 +47,7 @@
 #include "RiuGeoMechXfTensorResultAccessor.h"
 
 #include "cafTensor3.h"
+
 #include "cvfDrawableGeo.h"
 #include "cvfGeometryTools.h"
 #include "cvfModelBasicList.h"

ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.h

@@ -19,12 +19,11 @@
 
 #pragma once
 
-#include "RivIntersectionGeometryGenerator.h"
-
 #include "cvfBase.h"
 #include "cvfObject.h"
 #include "cvfColor4.h"
 #include "cvfVector3.h"
+#include "cvfArray.h"
 
 
 namespace cvf
@@ -32,14 +31,21 @@ namespace cvf
     class ModelBasicList;
     class Transform;
     class Part;
+    class ScalarMapper;
 }
 
-class RigMainGrid;
-class RimEclipseCellColors;
-class RimCellEdgeColors;
-class RimIntersection;
-class RigGeoMechCaseData;
+class RigFemPart;
 class RigFemResultAddress;
+class RigGeoMechCaseData;
+class RigMainGrid;
+class RigResultAccessor;
+class RimCellEdgeColors;
+class RimEclipseCellColors;
+class RimIntersection;
+class RivIntersectionGeometryGenerator;
+class RivIntersectionHexGridInterface;
+class RivIntersectionVertexWeights;
+
 
 //==================================================================================================
 ///

ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp

@@ -45,7 +45,6 @@
 #include "cafPdmFieldCvfMat4d.h"
 
 #include "cvfDrawableGeo.h"
-#include "cvfLibCore.h"
 #include "cvfModelBasicList.h"
 #include "cvfPart.h"
 #include "cvfRay.h"

ApplicationCode/ProjectDataModel/RimIntersection.cpp

@@ -41,6 +41,8 @@
 #include "cafPdmUiListEditor.h"
 #include "cafPdmUiPushButtonEditor.h"
 
+#include "cvfBoundingBox.h"
+
 
 namespace caf {
 

ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.h

@@ -24,6 +24,8 @@
 
 #include "RimDefines.h"
 
+#include "cvfCollection.h"
+
 #include <QDateTime>
 
 #include <vector>

ApplicationCode/ReservoirDataModel/RigEclipseCaseData.h

@@ -24,9 +24,11 @@
 #include "RifReaderInterface.h"
 
 #include "cvfAssert.h"
+#include "cvfArray.h"
 #include "cvfObject.h"
-#include "cvfVector3.h"
+#include "cvfCollection.h"
 #include "cvfStructGrid.h"
+#include "cvfVector3.h"
 
 #include <vector>
 

ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp

@@ -35,11 +35,6 @@
 #include "RimEclipseResultDefinition.h"
 #include "RimFlowDiagSolution.h"
 
-#include "cvfAssert.h"
-#include "cvfBase.h"
-#include "cvfLibCore.h"
-#include "cvfObject.h"
-
 #include <math.h>
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/SocketInterface/RiaSocketTools.cpp

@@ -39,6 +39,8 @@
 #include "RimIdenticalGridCaseGroup.h"
 #include "RimReservoirCellResultsStorage.h"
 
+#include "cvfTimer.h"
+
 #include <QErrorMessage>
 #include <QTcpSocket>
 

ApplicationCode/UserInterface/RiuMainWindow.cpp

@@ -56,6 +56,8 @@
 #include "cafPdmUiTreeView.h"
 #include "cafSelectionManager.h"
 
+#include "cvfTimer.h"
+
 #include <QAction>
 #include <QCloseEvent>
 #include <QDir>
@@ -71,6 +73,7 @@
 
 
 
+
 //==================================================================================================
 ///
 /// \class RiuMainWindow