diff -r 6783e13bb05d -r f688a9913724 branchobj.h
--- a/branchobj.h	Sat Apr 09 22:50:08 2005 +0000
+++ b/branchobj.h	Mon Apr 18 06:17:00 2005 +0000
@@ -4,7 +4,7 @@
 #include "floatimageobj.h"
 #include "linkablemapobj.h"
 #include "ornamentedobj.h"
-#include "linkobj.h"
+#include "xlinkobj.h"
 
 class BranchObjPtrList : public QPtrList<BranchObj>
 {
@@ -28,7 +28,7 @@
 	virtual int getFloatImageNum(FloatImageObj*);		
 	virtual int countBranches();		
 	virtual int countFloatImages();		
-	virtual int countLinks();		
+	virtual int countXLinks();		
     virtual void setParObjTmp (LinkableMapObj*,QPoint,int);// Only for moving Obj around
 	virtual void unsetParObjTmp();			// reuse original ParObj
 
@@ -63,12 +63,12 @@
     virtual void setVymLink (QString);
     virtual QString getVymLink ();
 	virtual QString saveToDir (const QString&,const QString&, const QPoint&);// Save data recursivly to tempdir
-	virtual void addLink (LinkObj*);
-	virtual void removeLinkRef (LinkObj*);	// Remove ref in list
-	virtual void deleteLink (LinkObj*);		// remove references and delete LinkObj 
-	virtual void deleteLinkAt (int);		// remove references and delete LinkObj 
-	virtual int countLink ();
-	virtual BranchObj* linkTargetAt (int);
+	virtual void addXLink (XLinkObj*);
+	virtual void removeXLinkRef (XLinkObj*);	// Remove ref in list
+	virtual void deleteXLink (XLinkObj*);		// remove references and delete XLinkObj 
+	virtual void deleteXLinkAt (int);		// remove references and delete XLinkObj 
+	virtual int countXLink ();
+	virtual BranchObj* XLinkTargetAt (int);
 	virtual LinkableMapObj* addFloatImage();
 	virtual LinkableMapObj* addFloatImage(FloatImageObj*);
 	virtual void removeFloatImage(FloatImageObj*);
@@ -109,7 +109,7 @@
 	static BranchObj* itLast;		// iterator for first(), next()
     BranchObjPtrList branch;		// all child branches
 	QPtrList<FloatImageObj> floatimage;	// child images
-	QPtrList<LinkObj> link;			// links to other branches
+	QPtrList<XLinkObj> xlink;		// xlinks to other branches
 public:	
 	float angle;					// used in mainbranch to reorder mainbranches
 protected: