diff -r f0fe7c36ec5c -r 43268373032d treeitem.cpp
--- a/treeitem.cpp	Fri Apr 09 14:24:04 2010 +0000
+++ b/treeitem.cpp	Wed Jun 09 13:14:08 2010 +0000
@@ -17,7 +17,7 @@
 
 TreeItem::TreeItem()
 {
-	cout << "Constr. TI  this="<<this<<endl;
+	//cout << "Constr. TI  this="<<this<<endl;
 	init();
 	itemData.clear();
 	rootItem=this;
@@ -38,13 +38,30 @@
 
 TreeItem::~TreeItem()
 {
-	//cout << "Destructor TreeItem "<<getHeadingStd()<<endl;
+	//qDebug()<<"Destr TreeItem this="<<this<<"  childcount="<<childItems.count();
+	/*
+	qDeleteAll(childItems);	// Call delete	//FIXME-3 use this instead of below
+	qDebug()<<"  ok1";
+	childItems.clear();		// and clear list
+	qDebug()<<"  ok2";use
+	*/
+
+	/*
+	if (this==rootItem)
+	{
+		qDebug()<<"  I'm rootItem, aborting";
+		return;
+	}
+	*/
+	//qDebug()<<"                   ="<<getHeading();
 	TreeItem *ti;
 	while (!childItems.isEmpty())
 	{
+		//qDebug()<<"    ="<<ti->getHeading();
 		ti=childItems.takeFirst();
+		//qDebug()<<"  ti="<<ti;
 		delete ti;
-	}	
+	}
 }
 
 
@@ -316,6 +333,7 @@
 void TreeItem::setHeading (const QString s)
 {
 	itemData[0]=s;
+	//qDebug()<<"TI::setHeading this="<<this<<"  "<<s;
 }
 
 QString TreeItem::getHeading () const
@@ -591,9 +609,17 @@
 {
 	if (n>=0 && n<branchCounter)
 	{
-		return (BranchObj*)(getBranchNum(n)->getLMO());
-	} else
-		return NULL;
+		BranchItem *bi=getBranchNum(n);
+		if (bi)
+		{
+			BranchObj *bo=(BranchObj*)(bi->getLMO());
+			if (bo)
+				return bo;
+			else
+				qDebug()<<"TI::getBONum bo=NULL";
+		}
+	} 
+	return NULL;
 }
 
 ImageItem* TreeItem::getImageNum (const int &n)
@@ -634,14 +660,10 @@
 	if (xlinkCounter>0 )
 	{
 		XLinkItem *xli=getXLinkNum (n);
-		if (!xli) return NULL;
-		if (xli->isBegin() )
-			return (XLinkObj*)(xli->getLMO());
-		else
+		if (xli)
 		{
-			xli=xli->getPartnerXLink();
-			if (!xli) return NULL;
-			return (XLinkObj*)(xli->getLMO());
+			Link *l=xli->getLink();
+			if (l) return l->getXLinkObj();
 		}
 	}
 	return NULL;