Major cleanup/change in the way things are included.

Needs a Linux compile check.
p4#: 21545

ApplicationCode/Application/RiaApplication.cpp

@@ -17,47 +17,57 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RiaStdInclude.h"
+#include "RiaApplication.h"
 
-#include "cafLog.h"
 #include "cafEffectCache.h"
 #include "cafUtils.h"
-
+#include "cafAppEnum.h"
-#include "cvfPart.h"
-
-#include "cvfStructGridGeometryGenerator.h"
 
 #include "RiaVersionInfo.h"
 #include "RiaBaseDefs.h"
-
+//
-#include "RiaApplication.h"
 #include "RiuMainWindow.h"
 #include "RiuViewer.h"
 #include "RiuProcessMonitor.h"
 #include "RiaPreferences.h"
-
+//
 #include "RimResultCase.h"
 #include "RimInputCase.h"
 #include "RimReservoirView.h"
 
-#include "RigCaseData.h"
-#include "RigCell.h"
-#include "RigReservoirBuilderMock.h"
-
-#include <QSettings>
-#include "cafPdmDocument.h"
-#include "RifReaderMockModel.h"
-
 #include "cafCeetronNavigation.h"
 #include "cafCadNavigation.h"
 #include "RiaSocketServer.h"
 #include "cafUiProcess.h"
-
+//
 #include "RimUiTreeModelPdm.h"
 #include "RiaImageCompareReporter.h"
 #include "RiaImageFileCompare.h"
 #include "cafProgressInfo.h"
 #include "RigGridManager.h"
 
