From 803e6cd2b4f0069c7a50eb6c9d8ae88d6edfa3f5 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Mon, 11 Feb 2019 14:16:33 +0100
Subject: [PATCH] #4068 System : Add forward declare

---
 .../RicApplyPropertyFilterAsCellResultFeature.cpp |  2 ++
 .../RicGeoMechPropertyFilterFeatureImpl.cpp       |  2 ++
 .../RicNewGridTimeHistoryCurveFeature.cpp         |  2 ++
 .../GeoMech/GeoMechDataModel/RigGeoMechCaseData.h | 15 +++++++--------
 .../GeoMechDataModel/RimFemResultObserver.h       |  4 ++--
 .../ProjectDataModel/RimGeoMechResultDefinition.h |  1 -
 .../ProjectDataModel/RimGridTimeHistoryCurve.cpp  |  1 +
 .../ProjectDataModel/RimViewLinker.cpp            |  1 +
 8 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/ApplicationCode/Commands/EclipseCommands/RicApplyPropertyFilterAsCellResultFeature.cpp b/ApplicationCode/Commands/EclipseCommands/RicApplyPropertyFilterAsCellResultFeature.cpp
index a9ab8dff7c..94dfd34763 100644
--- a/ApplicationCode/Commands/EclipseCommands/RicApplyPropertyFilterAsCellResultFeature.cpp
+++ b/ApplicationCode/Commands/EclipseCommands/RicApplyPropertyFilterAsCellResultFeature.cpp
@@ -18,6 +18,8 @@
 
 #include "RicApplyPropertyFilterAsCellResultFeature.h"
 
+#include "RigFemResultAddress.h"
+
 #include "RimEclipseCellColors.h"
 #include "RimEclipsePropertyFilter.h"
 #include "RimEclipseView.h"
diff --git a/ApplicationCode/Commands/RicGeoMechPropertyFilterFeatureImpl.cpp b/ApplicationCode/Commands/RicGeoMechPropertyFilterFeatureImpl.cpp
index 5e01fee6c9..f10d2a329b 100644
--- a/ApplicationCode/Commands/RicGeoMechPropertyFilterFeatureImpl.cpp
+++ b/ApplicationCode/Commands/RicGeoMechPropertyFilterFeatureImpl.cpp
@@ -20,6 +20,8 @@
 #include "RicGeoMechPropertyFilterFeatureImpl.h"
 #include "RicEclipsePropertyFilterFeatureImpl.h"
 
+#include "RigFemResultAddress.h"
+
 #include "RimGeoMechPropertyFilter.h"
 #include "RimGeoMechPropertyFilterCollection.h"
 #include "RimGeoMechView.h"
diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicNewGridTimeHistoryCurveFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicNewGridTimeHistoryCurveFeature.cpp
index a1344ddc44..605c2ce330 100644
--- a/ApplicationCode/Commands/SummaryPlotCommands/RicNewGridTimeHistoryCurveFeature.cpp
+++ b/ApplicationCode/Commands/SummaryPlotCommands/RicNewGridTimeHistoryCurveFeature.cpp
@@ -21,6 +21,8 @@
 #include "RiaApplication.h"
 #include "RiaSummaryTools.h"
 
+#include "RigFemResultAddress.h"
+
 #include "RicNewSummaryCurveFeature.h"
 #include "RicSelectSummaryPlotUI.h"
 #include "RicWellLogTools.h"
diff --git a/ApplicationCode/GeoMech/GeoMechDataModel/RigGeoMechCaseData.h b/ApplicationCode/GeoMech/GeoMechDataModel/RigGeoMechCaseData.h
index dc594f5b2b..7e992f6f8b 100644
--- a/ApplicationCode/GeoMech/GeoMechDataModel/RigGeoMechCaseData.h
+++ b/ApplicationCode/GeoMech/GeoMechDataModel/RigGeoMechCaseData.h
@@ -18,18 +18,17 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
-#include "cvfObject.h"
-#include <string>
-#include <map>
-#include <vector>
-#include "RigFemResultPosEnum.h"
-#include "cvfCollection.h"
+
 #include "RigFemPartResults.h"
-#include "RigFemResultAddress.h"
+#include "RigFemResultPosEnum.h"
+
+#include "cvfObject.h"
+
+#include <string>
+#include <vector>
 
 class RifGeoMechReaderInterface;
 class RigFemPartCollection;
-class RigFemScalarResultFrames;
 class RigFemPartResultsCollection;
 class RifElementPropertyReader;
 
diff --git a/ApplicationCode/GeoMech/GeoMechDataModel/RimFemResultObserver.h b/ApplicationCode/GeoMech/GeoMechDataModel/RimFemResultObserver.h
index 0c4a087c06..1be888db39 100644
--- a/ApplicationCode/GeoMech/GeoMechDataModel/RimFemResultObserver.h
+++ b/ApplicationCode/GeoMech/GeoMechDataModel/RimFemResultObserver.h
@@ -18,12 +18,12 @@
 
 #pragma once
 
-#include "RigFemResultAddress.h"
-
 #include "cafPdmObject.h"
 
 #include <vector>
 
+class RigFemResultAddress;
+
 class RimFemResultObserver : public caf::PdmObject
 {
     CAF_PDM_HEADER_INIT;
diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.h b/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.h
index 5784cff651..ad4f4004bc 100644
--- a/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.h
+++ b/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.h
@@ -24,7 +24,6 @@
 #include "cafPdmPointer.h"
 #include "cafAppEnum.h"
 #include "RigFemResultPosEnum.h"
-#include "RigFemResultAddress.h"
 #include "RimFemResultObserver.h"
 
 class RimGeoMechView;
diff --git a/ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp b/ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp
index c79d2c1b7e..c0575d2616 100644
--- a/ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp
+++ b/ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp
@@ -24,6 +24,7 @@
 #include "RigEclipseCaseData.h"
 #include "RigMainGrid.h"
 #include "RigTimeHistoryResultAccessor.h"
+#include "RigFemResultAddress.h"
 
 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
diff --git a/ApplicationCode/ProjectDataModel/RimViewLinker.cpp b/ApplicationCode/ProjectDataModel/RimViewLinker.cpp
index 77d192bd2e..13f59b9ca7 100644
--- a/ApplicationCode/ProjectDataModel/RimViewLinker.cpp
+++ b/ApplicationCode/ProjectDataModel/RimViewLinker.cpp
@@ -22,6 +22,7 @@
 #include "RiaApplication.h"
 
 #include "RigMainGrid.h"
+#include "RigFemResultAddress.h"
 
 #include "Rim3dView.h"
 #include "RimCase.h"