1.1 --- a/vymmodel.h	Tue Aug 05 07:36:53 2008 +0000
     1.2 +++ b/vymmodel.h	Mon Oct 06 11:10:20 2008 +0000
     1.3 @@ -9,14 +9,10 @@
     1.4  #include "mapeditor.h"
     1.5  #include "parser.h"
     1.6  #include "selection.h"
     1.7 +#include "treeitem.h"
     1.8  #include "treemodel.h"
     1.9 -#include "xmlobj.h"
    1.10  
    1.11 -
    1.12 -/*! \brief This will later be divided into Model/View
    1.13 -*/
    1.14 -
    1.15 -class VymModel : public QObject,  public XMLObj {		
    1.16 +class VymModel : public TreeModel {		
    1.17  	Q_OBJECT
    1.18  
    1.19  ////////////////////////////////////////////
    1.20 @@ -39,11 +35,6 @@
    1.21  
    1.22  	MapEditor* getMapEditor();			// FIXME not necessary
    1.23  
    1.24 -private:
    1.25 -	TreeModel* treeModel;
    1.26 -public:	
    1.27 -	TreeModel* getTreeModel();
    1.28 -
    1.29  	bool isRepositionBlocked();		//!< While load or undo there is no need to update graphicsview
    1.30  
    1.31  	void updateActions();			//!< Update buttons in mainwindow
    1.32 @@ -288,6 +279,10 @@
    1.33      void moveBranchDown();	//!< Move branch down
    1.34  	void sortChildren();	//!< Sort children lexically
    1.35  
    1.36 +	// The create methods are used to quickly parse a XML file
    1.37 +	void createMapCenter();	//!< Create and select MapCenter
    1.38 +	void createBranch();	//!< Create and select Branch
    1.39 +
    1.40  	/*! \brief Add new mapcenter
    1.41  
    1.42  	    Disclaimer: Still experimental, not fully supported yet.
    1.43 @@ -552,6 +547,7 @@
    1.44      void selectRightBranch();
    1.45      void selectFirstBranch();
    1.46      void selectLastBranch();
    1.47 +	void selectParent();
    1.48  
    1.49  public:
    1.50  	Selection::Type selectionType();