diff -r 192e1392ba6a -r 12958f987bcf branchobj.h
--- a/branchobj.h	Wed Jul 16 10:44:44 2008 +0000
+++ b/branchobj.h	Wed Jul 16 10:46:14 2008 +0000
@@ -11,7 +11,7 @@
 
 /*! \brief A branch visible in the map */
 
-/*! If HideExport is used, this branch and its childs will be hidden in export */
+/*! If HideExport is used, this branch and its children will be hidden in export */
 enum HideTmpMode {HideNone, HideExport};
 
 
@@ -102,7 +102,7 @@
     virtual BranchObj* insertBranch(BranchObj*,int);
     virtual BranchObj* insertBranchPtr (BranchObj*,int);
     virtual void removeBranchHere(BranchObj*);  
-    virtual void removeChilds();  
+    virtual void removeChildren();  
     virtual void removeBranch(BranchObj*);  
     virtual void removeBranchPtr (BranchObj*);  
     virtual void setLastSelectedBranch(BranchObj*);
@@ -116,14 +116,14 @@
     virtual BranchObj* moveBranchDown(BranchObj*);
     virtual void sortChildren();
     virtual BranchObj* linkTo (BranchObj*, int);
-    virtual void alignRelativeTo(const QPointF );
+    virtual void alignRelativeTo(const QPointF, bool alignSelf=false );
 	virtual void reposition();
 	virtual void unsetAllRepositionRequests();
 
 	virtual QPolygonF shape();				//!< Returns arbitrary bounding polygon
-	virtual QRectF getTotalBBox();			// return BBox including childs			
-	virtual QRectF getBBoxSizeWithChilds();	// return size of BBox including childs  
-	virtual void calcBBoxSizeWithChilds();	// calc size of  BBox including childs recursivly
+	virtual QRectF getTotalBBox();			// return BBox including children			
+	virtual QRectF getBBoxSizeWithChildren();	// return size of BBox including children  
+	virtual void calcBBoxSizeWithChildren();	// calc size of  BBox including children recursivly
 
     virtual void select();
     virtual void unselect();
@@ -144,7 +144,7 @@
 	float angle;					// used in mainbranch to reorder mainbranches
 protected:	
     int lastSelectedBranch;			// for going deeper into tree
-	bool scrolled;					// true if all childs are scrolled and thus invisible
+	bool scrolled;					// true if all children are scrolled and thus invisible
 	bool tmpUnscrolled;				// can only be true (temporary) for a scrolled subtree
 	bool includeImagesVer;			// include floatimages in bbox vertically
 	bool includeImagesHor;			// include floatimages in bbox horizontally