1.1 --- a/branchobj.cpp	Wed Feb 10 13:48:42 2010 +0000
     1.2 +++ b/branchobj.cpp	Fri Feb 19 13:47:03 2010 +0000
     1.3 @@ -39,18 +39,6 @@
     1.4  		model->stopAnimation (this);
     1.5  	}
     1.6  
     1.7 -	// Check, if this branch was the last child to be deleted
     1.8 -	// If so, unset the scrolled flags in parent // FIXME-2 better do this in model?
     1.9 -
    1.10 -	/*
    1.11 -	BranchObj *po=(BranchObj*)parObj;
    1.12 -	BranchObj *bo;
    1.13 -	if (po)
    1.14 -	{
    1.15 -		bo=((BranchObj*)parObj)->getLastBranch();
    1.16 -		if (bo) po->unScroll();
    1.17 -	}
    1.18 -	*/
    1.19  	clear();
    1.20  }
    1.21  
    1.22 @@ -465,11 +453,12 @@
    1.23  	heading->setFont(font );
    1.24  
    1.25  	if (mod==NewBranch && !keepFrame)
    1.26 -	if (treeItem->depth()==0)
    1.27 -		setFrameType (FrameObj::Rectangle);
    1.28 -	else	
    1.29 -		setFrameType (FrameObj::NoFrame);
    1.30 -
    1.31 +	{
    1.32 +		if (treeItem->depth()==0)
    1.33 +			setFrameType (FrameObj::Rectangle);
    1.34 +		else	
    1.35 +			setFrameType (FrameObj::NoFrame);
    1.36 +	}
    1.37  	if (mod==NewBranch)
    1.38  		setColor (treeItem->getHeadingColor() );
    1.39  	else
    1.40 @@ -630,31 +619,6 @@
    1.41  		treeItem->getBranchObjNum(i)->unsetAllRepositionRequests();
    1.42  }
    1.43  
    1.44 -
    1.45 -QRectF BranchObj::getTotalBBox() // FIXME-2 not really needed, get rid of this
    1.46 -{
    1.47 -	QRectF r=bbox;
    1.48 -
    1.49 -	if ( ((BranchItem*)treeItem)->isScrolled() ) return r;
    1.50 -
    1.51 -/* FIXME-2 really include children _here_ ?  likely not needed anymore, but done in TreeItem */
    1.52 -	for (int i=0; i<treeItem->branchCount(); ++i)
    1.53 -		if (!treeItem->getBranchNum(i)->isHidden())
    1.54 -			r=addBBox(treeItem->getBranchObjNum(i)->getTotalBBox(),r);
    1.55 -
    1.56 -/* FIXME-3 lots of occurences of treeItem->getBranchObjNum(i) in branchobj.cpp
    1.57 -            better check if they are not NULL and maybe simplify...
    1.58 -			(have been NULL at least in calcBBoxSizeWithChilds...)
    1.59 -*/			
    1.60 -
    1.61 -/* FIXME-2 in
    1.62 -	for (int i=0; i<treeItem->imageCount(); ++i
    1.63 -		if (!treeItem->isHidden())
    1.64 -			r=addBBox(treeItem->getImageObjNum(i)->getTotalBBox(),r);
    1.65 -*/			
    1.66 -	return r;
    1.67 -}
    1.68 -
    1.69  QRectF BranchObj::getBBoxSizeWithChildren()
    1.70  {
    1.71  	return bboxTotal;
    1.72 @@ -678,7 +642,7 @@
    1.73  		return MapObj::getBoundingPolygon();
    1.74  	}
    1.75  
    1.76 -	calcBBoxSizeWithChildren();	//FIXME-2 really needed?
    1.77 +	calcBBoxSizeWithChildren();	//FIXME-3 really needed?
    1.78  	QPolygonF p;
    1.79  	p<<bboxTotal.topLeft();
    1.80  	p<<bboxTotal.topRight();