# HG changeset patch
# User insilmaril
# Date 1188914013 0
# Node ID 88d558ce079d6ebc3af1faa2558a0536a086a5e6
# Parent  e46d634e071c1e7bfdd25dc35d8864bb5ad09f35
Fixed broken xLink handling

diff -r e46d634e071c -r 88d558ce079d linkablemapobj.cpp
--- a/linkablemapobj.cpp	Tue Sep 04 13:53:33 2007 +0000
+++ b/linkablemapobj.cpp	Tue Sep 04 13:53:33 2007 +0000
@@ -93,7 +93,7 @@
 	useOrientation=true;
 
 	// Reset ID
-	id="";
+	objID="";
 }
 
 void LinkableMapObj::copy (LinkableMapObj* other)
@@ -104,7 +104,7 @@
     setLinkColor (other->linkcolor);
 	relPos=other->relPos;
 	useOrientation=other->useOrientation;
-
+	objID=other->objID;
 }
 
 void LinkableMapObj::setChildObj(LinkableMapObj* o)
@@ -299,12 +299,12 @@
 
 void LinkableMapObj::setID (const QString &s)
 {
-	id=s;
+	objID=s;
 }
 
 QString LinkableMapObj::getID()
 {
-	return id;
+	return objID;
 }
 
 void LinkableMapObj::setLinkColor()
diff -r e46d634e071c -r 88d558ce079d linkablemapobj.h
--- a/linkablemapobj.h	Tue Sep 04 13:53:33 2007 +0000
+++ b/linkablemapobj.h	Tue Sep 04 13:53:33 2007 +0000
@@ -161,6 +161,6 @@
 	bool useRelPos;
 	bool useOrientation;
 
-	QString id;						// id set during load/save currently used for xLinks
+	QString objID;					// id set during load/save currently used for xLinks
 };
 #endif