1.1 --- a/branchobj.cpp	Fri Sep 11 12:56:15 2009 +0000
     1.2 +++ b/branchobj.cpp	Thu Sep 17 09:41:09 2009 +0000
     1.3 @@ -505,28 +505,6 @@
     1.4  	calcBBoxSize();
     1.5  }
     1.6  
     1.7 -void BranchObj::sortChildren() //FIXME-3 not moved to model yet 
     1.8 -{
     1.9 -/*
    1.10 -	int childCount=branch.count(); 
    1.11 -	int curChildIndex;
    1.12 -	bool madeChanges=false;
    1.13 -	do
    1.14 -	{
    1.15 -		madeChanges=false;
    1.16 -		for(curChildIndex=1;curChildIndex<childCount;curChildIndex++){
    1.17 -			BranchObj* curChild=(BranchObj*)treeItem->getBranchObjNum(curChildIndex);
    1.18 -			BranchObj* prevChild=(BranchObj*)treeItem->getBranchObjNum(curChildIndex-1);
    1.19 -			if(prevChild->heading->text().compare(curChild->heading->text())>0)
    1.20 -			{
    1.21 -				this->moveBranchUp(curChild);
    1.22 -				madeChanges=true;
    1.23 -			}
    1.24 -		}
    1.25 -	}while(madeChanges);
    1.26 -*/
    1.27 -}
    1.28 -
    1.29  void BranchObj::alignRelativeTo (QPointF ref,bool alignSelf)
    1.30  {
    1.31  	qreal th = bboxTotal.height();	
    1.32 @@ -545,10 +523,10 @@
    1.33  //cout<<  "  ref="<<ref<<
    1.34        	"  bbox.tL="<<bboxTotal.topLeft()<<
    1.35  		"  absPos="<<absPos<<
    1.36 -//		"  relPos="<<relPos<<
    1.37 +		"  relPos="<<relPos<<
    1.38  //		"  parPos="<<pp<<
    1.39 -		"  w="<<bbox.width()<<
    1.40 -		"  h="<<bbox.height()<<
    1.41 +//		"  w="<<bbox.width()<<
    1.42 +//		"  h="<<bbox.height()<<
    1.43  //		"  orient="<<orientation<<
    1.44  //		"  alignSelf="<<alignSelf<<
    1.45  //		"  scrolled="<<((BranchItem*)treeItem)->isScrolled()<<