*** empty log message ***

[creaImageIO.git] / src2 / creaImageIOTreeNode.cpp

diff --git a/src2/creaImageIOTreeNode.cpp b/src2/creaImageIOTreeNode.cpp
index 954a7144da7216080efd4eae54551f26a8155714..5d892afdcf03eb65d6387f0bc6383eac6a903ae7 100644 (file)
--- a/src2/creaImageIOTreeNode.cpp
+++ b/src2/creaImageIOTreeNode.cpp
@@ -2,6 +2,7 @@
 #include <creaImageIOTree.h>
 #include <creaImageIOSystem.h>
 #include <algorithm>
+#include <creaImageIOGimmick.h>
 
 namespace creaImageIO
 {
@@ -11,17 +12,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();
+         InitializeAttributeMap();
+        parent->GetChildrenList().push_back(this);
        }
       else
        {
@@ -34,12 +35,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 +78,7 @@ namespace creaImageIO
        {
          delete *i;
        }
-      if (mData) 
-       {
-         delete mData;
-         mData = 0;
-       }
+       mData.reset();
     }
     //=============================================================
 
@@ -130,7 +128,7 @@ namespace creaImageIO
     //=============================================================
 
     //=============================================================
-    void Node::RemoveChildrenFromList(Node* node)
+    int Node::RemoveChildrenFromList(Node* node)
     {
       ChildrenListType::iterator i = find(GetChildrenList().begin(),
                                          GetChildrenList().end(),
@@ -139,6 +137,7 @@ namespace creaImageIO
        {
          GetChildrenList().erase(i);
        }
+       return GetChildrenList().size();
     }
     //=============================================================