1.1 --- a/treeitem.h	Mon Jun 29 10:28:28 2009 +0000
     1.2 +++ b/treeitem.h	Tue Jul 07 09:34:24 2009 +0000
     1.3 @@ -6,7 +6,7 @@
     1.4  #include <QVariant>
     1.5  
     1.6  #include "flagrow.h"
     1.7 -#include "mapitem.h"
     1.8 +//#include "mapitem.h"
     1.9  #include "noteobj.h"
    1.10  #include "xmlobj.h"
    1.11  
    1.12 @@ -17,7 +17,7 @@
    1.13  class ImageItem;
    1.14  class VymModel;
    1.15  
    1.16 -class TreeItem:public MapItem
    1.17 +class TreeItem:public XMLObj
    1.18  {
    1.19  public:
    1.20  	enum Type {Undefined,MapCenter,Branch,Image};	//FIXME-3 MapCenter still needed?
    1.21 @@ -157,6 +157,7 @@
    1.22  
    1.23  	virtual ImageItem* getImageNum(const int &n);
    1.24  	virtual FloatImageObj* getImageObjNum(const int &n);
    1.25 +
    1.26  protected:
    1.27  	bool hideExport;							//! Hide this item in export
    1.28  public:
    1.29 @@ -165,8 +166,8 @@
    1.30  	virtual void setHideInExport(bool);		// set export of object (and children)
    1.31  	virtual bool hideInExport();
    1.32  	virtual bool isHidden ();		
    1.33 -	virtual QString getAttr();				//! Get attributes for saving as XML
    1.34  
    1.35 +	virtual QString getGeneralAttr();
    1.36  	
    1.37  protected:
    1.38  	VymModel *model;