diff -r bf3ea1f1520b -r 59614eaf5fbb treeitem.h
--- a/treeitem.h	Tue Apr 28 20:53:44 2009 +0000
+++ b/treeitem.h	Wed Apr 29 18:46:31 2009 +0000
@@ -5,17 +5,16 @@
 #include <QList>
 #include <QVariant>
 
+#include "mapitem.h"
 #include "noteobj.h"
 #include "xmlobj.h"
 
 class LinkableMapObj;
 class BranchObj;
 class BranchItem;
-
-
 class VymModel;
 
-class TreeItem:public XMLObj
+class TreeItem:public XMLObj, public MapItem
 {
 public:
 	enum Type {Undefined,MapCenter,Branch,Image};
@@ -77,7 +76,6 @@
     virtual QString getNoteASCII();			// returns note	(ASCII)
     virtual QString getNoteOpenDoc();		// returns note	(OpenDoc)
 
-
 protected:
 	Type type;
 public:	
@@ -101,7 +99,6 @@
 	virtual void setLastSelectedBranch();		//! Set myself as last selected in parent
 	virtual void setLastSelectedBranch(int i);	//! Set last selected branch directly
 	virtual TreeItem* getLastSelectedBranch();
-	virtual TreeItem* findBySelectString (const QString &);	
 
 	virtual void setHideTmp (HideTmpMode);
 	virtual bool hasHiddenExportParent ();
@@ -110,10 +107,6 @@
 	virtual bool isHidden ();		
 
 	
-	// Relation to map objects in graphicsscene	// FIXME-4 should be obsolete
-	virtual LinkableMapObj* getLMO();
-	virtual void setLMO (LinkableMapObj*);
-
 protected:
 	VymModel *model;
 
@@ -121,8 +114,6 @@
     QList<QVariant> itemData;
     TreeItem *parentItem;
  
-	LinkableMapObj *lmo;
-
 	int branchOffset;
 	int branchCounter;
 	int lastSelectedBranchNum;