diff -r 25a77484ec72 -r db0ec4bcf416 vymmodel.h
--- a/vymmodel.h	Tue Apr 07 16:15:53 2009 +0000
+++ b/vymmodel.h	Mon Apr 20 10:42:05 2009 +0000
@@ -14,6 +14,7 @@
 
 class BranchItem;
 class MapCenterItem;
+class MapEditor;
 
 class VymModel : public TreeModel {		
 	Q_OBJECT
@@ -23,7 +24,6 @@
 ////////////////////////////////////////////
 private:
 	QGraphicsScene *mapScene;
-	QList <MapCenterObj*> mapCenters;
 	QString version;	//!< version string saved in vym file
 	QString author;
 	QString comment;
@@ -36,7 +36,7 @@
     void init();
 	void makeTmpDirectories();		//!< create temporary directories e.g. for history
 
-	MapEditor* getMapEditor();			// FIXME not necessary
+	MapEditor* getMapEditor();			// FIXME-2 still necessary?
 
 	bool isRepositionBlocked();		//!< While load or undo there is no need to update graphicsview
 
@@ -220,9 +220,8 @@
 	void setScene(QGraphicsScene *s);
 	QGraphicsScene *getScene();
 
-    LinkableMapObj* findMapObj(QPointF,LinkableMapObj*);	// find MapObj 
-    LinkableMapObj* findObjBySelect (const QString &s);		// find MapObj by select string
-    LinkableMapObj* findID (const QString &s);				// find MapObj by previously set ID
+    TreeItem* findBySelectString (const QString &s);		
+    TreeItem* findID (const QString &s);				// find MapObj by previously set ID
 
 
 ////////////////////////////////////////////
@@ -555,7 +554,7 @@
 
 	void ensureSelectionVisible();			//!< Show selection in all views
 
-//	void selectInt(LinkableMapObj*);	
+//	void selectInt(LinkableMapObj*);	//FIXME-4
 
 private:	
 	void selectNextBranchInt();		// Increment number of branch