diff -r 25a77484ec72 -r db0ec4bcf416 branchobj.cpp --- a/branchobj.cpp Tue Apr 07 16:15:53 2009 +0000 +++ b/branchobj.cpp Mon Apr 20 10:42:05 2009 +0000 @@ -424,58 +424,6 @@ } } -LinkableMapObj* BranchObj::findMapObj(QPointF p, LinkableMapObj* excludeLMO) -{ - // Search branches - LinkableMapObj *lmo; - for (int i=0; ibranchCount(); ++i) - { - lmo=treeItem->getBranchObjNum(i)->findMapObj(p, excludeLMO); - if (lmo != NULL) return lmo; - } - - - // Search myself - if (inBox (p,clickBox) && (this != excludeLMO) && isVisibleObj() ) - return this; - - // Search float images - for (int i=0; igetClickBox()) && - (floatimage.at(i) != excludeLMO) && - floatimage.at(i)->getParObj()!= excludeLMO && - floatimage.at(i)->isVisibleObj() - ) return floatimage.at(i); - - return NULL; -} - -LinkableMapObj* BranchObj::findID (QString sid) -{ - // Search branches - LinkableMapObj *lmo; - for (int i=0; ibranchCount(); ++i) - { - lmo=treeItem->getBranchObjNum(i)->findID (sid); - if (lmo != NULL) return lmo; - } - - // Search myself - if (sid==objID) return this; - - -/* - // Search float images - for (int i=0; iinBox(p) && - (floatimage.at(i) != excludeLMO) && - floatimage.at(i)->getParObj()!= excludeLMO && - floatimage.at(i)->isVisibleObj() - ) return floatimage.at(i); -*/ - return NULL; -} - void BranchObj::updateHeading() { if (!treeItem) @@ -743,7 +691,6 @@ BranchObj* BranchObj::addBranch() { BranchObj* newbo=new BranchObj(scene,this); - //FIXME-1 branch.append (newbo); newbo->setParObj(this); newbo->setDefAttr(NewBranch); /* FIXME-2 treeItem not set yet!!!