diff -r 25a77484ec72 -r db0ec4bcf416 linkablemapobj.cpp --- a/linkablemapobj.cpp Tue Apr 07 16:15:53 2009 +0000 +++ b/linkablemapobj.cpp Mon Apr 20 10:42:05 2009 +0000 @@ -60,7 +60,6 @@ model=NULL; depth=-1; - mapEditor=NULL; childObj=NULL; parObj=NULL; parObjTmpBuf=NULL; @@ -98,9 +97,6 @@ useRelPos=false; useOrientation=true; - // Reset ID - objID=""; - // Crossreference to treemodel treeItem=NULL; } @@ -114,7 +110,6 @@ setLinkColor (other->linkcolor); relPos=other->relPos; useOrientation=other->useOrientation; - objID=other->objID; treeItem=other->treeItem; } @@ -146,7 +141,6 @@ void LinkableMapObj::setParObj(LinkableMapObj* o) { parObj=o; - mapEditor=parObj->getMapEditor(); model=parObj->getModel(); } @@ -334,16 +328,6 @@ return linkpos; } -void LinkableMapObj::setID (const QString &s) -{ - objID=s; -} - -QString LinkableMapObj::getID() -{ - return objID; -} - void LinkableMapObj::setLinkColor() { // Overloaded in BranchObj and children @@ -580,7 +564,7 @@ return parObj; } -LinkableMapObj* LinkableMapObj::findObjBySelect (QString s) // FIXME-2 port to TreeItem... +LinkableMapObj* LinkableMapObj::findObjBySelect (QString s) // FIXME-0 already in VM??? { LinkableMapObj *lmo=this; QString part; @@ -642,17 +626,6 @@ return depth; } -void LinkableMapObj::setMapEditor (MapEditor *me) -{ - mapEditor=me; - model=mapEditor->getModel(); -} - -MapEditor* LinkableMapObj::getMapEditor () -{ - return mapEditor; -} - QPointF LinkableMapObj::getRandPos() { // Choose a random position with given distance to parent: