diff -r 914f330b6aa8 -r 25a77484ec72 xml-freemind.cpp
--- a/xml-freemind.cpp	Thu Apr 02 09:57:47 2009 +0000
+++ b/xml-freemind.cpp	Tue Apr 07 16:15:53 2009 +0000
@@ -78,14 +78,13 @@
 
 		//cout <<"model="<<model<<"   first="<<model->first()<<endl;
 
-		lastBranch=bo->addBranch();
+		lastBranchItem=model->createBranch();
 
-		lastBranch->move2RelPos (200,0);
-		lastBranch->setHeading ("  ");
-		lastBranch=bo->addBranch();
-		lastBranch->move2RelPos (-200,0);
-		lastBranch->setHeading ("  ");
-		lastBranch=bo;
+		//FIXME-3 lastBranch->move2RelPos (200,0);
+		lastBranchItem->setHeading ("  ");
+		//FIXME-3 lastBranch->move2RelPos (-200,0);
+		lastBranchItem->setHeading ("  ");
+		lastBranchItem=(BranchItem*)lastBranchItem->parent();
 
 	} else if ( eName == "node" &&  (state == StateMap || state == StateNode )) 
 	{
@@ -98,7 +97,6 @@
 				if (lastBranchItem)
 				{	
 					lastBranchItem=model->createBranch();
-					lastBranch=lastBranchItem->getBranchObj();
 					readNodeAttr (atts);
 				}	
 			} else if (atts.value ("POSITION")=="right")
@@ -108,7 +106,6 @@
 				if (lastBranchItem)
 				{	
 					lastBranchItem=model->createBranch();
-					lastBranch=lastBranchItem->getBranchObj();
 					readNodeAttr (atts);
 				}	
 			}
@@ -117,7 +114,6 @@
 			if (state!=StateMap)
 			{
 				lastBranchItem=model->createBranch();
-				lastBranch=lastBranchItem->getBranchObj();
 			}
 			readNodeAttr (atts);
 		}
@@ -193,7 +189,7 @@
 			else if (f=="licq")
 				v="freemind-licq"; 
 
-			lastBranch->activateStandardFlag( v);
+			//FIXME-3 lastBranch->activateStandardFlag( v);
 		}
 	} else if ( eName == "arrowlink" && state == StateNode) 
 	{
@@ -221,7 +217,7 @@
     switch ( state ) 
 	{
         case StateNode: 
-			lastBranch=(BranchObj*)(lastBranch->getParObj());
+			lastBranchItem=(BranchItem*)lastBranchItem->parent();
             break;
 		default: 
 			break;
@@ -250,7 +246,7 @@
         case StateFont: break; 
         case StateHook: break; 
         case StateText: 
-			lastBranch->getTreeItem()->setNote (ch_simplified);
+			lastBranchItem->setNote (ch_simplified);
 			break; 
         default: 
 			return false;
@@ -263,8 +259,9 @@
     return "the document is not in the Freemind file format";
 }
 
-bool parseFreemindHandler::readNodeAttr (const QXmlAttributes& a)
+bool parseFreemindHandler::readNodeAttr (const QXmlAttributes& a)	//FIXME-3
 {
+/*
 	lastOO=lastBranch;
 	lastBranchItem=(BranchItem*)(lastBranch->getTreeItem() );
 
@@ -278,7 +275,7 @@
 
 	if (!a.value( "LINK").isEmpty() )
 		lastBranch->setURL (a.value ("LINK"));
-
+*/
 	return true;	
 }