From 625a6b5f0eeab801653aff4dfe0386e007cda727 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Tue, 6 May 2014 22:51:17 +0200
Subject: [PATCH] Cleaned up includes

---
 .../ModelVisualization/RivGridPartMgr.cpp     | 52 +++++++++----------
 .../ProjectDataModel/RimResultSlot.cpp        | 19 ++-----
 .../ProjectDataModel/RimResultSlot.h          |  5 +-
 3 files changed, 30 insertions(+), 46 deletions(-)

diff --git a/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp b/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp
index 4bcb6a0f1a..c209a4d578 100644
--- a/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp
@@ -18,42 +18,38 @@
 
 #include "RivGridPartMgr.h"
 
-#include "cvfPart.h"
+
 #include "cafEffectGenerator.h"
-#include "cvfStructGrid.h"
+#include "cafPdmFieldCvfColor.h"
+#include "cafPdmFieldCvfMat4d.h"
+#include "cafProgressInfo.h"
 #include "cvfDrawableGeo.h"
+#include "cvfMath.h"
 #include "cvfModelBasicList.h"
-#include "RivCellEdgeEffectGenerator.h"
-#include "RimReservoirView.h"
-#include "RimResultSlot.h"
-#include "RimCellEdgeResultSlot.h"
-#include "RigCaseCellResultsData.h"
-#include "RigCaseData.h"
+#include "cvfPart.h"
+#include "cvfRenderStateBlending.h"
+#include "cvfRenderStatePolygonOffset.h"
+#include "cvfRenderState_FF.h"
+#include "cvfShaderProgram.h"
+#include "cvfShaderProgramGenerator.h"
+#include "cvfShaderSourceProvider.h"
+#include "cvfShaderSourceRepository.h"
+#include "cvfStructGrid.h"
+#include "cvfUniform.h"
+
 #include "RiaApplication.h"
 #include "RiaPreferences.h"
-#include "RimTernaryLegendConfig.h"
-
+#include "RigCaseCellResultsData.h"
+#include "RigCaseData.h"
 #include "RimCase.h"
-#include "RimWellCollection.h"
-#include "cafPdmFieldCvfMat4d.h"
-#include "cafPdmFieldCvfColor.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
+#include "RimCellEdgeResultSlot.h"
 #include "RimReservoirCellResultsCacher.h"
+#include "RimReservoirView.h"
+#include "RimResultSlot.h"
+#include "RimTernaryLegendConfig.h"
+#include "RimWellCollection.h"
+#include "RivCellEdgeEffectGenerator.h"
 #include "RivSourceInfo.h"
-#include "cvfRenderState_FF.h"
-#include "cafProgressInfo.h"
-#include "cvfRenderStatePolygonOffset.h"
-#include "cvfRenderStateBlending.h"
-#include "cvfShaderProgramGenerator.h"
-#include "cvfShaderSourceRepository.h"
-#include "cvfUniform.h"
-#include "cvfShaderSourceProvider.h"
-#include "cvfShaderProgram.h"
-#include "cvfMath.h"
-
-
 
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/RimResultSlot.cpp b/ApplicationCode/ProjectDataModel/RimResultSlot.cpp
index 7c5b888179..5e4e6452b0 100644
--- a/ApplicationCode/ProjectDataModel/RimResultSlot.cpp
+++ b/ApplicationCode/ProjectDataModel/RimResultSlot.cpp
@@ -19,24 +19,11 @@
 #include "RiaStdInclude.h"
 
 #include "RimResultSlot.h"
-#include "RimLegendConfig.h"
+
 #include "RimReservoirView.h"
-#include "RimCase.h"
-#include "RiuMainWindow.h"
-#include "RimUiTreeModelPdm.h"
-
-
-#include "cafPdmFieldCvfMat4d.h"
-#include "cafPdmFieldCvfColor.h"
-#include "RimResultSlot.h"
-#include "RimCellEdgeResultSlot.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "RimWellCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
-
-#include "RimReservoirCellResultsCacher.h"
 #include "RimTernaryLegendConfig.h"
+#include "RimUiTreeModelPdm.h"
+#include "RiuMainWindow.h"
 
 CAF_PDM_SOURCE_INIT(RimResultSlot, "ResultSlot");
 
diff --git a/ApplicationCode/ProjectDataModel/RimResultSlot.h b/ApplicationCode/ProjectDataModel/RimResultSlot.h
index 97e84ff8b6..a5b9ec909d 100644
--- a/ApplicationCode/ProjectDataModel/RimResultSlot.h
+++ b/ApplicationCode/ProjectDataModel/RimResultSlot.h
@@ -18,10 +18,11 @@
 
 #pragma once
 
-#include "cafPdmObject.h"
-#include "RimLegendConfig.h"
 #include "cafAppEnum.h"
+#include "cafPdmObject.h"
+
 #include "RimDefines.h"
+#include "RimLegendConfig.h"
 #include "RimResultDefinition.h"
 
 class RimTernaryLegendConfig;