diff -r ed5b407975b3 -r a8a5c7288f57 treeitem.cpp
--- a/treeitem.cpp	Thu Apr 23 12:15:31 2009 +0000
+++ b/treeitem.cpp	Mon Apr 27 12:07:15 2009 +0000
@@ -11,11 +11,41 @@
 
 TreeItem::TreeItem(const QList<QVariant> &data, TreeItem *parent)
 {
+	init();
+    parentItem = parent;
+    itemData = data;
+}
+
+TreeItem::~TreeItem()
+{
+	//cout << "Destructor TreeItem "<<getHeadingStd()<<endl;
+	TreeItem *ti;
+	while (!childItems.isEmpty())
+	{
+		ti=childItems.takeFirst();
+		switch (ti->getType() )
+		{
+			case TreeItem::MapCenter:
+				delete (MapCenterItem*)ti;
+				break;
+			case TreeItem::Branch:
+				delete (BranchItem*)ti;
+				break;
+			default:
+				delete ti;
+				break;
+		}
+	}	
+}
+
+
+void TreeItem::init()
+{
 	model=NULL;
 
-    parentItem = parent;
-    itemData = data;
-	lmo=NULL;
+    parentItem = NULL;
+    itemData.clear();
+	lmo=NULL;	
 
 	branchOffset=0;
 	branchCounter=0;
@@ -33,13 +63,6 @@
 
 }
 
-TreeItem::~TreeItem()
-{
-	cout << "Destructor TreeItem\n";
-	//if (lmo) delete (lmo);
-    qDeleteAll(childItems);
-}
-
 QString TreeItem::saveToDir (const QString &tmpdir,const QString &prefix, const QPointF& offset)
 {
 	cout << "TreeItem::saveToDir called directly for ("<<getHeadingStd()<<"), instead of inherited type...\n";	//FIXME-1 triggered on save
@@ -71,6 +94,7 @@
 void TreeItem::appendChild(TreeItem *item)
 {
     childItems.append(item);
+	item->parentItem=this;
 	item->setModel (model);
 
 	if (item->type == Branch || item->type ==MapCenter)