1.1 --- a/branchobj.h	Mon Aug 24 14:39:07 2009 +0000
     1.2 +++ b/branchobj.h	Thu Sep 03 08:52:00 2009 +0000
     1.3 @@ -17,10 +17,7 @@
     1.4  	/*! New branches will get use same color for heading as parent */
     1.5  	enum BranchModification {NewBranch, MovedBranch};
     1.6  
     1.7 -
     1.8 -    BranchObj ();
     1.9 -    BranchObj (QGraphicsScene*);
    1.10 -    BranchObj (QGraphicsScene*, LinkableMapObj* parent);
    1.11 +    BranchObj (QGraphicsScene*,TreeItem *ti=NULL);
    1.12      ~BranchObj ();
    1.13  	bool operator< ( const BranchObj & );
    1.14  	bool operator== ( const BranchObj & );
    1.15 @@ -47,21 +44,6 @@
    1.16      
    1.17      virtual void updateData();	//! Update represantatio of heading, flags, etc.
    1.18  
    1.19 -	virtual void addXLink (XLinkObj*);
    1.20 -	virtual void removeXLinkRef (XLinkObj*);// Remove ref in list
    1.21 -	virtual void deleteXLink (XLinkObj*);	// remove references and delete XLinkObj 
    1.22 -	virtual void deleteXLinkAt (int);		// remove references and delete XLinkObj 
    1.23 -	virtual XLinkObj* XLinkAt (int);		// return reference of XLinkObj 
    1.24 -	virtual BranchObj* XLinkTargetAt (int);
    1.25 -
    1.26 -/* FIXME-3
    1.27 -	virtual FloatImageObj* addFloatImage();
    1.28 -	virtual FloatImageObj* addFloatImage(FloatImageObj*);
    1.29 -	virtual void removeFloatImage(FloatImageObj*);
    1.30 -    virtual FloatImageObj* getFirstFloatImage();
    1.31 -    virtual FloatImageObj* getLastFloatImage();
    1.32 -*/	
    1.33 -//FIXME-3	virtual FloatImageObj* getFloatImageNum(const uint &);
    1.34  protected:	
    1.35  	virtual void savePosInAngle();					// write pos in angle for resorting			
    1.36  public:	
    1.37 @@ -82,7 +64,6 @@
    1.38  	virtual bool animate();
    1.39  
    1.40  protected:
    1.41 -	//FIXME-3 QList<FloatImageObj*> floatimage;// child images
    1.42  	QList<XLinkObj*> xlink;			// xlinks to other branches
    1.43  
    1.44  	AnimPoint anim;