1.1 --- a/linkablemapobj.cpp	Tue Apr 07 16:15:53 2009 +0000
     1.2 +++ b/linkablemapobj.cpp	Mon Apr 20 10:42:05 2009 +0000
     1.3 @@ -60,7 +60,6 @@
     1.4  	model=NULL;
     1.5  
     1.6      depth=-1;	
     1.7 -	mapEditor=NULL;
     1.8      childObj=NULL;
     1.9      parObj=NULL;
    1.10      parObjTmpBuf=NULL;
    1.11 @@ -98,9 +97,6 @@
    1.12  	useRelPos=false;
    1.13  	useOrientation=true;
    1.14  
    1.15 -	// Reset ID
    1.16 -	objID="";
    1.17 -
    1.18  	// Crossreference to treemodel
    1.19  	treeItem=NULL;
    1.20  }
    1.21 @@ -114,7 +110,6 @@
    1.22      setLinkColor (other->linkcolor);
    1.23  	relPos=other->relPos;
    1.24  	useOrientation=other->useOrientation;
    1.25 -	objID=other->objID;
    1.26  	treeItem=other->treeItem;
    1.27  }
    1.28  
    1.29 @@ -146,7 +141,6 @@
    1.30  void LinkableMapObj::setParObj(LinkableMapObj* o)
    1.31  {
    1.32      parObj=o;
    1.33 -	mapEditor=parObj->getMapEditor();
    1.34  	model=parObj->getModel();	
    1.35  }
    1.36  
    1.37 @@ -334,16 +328,6 @@
    1.38  	return linkpos;
    1.39  }
    1.40  
    1.41 -void LinkableMapObj::setID (const QString &s)
    1.42 -{
    1.43 -	objID=s;
    1.44 -}
    1.45 -
    1.46 -QString LinkableMapObj::getID()
    1.47 -{
    1.48 -	return objID;
    1.49 -}
    1.50 -
    1.51  void LinkableMapObj::setLinkColor()
    1.52  {
    1.53  	// Overloaded in BranchObj and children
    1.54 @@ -580,7 +564,7 @@
    1.55      return parObj;
    1.56  }
    1.57  
    1.58 -LinkableMapObj* LinkableMapObj::findObjBySelect (QString s)	// FIXME-2 port to TreeItem...
    1.59 +LinkableMapObj* LinkableMapObj::findObjBySelect (QString s)	// FIXME-0 already in VM???
    1.60  {
    1.61  	LinkableMapObj *lmo=this;
    1.62  	QString part;
    1.63 @@ -642,17 +626,6 @@
    1.64      return depth;
    1.65  }
    1.66  
    1.67 -void LinkableMapObj::setMapEditor (MapEditor *me)
    1.68 -{
    1.69 -	mapEditor=me;
    1.70 -	model=mapEditor->getModel();
    1.71 -}
    1.72 -
    1.73 -MapEditor* LinkableMapObj::getMapEditor ()
    1.74 -{
    1.75 -	return mapEditor;
    1.76 -}
    1.77 -
    1.78  QPointF LinkableMapObj::getRandPos()
    1.79  {
    1.80  	// Choose a random position with given distance to parent: