diff -r e3f722759c7e -r 340bc29da9a0 vymmodel.h
--- a/vymmodel.h	Wed May 20 15:40:14 2009 +0000
+++ b/vymmodel.h	Tue May 26 11:23:44 2009 +0000
@@ -8,12 +8,10 @@
 #include "mapcenterobj.h"
 #include "mapeditor.h"
 #include "parser.h"
-#include "selection.h"
 #include "treeitem.h"
 #include "treemodel.h"
 
 class BranchItem;
-class MapCenterItem;
 class MapEditor;
 
 class VymModel : public TreeModel {		
@@ -282,7 +280,7 @@
 	void sortChildren();	//!< Sort children lexically
 
 	// The create methods are used to quickly parse a XML file
-	MapCenterItem* createMapCenter();	//!< Create and select MapCenter
+	BranchItem* createMapCenter();	//!< Create and select MapCenter // FIXME-3 maybe join this also with createBranch
 	BranchItem* createBranch();			//!< Create and select Branch
 	TreeItem* createImage();			//!< Create and select image
 
@@ -290,9 +288,9 @@
 
 	    Disclaimer: Still experimental, not fully supported yet.
 	*/	
-	MapCenterItem* addMapCenter();
+	BranchItem* addMapCenter();
 private:	
-	MapCenterItem* addMapCenter(QPointF absPos);
+	BranchItem* addMapCenter(QPointF absPos);
 
 	/*! \brief Add new branch
 
@@ -425,8 +423,8 @@
 	void reposition();					//!< Call reposition for all MCOs
 	void setHideTmpMode (TreeItem::HideTmpMode mode);	
 
-	QPolygonF shape(BranchObj *bo);		//!< Returns arbitrary shape of subtree
-	void moveAway (LinkableMapObj *lmo);//!< Autolayout: Move all out of the way
+	//FIXME-5 QPolygonF shape(BranchObj *bo);		//!< Returns arbitrary shape of subtree
+	//FIXME-5 void moveAway (LinkableMapObj *lmo);//!< Autolayout: Move all out of the way
 
 	void emitNoteHasChanged (TreeItem *ti);
 	void emitDataHasChanged (TreeItem *ti);
@@ -539,7 +537,6 @@
 // Selection related 
 ////////////////////////////////////////////
 private:
-	Selection selection;
 	TreeItem *latestAddedItem;				// latest added object, reset on setChanged()
 
 signals:
@@ -607,6 +604,8 @@
 private:	
     void setSelectionColorInt(QColor);
 	QItemSelectionModel *selModel;
+	QString lastSelectString;
+	bool selectionBlocked;		//! Used to block changes of selection while editing a heading
 
 public:	
     void setSelectionColor(QColor);