diff -r 25ee6b988b73 -r 8f987e376035 branchobj.cpp
--- a/branchobj.cpp	Tue Dec 15 09:14:59 2009 +0000
+++ b/branchobj.cpp	Mon Jan 04 20:36:06 2010 +0000
@@ -26,22 +26,6 @@
 	init();
 }
 
-/*
-BranchObj::BranchObj (QGraphicsScene* s, LinkableMapObj* p):OrnamentedObj (s)// FIXME-3 needed at all?
-{
-//    cout << "Const BranchObj (s,p)\n";
-    scene=s;
-    setParObj (p);	
-	if (treeItem->depth()==1)	// FIXME-3 needed to recursively calc depth?
-		// Calc angle to mapCenter if I am a mainbranch
-		// needed for reordering the mainbranches clockwise 
-		// around mapcenter 
-		angle=getAngle (QPointF (x() - parObj->getChildPos().x() , 
-								(y() - parObj->getChildPos().y() ) ) );
-    init();
-}
-*/
-
 BranchObj::~BranchObj ()
 {
 //	cout << "Destr BranchObj of "<<this<<" ("<<treeItem->getHeading().toStdString()<<")"<<endl;
@@ -95,7 +79,7 @@
 		delete xlink.takeFirst();
 }
 
-void BranchObj::setParObjTmp(LinkableMapObj* dst, QPointF m, int off)	//FIXME-1 when moving a mainbranch to a branch it still has relPos, not moved as child
+void BranchObj::setParObjTmp(LinkableMapObj* dst, QPointF m, int off)	
 {
 	// Temporary link to dst
 	// m is position of mouse pointer 
@@ -452,7 +436,7 @@
 			changed=true;
 		}	
 	}
-	updateContentSize();
+	if (changed) updateContentSize(); 
 }
 
 void BranchObj::setDefAttr (BranchModification mod)
@@ -628,12 +612,13 @@
 }
 
 
-QRectF BranchObj::getTotalBBox()
+QRectF BranchObj::getTotalBBox() // FIXME-2 not really needed, get rid of this
 {
 	QRectF r=bbox;
 
 	if ( ((BranchItem*)treeItem)->isScrolled() ) return r;
 
+/* FIXME-2 really include children _here_ ?  likely not needed anymore, but done in TreeItem */
 	for (int i=0; i<treeItem->branchCount(); ++i)
 		if (!treeItem->getBranchNum(i)->isHidden())
 			r=addBBox(treeItem->getBranchObjNum(i)->getTotalBBox(),r);
@@ -643,9 +628,11 @@
 			(have been NULL at least in calcBBoxSizeWithChilds...)
 */			
 
-	for (int i=0; i<treeItem->imageCount(); ++i)
+/* FIXME-2 in
+	for (int i=0; i<treeItem->imageCount(); ++i
 		if (!treeItem->isHidden())
 			r=addBBox(treeItem->getImageObjNum(i)->getTotalBBox(),r);
+*/			
 	return r;
 }
 
@@ -672,7 +659,7 @@
 		return MapObj::getBoundingPolygon();
 	}
 
-	calcBBoxSizeWithChildren();	//FIXME-3 really needed?
+	calcBBoxSizeWithChildren();	//FIXME-2 really needed?
 	QPolygonF p;
 	p<<bboxTotal.topLeft();
 	p<<bboxTotal.topRight();
@@ -749,15 +736,6 @@
 	bboxTotal.setHeight(max (r.height(),  bbox.height()));
 }
 
-QString BranchObj::getSelectString()
-{
-	VymModel *model=treeItem->getModel();
-	if (model)
-		return model->getSelectString (this);
-	else
-		return QString();
-}
-
 void BranchObj::setAnimation(const AnimPoint &ap)
 {
 	anim=ap;