diff -r 7ea31701156e -r 7f43b93242aa xml-vym.cpp
--- a/xml-vym.cpp	Tue Aug 05 07:36:53 2008 +0000
+++ b/xml-vym.cpp	Mon Oct 06 11:10:20 2008 +0000
@@ -18,15 +18,6 @@
 extern Settings settings;
 extern QString vymVersion;
 
-/*
-parseVYMHandler::parseVYMHandler() {}
-
-parseVYMHandler::~parseVYMHandler() {}
-
-QString parseVYMHandler::errorProtocol() { return errorProt; }
-
-*/
-
 bool parseVYMHandler::startDocument()
 {
     errorProt = "";
@@ -39,18 +30,6 @@
     return true;
 }
 
-
-/*
-QString parseVYMHandler::parseHREF(QString href)
-{
-	QString type=href.section(":",0,0);
-	QString path=href.section(":",1,1);
-	if (!tmpDir.endsWith("/"))
-		return tmpDir + "/" + path;
-	else	
-		return tmpDir + path;
-}
-*/
 bool parseVYMHandler::startElement  ( const QString&, const QString&,
                     const QString& eName, const QXmlAttributes& atts ) 
 {
@@ -144,7 +123,8 @@
 		{	
 			// Really use the found mapcenter as MCO in a new map
 
-			lastBranch=model->addMapCenter(); 
+			model->createMapCenter(); 
+			lastBranch=model->getSelectedBranch();
 		} else
 		{
 			// Treat the found mapcenter as a branch 
@@ -156,8 +136,8 @@
 				lastBranch=(BranchObj*)lmo;
 				if (loadMode==ImportAdd)
 				{
-					lastBranch->addBranch();
-					lastBranch=lastBranch->getLastBranch();
+					model->createBranch();
+					lastBranch=model->getSelectedBranch();
 				} else
 					lastBranch->clear();
 			} else
@@ -216,8 +196,8 @@
 				state=StateBranch;
 				if (loadMode==ImportAdd)
 				{
-					lastBranch->addBranch();
-					lastBranch=lastBranch->getLastBranch();
+					model->createBranch();
+					lastBranch=model->getSelectedBranch();
 					
 				} else
 					lastBranch->clear();
@@ -233,8 +213,8 @@
 	} else if ( eName == "branch" && state == StateMapCenter) 
 	{
 		state=StateBranch;
-		lastBranch->addBranch();
-		lastBranch=lastBranch->getLastBranch();
+		model->createBranch();
+		lastBranch=model->getSelectedBranch();
 		readBranchAttr (atts);
 	} else if ( eName == "htmlnote" && state == StateBranch) 
 	{
@@ -254,8 +234,8 @@
 		if (!readXLinkAttr (atts)) return false;
     } else if ( eName == "branch" && state == StateBranch ) 
 	{
-        lastBranch->addBranch();
-		lastBranch=lastBranch->getLastBranch();		
+		model->createBranch();
+		lastBranch=model->getSelectedBranch();
 		readBranchAttr (atts);
     } else if ( eName == "html" && state == StateHtmlNote ) 
 	{
@@ -286,7 +266,8 @@
     switch ( state ) 
 	{
         case StateBranch: 
-			lastBranch=(BranchObj*)(lastBranch->getParObj());
+			model->selectParent();
+			lastBranch=model->getSelectedBranch();
             break;
         case StateHtml: 
 			htmldata+="</"+eName+">";
@@ -335,7 +316,7 @@
 			htmldata+=ch_org;
 			break;
         case StateHeading: 
-            lastBranch->setHeading(ch_simplified);
+            model->setHeading(ch_simplified);
             break;
         default: 
 			return false;