X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOTreeNode.cpp;h=c78973b55b10fa50610a1d5de598bf7d5a817d2b;hb=7e532afa6e1ab955d7c0fa63ea5d12eabc2504e5;hp=e34b31facbfc6f7bc93f304c64ba7c75973f98b1;hpb=cac026929f2431aa4a966bf9ae3c8ff263f5dd63;p=creaImageIO.git

diff --git a/src2/creaImageIOTreeNode.cpp b/src2/creaImageIOTreeNode.cpp
index e34b31f..c78973b 100644
--- a/src2/creaImageIOTreeNode.cpp
+++ b/src2/creaImageIOTreeNode.cpp
@@ -2,7 +2,10 @@
 #include <creaImageIOTree.h>
 #include <creaImageIOSystem.h>
 #include <algorithm>
-
+#include <creaImageIOGimmick.h>
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
 namespace creaImageIO
 {
   namespace tree
@@ -11,17 +14,17 @@ namespace creaImageIO
     //=============================================================
     /// Ctor with parent
     Node::Node(Node* parent)
-      : mParent(parent),
-	mData(0),
+      : mParent(parent),//mData(0),
 	mChildrenLoaded(false)
     {
+	mData.reset();
       if (parent) 
 	{
 	  GimmickDebugMessage(6,"Default Node constructor (level "<<GetLevel()<<")"
 			 << std::endl);
 	  // Insert into parent's children list
-	  parent->GetChildrenList().push_back(this);
 	  InitializeAttributeMap();
+	 parent->GetChildrenList().push_back(this);
 	}
       else
 	{
@@ -34,12 +37,13 @@ namespace creaImageIO
     //=============================================================
     /// Ctor with parent and attributes map 
     Node::Node(Node* parent, const AttributeMapType& attr)
-     : mParent(parent),
-	mData(0),
+     : mParent(parent),//mData(0),
 	mChildrenLoaded(false)
     {
+	mData.reset();
       GimmickDebugMessage(6,"Node constructor (level "<<GetLevel()<<")"
 		     << std::endl);
+
      if (parent) 
 	{
 	  // Insert into parent's children list
@@ -76,11 +80,7 @@ namespace creaImageIO
 	{
 	  delete *i;
 	}
-      if (mData) 
-	{
-	  delete mData;
-	  mData = 0;
-	}
+	mData.reset();
     }
     //=============================================================
 
@@ -130,7 +130,7 @@ namespace creaImageIO
     //=============================================================
 
     //=============================================================
-    void Node::RemoveChildrenFromList(Node* node)
+    int Node::RemoveChildrenFromList(Node* node)
     {
       ChildrenListType::iterator i = find(GetChildrenList().begin(),
 					  GetChildrenList().end(),
@@ -139,6 +139,7 @@ namespace creaImageIO
 	{
 	  GetChildrenList().erase(i);
 	}
+	return GetChildrenList().size();
     }
     //=============================================================