1.1 --- a/branchobj.h	Mon May 05 13:46:42 2008 +0000
     1.2 +++ b/branchobj.h	Mon Aug 04 13:35:54 2008 +0000
     1.3 @@ -11,7 +11,7 @@
     1.4  
     1.5  /*! \brief A branch visible in the map */
     1.6  
     1.7 -/*! If HideExport is used, this branch and its childs will be hidden in export */
     1.8 +/*! If HideExport is used, this branch and its children will be hidden in export */
     1.9  enum HideTmpMode {HideNone, HideExport};
    1.10  
    1.11  
    1.12 @@ -102,7 +102,7 @@
    1.13      virtual BranchObj* insertBranch(BranchObj*,int);
    1.14      virtual BranchObj* insertBranchPtr (BranchObj*,int);
    1.15      virtual void removeBranchHere(BranchObj*);  
    1.16 -    virtual void removeChilds();  
    1.17 +    virtual void removeChildren();  
    1.18      virtual void removeBranch(BranchObj*);  
    1.19      virtual void removeBranchPtr (BranchObj*);  
    1.20      virtual void setLastSelectedBranch(BranchObj*);
    1.21 @@ -116,14 +116,14 @@
    1.22      virtual BranchObj* moveBranchDown(BranchObj*);
    1.23      virtual void sortChildren();
    1.24      virtual BranchObj* linkTo (BranchObj*, int);
    1.25 -    virtual void alignRelativeTo(const QPointF );
    1.26 +    virtual void alignRelativeTo(const QPointF, bool alignSelf=false );
    1.27  	virtual void reposition();
    1.28  	virtual void unsetAllRepositionRequests();
    1.29  
    1.30  	virtual QPolygonF shape();				//!< Returns arbitrary bounding polygon
    1.31 -	virtual QRectF getTotalBBox();			// return BBox including childs			
    1.32 -	virtual QRectF getBBoxSizeWithChilds();	// return size of BBox including childs  
    1.33 -	virtual void calcBBoxSizeWithChilds();	// calc size of  BBox including childs recursivly
    1.34 +	virtual QRectF getTotalBBox();			// return BBox including children			
    1.35 +	virtual QRectF getBBoxSizeWithChildren();	// return size of BBox including children  
    1.36 +	virtual void calcBBoxSizeWithChildren();	// calc size of  BBox including children recursivly
    1.37  
    1.38      virtual void select();
    1.39      virtual void unselect();
    1.40 @@ -144,7 +144,7 @@
    1.41  	float angle;					// used in mainbranch to reorder mainbranches
    1.42  protected:	
    1.43      int lastSelectedBranch;			// for going deeper into tree
    1.44 -	bool scrolled;					// true if all childs are scrolled and thus invisible
    1.45 +	bool scrolled;					// true if all children are scrolled and thus invisible
    1.46  	bool tmpUnscrolled;				// can only be true (temporary) for a scrolled subtree
    1.47  	bool includeImagesVer;			// include floatimages in bbox vertically
    1.48  	bool includeImagesHor;			// include floatimages in bbox horizontally