1.1 --- a/branchobj.h	Thu Apr 02 09:57:47 2009 +0000
     1.2 +++ b/branchobj.h	Tue Apr 07 16:15:53 2009 +0000
     1.3 @@ -11,10 +11,6 @@
     1.4  
     1.5  /*! \brief A branch visible in the map */
     1.6  
     1.7 -/*! If HideExport is used, this branch and its children will be hidden in export */
     1.8 -enum HideTmpMode {HideNone, HideExport};
     1.9 -
    1.10 -
    1.11  /////////////////////////////////////////////////////////////////////////////
    1.12  class BranchObj:public OrnamentedObj {
    1.13  public:
    1.14 @@ -40,6 +36,7 @@
    1.15  	virtual void setLinkColor();			// set the color of link
    1.16  	virtual void setColorSubtree(QColor);	// set the color of heading
    1.17  
    1.18 +	virtual void updateContentSize();
    1.19  	virtual void positionContents();
    1.20      virtual void move (double x,double y);
    1.21      virtual void move (QPointF);
    1.22 @@ -50,10 +47,7 @@
    1.23  	virtual void setDockPos();
    1.24      virtual LinkableMapObj* findMapObj(QPointF,LinkableMapObj*);	// find MapObj 
    1.25      virtual LinkableMapObj* findID (QString sid);	// find Obj by ID string
    1.26 -    virtual void setHeading (QString);
    1.27 -
    1.28 -	virtual void setHideTmp (HideTmpMode);
    1.29 -	virtual bool hasHiddenExportParent ();
    1.30 +    virtual void updateHeading ();
    1.31  
    1.32  	virtual QString saveToDir (const QString&,const QString&, const QPointF&);// Save data recursivly to tempdir
    1.33  
    1.34 @@ -112,9 +106,6 @@
    1.35  	virtual bool animate();
    1.36  
    1.37  protected:
    1.38 -	static BranchObj* itLast;		// iterator for first(), next()
    1.39 -	static BranchObj* itFirst;		// first iterator for first(), next()
    1.40 -    QList<BranchObj*> branch;		// all child branches
    1.41  	QList<FloatImageObj*> floatimage;// child images
    1.42  	QList<XLinkObj*> xlink;			// xlinks to other branches
    1.43