# HG changeset patch # User insilmaril # Date 1200328019 0 # Node ID 371945eb6d31545d0a22dcc1bdcdd0b65567bf5b # Parent 2abfdb7e85f48f8a470952135af43a8a5ca7826b Added french manual by Claude diff -r 2abfdb7e85f4 -r 371945eb6d31 xml-base.cpp --- a/xml-base.cpp Mon Jan 14 16:26:59 2008 +0000 +++ b/xml-base.cpp Mon Jan 14 16:26:59 2008 +0000 @@ -8,7 +8,6 @@ #include "misc.h" #include "settings.h" #include "linkablemapobj.h" -#include "version.h" /* static BranchObj *lastBranch; @@ -85,10 +84,9 @@ return QXmlDefaultHandler::fatalError( exception ); } -void parseBaseHandler::setMapEditor (MapEditor* e) +void parseBaseHandler::setModel (VymModel *m) { - me=e; - mc=me->getMapCenter(); + model=m; } void parseBaseHandler::setTmpDir (QString tp) diff -r 2abfdb7e85f4 -r 371945eb6d31 xml-base.h --- a/xml-base.h Mon Jan 14 16:26:59 2008 +0000 +++ b/xml-base.h Mon Jan 14 16:26:59 2008 +0000 @@ -8,6 +8,7 @@ #include "file.h" #include "mapcenterobj.h" #include "mapeditor.h" +#include "vymmodel.h" /*! \brief Base class for parsing maps from XML documents */ @@ -26,7 +27,7 @@ virtual QString errorString()=0; bool fatalError( const QXmlParseException&); - void setMapEditor (MapEditor*); + void setModel (VymModel *); void setTmpDir (QString); void setInputFile (QString); void setLoadMode (const LoadMode &); @@ -42,8 +43,7 @@ // QString htmldata; int branchDepth; // NoteObj no; - MapCenterObj* mc; - MapEditor* me; + VymModel *model; QString tmpDir; QString inputFile; };