1.1 --- a/branchobj.h Sat Apr 09 22:50:08 2005 +0000
1.2 +++ b/branchobj.h Mon Apr 18 06:17:00 2005 +0000
1.3 @@ -4,7 +4,7 @@
1.4 #include "floatimageobj.h"
1.5 #include "linkablemapobj.h"
1.6 #include "ornamentedobj.h"
1.7 -#include "linkobj.h"
1.8 +#include "xlinkobj.h"
1.9
1.10 class BranchObjPtrList : public QPtrList<BranchObj>
1.11 {
1.12 @@ -28,7 +28,7 @@
1.13 virtual int getFloatImageNum(FloatImageObj*);
1.14 virtual int countBranches();
1.15 virtual int countFloatImages();
1.16 - virtual int countLinks();
1.17 + virtual int countXLinks();
1.18 virtual void setParObjTmp (LinkableMapObj*,QPoint,int);// Only for moving Obj around
1.19 virtual void unsetParObjTmp(); // reuse original ParObj
1.20
1.21 @@ -63,12 +63,12 @@
1.22 virtual void setVymLink (QString);
1.23 virtual QString getVymLink ();
1.24 virtual QString saveToDir (const QString&,const QString&, const QPoint&);// Save data recursivly to tempdir
1.25 - virtual void addLink (LinkObj*);
1.26 - virtual void removeLinkRef (LinkObj*); // Remove ref in list
1.27 - virtual void deleteLink (LinkObj*); // remove references and delete LinkObj
1.28 - virtual void deleteLinkAt (int); // remove references and delete LinkObj
1.29 - virtual int countLink ();
1.30 - virtual BranchObj* linkTargetAt (int);
1.31 + virtual void addXLink (XLinkObj*);
1.32 + virtual void removeXLinkRef (XLinkObj*); // Remove ref in list
1.33 + virtual void deleteXLink (XLinkObj*); // remove references and delete XLinkObj
1.34 + virtual void deleteXLinkAt (int); // remove references and delete XLinkObj
1.35 + virtual int countXLink ();
1.36 + virtual BranchObj* XLinkTargetAt (int);
1.37 virtual LinkableMapObj* addFloatImage();
1.38 virtual LinkableMapObj* addFloatImage(FloatImageObj*);
1.39 virtual void removeFloatImage(FloatImageObj*);
1.40 @@ -109,7 +109,7 @@
1.41 static BranchObj* itLast; // iterator for first(), next()
1.42 BranchObjPtrList branch; // all child branches
1.43 QPtrList<FloatImageObj> floatimage; // child images
1.44 - QPtrList<LinkObj> link; // links to other branches
1.45 + QPtrList<XLinkObj> xlink; // xlinks to other branches
1.46 public:
1.47 float angle; // used in mainbranch to reorder mainbranches
1.48 protected: