diff -r 914f330b6aa8 -r 25a77484ec72 mapcenterobj.cpp
--- a/mapcenterobj.cpp	Thu Apr 02 09:57:47 2009 +0000
+++ b/mapcenterobj.cpp	Tue Apr 07 16:15:53 2009 +0000
@@ -90,8 +90,8 @@
 	childPos.setX( clickBox.topLeft().x() + (int)(clickBox.width())/2 );
 	childPos.setY( clickBox.topLeft().y() + (int)(clickBox.height())/2 );
 	parPos=childPos;		
-	for (int i=0; i<branch.size(); ++i)
-		branch.at(i)->updateLink();
+	for (int i=0; i<treeItem->branchCount(); ++i)
+		treeItem->getBranchObjNum(i)->updateLink();
 }
 
 void MapCenterObj::updateRelPositions()
@@ -99,10 +99,10 @@
 	if (repositionRequest) unsetAllRepositionRequests();
 
 	// update relative Positions of branches and floats
-	for (int i=0; i<branch.size(); ++i)
+	for (int i=0; i<treeItem->branchCount(); ++i)
 	{
-		branch.at(i)->setRelPos();
-		branch.at(i)->setOrientation();
+		treeItem->getBranchObjNum(i)->setRelPos();
+		treeItem->getBranchObjNum(i)->setOrientation();
 	}
 	
 	for (int i=0; i<floatimage.size(); ++i)
@@ -116,9 +116,9 @@
 	LinkableMapObj *lmo;
 
 	// Search through child branches
-	for (int i=0; i<branch.size(); ++i)
+	for (int i=0; i<treeItem->branchCount(); ++i)
 	{	
-		lmo = branch.at(i)->findMapObj(p, excludeLMO);
+		lmo = treeItem->getBranchObjNum(i)->findMapObj(p, excludeLMO);
 		if (lmo!= NULL) return lmo;
 	}
 	// is p in MapCenter?
@@ -169,7 +169,7 @@
 	s+=standardFlags->saveToDir(tmpdir+"/flags", "/standardFlag-", verbose);
 
 	// Save heading
-    s+=valueElement("heading", getHeading(),a);
+    s+=valueElement("heading", treeItem->getHeading(),a);
 
 	// Save frame
 	s+=frame->saveToDir ();
@@ -182,8 +182,8 @@
 		s+=treeItem->getNoteObj().saveToDir();
 	
 	// Save branches
-	for (int i=0; i<branch.size(); ++i)
-		s+=branch.at(i)->saveToDir(tmpdir,prefix, offset);
+	for (int i=0; i<treeItem->branchCount(); ++i)
+		s+=treeItem->getBranchObjNum(i)->saveToDir(tmpdir,prefix, offset);
 
 	// Save FloatImages
 	for (int i=0; i<floatimage.size(); ++i)