PdmDocument inherits directly from PdmObject and not PdmObjectGroup

ApplicationCode/ProjectDataModel/RimCommandObject.cpp

@@ -25,7 +25,7 @@
 #include "RimProject.h"
 #include "RimEclipseStatisticsCase.h"
 
-#include "cafPdmDocument.h"
+#include "cafPdmObjectGroup.h"
 #include "cafPdmUiPushButtonEditor.h"
 #include "cafPdmUiTextEditor.h"
 

ApplicationCode/ProjectDataModel/RimProject.cpp

@@ -20,23 +20,26 @@
 
 #include "RimProject.h"
 
+
 #include "RiaApplication.h"
 #include "RiaVersionInfo.h"
+
 #include "RigCaseData.h"
-#include "RimEclipseCaseCollection.h"
-#include "RimEclipseCase.h"
+
 #include "RimCaseCollection.h"
+#include "RimCommandObject.h"
+#include "RimEclipseCase.h"
+#include "RimEclipseCaseCollection.h"
+#include "RimEclipseView.h"
+#include "RimGeoMechCase.h"
+#include "RimGeoMechModels.h"
 #include "RimIdenticalGridCaseGroup.h"
 #include "RimOilField.h"
-#include "RimEclipseView.h"
 #include "RimScriptCollection.h"
 #include "RimWellPathCollection.h"
 #include "RimWellPathImport.h"
-#include "RimCommandObject.h"
 
 #include <QDir>
-#include "RimGeoMechModels.h"
-#include "RimGeoMechCase.h"
 
 CAF_PDM_SOURCE_INIT(RimProject, "ResInsightProject");
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimProject.h

@@ -20,6 +20,7 @@
 
 #pragma once
 
+#include "cafPdmChildArrayField.h"
 #include "cafPdmChildField.h"
 #include "cafPdmDocument.h"
 

ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp

@@ -22,34 +22,35 @@
 
 #include "RiaApplication.h"
 #include "RigGridManager.h"
-#include "RimEclipseCaseCollection.h"
-#include "RimEclipseCase.h"
 #include "RimCaseCollection.h"
-#include "RimEclipsePropertyFilterCollection.h"
 #include "RimCellRangeFilterCollection.h"
-#include "RimGeoMechPropertyFilterCollection.h"
-#include "RimGeoMechPropertyFilter.h"
-#include "RimIdenticalGridCaseGroup.h"
+#include "RimEclipseCase.h"
+#include "RimEclipseCaseCollection.h"
 #include "RimEclipseInputCase.h"
 #include "RimEclipseInputProperty.h"
 #include "RimEclipseInputPropertyCollection.h"
+#include "RimEclipsePropertyFilterCollection.h"
+#include "RimEclipseResultCase.h"
+#include "RimEclipseStatisticsCase.h"
+#include "RimEclipseView.h"
+#include "RimEclipseWellCollection.h"
+#include "RimGeoMechCase.h"
+#include "RimGeoMechPropertyFilter.h"
+#include "RimGeoMechPropertyFilterCollection.h"
+#include "RimGeoMechView.h"
+#include "RimIdenticalGridCaseGroup.h"
 #include "RimMimeData.h"
 #include "RimOilField.h"
 #include "RimProject.h"
-#include "RimEclipseView.h"
-#include "RimEclipseResultCase.h"
 #include "RimScriptCollection.h"
-#include "RimEclipseStatisticsCase.h"
 #include "RimUiTreeView.h"
-#include "RimEclipseWellCollection.h"
 #include "RimWellPathCollection.h"
-#include "RimGeoMechView.h"
 
+#include "cafPdmObjectGroup.h"
 #include "cvfAssert.h"
 
 #include <QClipboard>
 #include <QFileSystemWatcher>
-#include "RimGeoMechCase.h"
 
 
 

ApplicationCode/ProjectDataModel/RimUiTreeView.cpp

@@ -20,64 +20,65 @@
 
 //#include "RiaStdInclude.h"
 
