1.1 --- a/branchobj.cpp	Tue Apr 07 16:15:53 2009 +0000
     1.2 +++ b/branchobj.cpp	Mon Apr 20 10:42:05 2009 +0000
     1.3 @@ -424,58 +424,6 @@
     1.4      }
     1.5  }
     1.6  
     1.7 -LinkableMapObj* BranchObj::findMapObj(QPointF p, LinkableMapObj* excludeLMO)
     1.8 -{
     1.9 -	// Search branches
    1.10 -    LinkableMapObj *lmo;
    1.11 -	for (int i=0; i<treeItem->branchCount(); ++i)
    1.12 -    {	
    1.13 -		lmo=treeItem->getBranchObjNum(i)->findMapObj(p, excludeLMO);
    1.14 -		if (lmo != NULL) return lmo;
    1.15 -    }
    1.16 -	
    1.17 -
    1.18 -	// Search myself
    1.19 -    if (inBox (p,clickBox) && (this != excludeLMO) && isVisibleObj() ) 
    1.20 -		return this;
    1.21 -
    1.22 -	// Search float images
    1.23 -    for (int i=0; i<floatimage.size(); ++i )
    1.24 -		if (inBox(p,floatimage.at(i)->getClickBox()) && 
    1.25 -			(floatimage.at(i) != excludeLMO) && 
    1.26 -			floatimage.at(i)->getParObj()!= excludeLMO &&
    1.27 -			floatimage.at(i)->isVisibleObj() 
    1.28 -		) return floatimage.at(i);
    1.29 -
    1.30 -    return NULL;
    1.31 -}
    1.32 -
    1.33 -LinkableMapObj* BranchObj::findID (QString sid)
    1.34 -{
    1.35 -	// Search branches
    1.36 -    LinkableMapObj *lmo;
    1.37 -	for (int i=0; i<treeItem->branchCount(); ++i)
    1.38 -    {	
    1.39 -		lmo=treeItem->getBranchObjNum(i)->findID (sid);
    1.40 -		if (lmo != NULL) return lmo;
    1.41 -    }
    1.42 -	
    1.43 -	// Search myself
    1.44 -	if (sid==objID) return this;
    1.45 -
    1.46 -
    1.47 -/*
    1.48 -	// Search float images
    1.49 -    for (int i=0; i<floatimage.size(); ++i )
    1.50 -		if (floatimage.at(i)->inBox(p) && 
    1.51 -			(floatimage.at(i) != excludeLMO) && 
    1.52 -			floatimage.at(i)->getParObj()!= excludeLMO &&
    1.53 -			floatimage.at(i)->isVisibleObj() 
    1.54 -		) return floatimage.at(i);
    1.55 -*/
    1.56 -    return NULL;
    1.57 -}
    1.58 -
    1.59  void BranchObj::updateHeading()
    1.60  {
    1.61  	if (!treeItem)
    1.62 @@ -743,7 +691,6 @@
    1.63  BranchObj* BranchObj::addBranch()
    1.64  {
    1.65      BranchObj* newbo=new BranchObj(scene,this);
    1.66 -    //FIXME-1 branch.append (newbo);
    1.67      newbo->setParObj(this);
    1.68  	newbo->setDefAttr(NewBranch);
    1.69  	/* FIXME-2 treeItem not set yet!!!