1.1 --- a/branchobj.h	Sun Jan 30 12:59:10 2005 +0000
     1.2 +++ b/branchobj.h	Sun Jan 30 23:25:47 2005 +0000
     1.3 @@ -4,6 +4,7 @@
     1.4  #include "floatimageobj.h"
     1.5  #include "linkablemapobj.h"
     1.6  #include "ornamentedobj.h"
     1.7 +#include "linkobj.h"
     1.8  
     1.9  class BranchObjPtrList : public QPtrList<BranchObj>
    1.10  {
    1.11 @@ -61,6 +62,10 @@
    1.12      virtual void setVymLink (QString);
    1.13      virtual QString getVymLink ();
    1.14  	virtual QString saveToDir (const QString&,const QString&, const QPoint&);// Save data recursivly to tempdir
    1.15 +	virtual void addLink (LinkObj*);
    1.16 +	virtual void removeLink (LinkObj*);
    1.17 +	virtual void deleteLink (LinkObj*);
    1.18 +	virtual int countLink ();
    1.19  	virtual LinkableMapObj* addFloatImage();
    1.20  	virtual LinkableMapObj* addFloatImage(FloatImageObj*);
    1.21  	virtual void removeFloatImage(FloatImageObj*);
    1.22 @@ -72,9 +77,12 @@
    1.23  public:	
    1.24      virtual BranchObj* addBranch();
    1.25      virtual BranchObj* addBranch(BranchObj*);		// makes deep copy of BranchObj
    1.26 +    virtual BranchObj* addBranchPtr(BranchObj*);	// just adds pointer
    1.27      virtual BranchObj* insertBranch(int);
    1.28      virtual BranchObj* insertBranch(BranchObj*,int);
    1.29 +    virtual BranchObj* insertBranchPtr (BranchObj*,int);
    1.30      virtual void removeBranch(BranchObj*);  
    1.31 +    virtual void removeBranchPtr (BranchObj*);  
    1.32      virtual void setLastSelectedBranch(BranchObj*);
    1.33      virtual BranchObj* getLastSelectedBranch();
    1.34      virtual BranchObj* getFirstBranch();
    1.35 @@ -82,7 +90,7 @@
    1.36  	virtual BranchObj* getBranchNum(const uint &);
    1.37      virtual BranchObj* moveBranchUp(BranchObj*);
    1.38      virtual BranchObj* moveBranchDown(BranchObj*);
    1.39 -
    1.40 +    virtual BranchObj* moveBranchTo (BranchObj*, int);
    1.41      virtual void alignRelativeTo(const QPoint );
    1.42  	virtual void reposition();
    1.43  
    1.44 @@ -98,6 +106,7 @@
    1.45  	static BranchObj* itLast;		// iterator for first(), next()
    1.46      BranchObjPtrList branch;		// all child branches
    1.47  	QPtrList<FloatImageObj> floatimage;	// child images
    1.48 +	QPtrList<LinkObj> link;			// links to other branches
    1.49  public:	
    1.50  	float angle;					// used in mainbranch to reorder mainbranches
    1.51  protected: