1.1 --- a/xml-base.cpp	Mon Jan 14 16:26:59 2008 +0000
     1.2 +++ b/xml-base.cpp	Mon Jan 14 16:26:59 2008 +0000
     1.3 @@ -8,7 +8,6 @@
     1.4  #include "misc.h"
     1.5  #include "settings.h"
     1.6  #include "linkablemapobj.h"
     1.7 -#include "version.h"
     1.8  
     1.9  /*
    1.10  static BranchObj *lastBranch;
    1.11 @@ -85,10 +84,9 @@
    1.12      return QXmlDefaultHandler::fatalError( exception );
    1.13  }
    1.14  
    1.15 -void parseBaseHandler::setMapEditor (MapEditor* e)
    1.16 +void parseBaseHandler::setModel (VymModel *m)
    1.17  {
    1.18 -    me=e;
    1.19 -	mc=me->getMapCenter();
    1.20 +	model=m;
    1.21  }
    1.22  
    1.23  void parseBaseHandler::setTmpDir (QString tp)

     2.1 --- a/xml-base.h	Mon Jan 14 16:26:59 2008 +0000
     2.2 +++ b/xml-base.h	Mon Jan 14 16:26:59 2008 +0000
     2.3 @@ -8,6 +8,7 @@
     2.4  #include "file.h"
     2.5  #include "mapcenterobj.h"
     2.6  #include "mapeditor.h"
     2.7 +#include "vymmodel.h"
     2.8  
     2.9  
    2.10  /*! \brief Base class for parsing maps from XML documents */
    2.11 @@ -26,7 +27,7 @@
    2.12  
    2.13  	virtual QString errorString()=0;
    2.14  	bool fatalError( const QXmlParseException&);
    2.15 -	void setMapEditor (MapEditor*);
    2.16 +	void setModel (VymModel *);
    2.17  	void setTmpDir (QString);
    2.18  	void setInputFile (QString);
    2.19  	void setLoadMode (const LoadMode &);
    2.20 @@ -42,8 +43,7 @@
    2.21  //	QString htmldata;
    2.22  	int branchDepth; 
    2.23  //	NoteObj no;
    2.24 -	MapCenterObj* mc;
    2.25 -	MapEditor* me; 
    2.26 +	VymModel *model;
    2.27  	QString tmpDir; 
    2.28  	QString inputFile;
    2.29  };