From 86696d85e5cafaff582c5e9601da2d0b9482c5c4 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetron.com>
Date: Thu, 7 Mar 2013 09:21:29 +0100
Subject: [PATCH] Delete child objects when object is deleted p4#: 20799

---
 ApplicationCode/ProjectDataModel/RimCaseCollection.cpp      | 2 +-
 .../ProjectDataModel/RimIdenticalGridCaseGroup.cpp          | 6 ++++++
 .../ProjectDataModel/RimStatisticalCollection.cpp           | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/RimCaseCollection.cpp b/ApplicationCode/ProjectDataModel/RimCaseCollection.cpp
index 8001c8bffe..9840dddd6a 100644
--- a/ApplicationCode/ProjectDataModel/RimCaseCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCaseCollection.cpp
@@ -40,5 +40,5 @@ RimCaseCollection::RimCaseCollection()
 //--------------------------------------------------------------------------------------------------
 RimCaseCollection::~RimCaseCollection()
 {
-
+    reservoirs.deleteAllChildObjects();
 }
diff --git a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
index eab45f8957..21574c36be 100644
--- a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
+++ b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
@@ -52,7 +52,13 @@ RimIdenticalGridCaseGroup::RimIdenticalGridCaseGroup()
 //--------------------------------------------------------------------------------------------------
 RimIdenticalGridCaseGroup::~RimIdenticalGridCaseGroup()
 {
+    m_mainGrid = NULL;
 
+    delete caseCollection;
+    caseCollection = NULL;
+
+    delete statisticalReservoirCollection;
+    statisticalReservoirCollection = NULL;
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/RimStatisticalCollection.cpp b/ApplicationCode/ProjectDataModel/RimStatisticalCollection.cpp
index da22bc2b29..3b8a5f6436 100644
--- a/ApplicationCode/ProjectDataModel/RimStatisticalCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimStatisticalCollection.cpp
@@ -42,7 +42,7 @@ RimStatisticalCollection::RimStatisticalCollection()
 //--------------------------------------------------------------------------------------------------
 RimStatisticalCollection::~RimStatisticalCollection()
 {
-
+    reservoirs.deleteAllChildObjects();
 }
 
 //--------------------------------------------------------------------------------------------------