diff -r db0ec4bcf416 -r ed5b407975b3 treeitem.cpp
--- a/treeitem.cpp	Mon Apr 20 10:42:05 2009 +0000
+++ b/treeitem.cpp	Thu Apr 23 12:15:31 2009 +0000
@@ -35,12 +35,14 @@
 
 TreeItem::~TreeItem()
 {
+	cout << "Destructor TreeItem\n";
+	//if (lmo) delete (lmo);
     qDeleteAll(childItems);
 }
 
 QString TreeItem::saveToDir (const QString &tmpdir,const QString &prefix, const QPointF& offset)
 {
-	qWarning ("TreeItem::saveToDir called directly");
+	cout << "TreeItem::saveToDir called directly for ("<<getHeadingStd()<<"), instead of inherited type...\n";	//FIXME-1 triggered on save
 	return QString();
 }
 
@@ -86,7 +88,9 @@
 	else
 	{
 		cout << "TI::removeChild this="<<this<<"  row="<<row<<endl;
-		delete childItems.takeAt (row);
+		if (childItems.at(row)->isBranchLikeType())
+			branchCounter--;
+		childItems.removeAt (row);
 	}
 }
 
@@ -145,7 +149,7 @@
 
 int TreeItem::depth() 
 {
-	int d=-1;
+	int d=-2;
 	TreeItem *ti=this;
 	while (ti!=NULL)
 	{
@@ -160,6 +164,11 @@
     return parentItem;
 }
 
+int TreeItem::childNum()
+{
+	return parentItem->childItems.indexOf (this);
+}
+
 int TreeItem::num()
 {
 	switch (type)
@@ -200,7 +209,7 @@
 	return itemData[0].toString();
 }
 
-std::string TreeItem::headingStd () const
+std::string TreeItem::getHeadingStd () const
 {
 	return itemData[0].toString().toStdString();
 }