1.1 --- a/vymmodel.h	Tue Apr 07 16:15:53 2009 +0000
     1.2 +++ b/vymmodel.h	Mon Apr 20 10:42:05 2009 +0000
     1.3 @@ -14,6 +14,7 @@
     1.4  
     1.5  class BranchItem;
     1.6  class MapCenterItem;
     1.7 +class MapEditor;
     1.8  
     1.9  class VymModel : public TreeModel {		
    1.10  	Q_OBJECT
    1.11 @@ -23,7 +24,6 @@
    1.12  ////////////////////////////////////////////
    1.13  private:
    1.14  	QGraphicsScene *mapScene;
    1.15 -	QList <MapCenterObj*> mapCenters;
    1.16  	QString version;	//!< version string saved in vym file
    1.17  	QString author;
    1.18  	QString comment;
    1.19 @@ -36,7 +36,7 @@
    1.20      void init();
    1.21  	void makeTmpDirectories();		//!< create temporary directories e.g. for history
    1.22  
    1.23 -	MapEditor* getMapEditor();			// FIXME not necessary
    1.24 +	MapEditor* getMapEditor();			// FIXME-2 still necessary?
    1.25  
    1.26  	bool isRepositionBlocked();		//!< While load or undo there is no need to update graphicsview
    1.27  
    1.28 @@ -220,9 +220,8 @@
    1.29  	void setScene(QGraphicsScene *s);
    1.30  	QGraphicsScene *getScene();
    1.31  
    1.32 -    LinkableMapObj* findMapObj(QPointF,LinkableMapObj*);	// find MapObj 
    1.33 -    LinkableMapObj* findObjBySelect (const QString &s);		// find MapObj by select string
    1.34 -    LinkableMapObj* findID (const QString &s);				// find MapObj by previously set ID
    1.35 +    TreeItem* findBySelectString (const QString &s);		
    1.36 +    TreeItem* findID (const QString &s);				// find MapObj by previously set ID
    1.37  
    1.38  
    1.39  ////////////////////////////////////////////
    1.40 @@ -555,7 +554,7 @@
    1.41  
    1.42  	void ensureSelectionVisible();			//!< Show selection in all views
    1.43  
    1.44 -//	void selectInt(LinkableMapObj*);	
    1.45 +//	void selectInt(LinkableMapObj*);	//FIXME-4
    1.46  
    1.47  private:	
    1.48  	void selectNextBranchInt();		// Increment number of branch