-#include "cafPdmDocument.h"
+#include "RimUiTreeView.h"
+
+
+#include "RiaApplication.h"
+#include "RiaPreferences.h"
+#include "RifEclipseInputFileTools.h"
+#include "RigCaseCellResultsData.h"
+#include "RigSingleWellResultsData.h"
+#include "Rim3dOverlayInfoConfig.h"
+#include "RimBinaryExportSettings.h"
+#include "RimCalcScript.h"
+#include "RimCaseCollection.h"
+#include "RimCellEdgeColors.h"
+#include "RimCellRangeFilterCollection.h"
+#include "RimCellRangeFilterCollection.h"
+#include "RimEclipseCaseCollection.h"
+#include "RimEclipseCellColors.h"
+#include "RimEclipseInputCase.h"
+#include "RimEclipseInputProperty.h"
+#include "RimEclipseInputPropertyCollection.h"
+#include "RimEclipsePropertyFilterCollection.h"
+#include "RimEclipseResultCase.h"
+#include "RimEclipseStatisticsCase.h"
+#include "RimEclipseStatisticsCaseCollection.h"
+#include "RimEclipseView.h"
+#include "RimEclipseWell.h"
+#include "RimEclipseWellCollection.h"
+#include "RimExportInputPropertySettings.h"
+#include "RimGeoMechCase.h"
+#include "RimGeoMechPropertyFilter.h"
+#include "RimGeoMechPropertyFilterCollection.h"
+#include "RimGeoMechView.h"
+#include "RimIdenticalGridCaseGroup.h"
+#include "RimMimeData.h"
+#include "RimOilField.h"
+#include "RimProject.h"
+#include "RimReservoirCellResultsStorage.h"
+#include "RimScriptCollection.h"
+#include "RimUiTreeModelPdm.h"
+#include "RimWellPathCollection.h"
+#include "RiuMainWindow.h"
+
 #include "cafPdmFieldCvfColor.h"
 #include "cafPdmFieldCvfMat4d.h"
+#include "cafPdmObjectGroup.h"
+#include "cafPdmUiPropertyViewDialog.h"
+
+#include <QAction>
+#include <QClipboard>
+#include <QContextMenuEvent>
+#include <QFileDialog>
+#include <QFileInfo>
+#include <QMenu>
+#include <QMessageBox>
+
 
 // MODTODO
 //#include "cafPdmUiPropertyDialog.h"
 
-#include <QAction>
-#include <QMenu>
-#include <QContextMenuEvent>
-#include <QMessageBox>
-#include <QFileInfo>
-#include <QFileDialog>
-#include <QClipboard>
-
-#include "RimUiTreeView.h"
-#include "RimUiTreeModelPdm.h"
-#include "RimEclipseView.h"
-#include "RimCalcScript.h"
-#include "RiaApplication.h"
-#include "RiuMainWindow.h"
-#include "RimEclipseInputPropertyCollection.h"
-#include "RimExportInputPropertySettings.h"
-#include "RiaPreferences.h"
-#include "RifEclipseInputFileTools.h"
-#include "RimEclipseInputCase.h"
-#include "RimBinaryExportSettings.h"
-#include "RigCaseCellResultsData.h"
-#include "RimEclipseStatisticsCase.h"
-#include "RimEclipseResultCase.h"
-#include "RimMimeData.h"
-
-#include "RimCellRangeFilterCollection.h"
-#include "RimEclipsePropertyFilterCollection.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimGeoMechPropertyFilter.h"
-#include "RimGeoMechPropertyFilterCollection.h"
-#include "RimEclipseCellColors.h"
-#include "RimEclipseStatisticsCaseCollection.h"
-#include "RimIdenticalGridCaseGroup.h"
-#include "RimCaseCollection.h"
-#include "RimScriptCollection.h"
-#include "RimEclipseWell.h"
-#include "RimCellEdgeColors.h"
-#include "RimEclipseWellCollection.h"
-#include "RimWellPathCollection.h"
-#include "RimReservoirCellResultsStorage.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimProject.h"
-#include "RimOilField.h"
-#include "RimEclipseCaseCollection.h"
-#include "RimEclipseInputProperty.h"
-#include "RigSingleWellResultsData.h"
-#include "RimGeoMechView.h"
-#include "RimGeoMechCase.h"
-#include "cafPdmUiPropertyViewDialog.h"
-
-
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/UserInterface/RiuMainWindow.cpp

