1.1 --- a/linkablemapobj.cpp	Tue Sep 04 13:53:33 2007 +0000
     1.2 +++ b/linkablemapobj.cpp	Tue Sep 04 13:53:33 2007 +0000
     1.3 @@ -93,7 +93,7 @@
     1.4  	useOrientation=true;
     1.5  
     1.6  	// Reset ID
     1.7 -	id="";
     1.8 +	objID="";
     1.9  }
    1.10  
    1.11  void LinkableMapObj::copy (LinkableMapObj* other)
    1.12 @@ -104,7 +104,7 @@
    1.13      setLinkColor (other->linkcolor);
    1.14  	relPos=other->relPos;
    1.15  	useOrientation=other->useOrientation;
    1.16 -
    1.17 +	objID=other->objID;
    1.18  }
    1.19  
    1.20  void LinkableMapObj::setChildObj(LinkableMapObj* o)
    1.21 @@ -299,12 +299,12 @@
    1.22  
    1.23  void LinkableMapObj::setID (const QString &s)
    1.24  {
    1.25 -	id=s;
    1.26 +	objID=s;
    1.27  }
    1.28  
    1.29  QString LinkableMapObj::getID()
    1.30  {
    1.31 -	return id;
    1.32 +	return objID;
    1.33  }
    1.34  
    1.35  void LinkableMapObj::setLinkColor()

     2.1 --- a/linkablemapobj.h	Tue Sep 04 13:53:33 2007 +0000
     2.2 +++ b/linkablemapobj.h	Tue Sep 04 13:53:33 2007 +0000
     2.3 @@ -161,6 +161,6 @@
     2.4  	bool useRelPos;
     2.5  	bool useOrientation;
     2.6  
     2.7 -	QString id;						// id set during load/save currently used for xLinks
     2.8 +	QString objID;					// id set during load/save currently used for xLinks
     2.9  };
    2.10  #endif