1.1 --- a/branchobj.cpp	Fri Dec 08 20:18:58 2006 +0000
     1.2 +++ b/branchobj.cpp	Thu Dec 14 17:01:44 2006 +0000
     1.3 @@ -8,19 +8,6 @@
     1.4  extern FlagRowObj *standardFlagsDefault;
     1.5  
     1.6  
     1.7 -/* FIXME not needed any longer in QT4
     1.8 -int BranchObjPointrList::compareItems ( Q3PtrCollection::Item i, Q3PtrCollection::Item j)
     1.9 -{
    1.10 -	// Make sure PtrList::find works
    1.11 -	if (i==j) return 0;
    1.12 -
    1.13 -	if ( ((BranchObj*)(i))->angle > ((BranchObj*)(j))->angle )
    1.14 -		return 1;
    1.15 -	else
    1.16 -		return -1;
    1.17 -}
    1.18 -*/
    1.19 -
    1.20  /////////////////////////////////////////////////////////////////
    1.21  // BranchObj
    1.22  /////////////////////////////////////////////////////////////////
    1.23 @@ -138,6 +125,14 @@
    1.24  		delete branch.takeFirst();
    1.25  }
    1.26  
    1.27 +bool isAbove (BranchObj* a, BranchObj *b)
    1.28 +{
    1.29 +	if (a->angle < b->angle)
    1.30 +		return true;
    1.31 +	else	
    1.32 +		return false;
    1.33 +}
    1.34 +
    1.35  int BranchObj::getNum()
    1.36  {
    1.37  	if (parObj)
    1.38 @@ -962,11 +957,10 @@
    1.39  void BranchObj::removeFloatImage (FloatImageObj *fio)
    1.40  {
    1.41  	int i=floatimage.indexOf (fio);
    1.42 -	if (i!=-1) floatimage.takeAt (i);
    1.43 +	if (i>-1) delete (floatimage.takeAt (i));
    1.44  	calcBBoxSize();
    1.45  	positionBBox();
    1.46  	requestReposition();
    1.47 -	// FIMXE undo needed
    1.48  }
    1.49  
    1.50  void BranchObj::savePosInAngle ()
    1.51 @@ -1047,7 +1041,7 @@
    1.52  	// Add new bo and resort branches
    1.53  	BranchObj *newbo=addBranch ();
    1.54  	newbo->angle=pos-0.5;
    1.55 -	//FIXME   branch.sort();
    1.56 +	qSort (branch.begin(),branch.end(), isAbove);
    1.57  	return newbo;
    1.58  }
    1.59  
    1.60 @@ -1057,7 +1051,7 @@
    1.61  	// Add new bo and resort branches
    1.62  	bo->angle=pos-0.5;
    1.63  	BranchObj *newbo=addBranch (bo);
    1.64 -	//FIXME   branch.sort();
    1.65 +	qSort (branch.begin(),branch.end(), isAbove);
    1.66  	return newbo;
    1.67  }
    1.68  
    1.69 @@ -1072,7 +1066,7 @@
    1.70  	bo->setDefAttr (MovedBranch);
    1.71  	if (scrolled) tmpUnscroll();
    1.72  	setLastSelectedBranch (bo);
    1.73 -	//FIXME branch.sort();
    1.74 +	qSort (branch.begin(),branch.end(), isAbove);
    1.75  	return bo;
    1.76  }
    1.77  
    1.78 @@ -1176,7 +1170,7 @@
    1.79  	{	// -1 if bo1 not found 
    1.80  		branch.at(i)->angle--;
    1.81  		branch.at(i-1)->angle++;
    1.82 -		//FIXME branch.sort();
    1.83 +		qSort (branch.begin(),branch.end(), isAbove);
    1.84  		return branch.at(i);
    1.85  	} else
    1.86  		return NULL;
    1.87 @@ -1202,7 +1196,7 @@
    1.88  		j = i+1;
    1.89  		branch.at(i)->angle++;
    1.90  		branch.at(j)->angle--;
    1.91 -		//FIXME branch.sort();
    1.92 +		qSort (branch.begin(),branch.end(), isAbove);
    1.93  		return branch.at(i);
    1.94  	} else
    1.95  		return NULL;
    1.96 @@ -1345,7 +1339,7 @@
    1.97  
    1.98  	    alignRelativeTo ( QPointF (absPos.x(),
    1.99  			absPos.y()-(bboxTotal.height()-bbox.height())/2) );
   1.100 -		//FIXME branch.sort();	
   1.101 +		qSort (branch.begin(),branch.end(), isAbove);
   1.102  		positionBBox();	// Reposition bbox and contents
   1.103  	} else
   1.104  	{