1.1 --- a/xml-vym.cpp	Tue Aug 05 07:36:53 2008 +0000
     1.2 +++ b/xml-vym.cpp	Mon Oct 06 11:10:20 2008 +0000
     1.3 @@ -18,15 +18,6 @@
     1.4  extern Settings settings;
     1.5  extern QString vymVersion;
     1.6  
     1.7 -/*
     1.8 -parseVYMHandler::parseVYMHandler() {}
     1.9 -
    1.10 -parseVYMHandler::~parseVYMHandler() {}
    1.11 -
    1.12 -QString parseVYMHandler::errorProtocol() { return errorProt; }
    1.13 -
    1.14 -*/
    1.15 -
    1.16  bool parseVYMHandler::startDocument()
    1.17  {
    1.18      errorProt = "";
    1.19 @@ -39,18 +30,6 @@
    1.20      return true;
    1.21  }
    1.22  
    1.23 -
    1.24 -/*
    1.25 -QString parseVYMHandler::parseHREF(QString href)
    1.26 -{
    1.27 -	QString type=href.section(":",0,0);
    1.28 -	QString path=href.section(":",1,1);
    1.29 -	if (!tmpDir.endsWith("/"))
    1.30 -		return tmpDir + "/" + path;
    1.31 -	else	
    1.32 -		return tmpDir + path;
    1.33 -}
    1.34 -*/
    1.35  bool parseVYMHandler::startElement  ( const QString&, const QString&,
    1.36                      const QString& eName, const QXmlAttributes& atts ) 
    1.37  {
    1.38 @@ -144,7 +123,8 @@
    1.39  		{	
    1.40  			// Really use the found mapcenter as MCO in a new map
    1.41  
    1.42 -			lastBranch=model->addMapCenter(); 
    1.43 +			model->createMapCenter(); 
    1.44 +			lastBranch=model->getSelectedBranch();
    1.45  		} else
    1.46  		{
    1.47  			// Treat the found mapcenter as a branch 
    1.48 @@ -156,8 +136,8 @@
    1.49  				lastBranch=(BranchObj*)lmo;
    1.50  				if (loadMode==ImportAdd)
    1.51  				{
    1.52 -					lastBranch->addBranch();
    1.53 -					lastBranch=lastBranch->getLastBranch();
    1.54 +					model->createBranch();
    1.55 +					lastBranch=model->getSelectedBranch();
    1.56  				} else
    1.57  					lastBranch->clear();
    1.58  			} else
    1.59 @@ -216,8 +196,8 @@
    1.60  				state=StateBranch;
    1.61  				if (loadMode==ImportAdd)
    1.62  				{
    1.63 -					lastBranch->addBranch();
    1.64 -					lastBranch=lastBranch->getLastBranch();
    1.65 +					model->createBranch();
    1.66 +					lastBranch=model->getSelectedBranch();
    1.67  					
    1.68  				} else
    1.69  					lastBranch->clear();
    1.70 @@ -233,8 +213,8 @@
    1.71  	} else if ( eName == "branch" && state == StateMapCenter) 
    1.72  	{
    1.73  		state=StateBranch;
    1.74 -		lastBranch->addBranch();
    1.75 -		lastBranch=lastBranch->getLastBranch();
    1.76 +		model->createBranch();
    1.77 +		lastBranch=model->getSelectedBranch();
    1.78  		readBranchAttr (atts);
    1.79  	} else if ( eName == "htmlnote" && state == StateBranch) 
    1.80  	{
    1.81 @@ -254,8 +234,8 @@
    1.82  		if (!readXLinkAttr (atts)) return false;
    1.83      } else if ( eName == "branch" && state == StateBranch ) 
    1.84  	{
    1.85 -        lastBranch->addBranch();
    1.86 -		lastBranch=lastBranch->getLastBranch();		
    1.87 +		model->createBranch();
    1.88 +		lastBranch=model->getSelectedBranch();
    1.89  		readBranchAttr (atts);
    1.90      } else if ( eName == "html" && state == StateHtmlNote ) 
    1.91  	{
    1.92 @@ -286,7 +266,8 @@
    1.93      switch ( state ) 
    1.94  	{
    1.95          case StateBranch: 
    1.96 -			lastBranch=(BranchObj*)(lastBranch->getParObj());
    1.97 +			model->selectParent();
    1.98 +			lastBranch=model->getSelectedBranch();
    1.99              break;
   1.100          case StateHtml: 
   1.101  			htmldata+="</"+eName+">";
   1.102 @@ -335,7 +316,7 @@
   1.103  			htmldata+=ch_org;
   1.104  			break;
   1.105          case StateHeading: 
   1.106 -            lastBranch->setHeading(ch_simplified);
   1.107 +            model->setHeading(ch_simplified);
   1.108              break;
   1.109          default: 
   1.110  			return false;