1.1 --- a/treeitem.h	Tue Apr 28 20:53:44 2009 +0000
     1.2 +++ b/treeitem.h	Wed Apr 29 18:46:31 2009 +0000
     1.3 @@ -5,17 +5,16 @@
     1.4  #include <QList>
     1.5  #include <QVariant>
     1.6  
     1.7 +#include "mapitem.h"
     1.8  #include "noteobj.h"
     1.9  #include "xmlobj.h"
    1.10  
    1.11  class LinkableMapObj;
    1.12  class BranchObj;
    1.13  class BranchItem;
    1.14 -
    1.15 -
    1.16  class VymModel;
    1.17  
    1.18 -class TreeItem:public XMLObj
    1.19 +class TreeItem:public XMLObj, public MapItem
    1.20  {
    1.21  public:
    1.22  	enum Type {Undefined,MapCenter,Branch,Image};
    1.23 @@ -77,7 +76,6 @@
    1.24      virtual QString getNoteASCII();			// returns note	(ASCII)
    1.25      virtual QString getNoteOpenDoc();		// returns note	(OpenDoc)
    1.26  
    1.27 -
    1.28  protected:
    1.29  	Type type;
    1.30  public:	
    1.31 @@ -101,7 +99,6 @@
    1.32  	virtual void setLastSelectedBranch();		//! Set myself as last selected in parent
    1.33  	virtual void setLastSelectedBranch(int i);	//! Set last selected branch directly
    1.34  	virtual TreeItem* getLastSelectedBranch();
    1.35 -	virtual TreeItem* findBySelectString (const QString &);	
    1.36  
    1.37  	virtual void setHideTmp (HideTmpMode);
    1.38  	virtual bool hasHiddenExportParent ();
    1.39 @@ -110,10 +107,6 @@
    1.40  	virtual bool isHidden ();		
    1.41  
    1.42  	
    1.43 -	// Relation to map objects in graphicsscene	// FIXME-4 should be obsolete
    1.44 -	virtual LinkableMapObj* getLMO();
    1.45 -	virtual void setLMO (LinkableMapObj*);
    1.46 -
    1.47  protected:
    1.48  	VymModel *model;
    1.49  
    1.50 @@ -121,8 +114,6 @@
    1.51      QList<QVariant> itemData;
    1.52      TreeItem *parentItem;
    1.53   
    1.54 -	LinkableMapObj *lmo;
    1.55 -
    1.56  	int branchOffset;
    1.57  	int branchCounter;
    1.58  	int lastSelectedBranchNum;