+#include "RimProject.h"
+
+#include "RimResultSlot.h"
+
+#include "RimIdenticalGridCaseGroup.h"
+#include "RimInputPropertyCollection.h"
+
+#include "RimDefines.h"
+#include "RimScriptCollection.h"
+#include "RimCaseCollection.h"
+
+////////////
+
+#include "cafPdmFieldCvfColor.h"
+#include "cafPdmFieldCvfMat4d.h"
+#include "RimReservoirCellResultsCacher.h"
+#include "RimCellEdgeResultSlot.h"
+#include "RimCellRangeFilterCollection.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "Rim3dOverlayInfoConfig.h"
+#include "RimWellCollection.h"
+
 namespace caf
 {
 template<>
@@ -1183,9 +1193,9 @@ void RiaApplication::saveSnapshotAs(const QString& fileName)
 //--------------------------------------------------------------------------------------------------
 void RiaApplication::copySnapshotToClipboard()
 {
-    QClipboard* clipboard = QApplication::clipboard();
+        QClipboard* clipboard = QApplication::clipboard();
-    if (clipboard)
+        if (clipboard)
-    {
+        {
         QImage image = grabFrameBufferImage();
         if (!image.isNull())
         {
@@ -1500,3 +1510,11 @@ QImage RiaApplication::grabFrameBufferImage()
 
     return image;
 }
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimProject* RiaApplication::project()
+{
+    return m_project;
+}

ApplicationCode/Application/RiaApplication.h

@@ -17,17 +17,15 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QProcess>
+#include "cafPdmObject.h"
+#include "cafPdmField.h"
 #include "cvfBase.h"
 #include "cvfObject.h"
-
+#include "cvfFont.h"
-#include "cvfScalarMapperUniformLevels.h"
-#include "cvfOverlayScalarMapperLegend.h"
-#include "RimReservoirView.h"
 
 #include <iostream>
-#include "RimProject.h"
 
 class RIProcess;
 class RigCaseData;
@@ -35,6 +33,8 @@ class RimCase;
 class Drawable;
 class RiaSocketServer;
 class RiaPreferences;
+class RimReservoirView;
+class RimProject;
 
 namespace caf
 {
@@ -68,7 +68,7 @@ public:
     RimReservoirView*       activeReservoirView();
     const RimReservoirView* activeReservoirView() const;
 
-    RimProject*         project() {return m_project;} 
+    RimProject*         project(); 
 
     void                createMockModel();
     void                createResultsMockModel();

ApplicationCode/Application/RiaPreferences.cpp

@@ -18,7 +18,9 @@
 
 #include "RiaStdInclude.h"
 #include "RiaPreferences.h"
+
 #include "cafPdmUiFilePathEditor.h"
+#include "cafPdmFieldCvfColor.h"
 
 CAF_PDM_SOURCE_INIT(RiaPreferences, "RiaPreferences");
 //--------------------------------------------------------------------------------------------------

ApplicationCode/Application/RiaPreferences.h

@@ -18,9 +18,13 @@
 
 #pragma once
 
-#include "cafPdmObject.h"
 #include "RiaApplication.h"
 
+#include "cafPdmObject.h"
+#include "cafPdmField.h"
+#include "cafAppEnum.h"
+
+
 class RiaPreferences : public caf::PdmObject
 {
     CAF_PDM_HEADER_INIT;

ApplicationCode/ModelVisualization/RivCellEdgeEffectGenerator.cpp

@@ -44,6 +44,8 @@
 #include <QFile>
 #include <QTextStream>
 
+#include "RimCase.h"
+
 #include "RimReservoirView.h"
 #include "RimResultSlot.h"
 
@@ -53,7 +55,16 @@
 #include "RigCaseData.h"
 #include "RigActiveCellInfo.h"
 
+#include "RimReservoirCellResultsCacher.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"
 
 //--------------------------------------------------------------------------------------------------
 /// 

ApplicationCode/ModelVisualization/RivGridPartMgr.cpp

@@ -16,8 +16,8 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
 #include "RivGridPartMgr.h"
+
 #include "cvfPart.h"
 #include "cafEffectGenerator.h"
 #include "cvfStructGrid.h"
@@ -27,12 +27,22 @@
 #include "RimReservoirView.h"
 #include "RimResultSlot.h"
 #include "RimCellEdgeResultSlot.h"
-#include "RigGridScalarDataAccess.h"
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
 #include "RiaApplication.h"
 #include "RiaPreferences.h"
 
+#include "RimCase.h"
+#include "RimWellCollection.h"
+#include "cafPdmFieldCvfMat4d.h"
+#include "cafPdmFieldCvfColor.h"
+#include "RimCellRangeFilterCollection.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "Rim3dOverlayInfoConfig.h"
+#include "RimReservoirCellResultsCacher.h"
+
+
+
 
 //--------------------------------------------------------------------------------------------------
 /// 

ApplicationCode/ModelVisualization/RivGridPartMgr.h

@@ -17,6 +17,8 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
+#include "cvfBase.h"
+#include "cvfObject.h"
 
 #include "cvfStructGridGeometryGenerator.h"
 #include "RigGridBase.h"

ApplicationCode/ModelVisualization/RivReservoirPipesPartMgr.cpp

@@ -23,7 +23,14 @@
 #include "RimWellCollection.h"
 #include "RivWellPipesPartMgr.h"
 #include "RivWellHeadPartMgr.h"
+#include "RimCellEdgeResultSlot.h"
 
+#include "cafPdmFieldCvfMat4d.h"
+#include "cafPdmFieldCvfColor.h"
+#include "RimResultSlot.h"
+#include "RimCellRangeFilterCollection.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "Rim3dOverlayInfoConfig.h"
 
 //--------------------------------------------------------------------------------------------------
 /// 

ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp

@@ -24,6 +24,19 @@
 #include "RigGridBase.h"
 #include "RigCaseCellResultsData.h"
 #include "RigGridScalarDataAccess.h"
+#include "RimCase.h"
+#include "RimCellRangeFilterCollection.h"
+#include "RimWellCollection.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "RimResultDefinition.h"
+
+#include "cafPdmFieldCvfMat4d.h"
+#include "cafPdmFieldCvfColor.h"
+
+#include "RimResultSlot.h"
+#include "RimCellEdgeResultSlot.h"
+#include "Rim3dOverlayInfoConfig.h"
+#include "RimReservoirCellResultsCacher.h"
 
 //--------------------------------------------------------------------------------------------------
 /// 

ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp

@@ -35,6 +35,18 @@
 #include "cvfqtUtils.h"
 
 #include "RimReservoirView.h"
+#include "RimWellCollection.h"
+#include "cafPdmFieldCvfMat4d.h"
+#include "RimCellEdgeResultSlot.h"
+#include "RimCellRangeFilterCollection.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "Rim3dOverlayInfoConfig.h"
+#include "RimReservoirCellResultsCacher.h"
+#include "RimResultSlot.h"
+#include "RimLegendConfig.h"
+
+#include "RimCase.h"
+#include "RimWell.h"
 
 #include "RigCaseData.h"
 #include "RigCell.h"

ApplicationCode/ModelVisualization/RivWellPipesPartMgr.cpp

@@ -16,22 +16,37 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
+#include "RivWellPipesPartMgr.h"
 
 #include "cvfLibCore.h"
-
-#include "RimCase.h"
-#include "RigCaseData.h"
-#include "RivWellPipesPartMgr.h"
-#include "RigCell.h"
-#include "RivPipeGeometryGenerator.h"
 #include "cvfModelBasicList.h"
 #include "cvfTransform.h"
 #include "cvfPart.h"
 #include "cvfScalarMapperDiscreteLinear.h"
 #include "cvfDrawableGeo.h"
 #include "cvfRay.h"
+
 #include "cafEffectGenerator.h"
+#include "cafPdmFieldCvfColor.h"
+#include "cafPdmFieldCvfMat4d.h"
+
+#include "RigCaseData.h"
+#include "RigCell.h"
+#include "RivPipeGeometryGenerator.h"
+
+#include "RimCase.h"
 #include "RimReservoirView.h"
+#include "RimWellCollection.h"
+#include "RimReservoirCellResultsCacher.h"
+
+#include "RimResultSlot.h"
+#include "RimCellEdgeResultSlot.h"
+#include "RimCellRangeFilterCollection.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "Rim3dOverlayInfoConfig.h"
+
+
+
 
 //--------------------------------------------------------------------------------------------------
 /// 

ApplicationCode/ModelVisualization/RivWellPipesPartMgr.h

@@ -18,6 +18,10 @@
 
 #pragma once
 
+#include "cvfBase.h"
+#include "cvfObject.h"
+#include "cvfVector3.h"
+
 #include "cafPdmPointer.h"
 #include <list>
 #include "RigSingleWellResultsData.h"
@@ -28,6 +32,8 @@ namespace cvf
     class ModelBasicList;
     class Transform;
     class Effect;
+    class DrawableGeo;
+    class ScalarMapper;
 }
 
 class RivPipeGeometryGenerator;

ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp

@@ -16,14 +16,21 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 #include "Rim3dOverlayInfoConfig.h"
+
 #include "RimReservoirView.h"
 #include "RiuViewer.h"
 #include "RimCase.h"
 #include "RigCaseData.h"
-#include "RigMainGrid.h"
+#include "RimResultSlot.h"
+#include "RimCellEdgeResultSlot.h"
+#include "RimReservoirCellResultsCacher.h"
+
+#include "RimCellPropertyFilterCollection.h"
+#include "RimCellRangeFilterCollection.h"
+
+#include "RimWellCollection.h"
+#include "cafPdmFieldCvfMat4d.h"
 #include "RigCaseCellResultsData.h"
 
 CAF_PDM_SOURCE_INIT(Rim3dOverlayInfoConfig, "View3dOverlayInfoConfig");

ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.h

@@ -23,6 +23,7 @@
 #include "cafPdmField.h"
 #include "cafAppEnum.h"
 
+#include "cvfVector2.h"
 
 class RimReservoirView;
 //==================================================================================================

ApplicationCode/ProjectDataModel/RimCase.cpp

@@ -16,13 +16,28 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
+//#include "RiaStdInclude.h"
+#include "RimCase.h"
+
+#include <QFile>
+#include <QFileInfo>
+#include <QDir>
 
 #include "RifReaderEclipseOutput.h"
 #include "RifReaderMockModel.h"
 
-#include "RimCase.h"
 #include "RimReservoirView.h"
+#include "cafPdmFieldCvfMat4d.h"
+#include "cafPdmFieldCvfColor.h"
+#include "RimCellRangeFilter.h"
+#include "RimCellRangeFilterCollection.h"
+#include "RimCellPropertyFilter.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "Rim3dOverlayInfoConfig.h"
+#include "RimIdenticalGridCaseGroup.h"
+#include "RimWellCollection.h"
+
+#include "RimScriptCollection.h"
 
 #include "RigCaseData.h"
 #include "RigMainGrid.h"
@@ -30,11 +45,17 @@
 
 #include "cvfAssert.h"
 
+#include "cafPdmFieldCvfColor.h"
+
 #include "cafPdmUiPushButtonEditor.h"
 
 #include <QString>
 #include "RimProject.h"
 #include "RimReservoirCellResultsCacher.h"
+#include "RimResultSlot.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "RimCellEdgeResultSlot.h"
+#include "RimCaseCollection.h"
 
 CAF_PDM_SOURCE_INIT(RimCase, "RimReservoir");
 

ApplicationCode/ProjectDataModel/RimCase.h

@@ -22,7 +22,6 @@
 #include "cvfObject.h"
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
-#include "RimReservoirCellResultsCacher.h"
 #include "RifReaderInterface.h"
 
 class QString;
@@ -32,7 +31,7 @@ class RigGridBase;
 class RimReservoirView;
 class RimCaseCollection;
 class RimIdenticalGridCaseGroup;
-//class RimReservoirCellResultsCacher;
+class RimReservoirCellResultsStorage;
 
 //==================================================================================================
 // 

ApplicationCode/ProjectDataModel/RimCaseCollection.cpp

@@ -16,14 +16,24 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
-
 #include "RimCaseCollection.h"
+#include "RimCase.h"
 
 #include "RimReservoirView.h"
 #include "RimIdenticalGridCaseGroup.h"
 
+#include "cafPdmFieldCvfColor.h"
+#include "cafPdmFieldCvfMat4d.h"
+
+#include "RimReservoirCellResultsCacher.h"
+#include "RimResultSlot.h"
+
+#include "RimCellEdgeResultSlot.h"
+#include "RimCellRangeFilterCollection.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "Rim3dOverlayInfoConfig.h"
+#include "RimWellCollection.h"
+
 CAF_PDM_SOURCE_INIT(RimCaseCollection, "RimCaseCollection");
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimCaseCollection.h

@@ -18,13 +18,11 @@
 
 #pragma once
 
-#include "cvfBase.h"
-#include "cvfObject.h"
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 
-#include "RimStatisticsCase.h"
+class RimCase;
-
+class RimIdenticalGridCaseGroup;
 
 //==================================================================================================
 //

ApplicationCode/ProjectDataModel/RimCellEdgeResultSlot.cpp

@@ -16,18 +16,21 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 #include "RimCellEdgeResultSlot.h"
+#include "RimReservoirCellResultsCacher.h"
+
 #include "RimLegendConfig.h"
 #include "RimReservoirView.h"
-#include "RimCase.h"
-#include "RimReservoirView.h"
 #include "RigCaseCellResultsData.h"
-#include "RigCaseData.h"
-
 #include "cafPdmUiListEditor.h"
 
+#include "cafPdmFieldCvfColor.h"
+#include "cafPdmFieldCvfMat4d.h"
+#include "RimResultSlot.h"
+#include "RimCellRangeFilterCollection.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "Rim3dOverlayInfoConfig.h"
+#include "RimWellCollection.h"
 
 CAF_PDM_SOURCE_INIT(RimCellEdgeResultSlot, "CellEdgeResultSlot");
 

ApplicationCode/ProjectDataModel/RimCellEdgeResultSlot.h

@@ -19,11 +19,13 @@
 #pragma once
 
 #include "cafPdmObject.h"
-#include "RimLegendConfig.h"
+#include "cafPdmField.h"
 #include "cafAppEnum.h"
 #include "RimDefines.h"
 
 class RigCaseCellResultsData;
+class RimLegendConfig;
+class RimReservoirView;
 
 namespace caf
 {

ApplicationCode/ProjectDataModel/RimCellPropertyFilter.cpp

@@ -16,16 +16,14 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
-#include "RimReservoirView.h"
 #include "RimCellPropertyFilter.h"
+#include "RimResultDefinition.h"
+#include "cvfMath.h"
+
 #include "RimCellPropertyFilterCollection.h"
-#include "RigGridBase.h"
 #include "RigCaseCellResultsData.h"
-
 #include "cafPdmUiDoubleSliderEditor.h"
-
+#include "RimReservoirCellResultsCacher.h"
 
 
 namespace caf

ApplicationCode/ProjectDataModel/RimCellPropertyFilter.h

@@ -25,7 +25,7 @@
 
 #include "RimDefines.h"
 #include "RimCellFilter.h"
-#include "cvfStructGridGeometryGenerator.h"
+//#include "cvfStructGridGeometryGenerator.h"
 
 class RimReservoirView;
 class RimCellPropertyFilterCollection;

ApplicationCode/ProjectDataModel/RimCellPropertyFilterCollection.cpp

@@ -16,13 +16,18 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 #include "RimCellPropertyFilterCollection.h"
 
 #include "RimReservoirView.h"
-#include "RigGridBase.h"
+#include "RimResultDefinition.h"
-#include "RigCaseCellResultsData.h"
+#include "RimResultSlot.h"
+
+#include "cafPdmFieldCvfColor.h"
+#include "cafPdmFieldCvfMat4d.h"
+#include "RimCellRangeFilterCollection.h"
+#include "Rim3dOverlayInfoConfig.h"
+#include "RimWellCollection.h"
+#include "RimCellEdgeResultSlot.h"
 
 
 CAF_PDM_SOURCE_INIT(RimCellPropertyFilterCollection, "CellPropertyFilters");

ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp

@@ -16,12 +16,23 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
+//#include "RiaStdInclude.h"
 
 #include "RimCellRangeFilter.h"
 #include "RimCellRangeFilterCollection.h"
 #include "RimReservoirView.h"
 #include "RigCaseData.h"
+#include "RimCase.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 "cafPdmUiSliderEditor.h"
 

ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp

@@ -16,13 +16,20 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
+//#include "RiaStdInclude.h"
 
 #include "RimCellRangeFilterCollection.h"
-
+#include "RimCase.h"
 #include "RimReservoirView.h"
 #include "RigCaseData.h"
-
+#include "cafPdmFieldCvfMat4d.h"
+#include "cafPdmFieldCvfColor.h"
+#include "RimResultSlot.h"
+#include "RimCellEdgeResultSlot.h"
+#include "Rim3dOverlayInfoConfig.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "RimReservoirCellResultsCacher.h"
+#include "RimWellCollection.h"
 
 
 CAF_PDM_SOURCE_INIT(RimCellRangeFilterCollection, "CellRangeFilterCollection");

ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp

@@ -17,20 +17,33 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 #include "RimIdenticalGridCaseGroup.h"
+#include "RimCaseCollection.h"
+
 #include "RimCase.h"
 #include "RimReservoirView.h"
 #include "RigCaseData.h"
 #include "RigCaseCellResultsData.h"
 
+#include "RimResultSlot.h"
+#include "RimCellEdgeResultSlot.h"
 #include "RimStatisticsCase.h"
-#include "RimStatisticsCaseCollection.h"
+
 #include "RimResultCase.h"
 #include "cafProgressInfo.h"
 #include "RigActiveCellInfo.h"
+#include "RigActiveCellInfo.h"
+
 #include "RigGridManager.h"
+#include "RimReservoirCellResultsCacher.h"
+
+
+#include "cafPdmFieldCvfColor.h"
+#include "cafPdmFieldCvfMat4d.h"
+#include "RimCellRangeFilterCollection.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "Rim3dOverlayInfoConfig.h"
+#include "RimWellCollection.h"
 
 
 CAF_PDM_SOURCE_INIT(RimIdenticalGridCaseGroup, "RimIdenticalGridCaseGroup");

ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.h

@@ -23,8 +23,11 @@
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 
-#include "RimStatisticsCaseCollection.h"
+#include "RifReaderInterface.h"
-#include "RimCaseCollection.h"
+
+//#include "RimStatisticsCaseCollection.h"
+class RimCaseCollection;
+class RimStatisticsCase;
 
 class RimCase;
 class RigMainGrid;

ApplicationCode/ProjectDataModel/RimInputCase.cpp

@@ -16,20 +16,18 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
+//#include "RiaStdInclude.h"
 
 #include "RimInputCase.h"
-#include "RimInputProperty.h"
+#include "RimInputPropertyCollection.h"
+#include "RimReservoirCellResultsCacher.h"
+#include <QFileInfo>
+
 #include "RimReservoirView.h"
-
 #include "RifReaderEclipseInput.h"
-
 #include "RigCaseData.h"
 #include "RigCaseCellResultsData.h"
 
-#include "cvfAssert.h"
-
-#include <QString>
 #include "RifReaderMockModel.h"
 #include "RifEclipseInputFileTools.h"
 #include "cafProgressInfo.h"
@@ -37,6 +35,15 @@
 #include "RiaApplication.h"
 #include "RiaPreferences.h"
 
+#include "cafPdmFieldCvfColor.h"
+#include "cafPdmFieldCvfMat4d.h"
+
+#include "RimCellEdgeResultSlot.h"
+#include "RimResultSlot.h"
+#include "RimCellRangeFilterCollection.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "Rim3dOverlayInfoConfig.h"
+#include "RimWellCollection.h"
 
 CAF_PDM_SOURCE_INIT(RimInputCase, "RimInputReservoir");
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimInputCase.h

@@ -24,12 +24,10 @@
 #include "cafPdmObject.h"
 
 #include "RimCase.h"
-#include "RimInputPropertyCollection.h"
-
-
-class QString;
 
 class RifReaderInterface;
+class RimInputPropertyCollection;
+class RimInputProperty;
 
 //==================================================================================================
 //

ApplicationCode/ProjectDataModel/RimLegendConfig.cpp

@@ -16,7 +16,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
+//#include "RiaStdInclude.h"
 
 #include "RimLegendConfig.h"
 #include "RimReservoirView.h"
@@ -24,7 +24,19 @@
 #include "cafPdmUiLineEditor.h"
 #include "cafPdmUiComboBoxEditor.h"
 #include "cvfScalarMapperDiscreteLog.h"
+#include "cvfScalarMapperContinuousLog.h"
+#include "cvfScalarMapperContinuousLinear.h"
+#include "cvfOverlayScalarMapperLegend.h"
+#include "cvfScalarMapperDiscreteLinear.h"
 #include "RiaApplication.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"
 
 CAF_PDM_SOURCE_INIT(RimLegendConfig, "Legend");
 

ApplicationCode/ProjectDataModel/RimLegendConfig.h

@@ -17,17 +17,28 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
+#include "cvfBase.h"
+#include "cvfObject.h"
+#include "cvfVector2.h"
+#include "cvfArray.h"
 
 #include "cafPdmObject.h"
-#include "cafPdmPointer.h"
 #include "cafPdmField.h"
+#include "cafPdmPointer.h"
 #include "cafAppEnum.h"
-#include "cvfScalarMapperContinuousLog.h"
+
-#include "cvfScalarMapperContinuousLinear.h"
+namespace cvf
-#include "cvfOverlayScalarMapperLegend.h"
+{
-#include "cvfScalarMapperDiscreteLinear.h"
+    class ScalarMapperContinuousLog;
+    class ScalarMapperContinuousLinear;
+    class OverlayScalarMapperLegend;
+    class ScalarMapperDiscreteLinear;
+    class ScalarMapperDiscreteLog;
+    class ScalarMapper;
+}
 
 class RimReservoirView;
+
 //==================================================================================================
 ///  
 ///  

ApplicationCode/ProjectDataModel/RimProject.cpp

@@ -19,6 +19,13 @@
 #include "RiaStdInclude.h"
 
 #include "RimProject.h"
+#include "cafAppEnum.h"
+#include "RimReservoirView.h"
+
+
+#include "RimScriptCollection.h"
+#include "RimIdenticalGridCaseGroup.h"
+
 #include "RiaApplication.h"
 #include "RiaVersionInfo.h"
 
@@ -27,6 +34,17 @@
 #include "RimResultCase.h"
 
 
+#include "cafPdmFieldCvfColor.h"
+#include "cafPdmFieldCvfMat4d.h"
+#include "RimReservoirCellResultsCacher.h"
+#include "RimCellEdgeResultSlot.h"
+#include "RimCellRangeFilterCollection.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "Rim3dOverlayInfoConfig.h"
+#include "RimWellCollection.h"
+#include "RimCaseCollection.h"
+#include "RimResultSlot.h"
+
 CAF_PDM_SOURCE_INIT(RimProject, "ResInsightProject");
 //--------------------------------------------------------------------------------------------------
 /// 

ApplicationCode/ProjectDataModel/RimProject.h

@@ -19,11 +19,15 @@
 #pragma once
 
 #include "cafPdmDocument.h"
-#include "RimScriptCollection.h"
+//#include "RimScriptCollection.h"
-#include "RimIdenticalGridCaseGroup.h"
+//#include "RimIdenticalGridCaseGroup.h"
 
 class RimCase;
 class RigGridManager;
+class RimScriptCollection;
+class RimIdenticalGridCaseGroup;
+class RigMainGrid;
+class RigCaseData;
 
 //==================================================================================================
 ///  

ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.cpp

@@ -16,13 +16,34 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
+//#include "RiaStdInclude.h"
+#include <QFile>
+#include <QFileInfo>
+#include <QDir>
+#include <QDebug>
+#include <QUuid>
+
 #include "RimReservoirCellResultsCacher.h"
 #include "RigCaseCellResultsData.h"
 #include "RiaApplication.h"
 #include "RigMainGrid.h"
 #include "RigCell.h"
 #include "cafProgressInfo.h"
+#include "RimProject.h"
+#include "RimCase.h"
+#include "RimCaseCollection.h"
+#include "RimIdenticalGridCaseGroup.h"
+#include "RimScriptCollection.h"
+#include "RimReservoirView.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"
 
 CAF_PDM_SOURCE_INIT(RimReservoirCellResultsStorage, "ReservoirCellResultStorage");
 

ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.h

@@ -19,6 +19,9 @@
 #pragma once
 
 #include <QDateTime>
+
+#include "cvfBase.h"
+#include "cvfObject.h"
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 #include "cafAppEnum.h"

ApplicationCode/ProjectDataModel/RimReservoirView.cpp

@@ -16,10 +16,29 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
+//#include "RiaStdInclude.h"
-#include "RiuViewer.h"
-
 #include "RimReservoirView.h"
+#include "RiuViewer.h"
+#include "cvfViewport.h" 
+#include "cvfModelBasicList.h"
+#include "cvfPart.h"
+#include "cvfDrawable.h"
+#include "cvfScene.h"
+
+#include "cafPdmFieldCvfMat4d.h"
+#include "cafPdmFieldCvfColor.h"
+#include <QMessageBox>
+
+
+#include "RimCase.h"
+#include "RimResultSlot.h"
+#include "RimCellEdgeResultSlot.h"
+#include "RimCellRangeFilter.h"
+#include "RimCellRangeFilterCollection.h"
+#include "RimCellPropertyFilter.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "Rim3dOverlayInfoConfig.h"
+
 #include "RiuMainWindow.h"
 #include "RigGridBase.h"
 #include "RigCaseData.h"
@@ -28,13 +47,10 @@
 
 #include "cafEffectGenerator.h"
 #include "cafFrameAnimationControl.h"
-#include "RimCellRangeFilter.h"
-#include "RimCellRangeFilterCollection.h"
 
 #include "cvfStructGridGeometryGenerator.h"
 #include "RigCaseCellResultsData.h"
 #include "RivCellEdgeEffectGenerator.h"
-#include "RimCellEdgeResultSlot.h"
 #include "cvfqtUtils.h"
 #include "RivReservoirViewPartMgr.h"
 #include "RivReservoirPipesPartMgr.h"
@@ -44,6 +60,8 @@
 #include "RimCase.h"
 #include "Rim3dOverlayInfoConfig.h"
 #include "RigGridScalarDataAccess.h"
+#include "RimReservoirCellResultsCacher.h"
+#include "cvfOverlayScalarMapperLegend.h"
 
 namespace caf {
 

ApplicationCode/ProjectDataModel/RimReservoirView.h

@@ -18,26 +18,32 @@
 
 #pragma once
 #include "cafPdmObject.h"
+#include "cafPdmField.h"
 #include "cafAppEnum.h"
 
+#include "cvfBase.h"
+#include "cvfObject.h"
+
+#include "cafPdmFieldCvfMat4d.h"
+#include "cafPdmFieldCvfColor.h"
+
 #include <QPointer>
 #include <QString>
 
-#include "RimCase.h"
+class RimCase;
-#include "RimResultSlot.h"
+class RimResultSlot;
-#include "RimCellEdgeResultSlot.h"
+class RimCellEdgeResultSlot;
-#include "RimCellRangeFilter.h"
+class RimCellRangeFilter;
-#include "RimCellRangeFilterCollection.h"
+class RimCellRangeFilterCollection;
-#include "RimCellPropertyFilter.h"
+class RimCellPropertyFilter;
-#include "RimCellPropertyFilterCollection.h"
+class RimCellPropertyFilterCollection;
-#include "Rim3dOverlayInfoConfig.h"
+class Rim3dOverlayInfoConfig;
-
+class RimReservoirCellResultsStorage;
-#include "cvfMatrix4.h"
+class RimWellCollection;
-#include "cvfStructGridGeometryGenerator.h"
+class RigActiveCellInfo;
-#include "cafPdmFieldCvfMat4d.h"
 
 #include "RivReservoirViewPartMgr.h"
-#include "RivReservoirPipesPartMgr.h"
+class RivReservoirPipesPartMgr;
 
 class RiuViewer;
 class RigGridBase;

ApplicationCode/ProjectDataModel/RimResultCase.cpp

@@ -28,7 +28,21 @@
 #include "RimProject.h"
 #include "RifEclipseOutputFileTools.h"
 #include "RiaApplication.h"
+#include "RimIdenticalGridCaseGroup.h"
+#include "RimScriptCollection.h"
+#include "RimCaseCollection.h"
 
+#include "RimReservoirCellResultsCacher.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"
 
 CAF_PDM_SOURCE_INIT(RimResultCase, "EclipseCase");
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimResultDefinition.cpp

@@ -16,9 +16,10 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
+//#include "RiaStdInclude.h"
 
 #include "RimResultDefinition.h"
+#include "RimReservoirCellResultsCacher.h"
 
 #include "RimReservoirView.h"
 #include "RimCase.h"
@@ -28,6 +29,15 @@
 #include "cafPdmUiListEditor.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"
+
 CAF_PDM_SOURCE_INIT(RimResultDefinition, "ResultDefinition");
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimResultSlot.cpp

@@ -26,6 +26,17 @@
 #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"
+
 CAF_PDM_SOURCE_INIT(RimResultSlot, "ResultSlot");
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimStatisticsCase.cpp

@@ -32,6 +32,19 @@
 #include "RiuMainWindow.h"
 #include "RimUiTreeModelPdm.h"
 #include "cafProgressInfo.h"
+#include "RimCaseCollection.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"
 
 namespace caf {
     template<>

ApplicationCode/ProjectDataModel/RimStatisticsCase.h

@@ -22,8 +22,10 @@
 #include "cvfObject.h"
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
+#include "cafAppEnum.h"
 
 #include "RimCase.h"
+#include "RimDefines.h"
 
 class RimIdenticalGridCaseGroup;
 class RimResultDefinition;

ApplicationCode/ProjectDataModel/RimStatisticsCaseCollection.cpp

@@ -22,6 +22,17 @@
 
 #include "RimStatisticsCaseCollection.h"
 #include "RimIdenticalGridCaseGroup.h"
+#include "RimCaseCollection.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"
 
 
 CAF_PDM_SOURCE_INIT(RimStatisticsCaseCollection, "RimStatisticalCollection");

ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.cpp

@@ -15,7 +15,7 @@
 //  for more details.
 //
 /////////////////////////////////////////////////////////////////////////////////
-#include "RiaStdInclude.h"
+//#include "RiaStdInclude.h"
 
 #include "RimStatisticsCaseEvaluator.h"
 #include "RigCaseCellResultsData.h"
@@ -23,6 +23,17 @@
 #include "RimCase.h"
 #include "RigCaseData.h"
 #include "RigStatisticsMath.h"
+#include "RimReservoirCellResultsCacher.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 "RigCaseData.h"
 #include <QDebug>

ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp

@@ -41,6 +41,20 @@
 #include "RimCase.h"
 #include "RigCaseData.h"
 #include "RimMimeData.h"
+#include "RimCaseCollection.h"
+#include "RimIdenticalGridCaseGroup.h"
+#include "RimProject.h"
+#include "RimScriptCollection.h"
+#include "RimWellCollection.h"
+#include "cafPdmFieldCvfMat4d.h"
+#include "cafPdmFieldCvfColor.h"
+#include "RimResultSlot.h"
+#include "RimCellEdgeResultSlot.h"
+#include "Rim3dOverlayInfoConfig.h"
+#include "RimReservoirCellResultsCacher.h"
+
+
+
 
 //--------------------------------------------------------------------------------------------------
 /// 

ApplicationCode/ProjectDataModel/RimUiTreeView.cpp

@@ -16,10 +16,18 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
+//#include "RiaStdInclude.h"
 
 #include "cafPdmDocument.h"
 
+#include <QAction>
+#include <QMenu>
+#include <QContextMenuEvent>
+#include <QMessageBox>
+#include <QFileInfo>
+#include <QFileDialog>
+#include <QClipboard>
+
 #include "RimUiTreeView.h"
 #include "RimUiTreeModelPdm.h"
 #include "RimReservoirView.h"
@@ -38,6 +46,22 @@
 #include "RimResultCase.h"
 #include "RimMimeData.h"
 
+#include "RimCellRangeFilterCollection.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "RimResultSlot.h"
+#include "RimStatisticsCaseCollection.h"
+#include "RimIdenticalGridCaseGroup.h"
+#include "RimCaseCollection.h"
+#include "RimScriptCollection.h"
+#include "RimWell.h"
+#include "RimCellEdgeResultSlot.h"
+#include "RimWellCollection.h"
+#include "RimReservoirCellResultsCacher.h"
+#include "Rim3dOverlayInfoConfig.h"
+
+#include "cafPdmFieldCvfColor.h"
+#include "cafPdmFieldCvfMat4d.h"
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimWell.cpp

@@ -16,15 +16,22 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
+//#include "RiaStdInclude.h"
+#include "RimWell.h"
 
 
 #include "cafAppEnum.h"
 #include "cafPdmField.h"
-#include "RimWell.h"
 #include "RivReservoirViewPartMgr.h"
 #include "RimReservoirView.h"
-
+#include "RimWellCollection.h"
+#include "cafPdmFieldCvfMat4d.h"
+#include "cafPdmFieldCvfColor.h"
+#include "RimResultSlot.h"
+#include "RimCellEdgeResultSlot.h"
+#include "Rim3dOverlayInfoConfig.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "RimCellRangeFilterCollection.h"
 
 CAF_PDM_SOURCE_INIT(RimWell, "Well");
 

ApplicationCode/ProjectDataModel/RimWellCollection.cpp

@@ -16,17 +16,20 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
+#include "RimWellCollection.h"
-
 
 #include "cafAppEnum.h"
 #include "cafPdmFieldCvfColor.h"
-
+#include "cafPdmFieldCvfMat4d.h"
-#include "RigSingleWellResultsData.h"
-#include "RimWellCollection.h"
-#include "RimWell.h"
 #include "RimReservoirView.h"
 
+#include "RimResultSlot.h"
+#include "RimCellRangeFilterCollection.h"
+#include "RimCellPropertyFilterCollection.h"
+
+#include "Rim3dOverlayInfoConfig.h"
+#include "RimCellEdgeResultSlot.h"
+
 namespace caf
 {
     template<>

ApplicationCode/SocketInterface/RiaSocketServer.cpp

@@ -16,21 +16,39 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RiaStdInclude.h"
+#include "RiaSocketServer.h"
 
 #include <QtGui>
 #include <QtNetwork>
 
 #include <stdlib.h>
 
-#include "RiaSocketServer.h"
 #include "RiaApplication.h"
 #include "RiuMainWindow.h"
-#include "RimCase.h"
+#include "RimReservoirView.h"
+#include "RimProject.h"
+#include "RimReservoirCellResultsCacher.h"
+#include "RimInputCase.h"
+#include "RimInputProperty.h"
+#include "RimInputPropertyCollection.h"
+
+#include "RimUiTreeModelPdm.h"
+
+#include "RimResultSlot.h"
+#include "RimIdenticalGridCaseGroup.h"
+#include "RimCellEdgeResultSlot.h"
+#include "RimCellRangeFilterCollection.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "Rim3dOverlayInfoConfig.h"
+#include "RimWellCollection.h"
+#include "RimScriptCollection.h"
+#include "RimCaseCollection.h"
+
+#include "cafPdmFieldCvfColor.h"
+#include "cafPdmFieldCvfMat4d.h"
+
 #include "RigCaseData.h"
 #include "RigCaseCellResultsData.h"
-#include "RimInputProperty.h"
-#include "RimInputCase.h"
-#include "RimUiTreeModelPdm.h"
 
 //--------------------------------------------------------------------------------------------------
 ///

ApplicationCode/UserInterface/RiuMainWindow.cpp

@@ -17,30 +17,44 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RiaStdInclude.h"
-#include "RiaBaseDefs.h"
 
-#include "RiaApplication.h"
 #include "RiuMainWindow.h"
+#include "RiaApplication.h"
+
+#include "RimProject.h"
+#include "RimReservoirView.h"
+#include "RimUiTreeView.h"
+#include "RimCase.h"
+#include "RimResultSlot.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "RimWellCollection.h"
+#include "RimReservoirCellResultsCacher.h"
+#include "RimCaseCollection.h"
+
+#include "RimUiTreeModelPdm.h"
+
+#include "RiaBaseDefs.h"
 #include "RiuViewer.h"
 #include "RiuResultInfoPanel.h"
 #include "RiuProcessMonitor.h"
+#include "RiuMultiCaseImportDialog.h"
+
 #include "RiaPreferences.h"
 #include "RiuPreferencesDialog.h"
 
-#include "RigCaseData.h"
 #include "RigCaseCellResultsData.h"
-#include "RimCase.h"
-#include "RimUiTreeModelPdm.h"
 
-#include "cvfqtBasicAboutDialog.h"
-#include "cafUtils.h"
-
-#include "cafFrameAnimationControl.h"
 #include "cafAnimationToolBar.h"
-
 #include "cafPdmUiPropertyView.h"
-#include "RimUiTreeView.h"
+#include "cvfqtBasicAboutDialog.h"
-#include "RiuMultiCaseImportDialog.h"
+
+#include "cafPdmFieldCvfMat4d.h"
+
+#include "RimIdenticalGridCaseGroup.h"
+#include "RimScriptCollection.h"
+#include "RimCellEdgeResultSlot.h"
+#include "RimCellRangeFilterCollection.h"
+#include "Rim3dOverlayInfoConfig.h"
 
 
 

ApplicationCode/UserInterface/RiuMainWindow.h

@@ -18,9 +18,10 @@
 
 #pragma once
 
-#include <QtGui/QMainWindow>
-#include "qevent.h"
 #include "cafUiTreeModelPdm.h"
+
+#include <QMainWindow>
+#include <QEvent>
 #include <QPointer>
 
 class QTreeView;

ApplicationCode/UserInterface/RiuProcessMonitor.cpp

@@ -22,7 +22,6 @@
 #include "cafUiProcess.h"
 #include "RiaApplication.h"
 
-
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/UserInterface/RiuViewer.cpp

@@ -19,24 +19,33 @@
 #include "RiaStdInclude.h"
 
 #include "RiuViewer.h"
+
 #include "RiaApplication.h"
 #include "RiuMainWindow.h"
 
-#include "cvfqtOpenGLContext.h"
+#include "RimReservoirView.h"
-#include "cvfqtPerformanceInfoHud.h"
+
-#include "cvfCamera.h"
+#include "RimCase.h"
-#include "cvfRendering.h"
+#include "RimResultSlot.h"
-#include "cvfDrawableGeo.h"
+#include "RimCellEdgeResultSlot.h"
-#include "RiuCursors.h"
+#include "RimCellRangeFilterCollection.h"
-#include "RigCaseData.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "Rim3dOverlayInfoConfig.h"
+#include "RimWellCollection.h"
 
-#include "cafUtils.h"
-#include "cafFrameAnimationControl.h"
-#include "cafNavigationPolicy.h"
-#include "cafEffectGenerator.h"
-#include "RiuSimpleHistogramWidget.h"
 #include "RimUiTreeModelPdm.h"
 
+#include "RimReservoirCellResultsCacher.h"
+
+#include "RigCaseData.h"
+
+#include "RiuSimpleHistogramWidget.h"
+
+#include "cafNavigationPolicy.h"
+#include "cafEffectGenerator.h"
+
+#include "cafPdmFieldCvfColor.h"
+#include "cafPdmFieldCvfMat4d.h"
 
 using cvf::ManipulatorTrackball;
 

cafPdmCvf/cafPdmFieldCvfColor.h

@@ -23,7 +23,7 @@
 #include <QTextStream>
 
 #include "cafPdmFieldImpl.h"
-
+#include "cvfBase.h"
 #include "cvfColor3.h"
 
 namespace caf 

cafProjectDataModel/cafAppEnum.h

@@ -20,8 +20,8 @@
 #pragma once
 
 #include <vector>
-#include <string>
+#include <QString>
-#include <QtCore/QString>
+#include <QStringList>
 #include <QTextStream>
 
 namespace caf