mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-25 22:50:25 -05:00
Refactor: forward-declare element type in collection headers
Move the element-type include from each migrated collection header into
its .cpp, leaving only a forward declaration in the header. Follows the
pattern from 9e4d79159 for RimJobCollection, made possible by the
constructor-time PdmObject base check.
This commit is contained in:
1 parent
4feca2b920
commit
2fa7520b3a
25 files changed
+40
-35
No files matched your search
@@ -18,6 +18,8 @@
|
||||
|
||||
#include "RimPlotDataFilterCollection.h"
|
||||
|
||||
#include "RimPlotDataFilterItem.h"
|
||||
|
||||
CAF_PDM_SOURCE_INIT( RimPlotDataFilterCollection, "PlotDataFilterCollection" );
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -17,12 +17,12 @@
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
#pragma once
|
||||
|
||||
#include "RimPlotDataFilterItem.h"
|
||||
|
||||
#include "cafPdmField.h"
|
||||
#include "cafPdmObjectCollection.h"
|
||||
#include "cafSignal.h"
|
||||
|
||||
class RimPlotDataFilterItem;
|
||||
|
||||
//==================================================================================================
|
||||
///
|
||||
//==================================================================================================
|
||||
|
||||
+2
@@ -18,6 +18,8 @@
|
||||
|
||||
#include "RimEnsembleFractureStatisticsCollection.h"
|
||||
|
||||
#include "RimEnsembleFractureStatistics.h"
|
||||
|
||||
CAF_PDM_SOURCE_INIT( RimEnsembleFractureStatisticsCollection, "FractureGroupStatisticsCollection" );
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
+2
-2
@@ -18,10 +18,10 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "RimEnsembleFractureStatistics.h"
|
||||
|
||||
#include "cafPdmObjectCollection.h"
|
||||
|
||||
class RimEnsembleFractureStatistics;
|
||||
|
||||
//==================================================================================================
|
||||
///
|
||||
///
|
||||
|
||||
@@ -20,12 +20,11 @@
|
||||
|
||||
#include "RiaDefines.h"
|
||||
|
||||
#include "RimFractureTemplate.h"
|
||||
|
||||
#include "cafPdmField.h"
|
||||
#include "cafPdmObjectCollection.h"
|
||||
|
||||
class RimEllipseFractureTemplate;
|
||||
class RimFractureTemplate;
|
||||
|
||||
//==================================================================================================
|
||||
///
|
||||
|
||||
@@ -18,10 +18,10 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "RimEclipseContourMapView.h"
|
||||
|
||||
#include "cafPdmObjectCollection.h"
|
||||
|
||||
class RimEclipseContourMapView;
|
||||
|
||||
class RimEclipseContourMapViewCollection : public caf::PdmObjectCollection<RimEclipseContourMapView>
|
||||
{
|
||||
CAF_PDM_HEADER_INIT;
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
|
||||
#include "RimEnsembleFileSetCollection.h"
|
||||
|
||||
#include "RimEnsembleFileSet.h"
|
||||
#include "RimTools.h"
|
||||
|
||||
#include "cafCmdFeatureMenuBuilder.h"
|
||||
|
||||
@@ -18,10 +18,10 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "RimEnsembleFileSet.h"
|
||||
|
||||
#include "cafPdmObjectCollection.h"
|
||||
|
||||
class RimEnsembleFileSet;
|
||||
|
||||
//==================================================================================================
|
||||
///
|
||||
/// Class to manage a collection of ensemble filesets
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#include "RimGeoMechContourMapViewCollection.h"
|
||||
|
||||
#include "RimCase.h"
|
||||
#include "RimGeoMechContourMapView.h"
|
||||
|
||||
CAF_PDM_SOURCE_INIT( RimGeoMechContourMapViewCollection, "GeoMech2dViewCollection" );
|
||||
|
||||
|
||||
@@ -18,10 +18,10 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "RimGeoMechContourMapView.h"
|
||||
|
||||
#include "cafPdmObjectCollection.h"
|
||||
|
||||
class RimGeoMechContourMapView;
|
||||
|
||||
class RimGeoMechContourMapViewCollection : public caf::PdmObjectCollection<RimGeoMechContourMapView>
|
||||
{
|
||||
CAF_PDM_HEADER_INIT;
|
||||
|
||||
+2
-2
@@ -17,11 +17,11 @@
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
#pragma once
|
||||
|
||||
#include "RimIntersectionResultDefinition.h"
|
||||
|
||||
#include "cafPdmField.h"
|
||||
#include "cafPdmObjectCollection.h"
|
||||
|
||||
class RimIntersectionResultDefinition;
|
||||
|
||||
class RimIntersectionResultsDefinitionCollection : public caf::PdmObjectCollection<RimIntersectionResultDefinition>
|
||||
{
|
||||
CAF_PDM_HEADER_INIT;
|
||||
|
||||
@@ -18,11 +18,10 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "RimFieldQuickAccessGroup.h"
|
||||
|
||||
#include "cafPdmObjectCollection.h"
|
||||
|
||||
class RimFieldQuickAccess;
|
||||
class RimFieldQuickAccessGroup;
|
||||
class RimFieldReference;
|
||||
|
||||
//==================================================================================================
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "RimCustomObjectiveFunction.h"
|
||||
|
||||
#include "cafPdmObjectCollection.h"
|
||||
#include "cafSignal.h"
|
||||
|
||||
#include <QString>
|
||||
|
||||
class RimCustomObjectiveFunction;
|
||||
|
||||
//==================================================================================================
|
||||
///
|
||||
//==================================================================================================
|
||||
|
||||
@@ -20,6 +20,8 @@
|
||||
|
||||
#include "RimEclipseInputPropertyCollection.h"
|
||||
|
||||
#include "RimEclipseInputProperty.h"
|
||||
|
||||
#include <QFileInfo>
|
||||
|
||||
CAF_PDM_SOURCE_INIT( RimEclipseInputPropertyCollection, "RimInputPropertyCollection" );
|
||||
|
||||
@@ -20,10 +20,10 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "RimEclipseInputProperty.h"
|
||||
|
||||
#include "cafPdmObjectCollection.h"
|
||||
|
||||
class RimEclipseInputProperty;
|
||||
|
||||
//==================================================================================================
|
||||
//
|
||||
//
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
#include "RimEclipseStatisticsCaseCollection.h"
|
||||
|
||||
#include "RimEclipseStatisticsCase.h"
|
||||
#include "RimIdenticalGridCaseGroup.h"
|
||||
|
||||
CAF_PDM_SOURCE_INIT( RimEclipseStatisticsCaseCollection, "RimStatisticalCollection" );
|
||||
|
||||
@@ -20,10 +20,9 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "RimEclipseStatisticsCase.h"
|
||||
|
||||
#include "cafPdmObjectCollection.h"
|
||||
|
||||
class RimEclipseStatisticsCase;
|
||||
class RimIdenticalGridCaseGroup;
|
||||
|
||||
//==================================================================================================
|
||||
|
||||
@@ -18,8 +18,6 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "RimRefinementRegion.h"
|
||||
|
||||
#include "cafPdmField.h"
|
||||
#include "cafPdmObjectCollection.h"
|
||||
#include "cafVecIjk.h"
|
||||
@@ -33,6 +31,7 @@
|
||||
|
||||
class RigRefinement;
|
||||
class RimEclipseCase;
|
||||
class RimRefinementRegion;
|
||||
|
||||
//==================================================================================================
|
||||
///
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
#include "Rim3dView.h"
|
||||
#include "RimGridView.h"
|
||||
#include "RimProject.h"
|
||||
#include "RimSeismicView.h"
|
||||
|
||||
CAF_PDM_SOURCE_INIT( RimSeismicViewCollection, "SeismicViewCollection", "SeismicViewCollection" );
|
||||
|
||||
|
||||
@@ -19,13 +19,12 @@
|
||||
|
||||
#include "RiaSeismicDefines.h"
|
||||
|
||||
#include "RimSeismicView.h"
|
||||
|
||||
#include "cafPdmObjectCollection.h"
|
||||
|
||||
#include <QString>
|
||||
|
||||
class RimSeismicDataInterface;
|
||||
class RimSeismicView;
|
||||
|
||||
class RimSeismicViewCollection : public caf::PdmObjectCollection<RimSeismicView>
|
||||
{
|
||||
|
||||
+2
-2
@@ -18,11 +18,11 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "RimStimPlanModelTemplate.h"
|
||||
|
||||
#include "cafPdmField.h"
|
||||
#include "cafPdmObjectCollection.h"
|
||||
|
||||
class RimStimPlanModelTemplate;
|
||||
|
||||
//==================================================================================================
|
||||
///
|
||||
///
|
||||
|
||||
@@ -17,11 +17,10 @@
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
#pragma once
|
||||
|
||||
#include "RimVfpTableData.h"
|
||||
|
||||
#include "cafPdmObjectCollection.h"
|
||||
|
||||
class RimVfpTable;
|
||||
class RimVfpTableData;
|
||||
|
||||
//==================================================================================================
|
||||
///
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
|
||||
#include "RimEnsembleWellLogsCollection.h"
|
||||
|
||||
#include "RimEnsembleWellLogs.h"
|
||||
|
||||
#include "cafProgressInfo.h"
|
||||
|
||||
CAF_PDM_SOURCE_INIT( RimEnsembleWellLogsCollection, "EnsembleWellLogsCollection" );
|
||||
|
||||
@@ -17,10 +17,10 @@
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
#pragma once
|
||||
|
||||
#include "RimEnsembleWellLogs.h"
|
||||
|
||||
#include "cafPdmObjectCollection.h"
|
||||
|
||||
class RimEnsembleWellLogs;
|
||||
|
||||
//==================================================================================================
|
||||
///
|
||||
//==================================================================================================
|
||||
|
||||
@@ -17,14 +17,13 @@
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
#pragma once
|
||||
|
||||
#include "RimWellIASettings.h"
|
||||
|
||||
#include "cafPdmObjectCollection.h"
|
||||
|
||||
#include <QString>
|
||||
|
||||
class RimWellPath;
|
||||
class RimGeoMechCase;
|
||||
class RimWellIASettings;
|
||||
class RimWellPath;
|
||||
|
||||
class RimWellIASettingsCollection : public caf::PdmObjectCollection<RimWellIASettings>
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user