diff -r 30b22f7bd009 -r d442a66e9121 branchobj.cpp
--- a/branchobj.cpp	Mon Sep 12 19:52:51 2005 +0000
+++ b/branchobj.cpp	Thu Sep 22 12:14:23 2005 +0000
@@ -201,19 +201,9 @@
 	// ignore mapcenter and mainbranch
 	if (lmo->getDepth()<2) off=0;
 	if (off==0)
-	{
 		link2ParPos=false;
-	//	parObj=o;
-	}	
 	else
-	{	
 		link2ParPos=true;
-	//	if (off>0)
-	//		parObj=o->getParObj();
-	//	else	
-	//		parObj=o->getParObj();
-	//	parObj=o;
-	}		
 	parObj=o;
 
 	depth=parObj->getDepth()+1;
@@ -400,10 +390,11 @@
 	// Overloaded from LinkableMapObj
 	// BranchObj can use color of heading
 
-	if (mapEditor->getLinkColorHint()==HeadingColor)
-		LinkableMapObj::setLinkColor (heading->getColor() );
-	else	
-		LinkableMapObj::setLinkColor ();
+	if (mapEditor)
+		if (mapEditor->getLinkColorHint()==HeadingColor)
+			LinkableMapObj::setLinkColor (heading->getColor() );
+		else	
+			LinkableMapObj::setLinkColor ();
 }
 
 void BranchObj::setColor (QColor col, bool colorChilds)
@@ -578,7 +569,7 @@
 
 void BranchObj::positionBBox()
 {
-	// FIXME testing (optimization)
+	// TODO testing (optimization)
 	/*
 	QString h=getHeading();
 	if (!h.isEmpty())
@@ -663,12 +654,6 @@
 
 void BranchObj::setHeading(QString s)
 {
-	/*FIXME
-    // Adjusting font size
-    QFont font=heading->getFont();
-	font.setPointSize(getDefHeadingSize() );
-    heading->setFont(font);
-	*/
     heading->setText(s);	// set new heading
 	calcBBoxSize();			// recalculate bbox
     positionBBox();			// rearrange contents
@@ -1140,7 +1125,7 @@
 
 void BranchObj::alignRelativeTo (QPoint ref)
 {
-/* FIXME testing
+/* TODO testing
 	if (!getHeading().isEmpty())
 		cout << "BO::alignRelTo "<<getHeading()<<endl;
 	else	
@@ -1210,7 +1195,7 @@
 
 void BranchObj::reposition()
 {	
-/* FIXME testing
+/* TODO testing only
 	if (!getHeading().isEmpty())
 		cout << "BO::reposition  "<<getHeading()<<endl;
 	else