diff -r 192e1392ba6a -r 12958f987bcf xml-vym.cpp
--- a/xml-vym.cpp	Wed Jul 16 10:44:44 2008 +0000
+++ b/xml-vym.cpp	Wed Jul 16 10:46:14 2008 +0000
@@ -105,29 +105,29 @@
 			if (!atts.value( "selectionColor").isEmpty() )
 			{
 				col.setNamedColor(atts.value("selectionColor"));
-				model->getMapEditor()->setSelectionColor(col);
+				model->setSelectionColor(col);
 			}	    
 			if (!atts.value( "linkColorHint").isEmpty() ) 
 			{
 				if (atts.value("linkColorHint")=="HeadingColor")
-					model->getMapEditor()->setMapLinkColorHint(LinkableMapObj::HeadingColor);
+					model->setMapLinkColorHint(LinkableMapObj::HeadingColor);
 				else
-					model->getMapEditor()->setMapLinkColorHint(LinkableMapObj::DefaultColor);
+					model->setMapLinkColorHint(LinkableMapObj::DefaultColor);
 			}
 			if (!atts.value( "linkStyle").isEmpty() ) 
-				model->getMapEditor()->setMapLinkStyle(atts.value("linkStyle"));
+				model->setMapLinkStyle(atts.value("linkStyle"));
 			if (!atts.value( "linkColor").isEmpty() ) 
 			{
 				col.setNamedColor(atts.value("linkColor"));
-				model->getMapEditor()->setMapDefLinkColor(col);
+				model->setMapDefLinkColor(col);
 			}	
 			if (!atts.value( "defXLinkColor").isEmpty() ) 
 			{
 				col.setNamedColor(atts.value("defXLinkColor"));
-				model->getMapEditor()->setMapDefXLinkColor(col);
+				model->setMapDefXLinkColor(col);
 			}	
 			if (!atts.value( "defXLinkWidth").isEmpty() ) 
-				model->getMapEditor()->setMapDefXLinkWidth(atts.value("defXLinkWidth").toInt ());
+				model->setMapDefXLinkWidth(atts.value("defXLinkWidth").toInt ());
 		}	
 	} else if ( eName == "select" && state == StateMap ) 
 	{
@@ -150,8 +150,8 @@
 			// Treat the found mapcenter as a branch 
 			// in an existing map
 			LinkableMapObj* lmo=model->getSelection();
-			if (lmo && ((typeid(*lmo) == typeid(BranchObj) ) 
-			        ||  typeid(*lmo) == typeid(MapCenterObj) ) )
+			if (lmo && (typeid(*lmo) == typeid(BranchObj) ) 
+			        || (typeid(*lmo) == typeid(MapCenterObj) ) )
 			{
 				lastBranch=(BranchObj*)lmo;
 				if (loadMode==ImportAdd)
@@ -205,10 +205,10 @@
 			// selection==lmo==NULL
 			// Treat it like ImportAdd then...
 			loadMode=ImportAdd;
-			lmo=model->first();		// FIXME this used to be lmo=mc before
+			lmo=model->first();		
 		}	
-		if (lmo && ((typeid(*lmo) == typeid(BranchObj) ) 
-				||  typeid(*lmo) == typeid(MapCenterObj) ) )
+		if (lmo && (typeid(*lmo) == typeid(BranchObj) ) 
+				|| (typeid(*lmo) == typeid(MapCenterObj) ) )
 		{
 			lastBranch=(BranchObj*)(lmo);
 			if (eName=="branch")
@@ -626,7 +626,7 @@
 	if (!a.value( "key").isEmpty() ) 
 	{
 		if (!a.value( "value").isEmpty() ) 
-			settings.setLocalEntry (model->getMapEditor()->getDestPath(), a.value ("key"), a.value ("value"));
+			settings.setLocalEntry (model->getDestPath(), a.value ("key"), a.value ("value"));
 		else
 			return false;