@@ -59,6 +59,7 @@
 #include "cafAboutDialog.h"
 #include "cafAnimationToolBar.h"
 #include "cafPdmFieldCvfMat4d.h"
+#include "cafPdmObjectGroup.h"
 
 // MODTODO
 //#include "cafPdmUiPropertyDialog.h"

ApplicationCode/WellPathImportSsihub/RiuWellImportWizard.cpp

@@ -18,22 +18,22 @@
 
 #include "RiuWellImportWizard.h"
 
+#include "RifJsonEncodeDecode.h"
+#include "RimWellPathImport.h"
+
+#include "cafPdmDocument.h"
+#include "cafPdmObjectGroup.h"
+#include "cafPdmUiListView.h"
+#include "cafPdmUiListViewEditor.h"
+#include "cafPdmUiPropertyView.h"
+#include "cafPdmUiTreeView.h"
+#include "cafPdmUiTreeViewEditor.h"
+#include "cafUiTreeModelPdm.h"
+
 #include <QObject>
 #include <QtGui>
 #include <QtNetwork>
 
-#include "cafPdmUiPropertyView.h"
-#include "cafPdmUiTreeView.h"
-#include "cafPdmDocument.h"
-#include "cafPdmUiListViewEditor.h"
-#include "cafPdmUiListView.h"
-#include "cafUiTreeModelPdm.h"
-
-#include "RimWellPathImport.h"
-
-#include "RifJsonEncodeDecode.h"
-#include "cafPdmUiTreeViewEditor.h"
-
 
 //--------------------------------------------------------------------------------------------------
 /// 

Fwk/AppFwk/cafProjectDataModel/cafPdmDocument.h

@@ -39,7 +39,6 @@
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 #include "cafPdmPointer.h"
-#include "cafPdmObjectGroup.h"
 
 namespace caf 
 {
@@ -48,7 +47,7 @@ namespace caf
 /// The PdmDocument class is the main class to do file based IO, 
 /// and is also supposed to act as the overall container of the objects read.
 //==================================================================================================
-class PdmDocument: public PdmObjectGroup
+class PdmDocument: public PdmObject
 {
     CAF_PDM_HEADER_INIT;
  public:

Fwk/AppFwk/cafUserInterface/cafPdmUiListViewEditor.cpp

@@ -37,14 +37,14 @@
 
 #include "cafPdmUiListViewEditor.h"
 
-#include "cafPdmObject.h"
 #include "cafPdmField.h"
+#include "cafPdmObject.h"
+#include "cafPdmObjectGroup.h"
 #include "cafPdmUiEditorHandle.h"
-#include "cafPdmDocument.h"
 
-#include <QWidget>
 #include <QGridLayout>
 #include <QTableView>
+#include <QWidget>
 
 
 

Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.cpp

@@ -37,21 +37,22 @@
 
 #include "cafPdmUiTableViewEditor.h"
 
+#include "cafPdmChildArrayField.h"
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 #include "cafPdmUiCheckBoxDelegate.h"
-#include "cafPdmUiEditorHandle.h"
 #include "cafPdmUiCommandSystemProxy.h"
+#include "cafPdmUiEditorHandle.h"
 #include "cafPdmUiTableViewDelegate.h"
 #include "cafPdmUiTableViewModel.h"
 
 #include <QApplication>
+#include <QEvent>
 #include <QGridLayout>
 #include <QLabel>
 #include <QMenu>
 #include <QTableView>
 #include <QWidget>
-#include <QEvent>