*** empty log message ***

[creaImageIO.git] / src2 / creaImageIOTreeNode.cpp

diff --git a/src2/creaImageIOTreeNode.cpp b/src2/creaImageIOTreeNode.cpp
index faa0bf00cad7982493c084aeb17bce08a0464ee4..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
 {
@@ -9,12 +10,12 @@ namespace creaImageIO
   {
 
     //=============================================================
-    /// Ctor with parent Why does it enter once while charging?
+    /// 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()<<")"
@@ -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();
     }
     //=============================================================